wine-commits December 2006

wine-commits@winehq.org

4 participants
720 discussions

Clinton Stimpson : comctl32: Destroy header information on WM_NCDESTROY instead of WM_DESTROY.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: 3f91e7529a37e50a48f21c0c3cb75c47bf3da36a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f91e7529a37e50a48f21c0c3… Author: Clinton Stimpson <cjstimpson(a)utwire.net> Date: Sat Dec 2 18:12:07 2006 -0700 comctl32: Destroy header information on WM_NCDESTROY instead of WM_DESTROY. --- dlls/comctl32/header.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 5b62dda..73b1095 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -1502,10 +1502,17 @@ HEADER_Create (HWND hwnd, WPARAM wParam, static LRESULT HEADER_Destroy (HWND hwnd, WPARAM wParam, LPARAM lParam) { + HTHEME theme = GetWindowTheme(hwnd); + CloseThemeData(theme); + return 0; +} + +static LRESULT +HEADER_NCDestroy (HWND hwnd, WPARAM wParam, LPARAM lParam) +{ HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); HEADER_ITEM *lpItem; INT nItem; - HTHEME theme; if (infoPtr->items) { lpItem = infoPtr->items; @@ -1519,13 +1526,11 @@ HEADER_Destroy (HWND hwnd, WPARAM wParam Free(infoPtr->order); if (infoPtr->himl) - ImageList_Destroy (infoPtr->himl); + ImageList_Destroy (infoPtr->himl); SetWindowLongPtrW (hwnd, 0, 0); Free (infoPtr); - theme = GetWindowTheme(hwnd); - CloseThemeData(theme); return 0; } @@ -2078,6 +2083,9 @@ HEADER_WindowProc (HWND hwnd, UINT msg, case WM_DESTROY: return HEADER_Destroy (hwnd, wParam, lParam); + case WM_NCDESTROY: + return HEADER_NCDestroy (hwnd, wParam, lParam); + case WM_ERASEBKGND: return 1;

1 0

Chris Robinson : wgl: Don' t return prematurely if ConvertPixelFormatWGLtoGLX receives an invalid pixel format .
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: b4f0adbf96060556a69099132bb43c5cffd0495e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4f0adbf96060556a69099132… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sat Dec 2 18:06:42 2006 -0800 wgl: Don't return prematurely if ConvertPixelFormatWGLtoGLX receives an invalid pixel format. --- dlls/winex11.drv/opengl.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 465f2ef..5779bce 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -876,20 +876,26 @@ static BOOL init_formats(Display *displa */ static BOOL ConvertPixelFormatWGLtoGLX(Display *display, int iPixelFormat, int *fmt_index, int *fmt_count) { + int ret; + /* Init the list of pixel formats when we need it */ if(!WineGLPixelFormatListSize) init_formats(display, DefaultScreen(display), visual); if((iPixelFormat <= 0) || (iPixelFormat > WineGLPixelFormatListSize)) { ERR("invalid iPixelFormat %d\n", iPixelFormat); - return FALSE; + ret = FALSE; + *fmt_index = -1; + } + else { + ret = TRUE; + *fmt_index = WineGLPixelFormatList[iPixelFormat-1].fmt_index; } - *fmt_index = WineGLPixelFormatList[iPixelFormat-1].fmt_index; *fmt_count = WineGLPixelFormatListSize; TRACE("Returning fmt_index=%d, fmt_count=%d for iPixelFormat=%d\n", *fmt_index, *fmt_count, iPixelFormat); - return TRUE; + return ret; } /* Search our internal pixelformat list for the WGL format corresponding to the given fbconfig */ @@ -2272,7 +2278,7 @@ static GLboolean WINAPI X11DRV_wglGetPix * We don't have to fail yet as a program can specify an invaled iPixelFormat (lets say 0) if it wants to query * the number of supported WGL formats. Whether the iPixelFormat is valid is handled in the for-loop below. */ if(!ConvertPixelFormatWGLtoGLX(gdi_display, iPixelFormat, &fmt_index, &nWGLFormats)) { - ERR("Unable to convert iPixelFormat %d to a GLX one, expect problems!\n", iPixelFormat); + WARN("Unable to convert iPixelFormat %d to a GLX one!\n", iPixelFormat); } for (i = 0; i < nAttributes; ++i) {

1 0

Charles Blacklock : oleaut32: Cleanup of previous VarBstrCmp patch.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: 12e4aa21650447f6e9ee3afa8cd0a03534abcd4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=12e4aa21650447f6e9ee3afa8… Author: Charles Blacklock <charles(a)diagnos.co.uk> Date: Fri Dec 1 16:49:46 2006 +0000 oleaut32: Cleanup of previous VarBstrCmp patch. --- dlls/oleaut32/vartype.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 353a845..9754e8c 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -6652,14 +6652,16 @@ HRESULT WINAPI VarBstrCmp(BSTR pbstrLeft if (lcid == 0) { - ret = memcmp(pbstrLeft, pbstrRight, min(SysStringByteLen(pbstrLeft), SysStringByteLen(pbstrRight))); + unsigned int lenLeft = SysStringByteLen(pbstrLeft); + unsigned int lenRight = SysStringByteLen(pbstrRight); + ret = memcmp(pbstrLeft, pbstrRight, min(lenLeft, lenRight)); if (ret < 0) return VARCMP_LT; if (ret > 0) return VARCMP_GT; - if (SysStringByteLen(pbstrLeft) < SysStringByteLen(pbstrRight)) + if (lenLeft < lenRight) return VARCMP_LT; - if (SysStringByteLen(pbstrLeft) > SysStringByteLen(pbstrRight)) + if (lenLeft > lenRight) return VARCMP_GT; return VARCMP_EQ; }

1 0

Vitaliy Margolen : wined3d/d3d9: Pitch for DXTn textures can not be 0. With tests.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: 81c7c00bb2f1675f853dc0fe5b6ca8178ac7a537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81c7c00bb2f1675f853dc0fe5… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Dec 2 20:27:36 2006 -0700 wined3d/d3d9: Pitch for DXTn textures can not be 0. With tests. --- dlls/d3d9/tests/surface.c | 30 ++++++++++++++++++++++++++++++ dlls/wined3d/surface.c | 4 ++-- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c index b7a16a2..badfb3a 100644 --- a/dlls/d3d9/tests/surface.c +++ b/dlls/d3d9/tests/surface.c @@ -17,6 +17,7 @@ */ #define COBJMACROS #include <d3d9.h> +#include <dxerr9.h> #include "wine/test.h" static HWND create_window(void) @@ -117,6 +118,7 @@ static void test_surface_alignment(IDire { IDirect3DSurface9 *surface_ptr = 0; HRESULT hr; + int i; /* Test a sysmem surface as those aren't affected by the hardware's np2 restrictions */ hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device_ptr, 5, 5, D3DFMT_R5G6B5, D3DPOOL_SYSTEMMEM, &surface_ptr, 0); @@ -137,6 +139,34 @@ static void test_surface_alignment(IDire hr = IDirect3DSurface9_UnlockRect(surface_ptr); IDirect3DSurface9_Release(surface_ptr); } + + for (i = 0; i < 5; i++) + { + IDirect3DTexture9 *pTexture; + int j, pitch; + + hr = IDirect3DDevice9_CreateTexture(device_ptr, 64, 64, 0, 0, MAKEFOURCC('D', 'X', 'T', '1'+i), + D3DPOOL_MANAGED, &pTexture, NULL); + ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateTexture: %s\n", DXGetErrorString9(hr)); + if (FAILED(hr)) continue; + + for (j = IDirect3DBaseTexture9_GetLevelCount(pTexture) - 1; j >= 0; j--) + { + D3DLOCKED_RECT rc; + D3DSURFACE_DESC descr; + + IDirect3DTexture9_GetLevelDesc(pTexture, j, &descr); + hr = IDirect3DTexture9_LockRect(pTexture, j, &rc, NULL, 0); + ok(SUCCEEDED(hr), "IDirect3DTexture9_LockRect: %s\n", DXGetErrorString9(hr)); + IDirect3DTexture9_UnlockRect(pTexture, j); + + pitch = ((descr.Width + 3) >> 2) << 3; + if (i > 0) pitch <<= 1; + ok(rc.Pitch == pitch, "Wrong pitch for DXT%d lvl[%d (%dx%d)]: expected %d got %d\n", + i + 1, j, descr.Width, descr.Height, pitch, rc.Pitch); + } + IUnknown_Release( pTexture ); + } } START_TEST(surface) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 84a838f..abc35ee 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3023,10 +3023,10 @@ DWORD WINAPI IWineD3DSurfaceImpl_GetPitc where each block is 4x4 pixels, 8 bytes (dxt1) and 16 bytes (dxt2/3/4/5) ie pitch = (width/4) * bytes per block */ if (This->resource.format == WINED3DFMT_DXT1) /* DXT1 is 8 bytes per block */ - ret = (This->currentDesc.Width >> 2) << 3; + ret = ((This->currentDesc.Width + 3) >> 2) << 3; else if (This->resource.format == WINED3DFMT_DXT2 || This->resource.format == WINED3DFMT_DXT3 || This->resource.format == WINED3DFMT_DXT4 || This->resource.format == WINED3DFMT_DXT5) /* DXT2/3/4/5 is 16 bytes per block */ - ret = (This->currentDesc.Width >> 2) << 4; + ret = ((This->currentDesc.Width + 3) >> 2) << 4; else { if (NP2_REPACK == wined3d_settings.nonpower2_mode || This->resource.usage & WINED3DUSAGE_RENDERTARGET) { /* Front and back buffers are always lockes/unlocked on currentDesc.Width */

1 0

Vitaliy Margolen : dinput: Implement Poll for keyboard.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: 429c8ac94818eca9daa5987685d8a23a4f659ed5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=429c8ac94818eca9daa598768… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Dec 1 10:56:30 2006 -0700 dinput: Implement Poll for keyboard. --- dlls/dinput/keyboard.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index c29c444..f8ac0c9 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -669,6 +669,18 @@ static HRESULT WINAPI SysKeyboardWImpl_G return DI_OK; } +static HRESULT WINAPI SysKeyboardAImpl_Poll(LPDIRECTINPUTDEVICE8A iface) +{ + SysKeyboardImpl *This = (SysKeyboardImpl *)iface; + + TRACE("(%p)\n",This); + + if (!This->base.acquired) return DIERR_NOTACQUIRED; + + MsgWaitForMultipleObjectsEx(0, NULL, 0, QS_ALLINPUT, 0); + return DI_OK; +} + static const IDirectInputDevice8AVtbl SysKeyboardAvt = { IDirectInputDevice2AImpl_QueryInterface, @@ -696,7 +708,7 @@ static const IDirectInputDevice8AVtbl Sy IDirectInputDevice2AImpl_SendForceFeedbackCommand, IDirectInputDevice2AImpl_EnumCreatedEffectObjects, IDirectInputDevice2AImpl_Escape, - IDirectInputDevice2AImpl_Poll, + SysKeyboardAImpl_Poll, IDirectInputDevice2AImpl_SendDeviceData, IDirectInputDevice7AImpl_EnumEffectsInFile, IDirectInputDevice7AImpl_WriteEffectToFile, @@ -738,7 +750,7 @@ static const IDirectInputDevice8WVtbl Sy XCAST(SendForceFeedbackCommand)IDirectInputDevice2AImpl_SendForceFeedbackCommand, XCAST(EnumCreatedEffectObjects)IDirectInputDevice2AImpl_EnumCreatedEffectObjects, XCAST(Escape)IDirectInputDevice2AImpl_Escape, - XCAST(Poll)IDirectInputDevice2AImpl_Poll, + XCAST(Poll)SysKeyboardAImpl_Poll, XCAST(SendDeviceData)IDirectInputDevice2AImpl_SendDeviceData, IDirectInputDevice7WImpl_EnumEffectsInFile, IDirectInputDevice7WImpl_WriteEffectToFile,

1 0

Vitaliy Margolen : dinput: Move critical section to the base device class.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: 0da0486cc3761d9005ccea8903811bdfc15f38db URL: http://source.winehq.org/git/wine.git/?a=commit;h=0da0486cc3761d9005ccea890… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Dec 1 10:56:00 2006 -0700 dinput: Move critical section to the base device class. --- dlls/dinput/device.c | 18 ++++++++++++++---- dlls/dinput/device_private.h | 1 + dlls/dinput/joystick_linux.c | 15 +++++++-------- dlls/dinput/joystick_linuxinput.c | 3 +++ dlls/dinput/keyboard.c | 17 ++++++++--------- dlls/dinput/mouse.c | 21 ++++++++++----------- 6 files changed, 43 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0da0486cc3761d9005cce…

1 0

Vitaliy Margolen : dinput: Move acquired flag to the base device class. Add tests.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: f7eacd64d1ce683cfc902da2b0eac3a03cde9567 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7eacd64d1ce683cfc902da2b… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Dec 1 10:54:42 2006 -0700 dinput: Move acquired flag to the base device class. Add tests. --- dlls/dinput/device.c | 28 ++++++++++++++++++++++++++++ dlls/dinput/device_private.h | 3 +++ dlls/dinput/joystick_linux.c | 23 ++++++++--------------- dlls/dinput/keyboard.c | 36 ++++++++++++++++-------------------- dlls/dinput/mouse.c | 23 ++++++++--------------- dlls/dinput/tests/joystick.c | 8 ++++++++ dlls/dinput/tests/keyboard.c | 4 ++++ dlls/dinput/tests/mouse.c | 33 ++++++++++++++++++++++++++++----- 8 files changed, 103 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f7eacd64d1ce683cfc902…

1 0

Alexandre Julliard : winebuild: Check for illegal characters in entry point names.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: 813ae10f33949ea3f2bc259e68ecd8131346f671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=813ae10f33949ea3f2bc259e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 4 12:23:58 2006 +0100 winebuild: Check for illegal characters in entry point names. --- tools/winebuild/parser.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 78b5d80..3e0c400 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -46,6 +46,9 @@ static FILE *input_file; static const char *separator_chars; static const char *comment_chars; +/* valid characters in ordinal names */ +static const char valid_ordname_chars[] = "/$:-_@?abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; + static const char * const TypeNames[TYPE_NBTYPES] = { "variable", /* TYPE_VARIABLE */ @@ -447,6 +450,7 @@ static const char *parse_spec_flags( ORD static int parse_spec_ordinal( int ordinal, DLLSPEC *spec ) { const char *token; + size_t len; ORDDEF *odp = add_entry_point( spec ); memset( odp, 0, sizeof(*odp) ); @@ -470,6 +474,13 @@ static int parse_spec_ordinal( int ordin odp->lineno = current_line; odp->ordinal = ordinal; + len = strspn( odp->name, valid_ordname_chars ); + if (len < strlen( odp->name )) + { + error( "Character '%c' is not allowed in exported name '%s'\n", odp->name[len], odp->name ); + goto error; + } + switch(odp->type) { case TYPE_VARIABLE:

1 0

Dmitry Timoshkov : user32: Add ShowWindow test, make it pass under Wine.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: ed954e54616255a084c207df788128252ce43dbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed954e54616255a084c207df7… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Dec 4 15:06:54 2006 +0800 user32: Add ShowWindow test, make it pass under Wine. --- dlls/user32/nonclient.c | 4 +- dlls/user32/tests/win.c | 123 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 126 insertions(+), 1 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 3045397..cc3e66c 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -1541,7 +1541,9 @@ LRESULT NC_HandleNCLButtonDblClk( HWND h */ LRESULT NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam ) { - TRACE("Handling WM_SYSCOMMAND %x %lx\n", wParam, lParam ); + TRACE("hwnd %p WM_SYSCOMMAND %x %lx\n", hwnd, wParam, lParam ); + + if (!IsWindowEnabled( hwnd )) return 0; if (HOOK_CallHooks( WH_CBT, HCBT_SYSCOMMAND, wParam, lParam, TRUE )) return 0; diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 65795da..094a947 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3943,6 +3943,128 @@ static void test_SetWindowLong(void) } } +static void test_ShowWindow(void) +{ + HWND hwnd; + DWORD style; + RECT rcMain, rc; + LPARAM ret; + + SetRect(&rcMain, 120, 120, 210, 210); + + hwnd = CreateWindowEx(0, "MainWindowClass", NULL, + WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | + WS_MAXIMIZEBOX | WS_POPUP, + rcMain.left, rcMain.top, + rcMain.right - rcMain.left, rcMain.bottom - rcMain.top, + 0, 0, 0, NULL); + assert(hwnd); + + style = GetWindowLong(hwnd, GWL_STYLE); + ok(!(style & WS_DISABLED), "window should not be disabled\n"); + ok(!(style & WS_VISIBLE), "window should not be visible\n"); + ok(!(style & WS_MINIMIZE), "window should not be minimized\n"); + ok(!(style & WS_MAXIMIZE), "window should not be maximized\n"); + GetWindowRect(hwnd, &rc); + ok(EqualRect(&rcMain, &rc), "rects should match\n"); + + ret = ShowWindow(hwnd, SW_SHOW); + ok(!ret, "not expected ret: %lu\n", ret); + style = GetWindowLong(hwnd, GWL_STYLE); + ok(!(style & WS_DISABLED), "window should not be disabled\n"); + ok(style & WS_VISIBLE, "window should be visible\n"); + ok(!(style & WS_MINIMIZE), "window should not be minimized\n"); + ok(!(style & WS_MAXIMIZE), "window should not be maximized\n"); + GetWindowRect(hwnd, &rc); + ok(EqualRect(&rcMain, &rc), "rects should match\n"); + + ret = ShowWindow(hwnd, SW_MINIMIZE); + ok(ret, "not expected ret: %lu\n", ret); + style = GetWindowLong(hwnd, GWL_STYLE); + ok(!(style & WS_DISABLED), "window should not be disabled\n"); + ok(style & WS_VISIBLE, "window should be visible\n"); + ok(style & WS_MINIMIZE, "window should be minimized\n"); + ok(!(style & WS_MAXIMIZE), "window should not be maximized\n"); + GetWindowRect(hwnd, &rc); + ok(!EqualRect(&rcMain, &rc), "rects shouldn't match\n"); + + ShowWindow(hwnd, SW_RESTORE); + ok(ret, "not expected ret: %lu\n", ret); + style = GetWindowLong(hwnd, GWL_STYLE); + ok(!(style & WS_DISABLED), "window should not be disabled\n"); + ok(style & WS_VISIBLE, "window should be visible\n"); + ok(!(style & WS_MINIMIZE), "window should not be minimized\n"); + ok(!(style & WS_MAXIMIZE), "window should not be maximized\n"); + GetWindowRect(hwnd, &rc); + ok(EqualRect(&rcMain, &rc), "rects should match\n"); + + ret = EnableWindow(hwnd, FALSE); + ok(!ret, "not expected ret: %lu\n", ret); + style = GetWindowLong(hwnd, GWL_STYLE); + ok(style & WS_DISABLED, "window should be disabled\n"); + + ret = DefWindowProc(hwnd, WM_SYSCOMMAND, SC_MINIMIZE, 0); + ok(!ret, "not expected ret: %lu\n", ret); + style = GetWindowLong(hwnd, GWL_STYLE); + ok(style & WS_DISABLED, "window should be disabled\n"); + ok(style & WS_VISIBLE, "window should be visible\n"); + ok(!(style & WS_MINIMIZE), "window should not be minimized\n"); + ok(!(style & WS_MAXIMIZE), "window should not be maximized\n"); + GetWindowRect(hwnd, &rc); + ok(EqualRect(&rcMain, &rc), "rects should match\n"); + + ret = DefWindowProc(hwnd, WM_SYSCOMMAND, SC_MAXIMIZE, 0); + ok(!ret, "not expected ret: %lu\n", ret); + style = GetWindowLong(hwnd, GWL_STYLE); + ok(style & WS_DISABLED, "window should be disabled\n"); + ok(style & WS_VISIBLE, "window should be visible\n"); + ok(!(style & WS_MINIMIZE), "window should not be minimized\n"); + ok(!(style & WS_MAXIMIZE), "window should not be maximized\n"); + GetWindowRect(hwnd, &rc); + ok(EqualRect(&rcMain, &rc), "rects should match\n"); + + ret = ShowWindow(hwnd, SW_MINIMIZE); + ok(ret, "not expected ret: %lu\n", ret); + style = GetWindowLong(hwnd, GWL_STYLE); + ok(style & WS_DISABLED, "window should be disabled\n"); + ok(style & WS_VISIBLE, "window should be visible\n"); + ok(style & WS_MINIMIZE, "window should be minimized\n"); + ok(!(style & WS_MAXIMIZE), "window should not be maximized\n"); + GetWindowRect(hwnd, &rc); + ok(!EqualRect(&rcMain, &rc), "rects shouldn't match\n"); + + ret = DefWindowProc(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); + ok(!ret, "not expected ret: %lu\n", ret); + style = GetWindowLong(hwnd, GWL_STYLE); + ok(style & WS_DISABLED, "window should be disabled\n"); + ok(style & WS_VISIBLE, "window should be visible\n"); + ok(style & WS_MINIMIZE, "window should be minimized\n"); + ok(!(style & WS_MAXIMIZE), "window should not be maximized\n"); + GetWindowRect(hwnd, &rc); + ok(!EqualRect(&rcMain, &rc), "rects shouldn't match\n"); + + ret = ShowWindow(hwnd, SW_RESTORE); + ok(ret, "not expected ret: %lu\n", ret); + style = GetWindowLong(hwnd, GWL_STYLE); + ok(style & WS_DISABLED, "window should be disabled\n"); + ok(style & WS_VISIBLE, "window should be visible\n"); + ok(!(style & WS_MINIMIZE), "window should not be minimized\n"); + ok(!(style & WS_MAXIMIZE), "window should not be maximized\n"); + GetWindowRect(hwnd, &rc); + ok(EqualRect(&rcMain, &rc), "rects should match\n"); + + ret = DefWindowProc(hwnd, WM_SYSCOMMAND, SC_CLOSE, 0); + ok(!ret, "not expected ret: %lu\n", ret); + ok(IsWindow(hwnd), "window should exist\n"); + + ret = EnableWindow(hwnd, TRUE); + ok(ret, "not expected ret: %lu\n", ret); + + ret = DefWindowProc(hwnd, WM_SYSCOMMAND, SC_CLOSE, 0); + ok(!ret, "not expected ret: %lu\n", ret); + ok(!IsWindow(hwnd), "window should not exist\n"); +} + START_TEST(win) { pGetAncestor = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetAncestor" ); @@ -4019,6 +4141,7 @@ START_TEST(win) test_redrawnow(); test_csparentdc(); test_SetWindowLong(); + test_ShowWindow(); /* add the tests above this line */ UnhookWindowsHookEx(hhook);

1 0

Lei Zhang : riched20: Fixes and additional conformance tests for EM_EXSETSEL.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: c05bcabe9fb64af97d1dacc4a114843f10f79bd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c05bcabe9fb64af97d1dacc4a… Author: Lei Zhang <thestig(a)google.com> Date: Sun Dec 3 15:58:12 2006 -0800 riched20: Fixes and additional conformance tests for EM_EXSETSEL. --- dlls/riched20/editor.c | 52 +++++++++++++++++++--- dlls/riched20/tests/editor.c | 103 +++++++++++++++++++++++++++--------------- 2 files changed, 112 insertions(+), 43 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a8fadc1..254bbb7 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1616,28 +1616,68 @@ LRESULT WINAPI RichEditANSIWndProc(HWND case EM_EXSETSEL: { int start, end; + int swap; CHARRANGE range = *(CHARRANGE *)lParam; TRACE("EM_EXSETSEL (%d,%d)\n", range.cpMin, range.cpMax); - /* if cpMin < 0, then selection is deselected and caret moved to end of - * the current selection */ + /* all negative values are effectively the same */ if (range.cpMin < 0) + range.cpMin = -1; + if (range.cpMax < 0) + range.cpMax = -1; + + if (range.cpMin != range.cpMax) { + /* if cpMin is negative and cpMax is positive then selection is */ + /* deselected and caret moved to end of the current selection */ + if (range.cpMin < 0) + { ME_GetSelection(editor, &start, &end); range.cpMin = end; range.cpMax = end; - } - else if (range.cpMax > ME_GetTextLength(editor) +1) + } + else + { + /* adjust cpMax if it's a negative value */ + if (range.cpMax < 0) + range.cpMax = ME_GetTextLength(editor) + 1; + + /* flip cpMin and cpMax if they are reversed */ + if (range.cpMin > range.cpMax) + { + swap = range.cpMin; + range.cpMin = range.cpMax; + range.cpMax = swap; + } + + /* special case with cpMin too big */ + if (range.cpMin > ME_GetTextLength(editor)) + { + range.cpMin = ME_GetTextLength(editor); + range.cpMax = ME_GetTextLength(editor); + } + /* special case with cpMax too big */ + else if (range.cpMax > ME_GetTextLength(editor)) + range.cpMax = ME_GetTextLength(editor) + 1; + } + } + else { - range.cpMax = ME_GetTextLength(editor) + 1; + /* special case with cpMin == cpMax */ + /* make sure both values are within bounds */ + if (range.cpMax < 0 || range.cpMax > ME_GetTextLength(editor)) + { + range.cpMin = ME_GetTextLength(editor); + range.cpMax = range.cpMin; + } } ME_InvalidateSelection(editor); ME_SetSelection(editor, range.cpMin, range.cpMax); ME_InvalidateSelection(editor); ME_SendSelChange(editor); - + return range.cpMax; } case EM_SHOWSCROLLBAR: diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index da6390f..281206a 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1314,54 +1314,83 @@ static void test_EM_GETMODIFY(void) DestroyWindow(hwndRichEdit); } +struct exsetsel_s { + long min; + long max; + long expected_retval; + int expected_getsel_start; + int expected_getsel_end; + int _exsetsel_todo_wine; + int _getsel_todo_wine; +}; + +const struct exsetsel_s exsetsel_tests[] = { + /* sanity tests */ + {5, 10, 10, 5, 10, 0, 0}, + {15, 17, 17, 15, 17, 0, 0}, + /* test cpMax > strlen() */ + {0, 100, 18, 0, 18, 0, 1}, + /* test cpMin == cpMax */ + {5, 5, 5, 5, 5, 0, 0}, + /* test cpMin < 0 && cpMax >= 0 (bug 4462) */ + {-1, 0, 5, 5, 5, 0, 0}, + {-1, 17, 5, 5, 5, 0, 0}, + {-1, 18, 5, 5, 5, 0, 0}, + /* test cpMin < 0 && cpMax < 0 */ + {-1, -1, 17, 17, 17, 0, 0}, + {-4, -5, 17, 17, 17, 0, 0}, + /* test cMin >=0 && cpMax < 0 (bug 6814) */ + {0, -1, 18, 0, 18, 0, 1}, + {17, -5, 18, 17, 18, 0, 1}, + {18, -3, 17, 17, 17, 0, 0}, + /* test if cpMin > cpMax */ + {15, 19, 18, 15, 18, 0, 1}, + {19, 15, 18, 15, 18, 0, 1} +}; + +static void check_EM_EXSETSEL(HWND hwnd, const struct exsetsel_s *setsel, int id) { + CHARRANGE cr; + long result; + int start, end; + + cr.cpMin = setsel->min; + cr.cpMax = setsel->max; + result = SendMessage(hwnd, EM_EXSETSEL, 0, (LPARAM) &cr); + + if (setsel->_exsetsel_todo_wine) { + todo_wine { + ok(result == setsel->expected_retval, "EM_EXSETSEL(%d): expected: %ld actual: %ld\n", id, setsel->expected_retval, result); + } + } else { + ok(result == setsel->expected_retval, "EM_EXSETSEL(%d): expected: %ld actual: %ld\n", id, setsel->expected_retval, result); + } + + SendMessage(hwnd, EM_GETSEL, (WPARAM) &start, (LPARAM) &end); + + if (setsel->_getsel_todo_wine) { + todo_wine { + ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_EXSETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); + } + } else { + ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_EXSETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); + } +} + static void test_EM_EXSETSEL(void) { HWND hwndRichEdit = new_richedit(NULL); - long result; - CHARRANGE cr; - int start,end; + int i; + const int num_tests = sizeof(exsetsel_tests)/sizeof(struct exsetsel_s); /* sending some text to the window */ SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) "testing selection"); /* 01234567890123456*/ /* 10 */ - /* EM_EXSETSEL returns (cr.cpMax < strlen+1 ? cr.cpMax:strlen+1 if cpMin is positive */ - cr.cpMin = 0; - cr.cpMax = 100; - result = SendMessage(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM) &cr); - ok(result == 18, "EM_EXSETSEL: expected: 18 actual: %ld\n", result); - SendMessage(hwndRichEdit, EM_GETSEL, (WPARAM) &start, (LPARAM) &end); - - /* FIXME: EM_GETSEL needs to return proper ending value */ - todo_wine - { - ok(start == 0 && end == 18, "EM_EXSETSEL: expected (0,18) actual:(%d,%d)\n", start,end); + for (i = 0; i < num_tests; i++) { + check_EM_EXSETSEL(hwndRichEdit, &exsetsel_tests[i], i); } - cr.cpMin = 5; - cr.cpMax = 10; - result = SendMessage(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM) &cr); - ok(result == 10, "EM_EXSETSEL: expected: 10 actual: %ld\n", result); - SendMessage(hwndRichEdit, EM_GETSEL, (WPARAM) &start, (LPARAM) &end); - ok(start == 5 && end == 10, "EM_EXSETSEL: expected (5,10) actual:(%d,%d)\n", start,end); - - cr.cpMin = 15; - cr.cpMax = 17; - result = SendMessage(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM) &cr); - ok(result == 17, "EM_EXSETSEL: expected: 17 actual: %ld\n", result); - SendMessage(hwndRichEdit, EM_GETSEL, (WPARAM) &start, (LPARAM) &end); - ok(start == 15 && end == 17, "EM_EXSETSEL: expected (15,17) actual:(%d,%d)\n", start,end); - - /* bug 4462 - the following values get used in FileZilla */ - /* when min < 0, selection is deselected and caret is moved to end of last selection */ - cr.cpMin = -3; - cr.cpMax = 0; - result = SendMessage(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM) &cr); - ok(result == 17, "EM_EXSETSEL: expected: 17 actual: %ld\n", result); - SendMessage(hwndRichEdit, EM_GETSEL, (WPARAM) &start, (LPARAM) &end); - ok(start == 17 && end == 17, "EM_EXSETSEL: expected (17,17) actual:(%d,%d)\n", start,end); - DestroyWindow(hwndRichEdit); }

1 0

← Newer
1
...
63
64
65
66
67
68
69
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2006