May 2010 - Wine-commits - list.winehq.org

Alexandre Julliard : winex11: Don't send minimize/ maximize sys commands to windows that are not supposed to get them.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: ab111025c03e7e2a93bb61a6b3607e4bf8f83561 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab111025c03e7e2a93bb61a6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 24 16:54:59 2010 +0200 winex11: Don't send minimize/maximize sys commands to windows that are not supposed to get them. --- dlls/winex11.drv/event.c | 24 +++++++++++++++++++----- 1 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 7d84b63..da45fe2 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -941,6 +941,8 @@ static int get_window_wm_state( Display *display, struct x11drv_win_data *data ) static void handle_wm_state_notify( struct x11drv_win_data *data, XPropertyEvent *event, BOOL update_window ) { + DWORD style; + switch(event->state) { case PropertyDelete: @@ -966,25 +968,37 @@ static void handle_wm_state_notify( struct x11drv_win_data *data, XPropertyEvent if (!update_window || !data->managed || !data->mapped) return; + style = GetWindowLongW( data->hwnd, GWL_STYLE ); + if (data->iconic && data->wm_state == NormalState) /* restore window */ { data->iconic = FALSE; if (is_net_wm_state_maximized( event->display, data )) { - TRACE( "restoring to max %p/%lx\n", data->hwnd, data->whole_window ); - SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_MAXIMIZE, 0 ); + if ((style & WS_MAXIMIZEBOX) && !(style & WS_DISABLED)) + { + TRACE( "restoring to max %p/%lx\n", data->hwnd, data->whole_window ); + SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_MAXIMIZE, 0 ); + } + else TRACE( "not restoring to max win %p/%lx style %08x\n", + data->hwnd, data->whole_window, style ); } - else + else if (style & (WS_MINIMIZE | WS_MAXIMIZE)) { TRACE( "restoring win %p/%lx\n", data->hwnd, data->whole_window ); SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_RESTORE, 0 ); } + else TRACE( "not restoring win %p/%lx style %08x\n", data->hwnd, data->whole_window, style ); } else if (!data->iconic && data->wm_state == IconicState) { - TRACE( "minimizing win %p/%lx\n", data->hwnd, data->whole_window ); data->iconic = TRUE; - SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_MINIMIZE, 0 ); + if ((style & WS_MINIMIZEBOX) && !(style & WS_DISABLED)) + { + TRACE( "minimizing win %p/%lx\n", data->hwnd, data->whole_window ); + SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_MINIMIZE, 0 ); + } + else TRACE( "not minimizing win %p/%lx style %08x\n", data->hwnd, data->whole_window, style ); } }

1 0

Henri Verbeet : wined3d: Set the volume.c GLINFO_LOCATION to *gl_info.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 08c783a8ade5991a30357f4bb7a44b541ae71d6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=08c783a8ade5991a30357f4bb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 24 09:56:36 2010 +0200 wined3d: Set the volume.c GLINFO_LOCATION to *gl_info. --- dlls/wined3d/volume.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index b53f4d3..693ddd1 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -25,7 +25,8 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); -#define GLINFO_LOCATION This->resource.device->adapter->gl_info + +#define GLINFO_LOCATION (*gl_info) /* Context activation is done by the caller. */ static void volume_bind_and_dirtify(IWineD3DVolume *iface) { @@ -313,8 +314,10 @@ static HRESULT WINAPI IWineD3DVolumeImpl_SetContainer(IWineD3DVolume *iface, IWi } /* Context activation is done by the caller. */ -static HRESULT WINAPI IWineD3DVolumeImpl_LoadTexture(IWineD3DVolume *iface, int gl_level, BOOL srgb_mode) { - IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; +static HRESULT WINAPI IWineD3DVolumeImpl_LoadTexture(IWineD3DVolume *iface, int gl_level, BOOL srgb_mode) +{ + IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; + const struct wined3d_gl_info *gl_info = &This->resource.device->adapter->gl_info; const struct wined3d_format_desc *glDesc = This->resource.format_desc; TRACE("(%p) : level %u, format %s (0x%08x)\n", This, gl_level, debug_d3dformat(glDesc->format), glDesc->format);

1 0

Henri Verbeet : wined3d: Set the nvidia_texture_shader. c GLINFO_LOCATION to *gl_info.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 31d1417ca3cc552e857b2598f9b635fcfbd2e09d URL: http://source.winehq.org/git/wine.git/?a=commit;h=31d1417ca3cc552e857b2598f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 24 09:56:37 2010 +0200 wined3d: Set the nvidia_texture_shader.c GLINFO_LOCATION to *gl_info. --- dlls/wined3d/nvidia_texture_shader.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 3587db9..d22989d 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -28,7 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); -#define GLINFO_LOCATION stateblock->device->adapter->gl_info +#define GLINFO_LOCATION (*gl_info) /* GL locking for state handlers is done by the caller. */ @@ -137,7 +137,6 @@ void set_tex_op_nvrc(IWineD3DDevice *iface, BOOL is_alpha, int stage, WINED3DTEX GLenum portion = is_alpha ? GL_ALPHA : GL_RGB; GLenum target = GL_COMBINER0_NV + stage; GLenum output; - IWineD3DStateBlockImpl *stateblock = This->stateBlock; /* For GLINFO_LOCATION */ TRACE("stage %d, is_alpha %d, op %s, arg1 %#x, arg2 %#x, arg3 %#x, texture_idx %d\n", stage, is_alpha, debug_d3dtop(op), arg1, arg2, arg3, texture_idx); @@ -579,6 +578,7 @@ static void nvts_bumpenvmat(DWORD state, IWineD3DStateBlockImpl *stateblock, str { DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); DWORD mapped_stage = stateblock->device->texUnitMap[stage + 1]; + const struct wined3d_gl_info *gl_info = context->gl_info; float mat[2][2]; /* Direct3D sets the matrix in the stage reading the perturbation map. The result is used to @@ -587,7 +587,7 @@ static void nvts_bumpenvmat(DWORD state, IWineD3DStateBlockImpl *stateblock, str * map is read from a specified source stage(always stage - 1 for d3d). Thus set the matrix * for stage + 1. Keep the nvrc tex unit mapping in mind too */ - if (mapped_stage < context->gl_info->limits.textures) + if (mapped_stage < gl_info->limits.textures) { GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + mapped_stage)); checkGLcall("GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + mapped_stage))"); @@ -606,6 +606,7 @@ static void nvts_bumpenvmat(DWORD state, IWineD3DStateBlockImpl *stateblock, str static void nvrc_texfactor(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { + const struct wined3d_gl_info *gl_info = context->gl_info; float col[4]; D3DCOLORTOGLFLOAT4(stateblock->renderState[WINED3DRS_TEXTUREFACTOR], col); GL_EXTCALL(glCombinerParameterfvNV(GL_CONSTANT_COLOR0_NV, &col[0]));

1 0

Austin English : ntdll: Add %gs support for FreeBSD.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 40b3d2ed13f4a90b891527a9ded7a72e8f5aba18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40b3d2ed13f4a90b891527a9d… Author: Austin English <austinenglish(a)gmail.com> Date: Sun May 23 21:18:17 2010 -0500 ntdll: Add %gs support for FreeBSD. --- configure | 1 + configure.ac | 1 + dlls/ntdll/signal_x86_64.c | 9 ++++++++- include/config.h.in | 3 +++ 4 files changed, 13 insertions(+), 1 deletions(-) diff --git a/configure b/configure index fe69a20..54573a4 100755 --- a/configure +++ b/configure @@ -5837,6 +5837,7 @@ for ac_header in \ machine/cpu.h \ machine/limits.h \ machine/soundcard.h \ + machine/sysarch.h \ mntent.h \ mpg123.h \ ncurses.h \ diff --git a/configure.ac b/configure.ac index 130291c..4c0cdbe 100644 --- a/configure.ac +++ b/configure.ac @@ -422,6 +422,7 @@ AC_CHECK_HEADERS(\ machine/cpu.h \ machine/limits.h \ machine/soundcard.h \ + machine/sysarch.h \ mntent.h \ mpg123.h \ ncurses.h \ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 3411110..ccea6df 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -28,10 +28,15 @@ #include <stdlib.h> #include <stdarg.h> #include <stdio.h> + #ifdef HAVE_UNISTD_H # include <unistd.h> #endif +#ifdef HAVE_MACHINE_SYSARCH_H +# include <machine/sysarch.h> +#endif + #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif @@ -2288,8 +2293,10 @@ void signal_init_thread( TEB *teb ) { stack_t ss; -#ifdef __linux__ +#if defined __linux__ arch_prctl( ARCH_SET_GS, teb ); +#elif defined __FreeBSD__ + amd64_set_gsbase( teb ); #else # error Please define setting %gs for your architecture #endif diff --git a/include/config.h.in b/include/config.h.in index 0faf127..5d8806d 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -461,6 +461,9 @@ /* Define to 1 if you have the <machine/soundcard.h> header file. */ #undef HAVE_MACHINE_SOUNDCARD_H +/* Define to 1 if you have the <machine/sysarch.h> header file. */ +#undef HAVE_MACHINE_SYSARCH_H + /* Define to 1 if you have the <mach/machine.h> header file. */ #undef HAVE_MACH_MACHINE_H

1 0

Alexandre Julliard : winex11: Fetch the antialias parameter from fontconfig too.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 4c206326913706788644e8f4ebc11dcede368d6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c206326913706788644e8f4e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 24 12:34:28 2010 +0200 winex11: Fetch the antialias parameter from fontconfig too. --- dlls/winex11.drv/xrender.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index cc0b2b5..087da2b 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -193,6 +193,7 @@ MAKE_FUNCPTR(FcPatternCreate) MAKE_FUNCPTR(FcPatternDestroy) MAKE_FUNCPTR(FcPatternAddInteger) MAKE_FUNCPTR(FcPatternAddString) +MAKE_FUNCPTR(FcPatternGetBool) MAKE_FUNCPTR(FcPatternGetInteger) MAKE_FUNCPTR(FcPatternGetString) static void *fontconfig_handle; @@ -408,6 +409,7 @@ LOAD_OPTIONAL_FUNCPTR(XRenderSetPictureTransform) LOAD_FUNCPTR(FcPatternDestroy); LOAD_FUNCPTR(FcPatternAddInteger); LOAD_FUNCPTR(FcPatternAddString); + LOAD_FUNCPTR(FcPatternGetBool); LOAD_FUNCPTR(FcPatternGetInteger); LOAD_FUNCPTR(FcPatternGetString); #undef LOAD_FUNCPTR @@ -936,14 +938,17 @@ static int GetCacheEntry(X11DRV_PDEVICE *physDev, LFANDSIZE *plfsz) if ((match = pFcFontMatch( NULL, pattern, &result ))) { int rgba; + FcBool antialias; + if (pFcPatternGetBool( match, FC_ANTIALIAS, 0, &antialias ) != FcResultMatch) + antialias = TRUE; if (pFcPatternGetInteger( match, FC_RGBA, 0, &rgba ) == FcResultMatch) { FcChar8 *file; if (pFcPatternGetString( match, FC_FILE, 0, &file ) != FcResultMatch) file = NULL; - TRACE( "fontconfig returned rgba %u for font %s file %s\n", - rgba, debugstr_w(plfsz->lf.lfFaceName), debugstr_a((char *)file) ); + TRACE( "fontconfig returned rgba %u antialias %u for font %s file %s\n", + rgba, antialias, debugstr_w(plfsz->lf.lfFaceName), debugstr_a((char *)file) ); switch (rgba) { @@ -951,7 +956,7 @@ static int GetCacheEntry(X11DRV_PDEVICE *physDev, LFANDSIZE *plfsz) case FC_RGBA_BGR: entry->aa_default = AA_BGR; break; case FC_RGBA_VRGB: entry->aa_default = AA_VRGB; break; case FC_RGBA_VBGR: entry->aa_default = AA_VBGR; break; - case FC_RGBA_NONE: entry->aa_default = AA_None; break; + case FC_RGBA_NONE: entry->aa_default = antialias ? AA_Grey : AA_None; break; } } pFcPatternDestroy( match );

1 0

Alexandre Julliard : winex11: Allow the Xft configuration to override both registry and fontconfig parameters .
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: c30688c4d2e265216e4a30a809b6116e23297648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c30688c4d2e265216e4a30a80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 24 12:34:55 2010 +0200 winex11: Allow the Xft configuration to override both registry and fontconfig parameters. --- dlls/winex11.drv/xrender.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 087da2b..b13f2e4 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -964,6 +964,30 @@ static int GetCacheEntry(X11DRV_PDEVICE *physDev, LFANDSIZE *plfsz) pFcPatternDestroy( pattern ); } #endif /* SONAME_LIBFONTCONFIG */ + + /* now check Xft resources */ + { + char *value; + BOOL antialias = TRUE; + + wine_tsx11_lock(); + if ((value = XGetDefault( gdi_display, "Xft", "antialias" ))) + { + if (tolower(value[0]) == 'f' || tolower(value[0]) == 'n' || + value[0] == '0' || !strcasecmp( value, "off" )) + antialias = FALSE; + } + if ((value = XGetDefault( gdi_display, "Xft", "rgba" ))) + { + TRACE( "Xft resource returned rgba '%s' antialias %u\n", value, antialias ); + if (!strcmp( value, "rgb" )) entry->aa_default = AA_RGB; + else if (!strcmp( value, "bgr" )) entry->aa_default = AA_BGR; + else if (!strcmp( value, "vrgb" )) entry->aa_default = AA_VRGB; + else if (!strcmp( value, "vbgr" )) entry->aa_default = AA_VBGR; + else if (!strcmp( value, "none" )) entry->aa_default = antialias ? AA_Grey : AA_None; + } + wine_tsx11_unlock(); + } } else entry->aa_default = AA_None;

1 0

Andrey Turkin : server: Connect named pipe synchronously when overlapped param is NULL.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 85cc2c13f6f4309993b0daf5a51942228fbac0db URL: http://source.winehq.org/git/wine.git/?a=commit;h=85cc2c13f6f4309993b0daf5a… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sat May 22 22:00:59 2010 +0400 server: Connect named pipe synchronously when overlapped param is NULL. --- dlls/kernel32/tests/pipe.c | 48 +++++++++++++++++++++++++------------------ dlls/ntdll/file.c | 2 +- server/named_pipe.c | 2 +- 3 files changed, 30 insertions(+), 22 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index b48ceec..5abfd85 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -547,28 +547,36 @@ static DWORD CALLBACK serverThreadMain3(LPVOID arg) oOverlap.hEvent = hEvent; /* Wait for client to connect */ - trace("Server calling overlapped ConnectNamedPipe...\n"); - success = ConnectNamedPipe(hnp, &oOverlap); - err = GetLastError(); - ok(!success && (err == ERROR_IO_PENDING || err == ERROR_PIPE_CONNECTED), "overlapped ConnectNamedPipe\n"); - trace("overlapped ConnectNamedPipe returned.\n"); - if (!success && (err == ERROR_IO_PENDING)) { - if (letWFSOEwait) - { - DWORD ret; - do { - ret = WaitForSingleObjectEx(hEvent, INFINITE, TRUE); - } while (ret == WAIT_IO_COMPLETION); - ok(ret == 0, "wait ConnectNamedPipe returned %x\n", ret); - } - success = GetOverlappedResult(hnp, &oOverlap, &dummy, letGORwait); - if (!letGORwait && !letWFSOEwait && !success) { - ok(GetLastError() == ERROR_IO_INCOMPLETE, "GetOverlappedResult\n"); - success = GetOverlappedResult(hnp, &oOverlap, &dummy, TRUE); + if (i == 0) { + trace("Server calling non-overlapped ConnectNamedPipe on overlapped pipe...\n"); + success = ConnectNamedPipe(hnp, NULL); + err = GetLastError(); + ok(success || (err == ERROR_PIPE_CONNECTED), "ConnectNamedPipe failed: %d\n", err); + trace("ConnectNamedPipe operation complete.\n"); + } else { + trace("Server calling overlapped ConnectNamedPipe...\n"); + success = ConnectNamedPipe(hnp, &oOverlap); + err = GetLastError(); + ok(!success && (err == ERROR_IO_PENDING || err == ERROR_PIPE_CONNECTED), "overlapped ConnectNamedPipe\n"); + trace("overlapped ConnectNamedPipe returned.\n"); + if (!success && (err == ERROR_IO_PENDING)) { + if (letWFSOEwait) + { + DWORD ret; + do { + ret = WaitForSingleObjectEx(hEvent, INFINITE, TRUE); + } while (ret == WAIT_IO_COMPLETION); + ok(ret == 0, "wait ConnectNamedPipe returned %x\n", ret); + } + success = GetOverlappedResult(hnp, &oOverlap, &dummy, letGORwait); + if (!letGORwait && !letWFSOEwait && !success) { + ok(GetLastError() == ERROR_IO_INCOMPLETE, "GetOverlappedResult\n"); + success = GetOverlappedResult(hnp, &oOverlap, &dummy, TRUE); + } } + ok(success || (err == ERROR_PIPE_CONNECTED), "GetOverlappedResult ConnectNamedPipe\n"); + trace("overlapped ConnectNamedPipe operation complete.\n"); } - ok(success || (err == ERROR_PIPE_CONNECTED), "GetOverlappedResult ConnectNamedPipe\n"); - trace("overlapped ConnectNamedPipe operation complete.\n"); /* Echo bytes once */ memset(buf, 0, sizeof(buf)); diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 741395d..b5d1c14 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1227,7 +1227,7 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, SERVER_START_REQ( ioctl ) { req->code = code; - req->blocking = !apc && !event; + req->blocking = !apc && !event && !cvalue; req->async.handle = wine_server_obj_handle( handle ); req->async.callback = wine_server_client_ptr( ioctl_completion ); req->async.iosb = wine_server_client_ptr( io ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 54ce823..95f06b9 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -613,7 +613,7 @@ static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const a { case ps_idle_server: case ps_wait_connect: - if (blocking && !is_overlapped( get_fd_options(fd) )) + if (blocking) { async_data_t new_data = *async_data; if (!(wait_handle = alloc_wait_event( current->process ))) break;

1 0

Austin English : user32: Add test for drop down width in test_changesize().
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 8ee8806773f7d6b883991b7514f0ae5fc6f672ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ee8806773f7d6b883991b751… Author: Austin English <austinenglish(a)gmail.com> Date: Sat May 22 02:25:13 2010 -0500 user32: Add test for drop down width in test_changesize(). --- dlls/user32/tests/combo.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index faf2145..b7fa63f 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -384,6 +384,8 @@ static void test_changesize( DWORD style) rc.right - rc.left, clwidth - 2); ok( rc.bottom - rc.top == ddheight, "drop-down rect height is %d vs %d\n", rc.bottom - rc.top, ddheight); + ok( rc.right - rc.left == ddwidth -2, "drop-down rect width is %d vs %d\n", + rc.right - rc.left, ddwidth - 2); /* new cx, cy is slightly bigger than the initial values */ MoveWindow( hCombo, 10, 10, clwidth + 2, clheight + 2, TRUE); GetClientRect( hCombo, &rc);

1 0

Austin English : user32/tests: Check return value of DdeClientTransaction in test_initialisation().
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 5396713c2bed6bd8020013903ffa161277babffa URL: http://source.winehq.org/git/wine.git/?a=commit;h=5396713c2bed6bd8020013903… Author: Austin English <austinenglish(a)gmail.com> Date: Sat May 22 03:17:37 2010 -0500 user32/tests: Check return value of DdeClientTransaction in test_initialisation(). --- dlls/user32/tests/dde.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 3a0d656..92bee45 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -1447,6 +1447,7 @@ static void test_initialisation(void) res = 0xdeadbeef; DdeGetLastError(client_pid); hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res); + ok(hdata == NULL, "Expected NULL, got %p\n", hdata); ret = DdeGetLastError(client_pid); todo_wine ok(ret == DMLERR_INVALIDPARAMETER, "Expected DMLERR_INVALIDPARAMETER, got %d\n", ret);

1 0

Austin English : gdi32/tests: Use ret in test_CreateFontIndirect().
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 00ddfc804aaf11f5e9f3120fc998fedd0a902e83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00ddfc804aaf11f5e9f3120fc… Author: Austin English <austinenglish(a)gmail.com> Date: Sat May 22 03:35:07 2010 -0500 gdi32/tests: Use ret in test_CreateFontIndirect(). --- dlls/gdi32/tests/font.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 72cf9be..6ef98c8 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3095,7 +3095,9 @@ static void test_CreateFontIndirect(void) lstrcpyA(lf.lfFaceName, TestName[i]); hfont = CreateFontIndirectA(&lf); ok(hfont != 0, "CreateFontIndirectA failed\n"); + SetLastError(0xdeadbeef); ret = GetObject(hfont, sizeof(getobj_lf), &getobj_lf); + ok(ret, "GetObject failed: %d\n", GetLastError()); ok(lf.lfItalic == getobj_lf.lfItalic, "lfItalic: expect %02x got %02x\n", lf.lfItalic, getobj_lf.lfItalic); ok(lf.lfWeight == getobj_lf.lfWeight || broken((SHORT)lf.lfWeight == getobj_lf.lfWeight), /* win9x */

1 0