September 2006 - Wine-Commits

Andrew Talbot : hlink: Cast-qual warnings fix.
by Alexandre Julliard Sept. 20, 2006

Sept. 20, 2006

Module: wine Branch: master Commit: 752600b3148ce46189cc68a7aee628e8dc1fa0bd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=752600b3148ce46189cc68a… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Sep 14 12:51:48 2006 +0100 hlink: Cast-qual warnings fix. --- dlls/hlink/hlink_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index b710220..ec2c5d0 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -382,8 +382,8 @@ static HRESULT register_clsid(LPCGUID gu if (r != ERROR_SUCCESS) return E_FAIL; - RegSetValueExW(key, NULL, 0, REG_SZ, (LPBYTE)hlink, sizeof hlink); - RegSetValueExW(key, threading_model, 0, REG_SZ, (LPBYTE)apartment, sizeof apartment); + RegSetValueExW(key, NULL, 0, REG_SZ, (const BYTE *)hlink, sizeof hlink); + RegSetValueExW(key, threading_model, 0, REG_SZ, (const BYTE *)apartment, sizeof apartment); RegCloseKey(key); return S_OK;

1 0

Paul Vriens : url: Fixed wrong argument (Coverity).
by Alexandre Julliard Sept. 20, 2006

Sept. 20, 2006

Module: wine Branch: master Commit: 2ade49bf086a4cbc51583c2d94c61ac794bb9319 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2ade49bf086a4cbc51583c2… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Sun Sep 17 15:56:05 2006 +0200 url: Fixed wrong argument (Coverity). --- dlls/shlwapi/tests/path.c | 6 ++++++ dlls/url/url_main.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index f700038..9bc534a 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -738,6 +738,12 @@ static void test_PathCreateFromUrl(void) DWORD len, ret; WCHAR ret_pathW[INTERNET_MAX_URL_LENGTH]; WCHAR *pathW, *urlW; + static const char url[] = "http://www.winehq.org"; + + /* Check ret_path = NULL */ + len = sizeof(url); + ret = PathCreateFromUrlA(url, NULL, &len, 0); + ok ( ret == E_INVALIDARG, "got 0x%08lx expected E_INVALIDARG\n", ret); for(i = 0; i < sizeof(TEST_PATHFROMURL) / sizeof(TEST_PATHFROMURL[0]); i++) { len = INTERNET_MAX_URL_LENGTH; diff --git a/dlls/url/url_main.c b/dlls/url/url_main.c index eeb4483..0d8b5eb 100644 --- a/dlls/url/url_main.c +++ b/dlls/url/url_main.c @@ -66,7 +66,7 @@ BOOL WINAPI InetIsOffline(void) HRESULT WINAPI FileProtocolHandlerA(HWND hWnd, LPCSTR pszUrl,int nShowCmd) { - LPSTR pszPath = NULL; + CHAR pszPath[MAX_PATH]; DWORD size = MAX_PATH; HRESULT createpath = PathCreateFromUrlA(pszUrl,pszPath,&size,0);

1 0

Byeong-Sik Jeon : notepad: Keep the modify information of edit control when toggle wrap line.
by Alexandre Julliard Sept. 20, 2006

Sept. 20, 2006

Module: wine Branch: master Commit: 53a48942a0b09d213ca6abe3d815346f4878e9c3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=53a48942a0b09d213ca6abe… Author: Byeong-Sik Jeon <wjsqudtlr(a)gmail.com> Date: Sat Sep 16 09:43:07 2006 +0900 notepad: Keep the modify information of edit control when toggle wrap line. --- programs/notepad/dialog.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index a78b75b..a4f7de5 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -597,6 +597,7 @@ VOID DIALOG_EditTimeDate(VOID) VOID DIALOG_EditWrap(VOID) { + BOOL modify = FALSE; static const WCHAR editW[] = { 'e','d','i','t',0 }; DWORD dwStyle = WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | ES_AUTOVSCROLL | ES_MULTILINE; @@ -612,6 +613,7 @@ VOID DIALOG_EditWrap(VOID) return; } GetWindowText(Globals.hEdit, pTemp, size); + modify = SendMessage(Globals.hEdit, EM_GETMODIFY, 0, 0); DestroyWindow(Globals.hEdit); GetClientRect(Globals.hMainWnd, &rc); if( Globals.bWrapLongLines ) dwStyle |= WS_HSCROLL | ES_AUTOHSCROLL; @@ -620,6 +622,7 @@ VOID DIALOG_EditWrap(VOID) NULL, Globals.hInstance, NULL); SendMessage(Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, (LPARAM)FALSE); SetWindowTextW(Globals.hEdit, pTemp); + SendMessage(Globals.hEdit, EM_SETMODIFY, (WPARAM)modify, 0); SetFocus(Globals.hEdit); HeapFree(GetProcessHeap(), 0, pTemp);

1 0

Byeong-Sik Jeon : notepad: Use HKCU\Software\Microsoft\Notepad for font and window-geometry.
by Alexandre Julliard Sept. 20, 2006

Sept. 20, 2006

Module: wine Branch: master Commit: 876c9d16cdb755309757210383ec968a1e62c004 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=876c9d16cdb755309757210… Author: Byeong-Sik Jeon <wjsqudtlr(a)gmail.com> Date: Sat Sep 16 09:11:47 2006 +0900 notepad: Use HKCU\Software\Microsoft\Notepad for font and window-geometry. --- programs/notepad/main.c | 200 +++++++++++++++++++++++++++++++++++++++++------ programs/notepad/main.h | 5 + 2 files changed, 180 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=876c9d16cdb75530975…

1 0

James Hawkins : msi: Use ACTION_UpdateComponentStates in the selection tree so we don' t have to duplicate the component changing logic.
by Alexandre Julliard Sept. 20, 2006

Sept. 20, 2006

Module: wine Branch: master Commit: 7a97b3ed84baf36d7a09f5932d64f4daa819a890 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7a97b3ed84baf36d7a09f59… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Sep 15 17:13:10 2006 -0700 msi: Use ACTION_UpdateComponentStates in the selection tree so we don't have to duplicate the component changing logic. --- dlls/msi/dialog.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index ce1ae81..1f15f40 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1700,8 +1700,9 @@ msi_seltree_feature_from_item( HWND hwnd static LRESULT msi_seltree_menu( HWND hwnd, HTREEITEM hItem ) { + struct msi_selection_tree_info *info; MSIFEATURE *feature; - ComponentList *cl; + MSIPACKAGE *package; union { RECT rc; POINT pt[2]; @@ -1709,6 +1710,9 @@ msi_seltree_menu( HWND hwnd, HTREEITEM h } u; UINT r; + info = GetPropW(hwnd, szButtonData); + package = info->dialog->package; + feature = msi_seltree_feature_from_item( hwnd, hItem ); if (!feature) { @@ -1737,13 +1741,7 @@ msi_seltree_menu( HWND hwnd, HTREEITEM h /* update */ msi_seltree_sync_item_state( hwnd, feature, hItem ); - - /* update the feature's components */ - LIST_FOR_EACH_ENTRY( cl, &feature->Components, ComponentList, entry ) - { - cl->component->Action = feature->Action; - cl->component->ActionRequest = feature->ActionRequest; - } + ACTION_UpdateComponentStates( package, feature->Feature ); return 0; }

1 0

James Hawkins : msi: INSTALLSTATE_SOURCE also overrides a parent feature state change to INSTALLSTATE_ABSENT .
by Alexandre Julliard Sept. 20, 2006

Sept. 20, 2006

Module: wine Branch: master Commit: 6518f3d7f2515b52a9c0d2f8a757998b41bd2ead URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6518f3d7f2515b52a9c0d2f… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Sep 15 17:10:01 2006 -0700 msi: INSTALLSTATE_SOURCE also overrides a parent feature state change to INSTALLSTATE_ABSENT. --- dlls/msi/helpers.c | 19 ++++++++++--------- dlls/msi/tests/package.c | 8 ++++---- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index 45d3ebe..8c957a2 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -869,20 +869,21 @@ void ACTION_UpdateComponentStates(MSIPAC /*if any other feature wants is local we need to set it local*/ LIST_FOR_EACH_ENTRY( f, &package->features, MSIFEATURE, entry ) { - if ( component->ActionRequest != INSTALLSTATE_LOCAL ) + if ( f->ActionRequest != INSTALLSTATE_LOCAL && + f->ActionRequest != INSTALLSTATE_SOURCE ) + { break; + } LIST_FOR_EACH_ENTRY( clist, &f->Components, ComponentList, entry ) { - if ( clist->component == component ) + if ( clist->component == component && + (f->ActionRequest == INSTALLSTATE_LOCAL || + f->ActionRequest == INSTALLSTATE_SOURCE) ) { - if (f->ActionRequest == INSTALLSTATE_LOCAL) - { - TRACE("Saved by %s\n", debugstr_w(f->Feature)); - component->ActionRequest = INSTALLSTATE_LOCAL; - component->Action = INSTALLSTATE_LOCAL; - } - break; + TRACE("Saved by %s\n", debugstr_w(f->Feature)); + component->ActionRequest = f->ActionRequest; + component->Action = f->ActionRequest; } } } diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index f5ff39c..e07f86a 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2638,8 +2638,8 @@ static void test_featureparents(void) todo_wine { ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); } + ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; @@ -2658,8 +2658,8 @@ static void test_featureparents(void) todo_wine { ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); } + ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; @@ -2678,8 +2678,8 @@ static void test_featureparents(void) todo_wine { ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - ok( action == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", action); } + ok( action == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; @@ -2688,8 +2688,8 @@ static void test_featureparents(void) todo_wine { ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - ok( action == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", action); } + ok( action == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee;

1 0

James Hawkins : msi: Add tests for components with multiple parent features .
by Alexandre Julliard Sept. 20, 2006

Sept. 20, 2006

Module: wine Branch: master Commit: a4c6ca2b6551f822733284041b6bf8768b69bab4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a4c6ca2b6551f8227332840… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Sep 15 17:08:42 2006 -0700 msi: Add tests for components with multiple parent features. --- dlls/msi/tests/package.c | 394 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 394 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=a4c6ca2b6551f822733…

1 0

James Hawkins : msi: Add the total and free disk space to the VolumeCostList control.
by Alexandre Julliard Sept. 20, 2006

Sept. 20, 2006

Module: wine Branch: master Commit: 32c0a764ee898349b1278eab196e17b59fe1c1aa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=32c0a764ee898349b1278ea… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Sep 14 18:10:30 2006 -0700 msi: Add the total and free disk space to the VolumeCostList control. --- dlls/msi/dialog.c | 27 ++++++++++++++++++++------- 1 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 0b63966..ce1ae81 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2290,7 +2290,6 @@ static void msi_dialog_vcl_add_columns( WCHAR num[10]; LVCOLUMNW lvc; DWORD count = 0; - LRESULT r; static const WCHAR zero[] = {'0',0}; static const WCHAR negative[] = {'-',0}; @@ -2316,20 +2315,20 @@ static void msi_dialog_vcl_add_columns( if ( !strncmpW( num, negative, 1 ) || !str_is_number( num ) ) return; - lvc.mask = LVCF_FMT | LVCF_ORDER | LVCF_WIDTH | LVCF_TEXT; - lvc.iOrder = count; - lvc.pszText = msi_dialog_get_uitext( dialog, column_keys[count++] ); + ZeroMemory( &lvc, sizeof(lvc) ); + lvc.mask = LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; lvc.cx = atolW( num ); - lvc.fmt = LVCFMT_LEFT; + lvc.pszText = msi_dialog_get_uitext( dialog, column_keys[count] ); - r = SendMessageW( control->hwnd, LVM_INSERTCOLUMNW, 0, (LPARAM)&lvc ); + SendMessageW( control->hwnd, LVM_INSERTCOLUMNW, count++, (LPARAM)&lvc ); msi_free( lvc.pszText ); - if ( r ) return; } } static void msi_dialog_vcl_add_drives( msi_dialog *dialog, msi_control *control ) { + ULARGE_INTEGER total, free; + WCHAR size_text[MAX_PATH]; LPWSTR drives, ptr; LVITEMW lvitem; DWORD size; @@ -2353,6 +2352,20 @@ static void msi_dialog_vcl_add_drives( m lvitem.cchTextMax = lstrlenW(ptr) + 1; SendMessageW( control->hwnd, LVM_INSERTITEMW, 0, (LPARAM)&lvitem ); + GetDiskFreeSpaceExW(ptr, &free, &total, NULL); + + StrFormatByteSizeW(total.QuadPart, size_text, MAX_PATH); + lvitem.iSubItem = 1; + lvitem.pszText = size_text; + lvitem.cchTextMax = lstrlenW(size_text) + 1; + SendMessageW( control->hwnd, LVM_SETITEMW, 0, (LPARAM)&lvitem ); + + StrFormatByteSizeW(free.QuadPart, size_text, MAX_PATH); + lvitem.iSubItem = 2; + lvitem.pszText = size_text; + lvitem.cchTextMax = lstrlenW(size_text) + 1; + SendMessageW( control->hwnd, LVM_SETITEMW, 0, (LPARAM)&lvitem ); + ptr += lstrlenW(ptr) + 1; i++; }

1 0

Louis. Lenders : d3d8: More correct stub for ValidatePixelShader + tests.
by Alexandre Julliard Sept. 20, 2006

Sept. 20, 2006

Module: wine Branch: master Commit: 34e03fc0425a5efbef5824e687a20f4540a0b497 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=34e03fc0425a5efbef5824e… Author: Louis. Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Mon Sep 18 19:16:48 2006 +0100 d3d8: More correct stub for ValidatePixelShader + tests. --- dlls/d3d8/d3d8_main.c | 26 +++++++++++++++++++++++--- dlls/d3d8/tests/d3d8_main.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 65b8a00..0f6bc12 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -106,8 +106,28 @@ HRESULT WINAPI ValidateVertexShader(DWOR * PARAMS * toto result? */ -BOOL WINAPI ValidatePixelShader(LPVOID pFunction, int param1, int param2, LPVOID toto) +HRESULT WINAPI ValidatePixelShader(DWORD* pixelshader, DWORD* reserved1, int bool, DWORD* toto) { - FIXME("(%p %d %d %p): stub\n", pFunction, param1, param2, toto); - return TRUE; + HRESULT ret; + FIXME("(%p %p %d %p): stub\n", pixelshader, reserved1, bool, toto); + + if (!pixelshader) + return E_FAIL; + + if (reserved1) + return E_FAIL; + + switch(*pixelshader) { + case 0xFFFF0100: + case 0xFFFF0101: + case 0xFFFF0102: + case 0xFFFF0103: + case 0xFFFF0104: + ret=S_OK; + break; + default: + ERR("pixelshader version mismatch\n"); + ret=E_FAIL; + } + return ret; } diff --git a/dlls/d3d8/tests/d3d8_main.c b/dlls/d3d8/tests/d3d8_main.c index e2f03bd..48d2436 100644 --- a/dlls/d3d8/tests/d3d8_main.c +++ b/dlls/d3d8/tests/d3d8_main.c @@ -19,6 +19,7 @@ #include "wine/test.h" static HRESULT (WINAPI *ValidateVertexShader)(DWORD*,DWORD*,DWORD*,int,DWORD*); +static HRESULT (WINAPI *ValidatePixelShader)(DWORD*,DWORD*,int,DWORD*); static void test_ValidateVertexShader(void) { @@ -64,9 +65,49 @@ static void test_ValidateVertexShader(vo ok(ret==S_OK,"ValidateVertexShader returned %lx but expected S_OK\n",ret); } +static void test_ValidatePixelShader(void) +{ + HRESULT ret; + static DWORD simple_ps[] = {0xFFFF0101, /* ps_1_1 */ + 0x00000051, 0xA00F0001, 0x3F800000, 0x00000000, 0x00000000, 0x00000000, /* def c1 = 1.0, 0.0, 0.0, 0.0 */ + 0x00000042, 0xB00F0000, /* tex t0 */ + 0x00000008, 0x800F0000, 0xA0E40001, 0xA0E40000, /* dp3 r0, c1, c0 */ + 0x00000005, 0x800F0000, 0x90E40000, 0x80E40000, /* mul r0, v0, r0 */ + 0x00000005, 0x800F0000, 0xB0E40000, 0x80E40000, /* mul r0, t0, r0 */ + 0x0000FFFF}; /* END */ + + ret=ValidatePixelShader(0,0,0,0); + ok(ret==E_FAIL,"ValidatePixelShader returned %lx but expected E_FAIL\n",ret); + + ret=ValidatePixelShader(0,0,1,0); + ok(ret==E_FAIL,"ValidatePixelShader returned %lx but expected E_FAIL\n",ret); + + ret=ValidatePixelShader(simple_ps,0,0,0); + ok(ret==S_OK,"ValidatePixelShader returned %lx but expected S_OK\n",ret); + + ret=ValidatePixelShader(simple_ps,0,1,0); + ok(ret==S_OK,"ValidatePixelShader returned %lx but expected S_OK\n",ret); + /* seems to do some version checking */ + *simple_ps=0xFFFF0105; /* bogus version */ + ret=ValidatePixelShader(simple_ps,0,1,0); + ok(ret==E_FAIL,"ValidatePixelShader returned %lx but expected E_FAIL\n",ret); + /* I've seen that applications pass 2nd parameter always as 0;simple test with non-zero parameter */ + *simple_ps=0xFFFF0101; /* ps_1_1 */ + ret=ValidatePixelShader(simple_ps,simple_ps,1,0); + ok(ret==E_FAIL,"ValidatePixelShader returned %lx but expected E_FAIL\n",ret); + /* I've seen 3rd parameter is always passed as either 0 or 1, but passing other values doesn't seem to hurt*/ + ret=ValidatePixelShader(simple_ps,0,12345,0); + ok(ret==S_OK,"ValidatePixelShader returned %lx but expected S_OK\n",ret); + /* What is 4th parameter ???? Following works ok */ + ret=ValidatePixelShader(simple_ps,0,1,simple_ps); + ok(ret==S_OK,"ValidatePixelShader returned %lx but expected S_OK\n",ret); +} + START_TEST(d3d8_main) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); ValidateVertexShader = (void*)GetProcAddress (d3d8_handle, "ValidateVertexShader" ); + ValidatePixelShader = (void*)GetProcAddress (d3d8_handle, "ValidatePixelShader" ); test_ValidateVertexShader(); + test_ValidatePixelShader(); }

1 0

Vitaliy Margolen : dinput: Return proper errors in SetCooperativeLevel.
by Alexandre Julliard Sept. 20, 2006

Sept. 20, 2006

Module: wine Branch: master Commit: adadb5be7815f0e9a404afeda04f72122918c234 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=adadb5be7815f0e9a404afe… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sat Sep 16 12:25:29 2006 -0600 dinput: Return proper errors in SetCooperativeLevel. --- dlls/dinput/mouse.c | 15 +++++++++--- dlls/dinput/tests/mouse.c | 58 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 363d1b8..5d4c04e 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -363,14 +363,23 @@ static HRESULT WINAPI SysMouseAImpl_SetC TRACE(" cooperative level : "); _dump_cooperativelevel_DI(dwflags); } + + if ((dwflags & (DISCL_EXCLUSIVE | DISCL_NONEXCLUSIVE)) == 0 || + (dwflags & (DISCL_EXCLUSIVE | DISCL_NONEXCLUSIVE)) == (DISCL_EXCLUSIVE | DISCL_NONEXCLUSIVE) || + (dwflags & (DISCL_FOREGROUND | DISCL_BACKGROUND)) == 0 || + (dwflags & (DISCL_FOREGROUND | DISCL_BACKGROUND)) == (DISCL_FOREGROUND | DISCL_BACKGROUND)) + return DIERR_INVALIDPARAM; + if (dwflags == (DISCL_NONEXCLUSIVE | DISCL_BACKGROUND)) + hwnd = GetDesktopWindow(); + + if (!hwnd) return E_HANDLE; + if (dwflags & DISCL_EXCLUSIVE && dwflags & DISCL_BACKGROUND) { return DIERR_UNSUPPORTED; } - + /* Store the window which asks for the mouse */ - if (!hwnd) - hwnd = GetDesktopWindow(); This->win = hwnd; This->dwCoopLevel = dwflags; diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index 07b4c01..fa542b1 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2005 Robert Reif + * Copyright (c) 2006 Vitaliy Margolen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,6 +19,7 @@ #define DIRECTINPUT_VERSION 0x0700 +#define COBJMACROS #define NONAMELESSSTRUCT #define NONAMELESSUNION #include <windows.h> @@ -32,8 +34,64 @@ #include "dinput.h" #include "dxerr8.h" #include "dinput_test.h" +static const HRESULT SetCoop_null_window[16] = { + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, + E_INVALIDARG, E_HANDLE, E_HANDLE, E_INVALIDARG, + E_INVALIDARG, E_HANDLE, S_OK, E_INVALIDARG, + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG}; + +static const HRESULT SetCoop_real_window[16] = { + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, + E_INVALIDARG, S_OK, S_OK, E_INVALIDARG, + E_INVALIDARG, E_NOTIMPL, S_OK, E_INVALIDARG, + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG}; + +static void test_set_coop(LPDIRECTINPUT pDI, HWND hwnd) +{ + HRESULT hr; + LPDIRECTINPUTDEVICE pMouse = NULL; + int i; + + hr = IDirectInput_CreateDevice(pDI, &GUID_SysMouse, &pMouse, NULL); + ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %s\n", DXGetErrorString8(hr)); + if (FAILED(hr)) return; + + for (i=0; i<16; i++) + { + hr = IDirectInputDevice_SetCooperativeLevel(pMouse, NULL, i); + ok(hr == SetCoop_null_window[i], "SetCooperativeLevel(NULL, %d): %s\n", i, DXGetErrorString8(hr)); + } + for (i=0; i<16; i++) + { + hr = IDirectInputDevice_SetCooperativeLevel(pMouse, hwnd, i); + ok(hr == SetCoop_real_window[i], "SetCooperativeLevel(hwnd, %d): %s\n", i, DXGetErrorString8(hr)); + } + + if (pMouse) IUnknown_Release(pMouse); +} + static void mouse_tests(void) { + HRESULT hr; + LPDIRECTINPUT pDI = NULL; + HINSTANCE hInstance = GetModuleHandle(NULL); + HWND hwnd; + + hr = DirectInputCreate(hInstance, DIRECTINPUT_VERSION, &pDI, NULL); + ok(SUCCEEDED(hr), "DirectInputCreate() failed: %s\n", DXGetErrorString8(hr)); + if (FAILED(hr)) return; + + hwnd = CreateWindow("static", "Title", WS_OVERLAPPEDWINDOW, + 10, 10, 200, 200, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "err: %ld\n", GetLastError()); + if (!hwnd) return; + + ShowWindow(hwnd, SW_SHOW); + + test_set_coop(pDI, hwnd); + + DestroyWindow(hwnd); + if (pDI) IUnknown_Release(pDI); } START_TEST(mouse)

1 0