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

Andrew Talbot : msvcrt: Remove superfluous semicolons.
by Alexandre Julliard April 11, 2007

April 11, 2007

Module: wine Branch: master Commit: 0edfb58d2aeee54cde84ba65007c5fdf40ab9e4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0edfb58d2aeee54cde84ba650… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Apr 10 23:13:10 2007 +0100 msvcrt: Remove superfluous semicolons. --- dlls/msvcrt/cpp.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 3592f9d..69ace0a 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -637,17 +637,17 @@ void * __stdcall MSVCRT_type_info_vector_dtor(type_info * _this, unsigned int fl funcs "\n\t.text"); #define __ASM_EXCEPTION_VTABLE(name) \ - __ASM_VTABLE(name, "\t.long " THISCALL_NAME(MSVCRT_what_exception) ); + __ASM_VTABLE(name, "\t.long " THISCALL_NAME(MSVCRT_what_exception) ) #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif -__ASM_VTABLE(type_info,""); -__ASM_EXCEPTION_VTABLE(exception); -__ASM_EXCEPTION_VTABLE(bad_typeid); -__ASM_EXCEPTION_VTABLE(bad_cast); -__ASM_EXCEPTION_VTABLE(__non_rtti_object); +__ASM_VTABLE(type_info,"") +__ASM_EXCEPTION_VTABLE(exception) +__ASM_EXCEPTION_VTABLE(bad_typeid) +__ASM_EXCEPTION_VTABLE(bad_cast) +__ASM_EXCEPTION_VTABLE(__non_rtti_object) #ifndef __GNUC__ }

1 0

Alexandre Julliard : ntdll: Store the file access and options in the fd cache, and get rid of the dynamic flags.
by Alexandre Julliard April 11, 2007

April 11, 2007

Module: wine Branch: master Commit: d85121f1996a7a2f79ccdedb6710a434486b66eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d85121f1996a7a2f79ccdedb6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 10 22:32:46 2007 +0200 ntdll: Store the file access and options in the fd cache, and get rid of the dynamic flags. This avoids server round-trips for all file I/O. --- dlls/ntdll/file.c | 31 ++++++++++------------ dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/server.c | 57 ++++++++++++++++++++++++--------------- dlls/ws2_32/socket.c | 50 ++++++++++++++--------------------- include/wine/server.h | 2 +- include/wine/server_protocol.h | 16 +++------- server/fd.c | 15 +++++----- server/protocol.def | 14 +++------- server/trace.c | 8 +++--- 9 files changed, 91 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d85121f1996a7a2f79ccd…

1 0

Alexandre Julliard : server: Store the opening options in the file descriptor instead of in the individual objects .
by Alexandre Julliard April 11, 2007

April 11, 2007

Module: wine Branch: master Commit: f85437c57fb44d511db97edbaa5b1f8abfe75fd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f85437c57fb44d511db97edba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 10 22:25:07 2007 +0200 server: Store the opening options in the file descriptor instead of in the individual objects. Allows moving the FD_FLAG_OVERLAPPED support to the generic get_handle_fd request handling. --- server/change.c | 2 +- server/fd.c | 24 +++++++++++++++--------- server/file.c | 21 ++++++++------------- server/file.h | 5 +++-- server/mailslot.c | 10 +++++----- server/named_pipe.c | 16 ++++------------ server/process.c | 2 +- server/queue.c | 2 +- server/request.c | 2 +- server/serial.c | 18 +----------------- server/signal.c | 2 +- server/sock.c | 44 +++++++++++++++++--------------------------- server/thread.c | 6 +++--- 13 files changed, 61 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f85437c57fb44d511db97…

1 0

Alexandre Julliard : kernel32: Add SYNCHRONIZE access to mailslot handles.
by Alexandre Julliard April 11, 2007

April 11, 2007

Module: wine Branch: master Commit: 83cef86f29bc5ad2ce80652f86a9b9f98a26ad35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83cef86f29bc5ad2ce80652f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 10 22:24:40 2007 +0200 kernel32: Add SYNCHRONIZE access to mailslot handles. Don't bother to request write access. --- dlls/kernel32/sync.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 8ee0e71..7c15fd8 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1701,7 +1701,7 @@ HANDLE WINAPI CreateMailslotW( LPCWSTR lpName, DWORD nMaxMessageSize, else timeout.QuadPart = ((LONGLONG)0x7fffffff << 32) | 0xffffffff; - status = NtCreateMailslotFile( &handle, GENERIC_READ | GENERIC_WRITE, &attr, + status = NtCreateMailslotFile( &handle, GENERIC_READ | SYNCHRONIZE, &attr, &iosb, 0, 0, nMaxMessageSize, &timeout ); if (status) {

1 0

Rolf Kalbermatter : notepad: Improve printing considerably.
by Alexandre Julliard April 10, 2007

April 10, 2007

Module: wine Branch: master Commit: 5eb6c11aba740869f7363f7b4444e5f763937d9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5eb6c11aba740869f7363f7b4… Author: Rolf Kalbermatter <r.kalbermatter(a)hccnet.nl> Date: Fri Apr 6 19:50:37 2007 +0200 notepad: Improve printing considerably. Make fonts and the other measurements the correct size in relation to the actual printer resolution instead of thinking it uses the same resolution as the display. Before fixed sized (and for most printer resolutions way to small) margins where used and the font size was taken directly from the screen font independent of the actual printer resolution, resulting in a completely unreadable micro text on most printouts. --- programs/notepad/dialog.c | 294 ++++++++++++++++++++++++++++----------------- programs/notepad/main.c | 2 +- programs/notepad/main.h | 1 + 3 files changed, 188 insertions(+), 109 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5eb6c11aba740869f7363…

1 0

Hans Leidekker : setupapi: Implement SetupGetFileCompressionInfo on top of SetupGetFileCompressionInfoEx .
by Alexandre Julliard April 10, 2007

April 10, 2007

Module: wine Branch: master Commit: aa4fe0673987f4b5d065c6446973514b2f7cad73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa4fe0673987f4b5d065c6446… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue Apr 10 20:22:39 2007 +0200 setupapi: Implement SetupGetFileCompressionInfo on top of SetupGetFileCompressionInfoEx. --- dlls/setupapi/misc.c | 75 +++++++++++++++++++++++++++++++++++++++++++ dlls/setupapi/setupapi.spec | 4 +- dlls/setupapi/tests/misc.c | 41 +++++++++++++++++++++++ include/setupapi.h | 3 ++ 4 files changed, 121 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index e77bf87..a9e1e82 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -1201,6 +1201,81 @@ BOOL WINAPI SetupGetFileCompressionInfoExW( PCWSTR source, PWSTR name, DWORD len return ret; } +/*********************************************************************** + * SetupGetFileCompressionInfoA (SETUPAPI.@) + * + * See SetupGetFileCompressionInfoW. + */ +DWORD WINAPI SetupGetFileCompressionInfoA( PCSTR source, PSTR *name, PDWORD source_size, + PDWORD target_size, PUINT type ) +{ + BOOL ret; + DWORD error, required; + LPSTR actual_name; + + TRACE("%s, %p, %p, %p, %p\n", debugstr_a(source), name, source_size, target_size, type); + + if (!source || !name || !source_size || !target_size || !type) + return ERROR_INVALID_PARAMETER; + + ret = SetupGetFileCompressionInfoExA( source, NULL, 0, &required, NULL, NULL, NULL ); + if (!(actual_name = MyMalloc( required ))) return ERROR_NOT_ENOUGH_MEMORY; + + ret = SetupGetFileCompressionInfoExA( source, actual_name, required, &required, + source_size, target_size, type ); + if (!ret) + { + error = GetLastError(); + MyFree( actual_name ); + return error; + } + *name = actual_name; + return ERROR_SUCCESS; +} + +/*********************************************************************** + * SetupGetFileCompressionInfoW (SETUPAPI.@) + * + * Get compression type and compressed/uncompressed sizes of a given file. + * + * PARAMS + * source [I] File to examine. + * name [O] Actual filename used. + * source_size [O] Size of compressed file. + * target_size [O] Size of uncompressed file. + * type [O] Compression type. + * + * RETURNS + * Success: ERROR_SUCCESS + * Failure: Win32 error code. + */ +DWORD WINAPI SetupGetFileCompressionInfoW( PCWSTR source, PWSTR *name, PDWORD source_size, + PDWORD target_size, PUINT type ) +{ + BOOL ret; + DWORD error, required; + LPWSTR actual_name; + + TRACE("%s, %p, %p, %p, %p\n", debugstr_w(source), name, source_size, target_size, type); + + if (!source || !name || !source_size || !target_size || !type) + return ERROR_INVALID_PARAMETER; + + ret = SetupGetFileCompressionInfoExW( source, NULL, 0, &required, NULL, NULL, NULL ); + if (!(actual_name = MyMalloc( required ))) return ERROR_NOT_ENOUGH_MEMORY; + + ret = SetupGetFileCompressionInfoExW( source, actual_name, required, &required, + source_size, target_size, type ); + if (!ret) + { + error = GetLastError(); + MyFree( actual_name ); + return error; + } + *name = actual_name; + return ERROR_SUCCESS; +} + static DWORD decompress_file_lz( LPCWSTR source, LPCWSTR target ) { DWORD ret; diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 1669cc4..b523644 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -395,10 +395,10 @@ @ stub SetupGetBackupInformationW @ stdcall SetupGetBinaryField(ptr long ptr long ptr) @ stdcall SetupGetFieldCount(ptr) -@ stub SetupGetFileCompressionInfoA +@ stdcall SetupGetFileCompressionInfoA(str ptr ptr ptr ptr) @ stdcall SetupGetFileCompressionInfoExA(str ptr long ptr ptr ptr ptr) @ stdcall SetupGetFileCompressionInfoExW(wstr ptr long ptr ptr ptr ptr) -@ stub SetupGetFileCompressionInfoW +@ stdcall SetupGetFileCompressionInfoW(wstr ptr ptr ptr ptr) @ stdcall SetupGetFileQueueCount(long long ptr) @ stdcall SetupGetFileQueueFlags(long ptr) @ stub SetupGetInfFileListA diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index cbfc647..9368540 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -316,6 +316,46 @@ static const BYTE comp_cab_zip[] = { 0x2d, 0x28, 0x4a, 0x2d, 0x2e, 0x4e, 0x4d, 0xe1, 0xe5, 0x02, 0x00 }; +static void test_SetupGetFileCompressionInfo(void) +{ + DWORD ret, source_size, target_size; + char source[MAX_PATH], temp[MAX_PATH], *name; + UINT type; + + GetTempPathA(sizeof(temp), temp); + GetTempFileNameA(temp, "fci", 0, source); + + create_source_file(source, uncompressed, sizeof(uncompressed)); + + ret = SetupGetFileCompressionInfoA(NULL, NULL, NULL, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "SetupGetFileCompressionInfo failed unexpectedly\n"); + + ret = SetupGetFileCompressionInfoA(source, NULL, NULL, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "SetupGetFileCompressionInfo failed unexpectedly\n"); + + ret = SetupGetFileCompressionInfoA(source, &name, NULL, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "SetupGetFileCompressionInfo failed unexpectedly\n"); + + ret = SetupGetFileCompressionInfoA(source, &name, &source_size, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "SetupGetFileCompressionInfo failed unexpectedly\n"); + + ret = SetupGetFileCompressionInfoA(source, &name, &source_size, &target_size, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "SetupGetFileCompressionInfo failed unexpectedly\n"); + + name = NULL; + source_size = target_size = 0; + type = 5; + + ret = SetupGetFileCompressionInfoA(source, &name, &source_size, &target_size, &type); + ok(!ret, "SetupGetFileCompressionInfo failed unexpectedly\n"); + ok(name && !lstrcmpA(name, source), "got %s, expected %s\n", name, source); + ok(source_size == sizeof(uncompressed), "got %d\n", source_size); + ok(target_size == sizeof(uncompressed), "got %d\n", target_size); + ok(type == FILE_COMPRESSION_NONE, "got %d, expected FILE_COMPRESSION_NONE\n", type); + + DeleteFileA(source); +} + static void test_SetupGetFileCompressionInfoEx(void) { BOOL ret; @@ -491,6 +531,7 @@ START_TEST(misc) GetCurrentDirectoryA(MAX_PATH, CURR_DIR); test_SetupCopyOEMInf(); + test_SetupGetFileCompressionInfo(); if (pSetupGetFileCompressionInfoExA) test_SetupGetFileCompressionInfoEx(); diff --git a/include/setupapi.h b/include/setupapi.h index dd20435..837278c 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -819,6 +819,9 @@ BOOL WINAPI SetupFindNextMatchLineW( PINFCONTEXT context_in, PCWSTR key, PIN #define SetupFindNextMatchLine WINELIB_NAME_AW(SetupFindNextMatchLine) BOOL WINAPI SetupGetBinaryField( PINFCONTEXT context, DWORD index, BYTE *buffer, DWORD size, LPDWORD required ); DWORD WINAPI SetupGetFieldCount( PINFCONTEXT context ); +DWORD WINAPI SetupGetFileCompressionInfoA(PCSTR, PSTR *, PDWORD, PDWORD, PUINT); +DWORD WINAPI SetupGetFileCompressionInfoW(PCWSTR, PWSTR *, PDWORD, PDWORD, PUINT); +#define SetupGetFileCompressionInfo WINELIB_NAME_AW(SetupGetFileCompressionInfo) BOOL WINAPI SetupGetFileCompressionInfoExA(PCSTR, PSTR, DWORD, PDWORD, PDWORD, PDWORD, PUINT); BOOL WINAPI SetupGetFileCompressionInfoExW(PCWSTR, PWSTR, DWORD, PDWORD, PDWORD, PDWORD, PUINT); #define SetupGetFileCompressionInfoEx WINELIB_NAME_AW(SetupGetFileCompressionInfoEx)

1 0

H. Verbeet : wined3d: Disable the scissor test for depth blits.
by Alexandre Julliard April 10, 2007

April 10, 2007

Module: wine Branch: master Commit: 8d3c078e6cbbb1d0dfbc829d07e8a173431f6ede URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d3c078e6cbbb1d0dfbc829d0… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Apr 10 19:14:10 2007 +0200 wined3d: Disable the scissor test for depth blits. --- dlls/wined3d/drawprim.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index b8d0fcc..9ec6142 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -765,6 +765,7 @@ static void depth_blt(IWineD3DDevice *iface, GLuint texture) { glDisable(GL_CULL_FACE); glDisable(GL_BLEND); glDisable(GL_ALPHA_TEST); + glDisable(GL_SCISSOR_TEST); glDisable(GL_STENCIL_TEST); glEnable(GL_DEPTH_TEST); glDepthFunc(GL_ALWAYS);

1 0

H. Verbeet : wined3d: Dirtify the sampler used by IWineD3DSurface_PreLoad in IWineD3DSurfaceImpl_BltOverride .
by Alexandre Julliard April 10, 2007

April 10, 2007

Module: wine Branch: master Commit: 2423c9f00331d314a07cc45fd06cd359c566a684 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2423c9f00331d314a07cc45fd… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Apr 10 19:14:27 2007 +0200 wined3d: Dirtify the sampler used by IWineD3DSurface_PreLoad in IWineD3DSurfaceImpl_BltOverride. --- dlls/wined3d/surface.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e846b18..6e09072 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2717,6 +2717,11 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * } /* Call preload for the surface to make sure it isn't dirty */ + if (GL_SUPPORT(ARB_MULTITEXTURE)) { + GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB)); + checkGLcall("glActiveTextureARB"); + } + IWineD3DDeviceImpl_MarkStateDirty(This->resource.wineD3DDevice, STATE_SAMPLER(0)); IWineD3DSurface_PreLoad((IWineD3DSurface *) This); /* Make sure that the top pixel is always above the bottom pixel, and keep a seperate upside down flag

1 0

H. Verbeet : wined3d: Disable the scissor test in stretch_rect_fbo.
by Alexandre Julliard April 10, 2007

April 10, 2007

Module: wine Branch: master Commit: 384ad311f3b8efd51bf28b9e2f39dbf27b36726a URL: http://source.winehq.org/git/wine.git/?a=commit;h=384ad311f3b8efd51bf28b9e2… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Apr 10 19:14:01 2007 +0200 wined3d: Disable the scissor test in stretch_rect_fbo. --- dlls/wined3d/device.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 290ea85..8153fb7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5276,6 +5276,9 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, const 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); + glDisable(GL_SCISSOR_TEST); + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE)); + switch (filter) { case WINED3DTEXF_LINEAR: gl_filter = GL_LINEAR;

1 0

H. Verbeet : wined3d: Remove some redundant IWineD3DSurface_PreLoad calls from stretch_rect_fbo.
by Alexandre Julliard April 10, 2007

April 10, 2007

Module: wine Branch: master Commit: f0fcf7e133f1eaa04491d2539ef0d85c4efcf271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0fcf7e133f1eaa04491d2539… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Apr 10 19:13:54 2007 +0200 wined3d: Remove some redundant IWineD3DSurface_PreLoad calls from stretch_rect_fbo. --- dlls/wined3d/device.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 26f0087..290ea85 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5296,7 +5296,6 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, const 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); } @@ -5308,7 +5307,6 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, const 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