April 2007 - Wine-Commits - list.winehq.org

H. Verbeet : wined3d: Add some traces to stretch_rect_fbo.
by Alexandre Julliard April 10, 2007

April 10, 2007

Module: wine Branch: master Commit: 112c3bf1c3b9a1437605ba219504e5de51d3a3c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=112c3bf1c3b9a1437605ba219… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Apr 10 19:13:44 2007 +0200 wined3d: Add some traces to stretch_rect_fbo. --- dlls/wined3d/device.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 459a0d7..26f0087 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5271,8 +5271,10 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, const GLbitfield mask = GL_COLOR_BUFFER_BIT; /* TODO: Support blitting depth/stencil surfaces */ GLenum gl_filter; - TRACE("(%p) : src_surface %p, src_rect %p, dst_surface %p, dst_rect %p, filter %s (0x%08x)\n", - This, src_surface, src_rect, dst_surface, dst_rect, debug_d3dtexturefiltertype(filter), filter); + TRACE("(%p) : src_surface %p, src_rect %p, dst_surface %p, dst_rect %p, filter %s (0x%08x), flip %u\n", + This, src_surface, src_rect, dst_surface, dst_rect, debug_d3dtexturefiltertype(filter), filter, flip); + TRACE("src_rect [%u, %u]->[%u, %u]\n", src_rect->x1, src_rect->y1, src_rect->x2, src_rect->y2); + TRACE("dst_rect [%u, %u]->[%u, %u]\n", dst_rect->x1, dst_rect->y1, dst_rect->x2, dst_rect->y2); switch (filter) { case WINED3DTEXF_LINEAR: @@ -5289,9 +5291,11 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, const /* Attach src surface to src fbo */ if (is_onscreen(src_surface)) { + TRACE("Source surface %p is onscreen\n", src_surface); GL_EXTCALL(glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, 0)); flip = !flip; } else { + TRACE("Source surface %p is offscreen\n", src_surface); IWineD3DSurface_PreLoad(src_surface); bind_fbo(iface, GL_READ_FRAMEBUFFER_EXT, &This->src_fbo); attach_surface_fbo(This, GL_READ_FRAMEBUFFER_EXT, 0, src_surface); @@ -5299,9 +5303,11 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, const /* Attach dst surface to dst fbo */ if (is_onscreen(dst_surface)) { + TRACE("Destination surface %p is onscreen\n", dst_surface); GL_EXTCALL(glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, 0)); flip = !flip; } else { + TRACE("Destination surface %p is offscreen\n", dst_surface); IWineD3DSurface_PreLoad(dst_surface); bind_fbo(iface, GL_DRAW_FRAMEBUFFER_EXT, &This->dst_fbo); attach_surface_fbo(This, GL_DRAW_FRAMEBUFFER_EXT, 0, dst_surface);

1 0

Huw Davies : wineps.drv: Add a heuristic to cope with resolution strings of the form "nnnmmmdpi" ( ie without the 'x' separator).
by Alexandre Julliard April 10, 2007

April 10, 2007

Module: wine Branch: master Commit: f7f5ed19965ecb32cab793deba3f075c671f9c86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7f5ed19965ecb32cab793deb… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 10 14:09:44 2007 +0100 wineps.drv: Add a heuristic to cope with resolution strings of the form "nnnmmmdpi" (ie without the 'x' separator). --- dlls/wineps.drv/ppd.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 72 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index 130613a..d52f6f9 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -516,6 +516,70 @@ static char *PSDRV_PPDGetWord(char *str, char **next) return ret; } +/************************************************************ + * parse_resolution + * + * Helper to extract x and y resolutions from a resolution entry. + * Returns TRUE on successful parsing, otherwise FALSE. + * + * The ppd spec says that entries can either be: + * "nnndpi" + * or + * "nnnxmmmdpi" + * in the former case return sz.cx == cx.cy == nnn. + * + * There are broken ppd files out there (notably from Samsung) that + * use the form "nnnmmmdpi", so we have to work harder to spot these. + * We use a transition from a zero to a non-zero digit as separator + * (and fail if we find more than one of these). We also don't bother + * trying to parse "dpi" in case that's missing. + */ +static BOOL parse_resolution(const char *str, SIZE *sz) +{ + int tmp[2]; + int *cur; + BOOL had_zero; + const char *c; + + if(sscanf(str, "%dx%d", tmp, tmp + 1) == 2) + { + sz->cx = tmp[0]; + sz->cy = tmp[1]; + return TRUE; + } + + tmp[0] = 0; + tmp[1] = -1; + cur = tmp; + had_zero = FALSE; + for(c = str; isdigit(*c); c++) + { + if(!had_zero || *c == '0') + { + *cur *= 10; + *cur += *c - '0'; + if(*c == '0') + had_zero = TRUE; + } + else if(cur != tmp) + return FALSE; + else + { + cur++; + *cur = *c - '0'; + had_zero = FALSE; + } + } + if(tmp[0] == 0) return FALSE; + + sz->cx = tmp[0]; + if(tmp[1] != -1) + sz->cy = tmp[1]; + else + sz->cy = sz->cx; + return TRUE; +} + /******************************************************************************* * PSDRV_AddSlot * @@ -605,8 +669,14 @@ PPD *PSDRV_ParsePPD(char *fname) else if((!strcmp("*DefaultResolution", tuple.key)) || (!strcmp("*DefaultJCLResolution", tuple.key))) { - sscanf(tuple.value, "%d", &(ppd->DefaultResolution)); - TRACE("DefaultResolution = %d\n", ppd->DefaultResolution); + SIZE sz; + if(parse_resolution(tuple.value, &sz)) + { + TRACE("DefaultResolution %dx%d\n", sz.cx, sz.cy); + ppd->DefaultResolution = sz.cx; + } + else + WARN("failed to parse DefaultResolution %s\n", debugstr_a(tuple.value)); } else if(!strcmp("*Font", tuple.key)) {

1 0

Alexandre Julliard : server: Explicitly shutdown closed pipes to prevent access from file descriptors cached in the client .
by Alexandre Julliard April 10, 2007

April 10, 2007

Module: wine Branch: master Commit: bc426ab059d9cf279755f113fda2780e860b7b7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc426ab059d9cf279755f113f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 10 21:30:37 2007 +0200 server: Explicitly shutdown closed pipes to prevent access from file descriptors cached in the client. --- dlls/ntdll/file.c | 2 +- server/mailslot.c | 2 ++ server/named_pipe.c | 1 + 3 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 8158a14..b3f5379 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -282,7 +282,7 @@ NTSTATUS FILE_GetNtStatus(void) case ENFILE: return STATUS_TOO_MANY_OPENED_FILES; case EINVAL: return STATUS_INVALID_PARAMETER; case ENOTEMPTY: return STATUS_DIRECTORY_NOT_EMPTY; - case EPIPE: return STATUS_PIPE_BROKEN; + case EPIPE: return STATUS_PIPE_DISCONNECTED; case EIO: return STATUS_DEVICE_NOT_READY; #ifdef ENOMEDIUM case ENOMEDIUM: return STATUS_NO_MEDIA_IN_DEVICE; diff --git a/server/mailslot.c b/server/mailslot.c index d130f6e..b29c84e 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -197,6 +197,7 @@ static void mailslot_destroy( struct object *obj) assert( mailslot->fd ); assert( mailslot->write_fd ); + shutdown( get_unix_fd( mailslot->fd ), SHUT_RDWR ); release_object( mailslot->fd ); release_object( mailslot->write_fd ); } @@ -408,6 +409,7 @@ static struct mailslot *create_mailslot( struct directory *root, { fcntl( fds[0], F_SETFL, O_NONBLOCK ); fcntl( fds[1], F_SETFL, O_NONBLOCK ); + shutdown( fds[0], SHUT_RD ); mailslot->fd = create_anonymous_fd( &mailslot_fd_ops, fds[1], &mailslot->obj ); mailslot->write_fd = create_anonymous_fd( &mail_writer_fd_ops, diff --git a/server/named_pipe.c b/server/named_pipe.c index 4b23816..527e4c8 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -338,6 +338,7 @@ static void do_disconnect( struct pipe_server *server ) server->client->fd = NULL; } assert( server->fd ); + shutdown( get_unix_fd( server->fd ), SHUT_RDWR ); release_object( server->fd ); server->fd = NULL; }

1 0

Alexandre Julliard : server: Add support for restarting an async I/ O when the client side couldn't finish it right away.
by Alexandre Julliard April 10, 2007

April 10, 2007

Module: wine Branch: master Commit: 72bff2e445f18c1fe4b5c6c3c8ca51ab8be722f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72bff2e445f18c1fe4b5c6c3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 10 17:07:27 2007 +0200 server: Add support for restarting an async I/O when the client side couldn't finish it right away. --- dlls/ntdll/directory.c | 3 +- dlls/ntdll/file.c | 51 +++++++++++++++------------------ dlls/ntdll/sync.c | 8 +++-- dlls/ws2_32/socket.c | 62 +++++++++++++-------------------------- include/wine/server_protocol.h | 4 +- server/async.c | 61 ++++++++++++++++++++++++++++++--------- server/change.c | 26 +++++++++-------- server/fd.c | 25 ++++++++++++++-- server/file.c | 1 + server/file.h | 4 ++ server/mailslot.c | 2 + server/named_pipe.c | 5 ++- server/process.c | 1 + server/protocol.def | 2 +- server/queue.c | 1 + server/request.c | 1 + server/serial.c | 1 + server/signal.c | 1 + server/sock.c | 9 ++++++ server/thread.c | 1 + server/trace.c | 1 + 21 files changed, 164 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=72bff2e445f18c1fe4b5c…

1 0

Alexandre Julliard : ntdll: Simplify the async read/ write code now that most of the work is done in the server.
by Alexandre Julliard April 10, 2007

April 10, 2007

Module: wine Branch: master Commit: 6dcb280bc5a36b7ddac69b4cdbb84dd2b4e041d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dcb280bc5a36b7ddac69b4cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 10 17:19:24 2007 +0200 ntdll: Simplify the async read/write code now that most of the work is done in the server. --- dlls/ntdll/file.c | 121 +++++++++++++++++++++++++++------------------------- 1 files changed, 63 insertions(+), 58 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index f3ba690..078e4fe 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -236,57 +236,24 @@ NTSTATUS WINAPI NtCreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATTRIB /*********************************************************************** * Asynchronous file I/O * */ -static NTSTATUS FILE_AsyncReadService(void*, PIO_STATUS_BLOCK, NTSTATUS); -static NTSTATUS FILE_AsyncWriteService(void*, PIO_STATUS_BLOCK, NTSTATUS); -typedef struct async_fileio +typedef struct { HANDLE handle; - PIO_APC_ROUTINE apc; - void* apc_user; char* buffer; unsigned int already; unsigned int count; BOOL avail_mode; - HANDLE event; -} async_fileio; +} async_fileio_read; -static void fileio_terminate(async_fileio *fileio, IO_STATUS_BLOCK* iosb, NTSTATUS status) +typedef struct { - TRACE("data: %p\n", fileio); - - iosb->u.Status = status; - iosb->Information = fileio->already; - RtlFreeHeap( GetProcessHeap(), 0, fileio ); -} - - -static ULONG fileio_queue_async(async_fileio* fileio, IO_STATUS_BLOCK* iosb, - BOOL do_read) -{ - NTSTATUS status; - - SERVER_START_REQ( register_async ) - { - req->handle = fileio->handle; - req->async.callback = do_read ? FILE_AsyncReadService : FILE_AsyncWriteService; - req->async.iosb = iosb; - req->async.arg = fileio; - req->async.apc = fileio->apc; - req->async.apc_arg = fileio->apc_user; - req->async.event = fileio->event; - req->type = do_read ? ASYNC_TYPE_READ : ASYNC_TYPE_WRITE; - req->count = (fileio->count < fileio->already) ? 0 : fileio->count - fileio->already; - status = wine_server_call( req ); - } - SERVER_END_REQ; + HANDLE handle; + const char *buffer; + unsigned int already; + unsigned int count; +} async_fileio_write; - if (status != STATUS_PENDING) - fileio_terminate( fileio, iosb, status ); - else - NtCurrentTeb()->num_async_io++; - return status; -} /*********************************************************************** * FILE_GetNtStatus(void) @@ -339,7 +306,7 @@ NTSTATUS FILE_GetNtStatus(void) */ static NTSTATUS FILE_AsyncReadService(void *user, PIO_STATUS_BLOCK iosb, NTSTATUS status) { - async_fileio *fileio = (async_fileio*)user; + async_fileio_read *fileio = user; int fd, needs_close, result; TRACE("%p %p 0x%x\n", iosb, fileio->buffer, status); @@ -394,7 +361,12 @@ static NTSTATUS FILE_AsyncReadService(void *user, PIO_STATUS_BLOCK iosb, NTSTATU if (fileio->already) status = STATUS_SUCCESS; break; } - if (status != STATUS_PENDING) fileio_terminate(fileio, iosb, status); + if (status != STATUS_PENDING) + { + iosb->u.Status = status; + iosb->Information = fileio->already; + RtlFreeHeap( GetProcessHeap(), 0, fileio ); + } return status; } @@ -580,7 +552,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, if (flags & FD_FLAG_OVERLAPPED) { - async_fileio *fileio; + async_fileio_read *fileio; if (total && (flags & FD_FLAG_AVAILABLE)) { @@ -588,7 +560,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, goto done; } - if (!(fileio = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(async_fileio)))) + if (!(fileio = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(*fileio)))) { status = STATUS_NO_MEMORY; goto done; @@ -596,12 +568,26 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, fileio->handle = hFile; fileio->already = total; fileio->count = length; - fileio->apc = apc; - fileio->apc_user = apc_user; fileio->buffer = buffer; fileio->avail_mode = (flags & FD_FLAG_AVAILABLE); - fileio->event = hEvent; - status = fileio_queue_async(fileio, io_status, TRUE); + + SERVER_START_REQ( register_async ) + { + req->handle = hFile; + req->type = ASYNC_TYPE_READ; + req->count = length; + req->async.callback = FILE_AsyncReadService; + req->async.iosb = io_status; + req->async.arg = fileio; + req->async.apc = apc; + req->async.apc_arg = apc_user; + req->async.event = hEvent; + status = wine_server_call( req ); + } + SERVER_END_REQ; + + if (status != STATUS_PENDING) RtlFreeHeap( GetProcessHeap(), 0, fileio ); + else NtCurrentTeb()->num_async_io++; goto done; } else /* synchronous read, wait for the fd to become ready */ @@ -662,7 +648,7 @@ done: */ static NTSTATUS FILE_AsyncWriteService(void *user, IO_STATUS_BLOCK *iosb, NTSTATUS status) { - async_fileio *fileio = user; + async_fileio_write *fileio = user; int result, fd, needs_close; enum server_fd_type type; @@ -701,7 +687,12 @@ static NTSTATUS FILE_AsyncWriteService(void *user, IO_STATUS_BLOCK *iosb, NTSTAT if (fileio->already) status = STATUS_SUCCESS; break; } - if (status != STATUS_PENDING) fileio_terminate(fileio, iosb, status); + if (status != STATUS_PENDING) + { + iosb->u.Status = status; + iosb->Information = fileio->already; + RtlFreeHeap( GetProcessHeap(), 0, fileio ); + } return status; } @@ -799,9 +790,9 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, if (flags & FD_FLAG_OVERLAPPED) { - async_fileio *fileio; + async_fileio_write *fileio; - if (!(fileio = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(async_fileio)))) + if (!(fileio = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(*fileio)))) { status = STATUS_NO_MEMORY; goto done; @@ -809,11 +800,25 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, fileio->handle = hFile; fileio->already = total; fileio->count = length; - fileio->apc = apc; - fileio->apc_user = apc_user; - fileio->buffer = (void*)buffer; - fileio->event = hEvent; - status = fileio_queue_async(fileio, io_status, FALSE); + fileio->buffer = buffer; + + SERVER_START_REQ( register_async ) + { + req->handle = hFile; + req->type = ASYNC_TYPE_WRITE; + req->count = length; + req->async.callback = FILE_AsyncWriteService; + req->async.iosb = io_status; + req->async.arg = fileio; + req->async.apc = apc; + req->async.apc_arg = apc_user; + req->async.event = hEvent; + status = wine_server_call( req ); + } + SERVER_END_REQ; + + if (status != STATUS_PENDING) RtlFreeHeap( GetProcessHeap(), 0, fileio ); + else NtCurrentTeb()->num_async_io++; goto done; } else /* synchronous write, wait for the fd to become ready */

1 0

Alexandre Julliard : ntdll: Determine the async read avail_mode flag from the client side.
by Alexandre Julliard April 10, 2007

April 10, 2007

Module: wine Branch: master Commit: 64ba011dba87ebbda3503935f1620cd7d89f7308 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64ba011dba87ebbda3503935f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 10 17:27:50 2007 +0200 ntdll: Determine the async read avail_mode flag from the client side. --- dlls/ntdll/file.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 078e4fe..8158a14 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -465,6 +465,40 @@ static inline int get_next_io_timeout( struct io_timeouts *timeouts, ULONG alrea } +/* retrieve the avail_mode flag for async reads */ +static NTSTATUS get_io_avail_mode( HANDLE handle, enum server_fd_type type, BOOL *avail_mode ) +{ + NTSTATUS status = STATUS_SUCCESS; + + switch(type) + { + case FD_TYPE_SERIAL: + { + /* GetCommTimeouts */ + SERIAL_TIMEOUTS st; + IO_STATUS_BLOCK io; + + status = NtDeviceIoControlFile( handle, NULL, NULL, NULL, &io, + IOCTL_SERIAL_GET_TIMEOUTS, NULL, 0, &st, sizeof(st) ); + if (status) break; + *avail_mode = (!st.ReadTotalTimeoutMultiplier && + !st.ReadTotalTimeoutConstant && + st.ReadIntervalTimeout == MAXDWORD); + } + break; + case FD_TYPE_MAILSLOT: + case FD_TYPE_SOCKET: + case FD_TYPE_PIPE: + *avail_mode = TRUE; + break; + default: + *avail_mode = FALSE; + break; + } + return status; +} + + /****************************************************************************** * NtReadFile [NTDLL.@] * ZwReadFile [NTDLL.@] @@ -553,8 +587,11 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, if (flags & FD_FLAG_OVERLAPPED) { async_fileio_read *fileio; + BOOL avail_mode; - if (total && (flags & FD_FLAG_AVAILABLE)) + if ((status = get_io_avail_mode( hFile, type, &avail_mode ))) + goto done; + if (total && avail_mode) { status = STATUS_SUCCESS; goto done; @@ -569,7 +606,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, fileio->already = total; fileio->count = length; fileio->buffer = buffer; - fileio->avail_mode = (flags & FD_FLAG_AVAILABLE); + fileio->avail_mode = avail_mode; SERVER_START_REQ( register_async ) {

1 0

Paul Vriens : setupapi/tests: Run tests on win98 again.
by Alexandre Julliard April 10, 2007

April 10, 2007

Module: wine Branch: master Commit: ce45b8b1c68d4053238e1947b5ec2ab5d82a7e5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce45b8b1c68d4053238e1947b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Apr 10 13:43:00 2007 +0200 setupapi/tests: Run tests on win98 again. --- dlls/setupapi/tests/misc.c | 27 +++++++++++++++++++-------- 1 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index 99f4dbb..cbfc647 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -42,6 +42,8 @@ static CHAR CURR_DIR[MAX_PATH]; * - copy styles */ +static BOOL (WINAPI *pSetupGetFileCompressionInfoExA)(PCSTR, PSTR, DWORD, PDWORD, PDWORD, PDWORD, PUINT); + static void append_str(char **str, const char *data) { sprintf(*str, data); @@ -324,19 +326,19 @@ static void test_SetupGetFileCompressionInfoEx(void) GetTempPathA(sizeof(temp), temp); GetTempFileNameA(temp, "doc", 0, source); - ret = SetupGetFileCompressionInfoExA(NULL, NULL, 0, NULL, NULL, NULL, NULL); + ret = pSetupGetFileCompressionInfoExA(NULL, NULL, 0, NULL, NULL, NULL, NULL); ok(!ret, "SetupGetFileCompressionInfoEx succeeded unexpectedly\n"); - ret = SetupGetFileCompressionInfoExA(source, NULL, 0, NULL, NULL, NULL, NULL); + ret = pSetupGetFileCompressionInfoExA(source, NULL, 0, NULL, NULL, NULL, NULL); ok(!ret, "SetupGetFileCompressionInfoEx succeeded unexpectedly\n"); - ret = SetupGetFileCompressionInfoExA(source, NULL, 0, &required_len, NULL, NULL, NULL); + ret = pSetupGetFileCompressionInfoExA(source, NULL, 0, &required_len, NULL, NULL, NULL); ok(!ret, "SetupGetFileCompressionInfoEx succeeded unexpectedly\n"); ok(required_len == lstrlenA(source) + 1, "got %d, expected %d\n", required_len, lstrlenA(source) + 1); create_source_file(source, comp_lzx, sizeof(comp_lzx)); - ret = SetupGetFileCompressionInfoExA(source, name, sizeof(name), &required_len, &source_size, &target_size, &type); + ret = pSetupGetFileCompressionInfoExA(source, name, sizeof(name), &required_len, &source_size, &target_size, &type); ok(ret, "SetupGetFileCompressionInfoEx failed unexpectedly: %d\n", ret); ok(!lstrcmpA(name, source), "got %s, expected %s\n", name, source); ok(required_len == lstrlenA(source) + 1, "got %d, expected %d\n", required_len, lstrlenA(source) + 1); @@ -347,7 +349,7 @@ static void test_SetupGetFileCompressionInfoEx(void) create_source_file(source, comp_zip, sizeof(comp_zip)); - ret = SetupGetFileCompressionInfoExA(source, name, sizeof(name), &required_len, &source_size, &target_size, &type); + ret = pSetupGetFileCompressionInfoExA(source, name, sizeof(name), &required_len, &source_size, &target_size, &type); ok(ret, "SetupGetFileCompressionInfoEx failed unexpectedly: %d\n", ret); ok(!lstrcmpA(name, source), "got %s, expected %s\n", name, source); ok(required_len == lstrlenA(source) + 1, "got %d, expected %d\n", required_len, lstrlenA(source) + 1); @@ -358,7 +360,7 @@ static void test_SetupGetFileCompressionInfoEx(void) create_source_file(source, comp_cab_lzx, sizeof(comp_cab_lzx)); - ret = SetupGetFileCompressionInfoExA(source, name, sizeof(name), &required_len, &source_size, &target_size, &type); + ret = pSetupGetFileCompressionInfoExA(source, name, sizeof(name), &required_len, &source_size, &target_size, &type); ok(ret, "SetupGetFileCompressionInfoEx failed unexpectedly: %d\n", ret); ok(!lstrcmpA(name, source), "got %s, expected %s\n", name, source); ok(required_len == lstrlenA(source) + 1, "got %d, expected %d\n", required_len, lstrlenA(source) + 1); @@ -369,7 +371,7 @@ static void test_SetupGetFileCompressionInfoEx(void) create_source_file(source, comp_cab_zip, sizeof(comp_cab_zip)); - ret = SetupGetFileCompressionInfoExA(source, name, sizeof(name), &required_len, &source_size, &target_size, &type); + ret = pSetupGetFileCompressionInfoExA(source, name, sizeof(name), &required_len, &source_size, &target_size, &type); ok(ret, "SetupGetFileCompressionInfoEx failed unexpectedly: %d\n", ret); ok(!lstrcmpA(name, source), "got %s, expected %s\n", name, source); ok(required_len == lstrlenA(source) + 1, "got %d, expected %d\n", required_len, lstrlenA(source) + 1); @@ -482,9 +484,18 @@ static void test_SetupDecompressOrCopyFile(void) START_TEST(misc) { + HMODULE hsetupapi = GetModuleHandle("setupapi.dll"); + + pSetupGetFileCompressionInfoExA = (void*)GetProcAddress(hsetupapi, "SetupGetFileCompressionInfoExA"); + GetCurrentDirectoryA(MAX_PATH, CURR_DIR); test_SetupCopyOEMInf(); - test_SetupGetFileCompressionInfoEx(); + + if (pSetupGetFileCompressionInfoExA) + test_SetupGetFileCompressionInfoEx(); + else + skip("SetupGetFileCompressionInfoExA is not available\n"); + test_SetupDecompressOrCopyFile(); }

1 0

Andrew Talbot : mshtml: Void functions should not return a value.
by Alexandre Julliard April 10, 2007

April 10, 2007

Module: wine Branch: master Commit: 824e452a9e42e0772edbebb7fbbf98c7d53c60ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=824e452a9e42e0772edbebb7f… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Apr 9 11:47:04 2007 +0100 mshtml: Void functions should not return a value. --- dlls/mshtml/task.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index f6030f1..a9becef 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -227,13 +227,17 @@ static void process_task(task_t *task) { switch(task->task_id) { case TASK_SETDOWNLOADSTATE: - return set_downloading(task->doc); + set_downloading(task->doc); + break; case TASK_PARSECOMPLETE: - return set_parsecomplete(task->doc); + set_parsecomplete(task->doc); + break; case TASK_SETPROGRESS: - return set_progress(task->doc); + set_progress(task->doc); + break; case TASK_START_BINDING: - return task_start_binding(task->bscallback); + task_start_binding(task->bscallback); + break; default: ERR("Wrong task_id %d\n", task->task_id); }

1 0

Lei Zhang : comctl32: Fix first day of the week in monthcal.
by Alexandre Julliard April 10, 2007

April 10, 2007

Module: wine Branch: master Commit: 6fb16fca6beeaf80c1c0294ebeff88da13e28950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fb16fca6beeaf80c1c0294eb… Author: Lei Zhang <thestig(a)google.com> Date: Mon Apr 9 18:25:41 2007 -0700 comctl32: Fix first day of the week in monthcal. --- dlls/comctl32/monthcal.c | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 6fe6283..3341626 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -94,6 +94,7 @@ typedef struct /* control moves when user clicks a scroll button */ int visible; /* # of months visible */ int firstDay; /* Start month calendar with firstDay's day */ + int firstDayHighWord; /* High word only used externally */ int monthRange; MONTHDAYSTATE *monthdayState; SYSTEMTIME todaysDate; @@ -885,7 +886,7 @@ MONTHCAL_SetMonthDelta(MONTHCAL_INFO *infoPtr, WPARAM wParam) static LRESULT MONTHCAL_GetFirstDayOfWeek(const MONTHCAL_INFO *infoPtr) { - return infoPtr->firstDay; + return MAKELONG(infoPtr->firstDay, infoPtr->firstDayHighWord); } @@ -896,7 +897,7 @@ MONTHCAL_GetFirstDayOfWeek(const MONTHCAL_INFO *infoPtr) static LRESULT MONTHCAL_SetFirstDayOfWeek(MONTHCAL_INFO *infoPtr, LPARAM lParam) { - int prev = infoPtr->firstDay; + int prev = MAKELONG(infoPtr->firstDay, infoPtr->firstDayHighWord); int localFirstDay; WCHAR buf[40]; @@ -908,11 +909,20 @@ MONTHCAL_SetFirstDayOfWeek(MONTHCAL_INFO *infoPtr, LPARAM lParam) localFirstDay = atoiW(buf); if(lParam == -1) - infoPtr->firstDay = MAKELONG(localFirstDay, FALSE); + { + infoPtr->firstDay = localFirstDay; + infoPtr->firstDayHighWord = FALSE; + } else if(lParam >= 7) - infoPtr->firstDay = MAKELONG(localFirstDay, TRUE); + { + infoPtr->firstDay = localFirstDay; + infoPtr->firstDayHighWord = TRUE; + } else - infoPtr->firstDay = MAKELONG(lParam, TRUE); + { + infoPtr->firstDay = lParam; + infoPtr->firstDayHighWord = TRUE; + } return prev; } @@ -1879,6 +1889,7 @@ MONTHCAL_Create(HWND hwnd, WPARAM wParam, LPARAM lParam) /* FIXME: calculate systemtime ->> localtime(substract timezoneinfo) */ GetLocalTime(&infoPtr->todaysDate); + infoPtr->firstDayHighWord = FALSE; MONTHCAL_SetFirstDayOfWeek(infoPtr, (LPARAM)-1); infoPtr->currentMonth = infoPtr->todaysDate.wMonth; infoPtr->currentYear = infoPtr->todaysDate.wYear;

1 0

Rob Shearman : shell32: Return Unicode strings from all of the IShellFolder ::GetDisplayNameOf functions in not running in Win9x mode.
by Alexandre Julliard April 10, 2007

April 10, 2007

Module: wine Branch: master Commit: 899e2ecff833a9f923b4b601e4e8a66145f50fe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=899e2ecff833a9f923b4b601e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 10 10:20:48 2007 +0100 shell32: Return Unicode strings from all of the IShellFolder::GetDisplayNameOf functions in not running in Win9x mode. --- dlls/shell32/shfldr_desktop.c | 61 +++++++++++++++++++++------------------- dlls/shell32/shfldr_fs.c | 40 +++++++++++++++++--------- dlls/shell32/shfldr_mycomp.c | 54 +++++++++++++++++++++++------------- 3 files changed, 93 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=899e2ecff833a9f923b4b…

1 0