August 2016 - Wine-Commits - list.winehq.org

Bruno Jesus : dinput: Fix some debug output.
by Alexandre Julliard Aug. 15, 2016

Aug. 15, 2016

Module: wine Branch: master Commit: 63284bf9b56f766fcf764099a69e9a92acc5ca31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63284bf9b56f766fcf764099a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Aug 13 17:17:28 2016 -0300 dinput: Fix some debug output. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 83d50dc..3993592 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -344,12 +344,12 @@ static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS /* check whether we have a joystick */ if ((fd = open(joystick_devices[id].device, O_RDONLY)) < 0) { - WARN("open(%s, O_RDONLY) failed: %s\n", joystick_devices[id].name, strerror(errno)); + WARN("open(%s, O_RDONLY) failed: %s\n", joystick_devices[id].device, strerror(errno)); return S_FALSE; } fill_joystick_dideviceinstanceA( lpddi, version, id ); close(fd); - TRACE("Enumerating the linux Joystick device: %s (%s)\n", joystick_devices[id].device, lpddi->tszProductName); + TRACE("Enumerating the linux Joystick device: %s (%s)\n", joystick_devices[id].device, joystick_devices[id].name); return S_OK; } @@ -373,7 +373,7 @@ static HRESULT joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS /* check whether we have a joystick */ if ((fd = open(joystick_devices[id].device, O_RDONLY)) < 0) { - WARN("open(%s,O_RDONLY) failed: %s\n", joystick_devices[id].device, strerror(errno)); + WARN("open(%s, O_RDONLY) failed: %s\n", joystick_devices[id].device, strerror(errno)); return S_FALSE; } fill_joystick_dideviceinstanceW( lpddi, version, id );

1 0

Nikolay Sivov : dwrite: Handle zero specified weight as normal.
by Alexandre Julliard Aug. 15, 2016

Aug. 15, 2016

Module: wine Branch: master Commit: 52bbc64a67d778fefe9ec9c6db3240625ae9b472 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52bbc64a67d778fefe9ec9c6d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 13 22:21:15 2016 +0300 dwrite: Handle zero specified weight as normal. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 7f4a208..b38b5a2 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1301,7 +1301,7 @@ void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct d if (usWeightClass > DWRITE_FONT_WEIGHT_ULTRA_BLACK) props->weight = DWRITE_FONT_WEIGHT_ULTRA_BLACK; - else + else if (usWeightClass > 0) props->weight = usWeightClass; if (version >= 4 && (fsSelection & OS2_FSSELECTION_OBLIQUE))

1 0

Vincent Povirk : gdiplus: Fix mismatched use of Begin/ EndContainer and Save/RestoreGraphics.
by Alexandre Julliard Aug. 15, 2016

Aug. 15, 2016

Module: wine Branch: master Commit: cc8cc65f79f35758976ad454128c3cf4d3b19d01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc8cc65f79f35758976ad4541… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Aug 12 15:47:16 2016 -0500 gdiplus: Fix mismatched use of Begin/EndContainer and Save/RestoreGraphics. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 59 ++++++++++++++++++++++++++++--------------- dlls/gdiplus/tests/graphics.c | 4 +-- 2 files changed, 41 insertions(+), 22 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e3b34fc..f0cf98c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1924,9 +1924,15 @@ GpStatus trace_path(GpGraphics *graphics, GpPath *path) return result; } +typedef enum GraphicsContainerType { + BEGIN_CONTAINER, + SAVE_GRAPHICS +} GraphicsContainerType; + typedef struct _GraphicsContainerItem { struct list entry; GraphicsContainer contid; + GraphicsContainerType type; SmoothingMode smoothing; CompositingQuality compqual; @@ -1943,7 +1949,7 @@ typedef struct _GraphicsContainerItem { } GraphicsContainerItem; static GpStatus init_container(GraphicsContainerItem** container, - GDIPCONST GpGraphics* graphics){ + GDIPCONST GpGraphics* graphics, GraphicsContainerType type){ GpStatus sts; *container = heap_alloc_zero(sizeof(GraphicsContainerItem)); @@ -1951,6 +1957,7 @@ static GpStatus init_container(GraphicsContainerItem** container, return OutOfMemory; (*container)->contid = graphics->contid + 1; + (*container)->type = type; (*container)->smoothing = graphics->smoothing; (*container)->compqual = graphics->compqual; @@ -5148,11 +5155,6 @@ GpStatus WINGDIPAPI GdipResetWorldTransform(GpGraphics *graphics) return GdipSetMatrixElements(&graphics->worldtrans, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); } -GpStatus WINGDIPAPI GdipRestoreGraphics(GpGraphics *graphics, GraphicsState state) -{ - return GdipEndContainer(graphics, state); -} - GpStatus WINGDIPAPI GdipRotateWorldTransform(GpGraphics *graphics, REAL angle, GpMatrixOrder order) { @@ -5176,23 +5178,16 @@ GpStatus WINGDIPAPI GdipRotateWorldTransform(GpGraphics *graphics, REAL angle, return GdipRotateMatrix(&graphics->worldtrans, angle, order); } -GpStatus WINGDIPAPI GdipSaveGraphics(GpGraphics *graphics, GraphicsState *state) -{ - return GdipBeginContainer2(graphics, state); -} - -GpStatus WINGDIPAPI GdipBeginContainer2(GpGraphics *graphics, - GraphicsContainer *state) +static GpStatus begin_container(GpGraphics *graphics, + GraphicsContainerType type, GraphicsContainer *state) { GraphicsContainerItem *container; GpStatus sts; - TRACE("(%p, %p)\n", graphics, state); - if(!graphics || !state) return InvalidParameter; - sts = init_container(&container, graphics); + sts = init_container(&container, graphics, type); if(sts != Ok) return sts; @@ -5202,6 +5197,19 @@ GpStatus WINGDIPAPI GdipBeginContainer2(GpGraphics *graphics, return Ok; } +GpStatus WINGDIPAPI GdipSaveGraphics(GpGraphics *graphics, GraphicsState *state) +{ + TRACE("(%p, %p)\n", graphics, state); + return begin_container(graphics, SAVE_GRAPHICS, state); +} + +GpStatus WINGDIPAPI GdipBeginContainer2(GpGraphics *graphics, + GraphicsContainer *state) +{ + TRACE("(%p, %p)\n", graphics, state); + return begin_container(graphics, BEGIN_CONTAINER, state); +} + GpStatus WINGDIPAPI GdipBeginContainer(GpGraphics *graphics, GDIPCONST GpRectF *dstrect, GDIPCONST GpRectF *srcrect, GpUnit unit, GraphicsContainer *state) { FIXME("(%p, %p, %p, %d, %p): stub\n", graphics, dstrect, srcrect, unit, state); @@ -5220,18 +5228,17 @@ GpStatus WINGDIPAPI GdipComment(GpGraphics *graphics, UINT sizeData, GDIPCONST B return NotImplemented; } -GpStatus WINGDIPAPI GdipEndContainer(GpGraphics *graphics, GraphicsContainer state) +static GpStatus end_container(GpGraphics *graphics, GraphicsContainerType type, + GraphicsContainer state) { GpStatus sts; GraphicsContainerItem *container, *container2; - TRACE("(%p, %x)\n", graphics, state); - if(!graphics) return InvalidParameter; LIST_FOR_EACH_ENTRY(container, &graphics->containers, GraphicsContainerItem, entry){ - if(container->contid == state) + if(container->contid == state && container->type == type) break; } @@ -5257,6 +5264,18 @@ GpStatus WINGDIPAPI GdipEndContainer(GpGraphics *graphics, GraphicsContainer sta return Ok; } +GpStatus WINGDIPAPI GdipEndContainer(GpGraphics *graphics, GraphicsContainer state) +{ + TRACE("(%p, %x)\n", graphics, state); + return end_container(graphics, BEGIN_CONTAINER, state); +} + +GpStatus WINGDIPAPI GdipRestoreGraphics(GpGraphics *graphics, GraphicsState state) +{ + TRACE("(%p, %x)\n", graphics, state); + return end_container(graphics, SAVE_GRAPHICS, state); +} + GpStatus WINGDIPAPI GdipScaleWorldTransform(GpGraphics *graphics, REAL sx, REAL sy, GpMatrixOrder order) { diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 4a762cc..f747a2d 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -335,7 +335,7 @@ static void test_save_restore(void) stat = GdipEndContainer(graphics1, state_a); expect(Ok, stat); GdipGetInterpolationMode(graphics1, &mode); - todo_wine expect(InterpolationModeBicubic, mode); + expect(InterpolationModeBicubic, mode); stat = GdipRestoreGraphics(graphics1, state_a); expect(Ok, stat); GdipGetInterpolationMode(graphics1, &mode); @@ -353,7 +353,7 @@ static void test_save_restore(void) stat = GdipRestoreGraphics(graphics1, state_a); expect(Ok, stat); GdipGetInterpolationMode(graphics1, &mode); - todo_wine expect(InterpolationModeBicubic, mode); + expect(InterpolationModeBicubic, mode); stat = GdipEndContainer(graphics1, state_a); expect(Ok, stat); GdipGetInterpolationMode(graphics1, &mode);

1 0

Jacek Caban : wininet: Don' t return available data sizes larger than the read buffer.
by Alexandre Julliard Aug. 15, 2016

Aug. 15, 2016

Module: wine Branch: master Commit: 7d9a4392741f1d9fd68d3fd26496f29c4e2e484b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d9a4392741f1d9fd68d3fd26… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 12 18:08:21 2016 +0200 wininet: Don't return available data sizes larger than the read buffer. Based on patch by Hans Leidekker. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 11 +++++++- dlls/wininet/tests/http.c | 65 ++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 69 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index ac79404..b51c6c9 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2621,7 +2621,16 @@ static DWORD refill_read_buffer(http_request_t *req, blocking_mode_t blocking_mo /* return the size of data available to be read immediately (the read section must be held) */ static DWORD get_avail_data( http_request_t *req ) { - return req->read_size + req->data_stream->vtbl->get_avail_data(req->data_stream, req); + DWORD avail = req->read_size; + + /* + * Different Windows versions have different limits of returned data, but all + * of them return no more than centrain amount. We use READ_BUFFER_SIZE as a limit. + */ + if(avail < READ_BUFFER_SIZE) + avail += req->data_stream->vtbl->get_avail_data(req->data_stream, req); + + return min(avail, READ_BUFFER_SIZE); } static DWORD netconn_get_avail_data(data_stream_t *stream, http_request_t *req) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index bf3f690..fc68fe1 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4622,11 +4622,10 @@ static void open_read_test_request(int port, test_request_t *req, const char *re CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); } -#define readex_expect_sync_data(a,b,c,d,e) _readex_expect_sync_data(__LINE__,a,b,c,d,e) -static void _readex_expect_sync_data(unsigned line, HINTERNET req, DWORD flags, INTERNET_BUFFERSW *buf, - DWORD buf_size, const char *exdata) +#define readex_expect_sync_data_len(a,b,c,d,e,f) _readex_expect_sync_data_len(__LINE__,a,b,c,d,e,f) +static void _readex_expect_sync_data_len(unsigned line, HINTERNET req, DWORD flags, INTERNET_BUFFERSW *buf, + DWORD buf_size, const char *exdata, DWORD len) { - DWORD len = strlen(exdata); BOOL ret; SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); @@ -4636,12 +4635,19 @@ static void _readex_expect_sync_data(unsigned line, HINTERNET req, DWORD flags, ret = InternetReadFileExW(req, buf, flags, 0xdeadbeef); ok_(__FILE__,line)(ret, "InternetReadFileExW failed: %u\n", GetLastError()); ok_(__FILE__,line)(buf->dwBufferLength == len, "dwBufferLength = %u, expected %u\n", buf->dwBufferLength, len); - if(len) + if(len && exdata) ok_(__FILE__,line)(!memcmp(buf->lpvBuffer, exdata, len), "Unexpected data\n"); CLEAR_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); } +#define readex_expect_sync_data(a,b,c,d,e) _readex_expect_sync_data(__LINE__,a,b,c,d,e) +static void _readex_expect_sync_data(unsigned line, HINTERNET req, DWORD flags, INTERNET_BUFFERSW *buf, + DWORD buf_size, const char *exdata) +{ + _readex_expect_sync_data_len(line, req, flags, buf, buf_size, exdata, strlen(exdata)); +} + static void send_response_and_wait(const char *response, BOOL close_connection, INTERNET_BUFFERSW *buf) { DWORD orig_size = buf->dwBufferLength; @@ -4666,6 +4672,17 @@ static void send_response_and_wait(const char *response, BOOL close_connection, ok(!*(int*)buf->lpvBuffer, "buffer data changed\n"); } +static void send_response_len_and_wait(unsigned len, BOOL close_connection, INTERNET_BUFFERSW *buf) +{ + char *response; + + response = HeapAlloc(GetProcessHeap(), 0, len+1); + memset(response, 'x', len); + response[len] = 0; + send_response_and_wait(response, close_connection, buf); + HeapFree(GetProcessHeap(), 0, response); +} + static void readex_expect_async(HINTERNET req, DWORD flags, INTERNET_BUFFERSW *buf, DWORD buf_size) { BOOL ret; @@ -4678,11 +4695,26 @@ static void readex_expect_async(HINTERNET req, DWORD flags, INTERNET_BUFFERSW *b ok(!*(int*)buf->lpvBuffer, "buffer data changed\n"); } +#define expect_data_available(a,b) _expect_data_available(__LINE__,a,b) +static DWORD _expect_data_available(unsigned line, HINTERNET req, int exsize) +{ + DWORD size = 0; + BOOL res; + + res = InternetQueryDataAvailable(req, &size, 0, 0); + ok_(__FILE__,line)(res, "InternetQueryDataAvailable failed: %u\n", GetLastError()); + if(exsize != -1) + ok_(__FILE__,line)(size == exsize, "size = %u, expected %u\n", size, exsize); + + return size; +} + static void test_http_read(int port) { INTERNET_BUFFERSW ib; test_request_t req; - char buf[4096]; + char buf[24000]; + DWORD avail; if(!is_ie7plus) return; @@ -4759,6 +4791,27 @@ static void test_http_read(int port) close_async_handle(req.session, hCompleteEvent, 2); + trace("Testing InternetQueryDataAvailable...\n"); + + open_read_test_request(port, &req, + "HTTP/1.1 200 OK\r\n" + "Server: winetest\r\n" + "\r\n" + "123"); + expect_data_available(req.request, 3); + readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, sizeof(buf), "123"); + readex_expect_async(req.request, IRF_NO_WAIT, &ib, sizeof(buf)); + + send_response_len_and_wait(20000, TRUE, &ib); + avail = expect_data_available(req.request, -1); + ok(avail < 17000, "avail = %u\n", avail); + + SET_WINE_ALLOW(INTERNET_STATUS_CLOSING_CONNECTION); + SET_WINE_ALLOW(INTERNET_STATUS_CONNECTION_CLOSED); + close_async_handle(req.session, hCompleteEvent, 2); + todo_wine CHECK_NOT_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); + todo_wine CHECK_NOT_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); + CloseHandle(hCompleteEvent); CloseHandle(conn_wait_event); CloseHandle(server_req_rec_event);

1 0

Vincent Povirk : gdiplus: Implement recording/ playback for TranslateWorldTransform.
by Alexandre Julliard Aug. 15, 2016

Aug. 15, 2016

Module: wine Branch: master Commit: af500612f26db776629d470ca8b4cdbb70592a29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af500612f26db776629d470ca… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Aug 12 15:47:14 2016 -0500 gdiplus: Implement recording/playback for TranslateWorldTransform. 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/graphics.c | 9 +++++++++ dlls/gdiplus/metafile.c | 43 ++++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/metafile.c | 31 ++++++++++++++++++++++++++++++ 4 files changed, 84 insertions(+) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index a4a2c53..1a028a5 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -94,6 +94,7 @@ extern GpStatus METAFILE_SetWorldTransform(GpMetafile* metafile, GDIPCONST GpMat extern GpStatus METAFILE_ScaleWorldTransform(GpMetafile* metafile, REAL sx, REAL sy, MatrixOrder order) DECLSPEC_HIDDEN; extern GpStatus METAFILE_MultiplyWorldTransform(GpMetafile* metafile, GDIPCONST GpMatrix* matrix, MatrixOrder order) DECLSPEC_HIDDEN; extern GpStatus METAFILE_RotateWorldTransform(GpMetafile* metafile, REAL angle, MatrixOrder order) DECLSPEC_HIDDEN; +extern GpStatus METAFILE_TranslateWorldTransform(GpMetafile* metafile, REAL dx, REAL dy, MatrixOrder order) DECLSPEC_HIDDEN; extern GpStatus METAFILE_ResetWorldTransform(GpMetafile* metafile) DECLSPEC_HIDDEN; extern GpStatus METAFILE_GraphicsDeleted(GpMetafile* metafile) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c04a847..e3b34fc 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5517,6 +5517,8 @@ GpStatus WINGDIPAPI GdipSetWorldTransform(GpGraphics *graphics, GpMatrix *matrix GpStatus WINGDIPAPI GdipTranslateWorldTransform(GpGraphics *graphics, REAL dx, REAL dy, GpMatrixOrder order) { + GpStatus stat; + TRACE("(%p, %.2f, %.2f, %d)\n", graphics, dx, dy, order); if(!graphics) @@ -5525,6 +5527,13 @@ GpStatus WINGDIPAPI GdipTranslateWorldTransform(GpGraphics *graphics, REAL dx, if(graphics->busy) return ObjectBusy; + if (graphics->image && graphics->image->type == ImageTypeMetafile) { + stat = METAFILE_TranslateWorldTransform((GpMetafile*)graphics->image, dx, dy, order); + + if (stat != Ok) + return stat; + } + return GdipTranslateMatrix(&graphics->worldtrans, dx, dy, order); } diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 7dbbf6d..63d9e22 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -109,6 +109,13 @@ typedef struct EmfPlusRotateWorldTransform REAL Angle; } EmfPlusRotateWorldTransform; +typedef struct EmfPlusTranslateWorldTransform +{ + EmfPlusRecordHeader Header; + REAL dx; + REAL dy; +} EmfPlusTranslateWorldTransform; + static GpStatus METAFILE_AllocateRecord(GpMetafile *metafile, DWORD size, void **result) { DWORD size_needed; @@ -673,6 +680,30 @@ GpStatus METAFILE_RotateWorldTransform(GpMetafile* metafile, REAL angle, MatrixO return Ok; } +GpStatus METAFILE_TranslateWorldTransform(GpMetafile* metafile, REAL dx, REAL dy, MatrixOrder order) +{ + if (metafile->metafile_type == MetafileTypeEmfPlusOnly || metafile->metafile_type == MetafileTypeEmfPlusDual) + { + EmfPlusTranslateWorldTransform *record; + GpStatus stat; + + stat = METAFILE_AllocateRecord(metafile, + sizeof(EmfPlusTranslateWorldTransform), + (void**)&record); + if (stat != Ok) + return stat; + + record->Header.Type = EmfPlusRecordTypeTranslateWorldTransform; + record->Header.Flags = (order == MatrixOrderAppend ? 0x2000 : 0); + record->dx = dx; + record->dy = dy; + + METAFILE_WriteRecords(metafile); + } + + return Ok; +} + GpStatus METAFILE_ResetWorldTransform(GpMetafile* metafile) { if (metafile->metafile_type == MetafileTypeEmfPlusOnly || metafile->metafile_type == MetafileTypeEmfPlusDual) @@ -1082,6 +1113,18 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, return METAFILE_PlaybackUpdateWorldTransform(real_metafile); } + case EmfPlusRecordTypeTranslateWorldTransform: + { + EmfPlusTranslateWorldTransform *record = (EmfPlusTranslateWorldTransform*)header; + MatrixOrder order = (flags & 0x2000) ? MatrixOrderAppend : MatrixOrderPrepend; + + if (dataSize + sizeof(EmfPlusRecordHeader) < sizeof(EmfPlusTranslateWorldTransform)) + return InvalidParameter; + + GdipTranslateMatrix(real_metafile->world_transform, record->dx, record->dy, order); + + return METAFILE_PlaybackUpdateWorldTransform(real_metafile); + } case EmfPlusRecordTypeResetWorldTransform: { GdipSetMatrixElements(real_metafile->world_transform, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 49a1dd7..c2cc400 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -1298,6 +1298,8 @@ static const emfplus_record worldtransform_records[] = { {0, EmfPlusRecordTypeFillRects}, {0, EmfPlusRecordTypeSetWorldTransform}, {0, EmfPlusRecordTypeFillRects}, + {0, EmfPlusRecordTypeTranslateWorldTransform}, + {0, EmfPlusRecordTypeFillRects}, {0, EmfPlusRecordTypeEndOfFile}, {0, EMR_EOF}, {0} @@ -1478,6 +1480,31 @@ static void test_worldtransform(void) stat = GdipDeleteBrush(brush); expect(Ok, stat); + /* translate transform */ + stat = GdipTranslateWorldTransform(graphics, -1.0, 0.0, MatrixOrderAppend); + expect(Ok, stat); + + stat = GdipGetWorldTransform(graphics, transform); + expect(Ok, stat); + + stat = GdipGetMatrixElements(transform, elements); + expect(Ok, stat); + expectf(1.0, elements[0]); + expectf(0.0, elements[1]); + expectf(0.0, elements[2]); + expectf(3.0, elements[3]); + expectf(-1.0, elements[4]); + expectf(0.0, elements[5]); + + stat = GdipCreateSolidFill((ARGB)0xffffffff, (GpSolidFill**)&brush); + expect(Ok, stat); + + stat = GdipFillRectangle(graphics, brush, 1.0, 1.0, 1.0, 1.0); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + stat = GdipDeleteMatrix(transform); expect(Ok, stat); @@ -1524,6 +1551,10 @@ static void test_worldtransform(void) expect(Ok, stat); expect(0xffffff00, color); + stat = GdipBitmapGetPixel(bitmap, 10, 90, &color); + expect(Ok, stat); + expect(0xffffffff, color); + stat = GdipDeleteGraphics(graphics); expect(Ok, stat);

1 0

Bruno Jesus : dinput/tests: Improve controller debug information.
by Alexandre Julliard Aug. 15, 2016

Aug. 15, 2016

Module: wine Branch: master Commit: f1b782bfc8413a2fa1cbbc8955f9975b113d18ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1b782bfc8413a2fa1cbbc895… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Aug 14 15:12:54 2016 -0300 dinput/tests: Improve controller debug information. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/joystick.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index b196ea7..4882744 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -203,7 +203,21 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) if (hr!=DI_OK) goto DONE; - trace("---- %s ----\n", lpddi->tszProductName); + trace("---- Controller Information ----\n" + "Product Name : %s\n" + "Instance Name : %s\n" + "devType : 0x%08x\n" + "GUID Product : %s\n" + "GUID Instance : %s\n" + "HID Page : 0x%04x\n" + "HID Usage : 0x%04x\n", + lpddi->tszProductName, + lpddi->tszInstanceName, + lpddi->dwDevType, + wine_dbgstr_guid(&lpddi->guidProduct), + wine_dbgstr_guid(&lpddi->guidInstance), + lpddi->wUsagePage, + lpddi->wUsage); /* Test for joystick ID property */ ZeroMemory(&dipw, sizeof(dipw));

1 0

Nikolay Sivov : dwrite: Sanitize specified stretch value, valid range is [ 1, 9].
by Alexandre Julliard Aug. 15, 2016

Aug. 15, 2016

Module: wine Branch: master Commit: ff57b1febba846fe30f420519b4aec2a1f23dc35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff57b1febba846fe30f420519… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 13 22:21:13 2016 +0300 dwrite: Sanitize specified stretch value, valid range is [1, 9]. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index b35f1df..7f4a208 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1291,9 +1291,10 @@ void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct d USHORT version = GET_BE_WORD(tt_os2->version); USHORT fsSelection = GET_BE_WORD(tt_os2->fsSelection); USHORT usWeightClass = GET_BE_WORD(tt_os2->usWeightClass); + USHORT usWidthClass = GET_BE_WORD(tt_os2->usWidthClass); - if (GET_BE_WORD(tt_os2->usWidthClass) <= DWRITE_FONT_STRETCH_ULTRA_EXPANDED) - props->stretch = GET_BE_WORD(tt_os2->usWidthClass); + if (usWidthClass > DWRITE_FONT_STRETCH_UNDEFINED && usWidthClass <= DWRITE_FONT_STRETCH_ULTRA_EXPANDED) + props->stretch = usWidthClass; if (usWeightClass >= 1 && usWeightClass <= 9) usWeightClass *= 100;

1 0

Bruno Jesus : dinput: Add support for DIPROP_VIDPID property in Linux js implementation.
by Alexandre Julliard Aug. 15, 2016

Aug. 15, 2016

Module: wine Branch: master Commit: 58937117fbd4d9e075d2b5be63cb56038623e49e URL: http://source.winehq.org/git/wine.git/?a=commit;h=58937117fbd4d9e075d2b5be6… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Aug 14 15:26:23 2016 -0300 dinput: Add support for DIPROP_VIDPID property in Linux js implementation. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linux.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 3993592..20e2573 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -645,6 +645,16 @@ static HRESULT WINAPI JoystickLinuxWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface switch (LOWORD(rguid)) { + case (DWORD_PTR) DIPROP_VIDPID: + { + LPDIPROPDWORD pd = (LPDIPROPDWORD)pdiph; + + if (!This->joydev->product_id || !This->joydev->vendor_id) + return DIERR_UNSUPPORTED; + pd->dwData = MAKELONG(This->joydev->vendor_id, This->joydev->product_id); + TRACE("DIPROP_VIDPID(%08x)\n", pd->dwData); + break; + } case (DWORD_PTR) DIPROP_JOYSTICKID: { LPDIPROPDWORD pd = (LPDIPROPDWORD)pdiph;

1 0

Nikolay Sivov : gdi32: Support special 'ttcf' tag in GetFontData().
by Alexandre Julliard Aug. 12, 2016

Aug. 12, 2016

Module: wine Branch: master Commit: 7e50116b52f37a3a191cb207c1543ffdd3941c8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e50116b52f37a3a191cb207c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 12 13:14:50 2016 +0300 gdi32: Support special 'ttcf' tag in GetFontData(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 7b0ff94..2e3b29a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -210,8 +210,10 @@ MAKE_FUNCPTR(FcPatternGetString); #ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x) +#define GET_BE_DWORD(x) (x) #else #define GET_BE_WORD(x) RtlUshortByteSwap(x) +#define GET_BE_DWORD(x) RtlUlongByteSwap(x) #endif #define MS_MAKE_TAG( _x1, _x2, _x3, _x4 ) \ @@ -223,6 +225,7 @@ MAKE_FUNCPTR(FcPatternGetString); #define MS_GASP_TAG MS_MAKE_TAG('g', 'a', 's', 'p') #define MS_GSUB_TAG MS_MAKE_TAG('G', 'S', 'U', 'B') #define MS_KERN_TAG MS_MAKE_TAG('k', 'e', 'r', 'n') +#define MS_TTCF_TAG MS_MAKE_TAG('t', 't', 'c', 'f') #define MS_VDMX_TAG MS_MAKE_TAG('V', 'D', 'M', 'X') /* 'gasp' flags */ @@ -424,6 +427,7 @@ struct tagGdiFont { GdiFont *base_font; VOID *GSUB_Table; const VOID *vert_feature; + ULONG ttc_item_offset; /* 0 if font is not a part of TrueType collection */ DWORD cache_num; DWORD instance_id; struct font_fileinfo *fileinfo; @@ -4549,6 +4553,9 @@ static FT_Face OpenFontFace(GdiFont *font, Face *face, LONG width, LONG height) font->ft_face = ft_face; if(FT_IS_SCALABLE(ft_face)) { + FT_ULong len; + DWORD header; + /* load the VDMX table if we have one */ font->ppem = load_VDMX(font, height); if(font->ppem == 0) @@ -4557,6 +4564,20 @@ static FT_Face OpenFontFace(GdiFont *font, Face *face, LONG width, LONG height) if((err = pFT_Set_Pixel_Sizes(ft_face, 0, font->ppem)) != 0) WARN("FT_Set_Pixel_Sizes %d, %d rets %x\n", 0, font->ppem, err); + + /* see if it's a TTC */ + len = sizeof(header); + if (!pFT_Load_Sfnt_Table(ft_face, 0, 0, (void*)&header, &len)) { + if (header == MS_TTCF_TAG) + { + len = sizeof(font->ttc_item_offset); + if (pFT_Load_Sfnt_Table(ft_face, 0, (3 + face->face_index) * sizeof(DWORD), + (void*)&font->ttc_item_offset, &len)) + font->ttc_item_offset = 0; + else + font->ttc_item_offset = GET_BE_DWORD(font->ttc_item_offset); + } + } } else { font->ppem = height; if((err = pFT_Set_Pixel_Sizes(ft_face, width, height)) != 0) @@ -4666,6 +4687,16 @@ static DWORD get_font_data( GdiFont *font, DWORD table, DWORD offset, LPVOID buf else len = cbData; + /* if font is a member of TTC, 'ttcf' tag allows reading from beginning of TTC file, + 0 tag means to read from start of collection member data. */ + if (font->ttc_item_offset) + { + if (table == MS_TTCF_TAG) + table = 0; + else if (table == 0) + offset += font->ttc_item_offset; + } + table = RtlUlongByteSwap( table ); /* MS tags differ in endianness from FT ones */ /* make sure value of len is the value freetype says it needs */

1 0

Nikolay Sivov : t2embed: Add some traces for fsType and exclusion list test results.
by Alexandre Julliard Aug. 12, 2016

Aug. 12, 2016

Module: wine Branch: master Commit: 9df16935c81fc76207ddb60a36f4ccbad2915c76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9df16935c81fc76207ddb60a3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 12 01:45:20 2016 +0300 t2embed: Add some traces for fsType and exclusion list test results. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/t2embed/main.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c index de78b25..766926f 100644 --- a/dlls/t2embed/main.c +++ b/dlls/t2embed/main.c @@ -75,6 +75,7 @@ LONG WINAPI TTEmbedFont(HDC hDC, ULONG ulFlags, ULONG ulCharSet, ULONG *pulPrivS LONG WINAPI TTGetEmbeddingType(HDC hDC, ULONG *status) { OUTLINETEXTMETRICW otm; + WORD fsType; TRACE("(%p %p)\n", hDC, status); @@ -88,7 +89,7 @@ LONG WINAPI TTGetEmbeddingType(HDC hDC, ULONG *status) if (!status) return E_PERMISSIONSINVALID; - otm.otmfsType &= 0xf; + otm.otmfsType = (fsType = otm.otmfsType) & 0xf; if (otm.otmfsType == LICENSE_INSTALLABLE) *status = EMBED_INSTALLABLE; else if (otm.otmfsType & LICENSE_EDITABLE) @@ -103,6 +104,7 @@ LONG WINAPI TTGetEmbeddingType(HDC hDC, ULONG *status) *status = EMBED_INSTALLABLE; } + TRACE("fsType 0x%04x, status %u\n", fsType, *status); return E_NONE; } @@ -124,7 +126,7 @@ LONG WINAPI TTIsEmbeddingEnabledForFacename(LPCSTR facename, BOOL *enabled) *enabled = TRUE; if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, exclusionlistW, 0, GENERIC_READ, &hkey)) - return E_NONE; + goto out; *enabled = TRUE; ret = ERROR_SUCCESS; @@ -148,6 +150,8 @@ LONG WINAPI TTIsEmbeddingEnabledForFacename(LPCSTR facename, BOOL *enabled) } RegCloseKey(hkey); +out: + TRACE("embedding %s for %s\n", *enabled ? "enabled" : "disabled", debugstr_a(facename)); return E_NONE; }

1 0