November 2023 - Wine-Commits

Piotr Caban : msvcrt: Initialize writable environment block in env_set.
by Alexandre Julliard Nov. 30, 2023

Nov. 30, 2023

Module: wine Branch: master Commit: ae32b2f45243462971d4581a0214d4834e715cf2 URL: https://gitlab.winehq.org/wine/wine/-/commit/ae32b2f45243462971d4581a0214d4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 30 11:41:51 2023 +0100 msvcrt: Initialize writable environment block in env_set. --- dlls/msvcrt/environ.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index 9e358d971f9..063a9254c67 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -155,6 +155,7 @@ static int env_set(char **env, wchar_t **wenv) GetLastError() != ERROR_ENVVAR_NOT_FOUND) return -1; + if (env_init(FALSE, TRUE)) return -1; *eq = 0; idx = env_get_index(*env); *eq = '='; @@ -180,6 +181,8 @@ static int env_set(char **env, wchar_t **wenv) } if (!MSVCRT__wenviron) return 0; + if (MSVCRT__wenviron == MSVCRT___winitenv) + if (env_init(TRUE, TRUE)) return -1; idx = wenv_get_index(*wenv); *weq = '='; if (!weq[1]) @@ -264,11 +267,6 @@ static int putenv_helper(const char *name, const char *val, const char *eq) char *env; int r; - _lock(_ENV_LOCK); - r = env_init(FALSE, TRUE); - _unlock(_ENV_LOCK); - if (r) return -1; - if (eq) { env = strdup(name);

1 0

Piotr Caban : wineps.drv: Return error when visible rectangle is empty in get_vis_rectangles.
by Alexandre Julliard Nov. 30, 2023

Nov. 30, 2023

Module: wine Branch: master Commit: ccbf1d25b68369a0ab2e72b32d4c35c8dd7100bd URL: https://gitlab.winehq.org/wine/wine/-/commit/ccbf1d25b68369a0ab2e72b32d4c35… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 28 16:46:06 2023 +0100 wineps.drv: Return error when visible rectangle is empty in get_vis_rectangles. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55950 --- dlls/wineps.drv/printproc.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index b957a0d3bbd..7d2306b8443 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -301,7 +301,7 @@ static void clip_visrect(HDC hdc, RECT *dst, const RECT *src) DeleteObject(hrgn); } -static void get_vis_rectangles(HDC hdc, struct ps_bitblt_coords *dst, +static BOOL get_vis_rectangles(HDC hdc, struct ps_bitblt_coords *dst, const XFORM *xform, DWORD width, DWORD height, struct ps_bitblt_coords *src) { RECT rect; @@ -323,7 +323,8 @@ static void get_vis_rectangles(HDC hdc, struct ps_bitblt_coords *dst, get_bounding_rect(&rect, dst->x, dst->y, dst->width, dst->height); clip_visrect(hdc, &dst->visrect, &rect); - if (!src) return; + if (IsRectEmpty(&dst->visrect)) return FALSE; + if (!src) return TRUE; rect.left = src->log_x; rect.top = src->log_y; @@ -341,7 +342,7 @@ static void get_vis_rectangles(HDC hdc, struct ps_bitblt_coords *dst, if (rect.bottom > height) rect.bottom = height; src->visrect = rect; - intersect_vis_rectangles(dst, src); + return intersect_vis_rectangles(dst, src); } static int stretch_blt(print_ctx *ctx, const EMRSTRETCHBLT *blt, @@ -363,7 +364,8 @@ static int stretch_blt(print_ctx *ctx, const EMRSTRETCHBLT *blt, if (!blt->cbBmiSrc) { - get_vis_rectangles(ctx->hdc, &dst, NULL, 0, 0, NULL); + if (!get_vis_rectangles(ctx->hdc, &dst, NULL, 0, 0, NULL)) + return TRUE; return PSDRV_PatBlt(ctx, &dst, blt->dwRop); } @@ -373,8 +375,9 @@ static int stretch_blt(print_ctx *ctx, const EMRSTRETCHBLT *blt, src.log_height = blt->cySrc; src.layout = 0; - get_vis_rectangles(ctx->hdc, &dst, &blt->xformSrc, - bi->bmiHeader.biWidth, abs(bi->bmiHeader.biHeight), &src); + if (!get_vis_rectangles(ctx->hdc, &dst, &blt->xformSrc, + bi->bmiHeader.biWidth, abs(bi->bmiHeader.biHeight), &src)) + return TRUE; memcpy(dst_info, bi, blt->cbBmiSrc); memset(&bits, 0, sizeof(bits));

1 0

Piotr Caban : wineps.drv: Fix EMR_SAVEDC record playback.
by Alexandre Julliard Nov. 30, 2023

Nov. 30, 2023

Module: wine Branch: master Commit: 4843daaee128ec5f4643d041139ce8f52e13df27 URL: https://gitlab.winehq.org/wine/wine/-/commit/4843daaee128ec5f4643d041139ce8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 29 21:36:09 2023 +0100 wineps.drv: Fix EMR_SAVEDC record playback. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55927 --- dlls/wineps.drv/printproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 7d2306b8443..98de5badda7 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -2250,7 +2250,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, } case EMR_SAVEDC: { - int ret = PlayEnhMetaFileRecord(hdc, htable, rec, handle_count); + int ret = PlayEnhMetaFileRecord(data->ctx->hdc, htable, rec, handle_count); if (!data->saved_dc_size) {

1 0

Nikolay Sivov : gdi32/emf: Pad EMREXTESCAPE record data.
by Alexandre Julliard Nov. 30, 2023

Nov. 30, 2023

Module: wine Branch: master Commit: 95c87562f8dd54c7964ccc229df689fa5914bd7a URL: https://gitlab.winehq.org/wine/wine/-/commit/95c87562f8dd54c7964ccc229df689… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 27 10:20:37 2023 +0100 gdi32/emf: Pad EMREXTESCAPE record data. --- dlls/gdi32/emfdc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index 5fc0109f78f..63110f57eeb 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -1199,8 +1199,7 @@ INT EMFDC_ExtEscape( DC_ATTR *dc_attr, INT escape, INT input_size, const char *i if (escape == QUERYESCSUPPORT) return 0; - size = FIELD_OFFSET( EMREXTESCAPE, EscData[input_size] ); - size = (size + 3) & ~3; + size = aligned_size(FIELD_OFFSET( EMREXTESCAPE, EscData[input_size] )); if (!(emr = HeapAlloc( GetProcessHeap(), 0, size ))) return 0; emr->emr.iType = EMR_EXTESCAPE; @@ -1208,6 +1207,7 @@ INT EMFDC_ExtEscape( DC_ATTR *dc_attr, INT escape, INT input_size, const char *i emr->iEscape = escape; emr->cbEscData = input_size; memcpy(emr->EscData, input, input_size); + pad_record(emr->EscData, input_size); emfdc_record( get_dc_emf( dc_attr ), &emr->emr ); HeapFree( GetProcessHeap(), 0, emr ); if (output_size && output) return 0;

1 0

Nikolay Sivov : gdi32/emf: Use public definition for EMREXTESCAPE record.
by Alexandre Julliard Nov. 30, 2023

Nov. 30, 2023

Module: wine Branch: master Commit: ba454b239feed275864441b87fd2bccfa8998592 URL: https://gitlab.winehq.org/wine/wine/-/commit/ba454b239feed275864441b87fd2bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 27 10:01:46 2023 +0100 gdi32/emf: Use public definition for EMREXTESCAPE record. --- dlls/gdi32/emfdc.c | 16 +++++----------- include/wingdi.h | 8 ++++++++ 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index fdd915a106f..5fc0109f78f 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -1194,26 +1194,20 @@ BOOL EMFDC_PolyDraw( DC_ATTR *dc_attr, const POINT *pts, const BYTE *types, DWOR INT EMFDC_ExtEscape( DC_ATTR *dc_attr, INT escape, INT input_size, const char *input, INT output_size, char *output) { - struct EMREXTESCAPE - { - EMR emr; - DWORD escape; - DWORD size; - BYTE data[1]; - } *emr; + EMREXTESCAPE *emr; size_t size; if (escape == QUERYESCSUPPORT) return 0; - size = FIELD_OFFSET( struct EMREXTESCAPE, data[input_size] ); + size = FIELD_OFFSET( EMREXTESCAPE, EscData[input_size] ); size = (size + 3) & ~3; if (!(emr = HeapAlloc( GetProcessHeap(), 0, size ))) return 0; emr->emr.iType = EMR_EXTESCAPE; emr->emr.nSize = size; - emr->escape = escape; - emr->size = input_size; - memcpy(emr->data, input, input_size); + emr->iEscape = escape; + emr->cbEscData = input_size; + memcpy(emr->EscData, input, input_size); emfdc_record( get_dc_emf( dc_attr ), &emr->emr ); HeapFree( GetProcessHeap(), 0, emr ); if (output_size && output) return 0; diff --git a/include/wingdi.h b/include/wingdi.h index ff0bbb6fc85..ef1b3e310aa 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -2341,6 +2341,14 @@ typedef struct { EXTLOGPEN elp; } EMREXTCREATEPEN, *PEMREXTCREATEPEN; +typedef struct tagEMREXTESCAPE +{ + EMR emr; + INT iEscape; + INT cbEscData; + BYTE EscData[1]; +} EMREXTESCAPE, *PEMREXTESCAPE, EMRDRAWESCAPE, *PEMRDRAWESCAPE; + typedef struct { EMR emr; POINTL ptlStart;

1 0

Nikolay Sivov : gdi32/emf: Align and pad bitmap data in EMRSETDIBITSTODEVICE records.
by Alexandre Julliard Nov. 30, 2023

Nov. 30, 2023

Module: wine Branch: master Commit: 7c479e797f62f789467fa1701d30b9d26543c70a URL: https://gitlab.winehq.org/wine/wine/-/commit/7c479e797f62f789467fa1701d30b9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 27 09:22:47 2023 +0100 gdi32/emf: Align and pad bitmap data in EMRSETDIBITSTODEVICE records. --- dlls/gdi32/emfdc.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index a93696d0446..fdd915a106f 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -1968,6 +1968,7 @@ BOOL EMFDC_SetDIBitsToDevice( DC_ATTR *dc_attr, INT x_dst, INT y_dst, DWORD widt UINT src_height, stride; BITMAPINFOHEADER bih; BITMAPINFO *bi; + void *ptr; /* calculate the size of the colour table and the image */ if (!emf_parse_user_bitmapinfo( &bih, &info->bmiHeader, usage, TRUE, @@ -1993,7 +1994,7 @@ BOOL EMFDC_SetDIBitsToDevice( DC_ATTR *dc_attr, INT x_dst, INT y_dst, DWORD widt } /* check for overflows */ - payload_size = bmi_size + img_size; + payload_size = aligned_size(bmi_size) + aligned_size(img_size); if (payload_size < bmi_size) return 0; emr_size = sizeof (EMRSETDIBITSTODEVICE) + payload_size; @@ -2002,14 +2003,6 @@ BOOL EMFDC_SetDIBitsToDevice( DC_ATTR *dc_attr, INT x_dst, INT y_dst, DWORD widt /* allocate record */ if (!(emr = HeapAlloc( GetProcessHeap(), 0, emr_size ))) return FALSE; - /* write a bitmap info header (with colours) to the record */ - bi = (BITMAPINFO *)&emr[1]; - bi->bmiHeader = bih; - emf_copy_colours_from_user_bitmapinfo( bi, info, usage ); - - /* write bitmap bits to the record */ - memcpy ( (BYTE *)&emr[1] + bmi_size, bits, img_size ); - emr->emr.iType = EMR_SETDIBITSTODEVICE; emr->emr.nSize = emr_size; emr->rclBounds.left = x_dst; @@ -2024,12 +2017,22 @@ BOOL EMFDC_SetDIBitsToDevice( DC_ATTR *dc_attr, INT x_dst, INT y_dst, DWORD widt emr->cySrc = height; emr->offBmiSrc = sizeof(EMRSETDIBITSTODEVICE); emr->cbBmiSrc = bmi_size; - emr->offBitsSrc = sizeof(EMRSETDIBITSTODEVICE) + bmi_size; + emr->offBitsSrc = sizeof(EMRSETDIBITSTODEVICE) + aligned_size(bmi_size); emr->cbBitsSrc = img_size; emr->iUsageSrc = usage; emr->iStartScan = startscan; emr->cScans = lines; + /* write a bitmap info header (with colours) to the record */ + bi = (BITMAPINFO *)((BYTE *)emr + emr->offBmiSrc); + bi->bmiHeader = bih; + emf_copy_colours_from_user_bitmapinfo( bi, info, usage ); + pad_record( bi, bmi_size ); + + /* write bitmap bits to the record */ + ptr = memcpy ( (BYTE *)emr + emr->offBitsSrc, bits, img_size ); + pad_record( ptr, img_size ); + if ((ret = emfdc_record( get_dc_emf( dc_attr ), (EMR*)emr ))) emfdc_update_bounds( get_dc_emf( dc_attr ), &emr->rclBounds );

1 0

Nikolay Sivov : wineps: Use public definition for EMREXTESCAPE record.
by Alexandre Julliard Nov. 30, 2023

Nov. 30, 2023

Module: wine Branch: master Commit: 8de0e3914de0d2403983fc8f62f42bc8d97f98fb URL: https://gitlab.winehq.org/wine/wine/-/commit/8de0e3914de0d2403983fc8f62f42b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 27 10:16:52 2023 +0100 wineps: Use public definition for EMREXTESCAPE record. --- dlls/wineps.drv/printproc.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 46ebe0b8e04..b957a0d3bbd 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -2773,15 +2773,9 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, } case EMR_EXTESCAPE: { - const struct EMREXTESCAPE - { - EMR emr; - DWORD escape; - DWORD size; - BYTE data[1]; - } *p = (const struct EMREXTESCAPE *)rec; + const EMREXTESCAPE *p = (const EMREXTESCAPE *)rec; - PSDRV_ExtEscape(data->ctx, p->escape, p->size, p->data, 0, NULL); + PSDRV_ExtEscape(data->ctx, p->iEscape, p->cbEscData, p->EscData, 0, NULL); return 1; } case EMR_GRADIENTFILL:

1 0

Nikolay Sivov : gdi32/emf: Align and pad bitmap data in EMRSTRETCHDIBITS records.
by Alexandre Julliard Nov. 30, 2023

Nov. 30, 2023

Module: wine Branch: master Commit: e63b00b1ad603e89242f503dc1af9060dbbc9311 URL: https://gitlab.winehq.org/wine/wine/-/commit/e63b00b1ad603e89242f503dc1af90… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 27 09:08:38 2023 +0100 gdi32/emf: Align and pad bitmap data in EMRSTRETCHDIBITS records. --- dlls/gdi32/emfdc.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index c8b7327ce5b..a93696d0446 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -1899,13 +1899,14 @@ BOOL EMFDC_StretchDIBits( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_dst, UINT bmi_size, img_size, payload_size, emr_size; BITMAPINFOHEADER bih; BITMAPINFO *bi; + void *ptr; /* calculate the size of the colour table and the image */ if (!emf_parse_user_bitmapinfo( &bih, &info->bmiHeader, usage, TRUE, &bmi_size, &img_size )) return 0; /* check for overflows */ - payload_size = bmi_size + img_size; + payload_size = aligned_size(bmi_size) + aligned_size(img_size); if (payload_size < bmi_size) return 0; emr_size = sizeof (EMRSTRETCHDIBITS) + payload_size; @@ -1914,14 +1915,6 @@ BOOL EMFDC_StretchDIBits( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_dst, /* allocate record */ if (!(emr = HeapAlloc(GetProcessHeap(), 0, emr_size ))) return 0; - /* write a bitmap info header (with colours) to the record */ - bi = (BITMAPINFO *)&emr[1]; - bi->bmiHeader = bih; - emf_copy_colours_from_user_bitmapinfo( bi, info, usage ); - - /* write bitmap bits to the record */ - memcpy ( (BYTE *)&emr[1] + bmi_size, bits, img_size ); - /* fill in the EMR header at the front of our piece of memory */ emr->emr.iType = EMR_STRETCHDIBITS; emr->emr.nSize = emr_size; @@ -1937,7 +1930,7 @@ BOOL EMFDC_StretchDIBits( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_dst, emr->iUsageSrc = usage; emr->offBmiSrc = sizeof (EMRSTRETCHDIBITS); emr->cbBmiSrc = bmi_size; - emr->offBitsSrc = emr->offBmiSrc + bmi_size; + emr->offBitsSrc = emr->offBmiSrc + aligned_size(bmi_size); emr->cbBitsSrc = img_size; emr->cxSrc = width_src; @@ -1948,6 +1941,16 @@ BOOL EMFDC_StretchDIBits( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_dst, emr->rclBounds.right = x_dst + width_dst - 1; emr->rclBounds.bottom = y_dst + height_dst - 1; + /* write a bitmap info header (with colours) to the record */ + bi = (BITMAPINFO *)((BYTE *)emr + emr->offBmiSrc); + bi->bmiHeader = bih; + emf_copy_colours_from_user_bitmapinfo( bi, info, usage ); + pad_record( bi, emr->cbBmiSrc ); + + /* write bitmap bits to the record */ + ptr = memcpy ( (BYTE *)emr + emr->offBitsSrc, bits, img_size ); + pad_record( ptr, emr->cbBitsSrc ); + /* save the record we just created */ ret = emfdc_record( get_dc_emf( dc_attr ), &emr->emr ); if (ret) emfdc_update_bounds( get_dc_emf( dc_attr ), &emr->rclBounds );

1 0

Nikolay Sivov : gdi32/emf: Add description field padding.
by Alexandre Julliard Nov. 30, 2023

Nov. 30, 2023

Module: wine Branch: master Commit: 169a23a14029edc00f47ad6e6a1a14402ace50c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/169a23a14029edc00f47ad6e6a1a14… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 27 08:50:40 2023 +0100 gdi32/emf: Add description field padding. --- dlls/gdi32/emfdc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index 0d53fe8d553..c8b7327ce5b 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -2638,6 +2638,7 @@ static struct emf *emf_create( HDC hdc, const RECT *rect, const WCHAR *descripti DWORD size = 0, length = 0; DC_ATTR *dc_attr; struct emf *emf; + void *ptr; if (!(dc_attr = get_dc_attr( hdc )) || !(emf = HeapAlloc( GetProcessHeap(), 0, sizeof(*emf) ))) return NULL; @@ -2649,7 +2650,7 @@ static struct emf *emf_create( HDC hdc, const RECT *rect, const WCHAR *descripti length += 3; length *= 2; } - size = sizeof(ENHMETAHEADER) + (length + 3) / 4 * 4; + size = sizeof(ENHMETAHEADER) + aligned_size(length); if (!(emf->emh = HeapAlloc( GetProcessHeap(), 0, size )) || !(emf->handles = HeapAlloc( GetProcessHeap(), 0, @@ -2674,7 +2675,8 @@ static struct emf *emf_create( HDC hdc, const RECT *rect, const WCHAR *descripti emf->emh->nDescription = length / 2; emf->emh->offDescription = length ? sizeof(ENHMETAHEADER) : 0; - memcpy( (char *)emf->emh + sizeof(ENHMETAHEADER), description, length ); + ptr = memcpy( (char *)emf->emh + sizeof(ENHMETAHEADER), description, length ); + pad_record( ptr, length ); emf_reset( dc_attr, rect ); return emf;

1 0

Nikolay Sivov : gdi32/emf: Use padding helper in GdiComment().
by Alexandre Julliard Nov. 30, 2023

Nov. 30, 2023

Module: wine Branch: master Commit: 47a939e2ad59c0191c98f5370c8530bcf5013e7a URL: https://gitlab.winehq.org/wine/wine/-/commit/47a939e2ad59c0191c98f5370c8530… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 27 08:35:56 2023 +0100 gdi32/emf: Use padding helper in GdiComment(). --- dlls/gdi32/emfdc.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index 83e1b27d27b..a3e263ae2a0 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -2514,20 +2514,19 @@ BOOL WINAPI GdiComment( HDC hdc, UINT bytes, const BYTE *buffer ) { DC_ATTR *dc_attr; EMRGDICOMMENT *emr; - UINT total, rounded_size; + UINT total; BOOL ret; if (!(dc_attr = get_dc_attr( hdc )) || !get_dc_emf( dc_attr )) return FALSE; - rounded_size = aligned_size(bytes); - total = offsetof(EMRGDICOMMENT,Data) + rounded_size; + total = offsetof(EMRGDICOMMENT,Data) + aligned_size(bytes); emr = HeapAlloc(GetProcessHeap(), 0, total); emr->emr.iType = EMR_GDICOMMENT; emr->emr.nSize = total; emr->cbData = bytes; - memset(&emr->Data[bytes], 0, rounded_size - bytes); memcpy(&emr->Data[0], buffer, bytes); + pad_record(&emr->Data[0], bytes); ret = emfdc_record( get_dc_emf( dc_attr ), &emr->emr );

1 0