October 2015 - Wine-commits

Alexandre Julliard : wineconsole: Deal with fonts that don' t have a uniform character width.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: 15f8b012239cd53d9e1a7bb2d1d01371f1cd3aa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15f8b012239cd53d9e1a7bb2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 20 15:45:42 2015 +0900 wineconsole: Deal with fonts that don't have a uniform character width. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/user.c | 59 ++++++++++----------------------------------- 1 file changed, 13 insertions(+), 46 deletions(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 4725ebd..879529c 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -55,6 +55,7 @@ static void WCUSER_FillMemDC(const struct inner_data* data, int upd_tp, int upd_ WCHAR* line; RECT r; HBRUSH hbr; + INT *dx; /* no font has been set up yet, don't worry about filling the bitmap, * we'll do it once a font is chosen @@ -66,6 +67,7 @@ static void WCUSER_FillMemDC(const struct inner_data* data, int upd_tp, int upd_ */ if (!(line = HeapAlloc(GetProcessHeap(), 0, data->curcfg.sb_width * sizeof(WCHAR)))) WINECON_Fatal("OOM\n"); + dx = HeapAlloc( GetProcessHeap(), 0, data->curcfg.sb_width * sizeof(*dx) ); hOldFont = SelectObject(PRIVATE(data)->hMemDC, PRIVATE(data)->hFont); for (j = upd_tp; j <= upd_bm; j++) @@ -79,10 +81,11 @@ static void WCUSER_FillMemDC(const struct inner_data* data, int upd_tp, int upd_ for (k = i; k < data->curcfg.sb_width && cell[k].Attributes == attr; k++) { line[k - i] = cell[k].Char.UnicodeChar; + dx[k - i] = data->curcfg.cell_width; } - TextOutW(PRIVATE(data)->hMemDC, i * data->curcfg.cell_width, - j * data->curcfg.cell_height, line, k - i); - if (PRIVATE(data)->ext_leading && + ExtTextOutW( PRIVATE(data)->hMemDC, i * data->curcfg.cell_width, j * data->curcfg.cell_height, + 0, NULL, line, k - i, dx ); + if (PRIVATE(data)->ext_leading && (hbr = CreateSolidBrush(WCUSER_ColorMap[(attr>>4)&0x0F]))) { r.left = i * data->curcfg.cell_width; @@ -96,6 +99,7 @@ static void WCUSER_FillMemDC(const struct inner_data* data, int upd_tp, int upd_ } } SelectObject(PRIVATE(data)->hMemDC, hOldFont); + HeapFree(GetProcessHeap(), 0, dx); HeapFree(GetProcessHeap(), 0, line); } @@ -431,62 +435,25 @@ HFONT WCUSER_CopyFont(struct config_data* config, HWND hWnd, const LOGFONTW* lf, TEXTMETRICW tm; HDC hDC; HFONT hFont, hOldFont; - int w, i, buf[256]; if (!(hDC = GetDC(hWnd))) return NULL; - if (!(hFont = CreateFontIndirectW(lf))) goto err1; - - hOldFont = SelectObject(hDC, hFont); - GetTextMetricsW(hDC, &tm); - - /* FIXME: - * the current freetype engine (at least 2.0.x with x <= 8) and its implementation - * in Wine don't return adequate values for fixed fonts - * In Windows, those fonts are expected to return the same value for - * - the average width - * - the largest width - * - the width of all characters in the font - * This isn't true in Wine. As a temporary workaround, we get as the width of the - * cell, the width of the first character in the font, after checking that all - * characters in the font have the same width (I hear paranoia coming) - * when this gets fixed, the code should be using tm.tmAveCharWidth - * or tm.tmMaxCharWidth as the cell width. - */ - GetCharWidth32W(hDC, tm.tmFirstChar, tm.tmFirstChar, &w); - for (i = tm.tmFirstChar + 1; i <= tm.tmLastChar; i += sizeof(buf) / sizeof(buf[0])) + if (!(hFont = CreateFontIndirectW(lf))) { - int j, k; - - k = min(tm.tmLastChar - i, sizeof(buf) / sizeof(buf[0]) - 1); - GetCharWidth32W(hDC, i, i + k, buf); - for (j = 0; j <= k; j++) - { - if (buf[j] != w) - { - WINE_WARN("Non uniform cell width: [%d]=%d [%d]=%d\n" - "This may be caused by old freetype libraries, >= 2.0.8 is recommended\n", - i + j, buf[j], tm.tmFirstChar, w); - goto err; - } - } + ReleaseDC(hWnd, hDC); + return NULL; } + hOldFont = SelectObject(hDC, hFont); + GetTextMetricsW(hDC, &tm); SelectObject(hDC, hOldFont); ReleaseDC(hWnd, hDC); - config->cell_width = w; + config->cell_width = tm.tmMaxCharWidth; config->cell_height = tm.tmHeight + tm.tmExternalLeading; config->font_weight = tm.tmWeight; lstrcpyW(config->face_name, lf->lfFaceName); if (el) *el = tm.tmExternalLeading; return hFont; - err: - if (hDC && hOldFont) SelectObject(hDC, hOldFont); - if (hFont) DeleteObject(hFont); - err1: - if (hDC) ReleaseDC(hWnd, hDC); - - return NULL; } /******************************************************************

1 0

Erich E. Hoover : ws2_32: Implement a basic synchronous TransmitFile.
by Alexandre Julliard 19 Oct '15

19 Oct '15

Module: wine Branch: master Commit: 4d081f36efefd3ccf702cacea4d20c5616cfbae1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d081f36efefd3ccf702cacea… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Wed Oct 7 12:14:56 2015 -0600 ws2_32: Implement a basic synchronous TransmitFile. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 193 +++++++++++++++++++++++++++++++++++++++++++++-- dlls/ws2_32/tests/sock.c | 36 ++++++++- 2 files changed, 222 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 44926de..f107d32 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -514,6 +514,18 @@ struct ws2_accept_async struct ws2_async *read; }; +struct ws2_transmitfile_async +{ + struct ws2_async_io io; + char *buffer; + HANDLE file; + DWORD file_read; + DWORD file_bytes; + DWORD bytes_per_send; + DWORD flags; + struct ws2_async write; +}; + static struct ws2_async_io *async_io_freelist; static void release_async_io( struct ws2_async_io *io ) @@ -2725,6 +2737,117 @@ static BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DW } /*********************************************************************** + * WS2_ReadFile (INTERNAL) + * + * Perform an APC-safe ReadFile operation + */ +static NTSTATUS WS2_ReadFile(HANDLE hFile, PIO_STATUS_BLOCK io_status, char* buffer, ULONG length) +{ + int result, unix_handle; + unsigned int options; + NTSTATUS status; + + TRACE( "(%p,%p,0x%08x)\n", hFile, buffer,length ); + + status = wine_server_handle_to_fd( hFile, FILE_READ_DATA, &unix_handle, &options ); + if (status) return status; + + while ((result = read( unix_handle, buffer, length )) == -1) + { + if (errno != EINTR) + break; + } + + if (!result) + status = (length ? STATUS_END_OF_FILE : STATUS_SUCCESS); + else if (result != -1) + status = STATUS_SUCCESS; + else if (errno != EAGAIN) + status = wsaErrStatus(); + else + status = STATUS_PENDING; + + close( unix_handle ); + TRACE("= 0x%08x (%d)\n", status, result); + if (status == STATUS_SUCCESS || status == STATUS_END_OF_FILE) + { + io_status->u.Status = status; + io_status->Information = result; + } + + return status; +} + +/*********************************************************************** + * WS2_transmitfile_getbuffer (INTERNAL) + * + * Pick the appropriate buffer for a TransmitFile send operation. + */ +static NTSTATUS WS2_transmitfile_getbuffer( int fd, struct ws2_transmitfile_async *wsa ) +{ + /* send any incomplete writes from a previous iteration */ + if (wsa->write.first_iovec < wsa->write.n_iovecs) + return STATUS_PENDING; + + /* process the main file */ + if (wsa->file) + { + DWORD bytes_per_send = wsa->bytes_per_send; + IO_STATUS_BLOCK iosb; + NTSTATUS status; + + /* when the size of the transfer is limited ensure that we don't go past that limit */ + if (wsa->file_bytes != 0) + bytes_per_send = min(bytes_per_send, wsa->file_bytes - wsa->file_read); + status = WS2_ReadFile( wsa->file, &iosb, wsa->buffer, bytes_per_send ); + if (status == STATUS_END_OF_FILE) + return STATUS_SUCCESS; + else if (status != STATUS_SUCCESS) + return status; + else + { + if (iosb.Information) + { + wsa->write.first_iovec = 0; + wsa->write.n_iovecs = 1; + wsa->write.iovec[0].iov_base = wsa->buffer; + wsa->write.iovec[0].iov_len = iosb.Information; + wsa->file_read += iosb.Information; + } + + if (wsa->file_bytes != 0 && wsa->file_read >= wsa->file_bytes) + wsa->file = NULL; + + return STATUS_PENDING; + } + } + + return STATUS_SUCCESS; +} + +/*********************************************************************** + * WS2_transmitfile_base (INTERNAL) + * + * Shared implementation for both synchronous and asynchronous TransmitFile. + */ +static NTSTATUS WS2_transmitfile_base( int fd, struct ws2_transmitfile_async *wsa ) +{ + NTSTATUS status; + + status = WS2_transmitfile_getbuffer( fd, wsa ); + if (status == STATUS_PENDING) + { + int n; + + n = WS2_send( fd, &wsa->write, convert_flags(wsa->write.flags) ); + if (n == -1 && errno != EAGAIN) + return wsaErrStatus(); + } + + return status; +} + +/*********************************************************************** * TransmitFile */ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD file_bytes, DWORD bytes_per_send, @@ -2733,12 +2856,22 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD file_bytes, DWORD { union generic_unix_sockaddr uaddr; unsigned int uaddrlen = sizeof(uaddr); + struct ws2_transmitfile_async *wsa; + NTSTATUS status; int fd; - FIXME("(%lx, %p, %d, %d, %p, %p, %d): stub !\n", s, h, file_bytes, bytes_per_send, overlapped, - buffers, flags ); + if (overlapped || buffers) + { + FIXME("(%lx, %p, %d, %d, %p, %p, %d): stub !\n", s, h, file_bytes, bytes_per_send, + overlapped, buffers, flags); + WSASetLastError( WSAEOPNOTSUPP ); + return FALSE; + } - fd = get_sock_fd( s, 0, NULL ); + TRACE("(%lx, %p, %d, %d, %p, %p, %d)\n", s, h, file_bytes, bytes_per_send, overlapped, + buffers, flags ); + + fd = get_sock_fd( s, FILE_WRITE_DATA, NULL ); if (fd == -1) { WSASetLastError( WSAENOTSOCK ); @@ -2750,12 +2883,60 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD file_bytes, DWORD WSASetLastError( WSAENOTCONN ); return FALSE; } - release_sock_fd( s, fd ); if (flags) FIXME("Flags are not currently supported (0x%x).\n", flags); - WSASetLastError( WSAEOPNOTSUPP ); - return FALSE; + if (h && GetFileType( h ) != FILE_TYPE_DISK) + { + FIXME("Non-disk file handles are not currently supported.\n"); + release_sock_fd( s, fd ); + WSASetLastError( WSAEOPNOTSUPP ); + return FALSE; + } + + /* set reasonable defaults when requested */ + if (!bytes_per_send) + bytes_per_send = (1 << 16); /* Depends on OS version: PAGE_SIZE, 2*PAGE_SIZE, or 2^16 */ + + if (!(wsa = (struct ws2_transmitfile_async *)alloc_async_io( sizeof(*wsa) + bytes_per_send ))) + { + release_sock_fd( s, fd ); + WSASetLastError( WSAEFAULT ); + return FALSE; + } + wsa->buffer = (char *)(wsa + 1); + wsa->file = h; + wsa->file_read = 0; + wsa->file_bytes = file_bytes; + wsa->bytes_per_send = bytes_per_send; + wsa->flags = flags; + wsa->write.hSocket = SOCKET2HANDLE(s); + wsa->write.addr = NULL; + wsa->write.addrlen.val = 0; + wsa->write.flags = 0; + wsa->write.lpFlags = &wsa->flags; + wsa->write.control = NULL; + wsa->write.n_iovecs = 0; + wsa->write.first_iovec = 0; + wsa->write.user_overlapped = NULL; + + do + { + status = WS2_transmitfile_base( fd, wsa ); + if (status == STATUS_PENDING) + { + /* block here */ + do_block(fd, POLLOUT, -1); + _sync_sock_state(s); /* let wineserver notice connection */ + } + } + while (status == STATUS_PENDING); + release_sock_fd( s, fd ); + + if (status != STATUS_SUCCESS) + WSASetLastError( NtStatusToWSAError(status) ); + HeapFree( GetProcessHeap(), 0, wsa ); + return (status == STATUS_SUCCESS); } /*********************************************************************** diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 7fbd67d..478a5fe 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7429,6 +7429,32 @@ end: closesocket(connector2); } +#define compare_file(h,s) compare_file2(h,s,__FILE__,__LINE__) + +static void compare_file2(HANDLE handle, SOCKET sock, const char *file, int line) +{ + char buf1[256], buf2[256]; + BOOL success; + int i = 0; + + SetFilePointer(handle, 0, NULL, FILE_BEGIN); + while (1) + { + DWORD n1 = 0, n2 = 0; + + success = ReadFile(handle, buf1, sizeof(buf1), &n1, NULL); + ok_(file,line)(success, "Failed to read from file.\n"); + if (success && n1 == 0) + break; + else if(!success) + return; + n2 = recv(sock, buf2, n1, 0); + ok_(file,line)(n1 == n2, "Block %d size mismatch (%d != %d)\n", i, n1, n2); + ok_(file,line)(memcmp(buf1, buf2, n2) == 0, "Block %d failed\n", i); + i++; + } +} + static void test_TransmitFile(void) { GUID transmitFileGuid = WSAID_TRANSMITFILE; @@ -7438,6 +7464,7 @@ static void test_TransmitFile(void) struct sockaddr_in bindAddress; SOCKET client, server, dest; DWORD num_bytes, err; + char buf[256]; int iret, len; BOOL bret; @@ -7515,7 +7542,14 @@ static void test_TransmitFile(void) /* Test TransmitFile with no possible buffer */ bret = pTransmitFile(client, NULL, 0, 0, NULL, NULL, 0); - todo_wine ok(bret, "TransmitFile failed unexpectedly.\n"); + ok(bret, "TransmitFile failed unexpectedly.\n"); + iret = recv(dest, buf, sizeof(buf), 0); + ok(iret == -1, "Returned an unexpected buffer from TransmitFile (%d != -1).\n", iret); + + /* Test TransmitFile with only file data */ + bret = pTransmitFile(client, file, 0, 0, NULL, NULL, 0); + ok(bret, "TransmitFile failed unexpectedly.\n"); + compare_file(file, dest); /* Test TransmitFile with a UDP datagram socket */ closesocket(client);

1 0

Erich E. Hoover : ws2_32: Add support for TransmitFile headers and footers.
by Alexandre Julliard 19 Oct '15

19 Oct '15

Module: wine Branch: master Commit: f1ebc93603058ee07b5b496d635bbd46e809f14d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1ebc93603058ee07b5b496d6… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Wed Oct 7 12:15:28 2015 -0600 ws2_32: Add support for TransmitFile headers and footers. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 31 +++++++++++++++++++++++++++++-- dlls/ws2_32/tests/sock.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f107d32..bc29f6d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -522,6 +522,7 @@ struct ws2_transmitfile_async DWORD file_read; DWORD file_bytes; DWORD bytes_per_send; + TRANSMIT_FILE_BUFFERS buffers; DWORD flags; struct ws2_async write; }; @@ -2789,6 +2790,17 @@ static NTSTATUS WS2_transmitfile_getbuffer( int fd, struct ws2_transmitfile_asyn if (wsa->write.first_iovec < wsa->write.n_iovecs) return STATUS_PENDING; + /* process the header (if applicable) */ + if (wsa->buffers.Head) + { + wsa->write.first_iovec = 0; + wsa->write.n_iovecs = 1; + wsa->write.iovec[0].iov_base = wsa->buffers.Head; + wsa->write.iovec[0].iov_len = wsa->buffers.HeadLength; + wsa->buffers.Head = NULL; + return STATUS_PENDING; + } + /* process the main file */ if (wsa->file) { @@ -2801,7 +2813,7 @@ static NTSTATUS WS2_transmitfile_getbuffer( int fd, struct ws2_transmitfile_asyn bytes_per_send = min(bytes_per_send, wsa->file_bytes - wsa->file_read); status = WS2_ReadFile( wsa->file, &iosb, wsa->buffer, bytes_per_send ); if (status == STATUS_END_OF_FILE) - return STATUS_SUCCESS; + wsa->file = NULL; /* continue on to the footer */ else if (status != STATUS_SUCCESS) return status; else @@ -2822,6 +2834,17 @@ static NTSTATUS WS2_transmitfile_getbuffer( int fd, struct ws2_transmitfile_asyn } } + /* send the footer (if applicable) */ + if (wsa->buffers.Tail) + { + wsa->write.first_iovec = 0; + wsa->write.n_iovecs = 1; + wsa->write.iovec[0].iov_base = wsa->buffers.Tail; + wsa->write.iovec[0].iov_len = wsa->buffers.TailLength; + wsa->buffers.Tail = NULL; + return STATUS_PENDING; + } + return STATUS_SUCCESS; } @@ -2860,7 +2883,7 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD file_bytes, DWORD NTSTATUS status; int fd; - if (overlapped || buffers) + if (overlapped) { FIXME("(%lx, %p, %d, %d, %p, %p, %d): stub !\n", s, h, file_bytes, bytes_per_send, overlapped, buffers, flags); @@ -2904,6 +2927,10 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD file_bytes, DWORD WSASetLastError( WSAEFAULT ); return FALSE; } + if (buffers) + wsa->buffers = *buffers; + else + memset(&wsa->buffers, 0x0, sizeof(wsa->buffers)); wsa->buffer = (char *)(wsa + 1); wsa->file = h; wsa->file_read = 0; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 478a5fe..3d20c89 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7460,8 +7460,11 @@ static void test_TransmitFile(void) GUID transmitFileGuid = WSAID_TRANSMITFILE; LPFN_TRANSMITFILE pTransmitFile = NULL; HANDLE file = INVALID_HANDLE_VALUE; + char header_msg[] = "hello world"; + char footer_msg[] = "goodbye!!!"; char system_ini_path[MAX_PATH]; struct sockaddr_in bindAddress; + TRANSMIT_FILE_BUFFERS buffers; SOCKET client, server, dest; DWORD num_bytes, err; char buf[256]; @@ -7546,11 +7549,42 @@ static void test_TransmitFile(void) iret = recv(dest, buf, sizeof(buf), 0); ok(iret == -1, "Returned an unexpected buffer from TransmitFile (%d != -1).\n", iret); + /* Test TransmitFile with only buffer data */ + buffers.Head = &header_msg[0]; + buffers.HeadLength = sizeof(header_msg)+1; + buffers.Tail = &footer_msg[0]; + buffers.TailLength = sizeof(footer_msg)+1; + bret = pTransmitFile(client, NULL, 0, 0, NULL, &buffers, 0); + ok(bret, "TransmitFile failed unexpectedly.\n"); + iret = recv(dest, buf, sizeof(buf), 0); + ok(iret == sizeof(header_msg)+sizeof(footer_msg)+2, + "Returned an unexpected buffer from TransmitFile: %d\n", iret ); + ok(memcmp(&buf[0], &header_msg[0], sizeof(header_msg)+1) == 0, + "TransmitFile header buffer did not match!\n"); + ok(memcmp(&buf[sizeof(header_msg)+1], &footer_msg[0], sizeof(footer_msg)+1) == 0, + "TransmitFile footer buffer did not match!\n"); + /* Test TransmitFile with only file data */ bret = pTransmitFile(client, file, 0, 0, NULL, NULL, 0); ok(bret, "TransmitFile failed unexpectedly.\n"); compare_file(file, dest); + /* Test TransmitFile with both file and buffer data */ + buffers.Head = &header_msg[0]; + buffers.HeadLength = sizeof(header_msg)+1; + buffers.Tail = &footer_msg[0]; + buffers.TailLength = sizeof(footer_msg)+1; + SetFilePointer(file, 0, NULL, FILE_BEGIN); + bret = pTransmitFile(client, file, 0, 0, NULL, &buffers, 0); + ok(bret, "TransmitFile failed unexpectedly.\n"); + iret = recv(dest, buf, sizeof(header_msg)+1, 0); + ok(memcmp(buf, &header_msg[0], sizeof(header_msg)+1) == 0, + "TransmitFile header buffer did not match!\n"); + compare_file(file, dest); + iret = recv(dest, buf, sizeof(footer_msg)+1, 0); + ok(memcmp(buf, &footer_msg[0], sizeof(footer_msg)+1) == 0, + "TransmitFile footer buffer did not match!\n"); + /* Test TransmitFile with a UDP datagram socket */ closesocket(client); client = socket(AF_INET, SOCK_DGRAM, 0);

1 0

Bruno Jesus : iccvid: Make decode_cinepak a bit more consistent and easier to read.
by Alexandre Julliard 19 Oct '15

19 Oct '15

Module: wine Branch: master Commit: 1b1e20ba1d2f4bdf7a78bb7552701b3fe046c974 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b1e20ba1d2f4bdf7a78bb755… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Oct 17 20:54:45 2015 +0800 iccvid: Make decode_cinepak a bit more consistent and easier to read. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iccvid/iccvid.c | 91 +++++++++++++++++++++++++++++----------------------- 1 file changed, 50 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b1e20ba1d2f4bdf7a78b…

1 0

Bruno Jesus : quartz: Cope with invalid MP3 headers being detect as valid.
by Alexandre Julliard 19 Oct '15

19 Oct '15

Module: wine Branch: master Commit: 3f55d106fa85aa61e292ca368b08737b5acd192b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f55d106fa85aa61e292ca368… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Oct 19 14:43:08 2015 +0800 quartz: Cope with invalid MP3 headers being detect as valid. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/mpegsplit.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 835eef6..33a93ba 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -476,7 +476,7 @@ static HRESULT MPEGSplitter_pre_connect(IPin *iface, IPin *pConnectPin, ALLOCATO HRESULT hr; LONGLONG pos = 0; /* in bytes */ BYTE header[10]; - int streamtype = 0; + int streamtype; LONGLONG total, avail; AM_MEDIA_TYPE amt; PIN_INFO piOutput; @@ -514,12 +514,37 @@ static HRESULT MPEGSplitter_pre_connect(IPin *iface, IPin *pConnectPin, ALLOCATO hr = IAsyncReader_SyncRead(pPin->pReader, pos, 4, header); if (SUCCEEDED(hr)) pos += 4; - TRACE("%x:%x:%x:%x\n", header[0], header[1], header[2], header[3]); } while (0); - while(SUCCEEDED(hr) && !(streamtype=MPEGSplitter_head_check(header))) + while(SUCCEEDED(hr)) { - TRACE("%x:%x:%x:%x\n", header[0], header[1], header[2], header[3]); + TRACE("Testing header %x:%x:%x:%x\n", header[0], header[1], header[2], header[3]); + + streamtype = MPEGSplitter_head_check(header); + if (streamtype == MPEG_AUDIO_HEADER) + { + LONGLONG length; + if (parse_header(header, &length, NULL) == S_OK) + { + BYTE next_header[4]; + /* Ensure we have a valid header by seeking for the next frame, some bad + * encoded ID3v2 may have an incorrect length and we end up finding bytes + * like FF FE 00 28 which are nothing more than a Unicode BOM followed by + * ')' character from inside a ID3v2 tag. Unfortunately that sequence + * matches like a valid mpeg audio header. + */ + hr = IAsyncReader_SyncRead(pPin->pReader, pos + length - 4, 4, next_header); + if (FAILED(hr)) + break; + if (parse_header(next_header, &length, NULL) == S_OK) + break; + TRACE("%x:%x:%x:%x is a fake audio header, looking for next...\n", + header[0], header[1], header[2], header[3]); + } + } + else if (streamtype) /* Video or System stream */ + break; + /* No valid header yet; shift by a byte and check again */ memmove(header, header+1, 3); hr = IAsyncReader_SyncRead(pPin->pReader, pos++, 1, header + 3);

1 0

Andrew Eikum : xaudio2: Implement IXAudio28MasteringVoice::GetChannelMask.
by Alexandre Julliard 19 Oct '15

19 Oct '15

Module: wine Branch: master Commit: 3b9e089c6352b7c1aae25fb2d7ebe5f6221725f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b9e089c6352b7c1aae25fb2d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 19 09:24:46 2015 -0500 xaudio2: Implement IXAudio28MasteringVoice::GetChannelMask. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/tests/xaudio2.c | 7 +++++++ dlls/xaudio2_7/xaudio_dll.c | 3 +++ 2 files changed, 10 insertions(+) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index 716fe23..23da38b 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -174,6 +174,7 @@ static void test_simple_streaming(IXAudio2 *xa) XAUDIO2_VOICE_STATE state; XAUDIO2_EFFECT_DESCRIPTOR effect; XAUDIO2_EFFECT_CHAIN chain; + DWORD chmask; memset(&ecb_state, 0, sizeof(ecb_state)); memset(&src1_state, 0, sizeof(src1_state)); @@ -196,6 +197,12 @@ static void test_simple_streaming(IXAudio2 *xa) hr = IXAudio2_CreateMasteringVoice(xa, &master, 2, 44100, 0, NULL, NULL, AudioCategory_GameEffects); ok(hr == S_OK, "CreateMasteringVoice failed: %08x\n", hr); + if(!xaudio27){ + chmask = 0xdeadbeef; + IXAudio2MasteringVoice_GetChannelMask(master, &chmask); + ok(chmask == (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT), "Got unexpected channel mask: 0x%x\n", chmask); + } + /* create first source voice */ fmt.wFormatTag = WAVE_FORMAT_IEEE_FLOAT; fmt.nChannels = 2; diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 76d9503..818c0e2 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -966,7 +966,10 @@ static void WINAPI XA2M_GetChannelMask(IXAudio2MasteringVoice *iface, DWORD *pChannelMask) { IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p %p\n", This, pChannelMask); + + *pChannelMask = This->fmt.dwChannelMask; } static const struct IXAudio2MasteringVoiceVtbl XAudio2MasteringVoice_Vtbl = {

1 0

Andrew Eikum : xaudio2: Explicitly trace the xaudio object version.
by Alexandre Julliard 19 Oct '15

19 Oct '15

Module: wine Branch: master Commit: 61202a68b2cf1feab02185803585ba01d7d1d547 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61202a68b2cf1feab02185803… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 19 09:24:50 2015 -0500 xaudio2: Explicitly trace the xaudio object version. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 818c0e2..76b4c13 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -2372,6 +2372,8 @@ static HRESULT WINAPI XAudio2CF_CreateInstance(IClassFactory *iface, IUnknown *p IXAudio2_StartEngine(&object->IXAudio2_iface); + TRACE("Created XAudio version %u: %p\n", object->version, object); + return hr; }

1 0

Alistair Leslie-Hughes : d3dcompiler: Add D3DReadFileToBlob, D3DWriteBlobToFile stubs.
by Alexandre Julliard 19 Oct '15

19 Oct '15

Module: wine Branch: master Commit: 26094c5634b1f12d3f156a90a3e228513675cd63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26094c5634b1f12d3f156a90a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Oct 18 14:19:53 2015 +1100 d3dcompiler: Add D3DReadFileToBlob, D3DWriteBlobToFile stubs. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/blob.c | 14 ++++++++++++++ dlls/d3dcompiler_46/d3dcompiler_46.spec | 4 ++-- dlls/d3dcompiler_47/d3dcompiler_47.spec | 4 ++-- include/d3dcompiler.h | 3 ++- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/d3dcompiler_43/blob.c b/dlls/d3dcompiler_43/blob.c index 865d139..f22dc71 100644 --- a/dlls/d3dcompiler_43/blob.c +++ b/dlls/d3dcompiler_43/blob.c @@ -463,3 +463,17 @@ HRESULT WINAPI D3DStripShader(const void *data, SIZE_T data_size, UINT flags, ID return d3dcompiler_strip_shader(data, data_size, flags, blob); } + +HRESULT WINAPI D3DReadFileToBlob(const WCHAR *filename, ID3DBlob **contents) +{ + FIXME("filename %s, contents %p\n", debugstr_w(filename), contents); + + return E_NOTIMPL; +} + +HRESULT WINAPI D3DWriteBlobToFile(ID3DBlob* blob, const WCHAR *filename, BOOL overwrite) +{ + FIXME("blob %p, filename %s, overwrite %d\n", blob, debugstr_w(filename), overwrite); + + return E_NOTIMPL; +} diff --git a/dlls/d3dcompiler_46/d3dcompiler_46.spec b/dlls/d3dcompiler_46/d3dcompiler_46.spec index 1b145c8a..7234c41 100644 --- a/dlls/d3dcompiler_46/d3dcompiler_46.spec +++ b/dlls/d3dcompiler_46/d3dcompiler_46.spec @@ -16,10 +16,10 @@ @ stdcall D3DGetOutputSignatureBlob(ptr long ptr) @ stub D3DGetTraceInstructionOffsets @ stdcall D3DPreprocess(ptr long str ptr ptr ptr ptr) -@ stub D3DReadFileToBlob +@ stdcall D3DReadFileToBlob(wstr ptr) @ stdcall D3DReflect(ptr long ptr ptr) @ stub D3DReturnFailure1 @ stub D3DSetBlobPart @ stdcall D3DStripShader(ptr long long ptr) -@ stub D3DWriteBlobToFile +@ stdcall D3DWriteBlobToFile(ptr wstr long) @ stub DebugSetMute diff --git a/dlls/d3dcompiler_47/d3dcompiler_47.spec b/dlls/d3dcompiler_47/d3dcompiler_47.spec index efa4767..9b2cb7d 100644 --- a/dlls/d3dcompiler_47/d3dcompiler_47.spec +++ b/dlls/d3dcompiler_47/d3dcompiler_47.spec @@ -19,11 +19,11 @@ @ stub D3DGetTraceInstructionOffsets @ stub D3DLoadModule @ stdcall D3DPreprocess(ptr long str ptr ptr ptr ptr) -@ stub D3DReadFileToBlob +@ stdcall D3DReadFileToBlob(wstr ptr) @ stdcall D3DReflect(ptr long ptr ptr) @ stub D3DReflectLibrary @ stub D3DReturnFailure1 @ stub D3DSetBlobPart @ stdcall D3DStripShader(ptr long long ptr) -@ stub D3DWriteBlobToFile +@ stdcall D3DWriteBlobToFile(ptr wstr long) @ stub DebugSetMute diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index b5e79e6..3f1fdb3 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -107,7 +107,8 @@ HRESULT WINAPI D3DGetInputSignatureBlob(const void *data, SIZE_T data_size, ID3D HRESULT WINAPI D3DGetOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); HRESULT WINAPI D3DGetInputAndOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); HRESULT WINAPI D3DGetDebugInfo(const void *data, SIZE_T data_size, ID3DBlob **blob); - +HRESULT WINAPI D3DReadFileToBlob(const WCHAR *filename, ID3DBlob **contents); +HRESULT WINAPI D3DWriteBlobToFile(ID3DBlob *blob, const WCHAR *filename, BOOL overwrite); HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID riid, void **reflector); HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob);

1 0

Bruno Jesus : avifil32: Absolute addresses already point to the correct place in the frame.
by Alexandre Julliard 19 Oct '15

19 Oct '15

Module: wine Branch: master Commit: 175138a42c83f10df1d7529f9c46ef1f3dd25f5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=175138a42c83f10df1d7529f9… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Oct 18 01:05:39 2015 +0800 avifil32: Absolute addresses already point to the correct place in the frame. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/avifile.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index f5abc1c..f649d05 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -1987,13 +1987,17 @@ static HRESULT AVIFILE_ParseIndex(const IAVIFileImpl *This, AVIINDEXENTRY *lp, if (nStream > This->fInfo.dwStreams) return AVIERR_BADFORMAT; + /* Video frames can be either indexed in a relative position to the + * "movi" chunk or in a absolute position in the file. If the index + * is relative the frame offset will always be so small that it will + * virtually never reach the "movi" offset so we can detect if the + * video is relative very fast. + */ if (*bAbsolute && lp->dwChunkOffset < This->dwMoviChunkPos) *bAbsolute = FALSE; - if (*bAbsolute) - lp->dwChunkOffset += sizeof(DWORD); - else - lp->dwChunkOffset += pos; + if (!*bAbsolute) + lp->dwChunkOffset += pos; /* make the offset absolute */ if (FAILED(AVIFILE_AddFrame(This->ppStreams[nStream], lp->ckid, lp->dwChunkLength, lp->dwChunkOffset, lp->dwFlags))) return AVIERR_MEMORY;

1 0

Alexandre Julliard : libwine: Pass the correct length to GetStringUTFRegion.
by Alexandre Julliard 19 Oct '15

19 Oct '15

Module: wine Branch: master Commit: d197252fb3c72c39f0778ef7b919b1bd7c69e811 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d197252fb3c72c39f0778ef7b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 19 15:43:07 2015 +0900 libwine: Pass the correct length to GetStringUTFRegion. Spotted by Jactry Zeng. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/loader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 3591ede..4173945 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -851,7 +851,8 @@ static jstring wine_init_jni( JNIEnv *env, jobject obj, jobjectArray cmdline, jo { jobject str_obj = (*env)->GetObjectArrayElement( env, cmdline, i ); length = (*env)->GetStringUTFLength( env, str_obj ); - (*env)->GetStringUTFRegion( env, str_obj, 0, length, str ); + (*env)->GetStringUTFRegion( env, str_obj, 0, + (*env)->GetStringLength( env, str_obj ), str ); argv[i] = str; str[length] = 0; str += length + 1;

1 0