January 2009 - Wine-Commits

Michael Karcher : include: Fix out string type from LPCSTR to LPSTR in shobjidl.idl.
by Alexandre Julliard Jan. 2, 2009

Jan. 2, 2009

Module: wine Branch: master Commit: 7290dafc46ab93201751e6da19576d1a4aeffee0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7290dafc46ab93201751e6da1… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Thu Jan 1 11:40:13 2009 +0100 include: Fix out string type from LPCSTR to LPSTR in shobjidl.idl. --- include/shobjidl.idl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 9d51361..b05adde 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -1305,7 +1305,7 @@ interface INewShortcutHookA : IUnknown [in] LPCSTR pcszReferent, [in] HWND hwnd); HRESULT GetReferent( - [out] LPCSTR pcszReferent, + [out] LPSTR pcszReferent, [in] int cchReferent); HRESULT SetFolder( [in] LPCSTR pcszReferent); @@ -1336,7 +1336,7 @@ interface INewShortcutHookW : IUnknown [in] LPCWSTR pcszReferent, [in] HWND hwnd); HRESULT GetReferent( - [out] LPCWSTR pcszReferent, + [out] LPWSTR pcszReferent, [in] int cchReferent); HRESULT SetFolder( [in] LPCWSTR pcszReferent);

1 0

Alexandre Julliard : include: Don't pack shellapi.h on 64-bit.
by Alexandre Julliard Jan. 2, 2009

Jan. 2, 2009

Module: wine Branch: master Commit: 253ccfbb99a279e990a6dc178b998bf06d6fd365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=253ccfbb99a279e990a6dc178… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 2 12:20:20 2009 +0100 include: Don't pack shellapi.h on 64-bit. --- include/shellapi.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/shellapi.h b/include/shellapi.h index 67e8923..930f261 100644 --- a/include/shellapi.h +++ b/include/shellapi.h @@ -23,7 +23,9 @@ extern "C" { #endif /* defined(__cplusplus) */ +#ifndef _WIN64 #include <pshpack1.h> +#endif DECLARE_HANDLE(HDROP); @@ -510,6 +512,8 @@ DWORD WINAPI DoEnvironmentSubstW(LPWSTR, UINT); } /* extern "C" */ #endif /* defined(__cplusplus) */ +#ifndef _WIN64 #include <poppack.h> +#endif #endif /* __WINE_SHELLAPI_H */

1 0

Michael Karcher : include: Add a missing [unique] to shobjidl.idl.
by Alexandre Julliard Jan. 2, 2009

Jan. 2, 2009

Module: wine Branch: master Commit: a20023ecef3b108f6a9de677d665e647b1f5ac2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a20023ecef3b108f6a9de677d… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Thu Jan 1 11:40:54 2009 +0100 include: Add a missing [unique] to shobjidl.idl. --- include/shobjidl.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index b05adde..07baea7 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -626,7 +626,7 @@ interface IShellLinkA : IUnknown HRESULT GetPath( [out, size_is(cch)] LPSTR pszFile, [in] int cch, - [in, out] WIN32_FIND_DATAA *pfd, + [in, out, unique] WIN32_FIND_DATAA *pfd, [in] DWORD fFlags); HRESULT GetIDList( [out] LPITEMIDLIST * ppidl );

1 0

Michael Karcher : include: Add missing local attributes to shobjidl.idl.
by Alexandre Julliard Jan. 2, 2009

Jan. 2, 2009

Module: wine Branch: master Commit: a9abbf9012a3173cd34911b1fcfdc0765dc56f26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9abbf9012a3173cd34911b1f… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Thu Jan 1 11:40:04 2009 +0100 include: Add missing local attributes to shobjidl.idl. --- include/shobjidl.idl | 36 ++++++++++++++++++++++++------------ 1 files changed, 24 insertions(+), 12 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 156d146..9d51361 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -103,7 +103,8 @@ cpp_quote("#endif") [ object, uuid(000214E9-0000-0000-C000-000000000046), - pointer_default(unique) + pointer_default(unique), + local ] interface IShellPropSheetExt : IUnknown { @@ -813,7 +814,8 @@ interface IPersistFolder3 : IPersistFolder2 [ object, uuid(000214eb-0000-0000-c000-000000000046), - pointer_default(unique) + pointer_default(unique), + local ] interface IExtractIconA : IUnknown { @@ -853,7 +855,8 @@ cpp_quote("#define GIL_DONTCACHE 0x0010") [ object, uuid(000214fa-0000-0000-c000-000000000046), - pointer_default(unique) + pointer_default(unique), + local ] interface IExtractIconW : IUnknown { @@ -939,7 +942,8 @@ cpp_quote("#define DWFAF_HIDDEN 0x0001") [ object, uuid(de5bf786-477a-11d2-839d-00c04fd918d0), - pointer_default(unique) + pointer_default(unique), + local ] interface IDragSourceHelper : IUnknown { @@ -968,7 +972,8 @@ interface IDragSourceHelper : IUnknown [ object, uuid(4657278b-411b-11d2-839a-00c04fd918d0), - pointer_default(unique) + pointer_default(unique), + local ] interface IDropTargetHelper : IUnknown { @@ -1119,7 +1124,8 @@ cpp_quote("#define CMIC_MASK_NOZONECHECKS SEE_MASK_NOZONECHECKS") [ object, uuid(000214f4-0000-0000-c000-000000000046), - pointer_default(unique) + pointer_default(unique), + local ] interface IContextMenu2 : IContextMenu { @@ -1138,7 +1144,8 @@ interface IContextMenu2 : IContextMenu [ object, uuid(bcfce0a0-ec17-11d0-8d10-00a0c90f2719), - pointer_default(unique) + pointer_default(unique), + local ] interface IContextMenu3 : IContextMenu2 { @@ -1232,7 +1239,8 @@ interface IResolveShellLink : IUnknown [ object, uuid(ac60f6a0-0fd9-11d0-99cb-00c04fd64497), - pointer_default(unique) + pointer_default(unique), + local ] interface IURLSearchHook : IUnknown { @@ -1248,7 +1256,8 @@ interface IURLSearchHook : IUnknown [ object, uuid(09f656a2-41af-480c-88f7-16cc0d164615), - pointer_default(unique) + pointer_default(unique), + local ] interface ISearchContext : IUnknown { @@ -1267,7 +1276,8 @@ interface ISearchContext : IUnknown [ object, uuid(5ee44da4-6d32-46e3-86bc-07540dedd0e0), - pointer_default(unique) + pointer_default(unique), + local ] interface IURLSearchHook2 : IURLSearchHook { @@ -1365,7 +1375,8 @@ interface IRunnableTask : IUnknown [ object, uuid(d82be2b1-5764-11d0-a96e-00c04fd705a2), - pointer_default(unique) + pointer_default(unique), + local ] interface IShellChangeNotify : IUnknown { @@ -1381,7 +1392,8 @@ interface IShellChangeNotify : IUnknown [ object, uuid(01e18d10-4d8b-11d2-855d-006008059367), - pointer_default(unique) + pointer_default(unique), + local ] interface IFileSystemBindData : IUnknown {

1 0

Andrew Fenn : xinput1_3: Added tests for XInputSetState.
by Alexandre Julliard Jan. 2, 2009

Jan. 2, 2009

Module: wine Branch: master Commit: 2c54c3dc82a577b754351dffee6a2812f660e8e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c54c3dc82a577b754351dffe… Author: Andrew Fenn <andrewfenn(a)gmail.com> Date: Thu Jan 1 08:06:34 2009 +0700 xinput1_3: Added tests for XInputSetState. --- dlls/xinput1_3/tests/xinput.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index 1125dcc..4b7f130 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -25,6 +25,37 @@ static DWORD (WINAPI *pXInputGetState)(DWORD, XINPUT_STATE*); static DWORD (WINAPI *pXInputGetCapabilities)(DWORD,DWORD,XINPUT_CAPABILITIES*); +static DWORD (WINAPI *pXInputSetState)(DWORD, XINPUT_VIBRATION*); +static void (WINAPI *pXInputEnable)(BOOL); + +static void test_set_state(void) +{ + XINPUT_VIBRATION vibrator; + DWORD controllerNum; + DWORD result; + + for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + { + ZeroMemory(&vibrator, sizeof(XINPUT_VIBRATION)); + + vibrator.wLeftMotorSpeed = 0; + vibrator.wRightMotorSpeed = 0; + result = pXInputSetState(controllerNum, &vibrator); + ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputSetState failed with (%d)\n", result); + + pXInputEnable(0); + + vibrator.wLeftMotorSpeed = 65535; + vibrator.wRightMotorSpeed = 65535; + result = pXInputSetState(controllerNum, &vibrator); + ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputSetState failed with (%d)\n", result); + + pXInputEnable(1); + } + + result = pXInputSetState(XUSER_MAX_COUNT+1, &vibrator); + ok(result == ERROR_BAD_ARGUMENTS, "XInputSetState returned (%d)\n", result); +} static void test_get_state(void) { @@ -100,8 +131,11 @@ START_TEST(xinput) return; } + pXInputEnable = (void*)GetProcAddress(hXinput, "XInputEnable"); + pXInputSetState = (void*)GetProcAddress(hXinput, "XInputSetState"); pXInputGetState = (void*)GetProcAddress(hXinput, "XInputGetState"); pXInputGetCapabilities = (void*)GetProcAddress(hXinput, "XInputGetCapabilities"); + test_set_state(); test_get_state(); test_get_capabilities(); FreeLibrary(hXinput);

1 0

Jeff Zaroyko : dsound: Fix a typo in convert_32_to_24.
by Alexandre Julliard Jan. 2, 2009

Jan. 2, 2009

Module: wine Branch: master Commit: bea7933d95dfcdd8ef55a7755567486282dca1b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bea7933d95dfcdd8ef55a7755… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Fri Jan 2 14:37:58 2009 +1100 dsound: Fix a typo in convert_32_to_24. --- dlls/dsound/dsound_convert.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index d149b7d..95a9995 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -159,7 +159,7 @@ static void convert_32_to_16 (const void *src, void *dst) static void convert_32_to_24 (const void *src, void *dst) { - DWORD dest = le32(*(DWORD*)dst); + DWORD dest = le32(*(DWORD*)src); BYTE *dest24 = dst; dest24[0] = dest / 256;

1 0

Roderick Colenbrander : d3d9: Relax color matching in bumpmap test.
by Alexandre Julliard Jan. 2, 2009

Jan. 2, 2009

Module: wine Branch: master Commit: a6d28bcc52627a122d6e4e65427efb9682d790a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6d28bcc52627a122d6e4e654… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Wed Dec 31 19:11:53 2008 +0100 d3d9: Relax color matching in bumpmap test. --- dlls/d3d9/tests/visual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 9bcb42f..5574313 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -7937,7 +7937,7 @@ static void fixed_function_bumpmap_test(IDirect3DDevice9 *device) * green: 0.5 * (0.25 * 2.0 + 0.1) = 0.5 * 0.6 = 0.3 = 0x4c * green: 0.75 * (0.25 * 2.0 + 0.1) = 0.75 * 0.6 = 0.45 = 0x72 */ - ok(color_match(color, 0x00994c72, 3), "bumpmap failed: Got color 0x%08x, expected 0x00994c72.\n", color); + ok(color_match(color, 0x00994c72, 5), "bumpmap failed: Got color 0x%08x, expected 0x00994c72.\n", color); /* Check a result scale factor > 1.0 */ scale = 10;

1 0

James Hawkins : advapi32: Request the owner and group token size instead of hardcoding the value.
by Alexandre Julliard Jan. 2, 2009

Jan. 2, 2009

Module: wine Branch: master Commit: 954820d027564d9a6fa34d7f258e0781f798520b URL: http://source.winehq.org/git/wine.git/?a=commit;h=954820d027564d9a6fa34d7f2… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jan 1 23:20:54 2009 -0800 advapi32: Request the owner and group token size instead of hardcoding the value. --- dlls/advapi32/tests/security.c | 26 ++++++++++++++++++++++---- 1 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index d521e90..0eccbaa 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1870,7 +1870,8 @@ static void test_granted_access(HANDLE handle, ACCESS_MASK access, static void test_process_security(void) { BOOL res; - char owner[32], group[32]; + PTOKEN_OWNER owner; + PTOKEN_PRIMARY_GROUP group; PSID AdminSid = NULL, UsersSid = NULL; PACL Acl = NULL; SECURITY_DESCRIPTOR *SecurityDescriptor = NULL; @@ -1879,7 +1880,7 @@ static void test_process_security(void) STARTUPINFOA startup; SECURITY_ATTRIBUTES psa; HANDLE token, event; - DWORD tmp; + DWORD size; Acl = HeapAlloc(GetProcessHeap(), 0, 256); res = InitializeAcl(Acl, 256, ACL_REVISION); @@ -1900,16 +1901,31 @@ static void test_process_security(void) return; } - res = GetTokenInformation( token, TokenOwner, owner, sizeof(owner), &tmp ); + res = GetTokenInformation( token, TokenOwner, NULL, 0, &size ); + ok(!res, "Expected failure, got %d\n", res); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + + owner = HeapAlloc(GetProcessHeap(), 0, size); + res = GetTokenInformation( token, TokenOwner, owner, size, &size ); ok(res, "GetTokenInformation failed with error %d\n", GetLastError()); AdminSid = ((TOKEN_OWNER*)owner)->Owner; - res = GetTokenInformation( token, TokenPrimaryGroup, group, sizeof(group), &tmp ); + + res = GetTokenInformation( token, TokenPrimaryGroup, NULL, 0, &size ); + ok(!res, "Expected failure, got %d\n", res); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + + group = HeapAlloc(GetProcessHeap(), 0, size); + res = GetTokenInformation( token, TokenPrimaryGroup, group, size, &size ); ok(res, "GetTokenInformation failed with error %d\n", GetLastError()); UsersSid = ((TOKEN_PRIMARY_GROUP*)group)->PrimaryGroup; CloseHandle( token ); if (!res) { + HeapFree(GetProcessHeap(), 0, group); + HeapFree(GetProcessHeap(), 0, owner); HeapFree(GetProcessHeap(), 0, Acl); return; } @@ -1969,6 +1985,8 @@ static void test_process_security(void) CloseHandle( info.hProcess ); CloseHandle( info.hThread ); CloseHandle( event ); + HeapFree(GetProcessHeap(), 0, group); + HeapFree(GetProcessHeap(), 0, owner); HeapFree(GetProcessHeap(), 0, Acl); HeapFree(GetProcessHeap(), 0, SecurityDescriptor); }

1 0

Michael Stefaniuc : dnsapi/tests: Remove superfluous casts.
by Alexandre Julliard Jan. 2, 2009

Jan. 2, 2009

Module: wine Branch: master Commit: b8f17bac2b9fb83d52826f227a32b346ee2d8b50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8f17bac2b9fb83d52826f227… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 1 23:26:59 2009 +0100 dnsapi/tests: Remove superfluous casts. The pointers to r1 and r2 are already PDNS_RECORDs. --- dlls/dnsapi/tests/record.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/dnsapi/tests/record.c b/dlls/dnsapi/tests/record.c index 8ce0f3d..4e97d85 100644 --- a/dlls/dnsapi/tests/record.c +++ b/dlls/dnsapi/tests/record.c @@ -37,25 +37,25 @@ static DNS_RECORDA r3 = { NULL, name1, DNS_TYPE_A, sizeof(DNS_A_DATA), { 0 }, 12 static void test_DnsRecordCompare( void ) { - ok( DnsRecordCompare( (PDNS_RECORD)&r1, (PDNS_RECORD)&r1 ) == TRUE, "failed unexpectedly\n" ); + ok( DnsRecordCompare( &r1, &r1 ) == TRUE, "failed unexpectedly\n" ); r2.pName = name2; - ok( DnsRecordCompare( (PDNS_RECORD)&r1, (PDNS_RECORD)&r2 ) == TRUE, "failed unexpectedly\n" ); + ok( DnsRecordCompare( &r1, &r2 ) == TRUE, "failed unexpectedly\n" ); r2.Flags.S.CharSet = DnsCharSetUnicode; - ok( DnsRecordCompare( (PDNS_RECORD)&r1, (PDNS_RECORD)&r2 ) == FALSE, "succeeded unexpectedly\n" ); + ok( DnsRecordCompare( &r1, &r2 ) == FALSE, "succeeded unexpectedly\n" ); r2.Flags.S.CharSet = DnsCharSetAnsi; - ok( DnsRecordCompare( (PDNS_RECORD)&r1, (PDNS_RECORD)&r2 ) == FALSE, "succeeded unexpectedly\n" ); + ok( DnsRecordCompare( &r1, &r2 ) == FALSE, "succeeded unexpectedly\n" ); r1.Flags.S.CharSet = DnsCharSetAnsi; - ok( DnsRecordCompare( (PDNS_RECORD)&r1, (PDNS_RECORD)&r2 ) == TRUE, "failed unexpectedly\n" ); + ok( DnsRecordCompare( &r1, &r2 ) == TRUE, "failed unexpectedly\n" ); r1.dwTtl = 0; - ok( DnsRecordCompare( (PDNS_RECORD)&r1, (PDNS_RECORD)&r2 ) == TRUE, "failed unexpectedly\n" ); + ok( DnsRecordCompare( &r1, &r2 ) == TRUE, "failed unexpectedly\n" ); r2.Data.A.IpAddress = 0; - ok( DnsRecordCompare( (PDNS_RECORD)&r1, (PDNS_RECORD)&r2 ) == FALSE, "succeeded unexpectedly\n" ); + ok( DnsRecordCompare( &r1, &r2 ) == FALSE, "succeeded unexpectedly\n" ); } static void test_DnsRecordSetCompare( void )

1 0

Andrew Fenn : xinput1_3: Added stub XInputSetState.
by Alexandre Julliard Jan. 2, 2009

Jan. 2, 2009

Module: wine Branch: master Commit: 2e71742d6a30800094af9263693befdc9c423a7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e71742d6a30800094af92636… Author: Andrew Fenn <andrewfenn(a)gmail.com> Date: Thu Jan 1 08:05:16 2009 +0700 xinput1_3: Added stub XInputSetState. --- dlls/xinput1_3/xinput1_3.spec | 2 +- dlls/xinput1_3/xinput1_3_main.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/xinput1_3/xinput1_3.spec b/dlls/xinput1_3/xinput1_3.spec index e8e176e..7c71bd5 100644 --- a/dlls/xinput1_3/xinput1_3.spec +++ b/dlls/xinput1_3/xinput1_3.spec @@ -1,5 +1,5 @@ @ stdcall XInputEnable(long) -@ stub XInputSetState #(long ptr) +@ stdcall XInputSetState(long ptr) @ stdcall XInputGetState(long ptr) @ stub XInputGetKeystroke #(long long ptr) @ stdcall XInputGetCapabilities(long long ptr) diff --git a/dlls/xinput1_3/xinput1_3_main.c b/dlls/xinput1_3/xinput1_3_main.c index 15ee4e3..7f28f37 100644 --- a/dlls/xinput1_3/xinput1_3_main.c +++ b/dlls/xinput1_3/xinput1_3_main.c @@ -55,6 +55,18 @@ void WINAPI XInputEnable(BOOL enable) FIXME("(%d) Stub!\n", enable); } +DWORD WINAPI XInputSetState(DWORD dwUserIndex, XINPUT_VIBRATION* pVibration) +{ + FIXME("(%d %p) Stub!\n", dwUserIndex, pVibration); + + if (dwUserIndex < XUSER_MAX_COUNT) + { + return ERROR_DEVICE_NOT_CONNECTED; + /* If controller exists then return ERROR_SUCCESS */ + } + return ERROR_BAD_ARGUMENTS; +} + DWORD WINAPI XInputGetState(DWORD dwUserIndex, XINPUT_STATE* pState) { FIXME("(%u %p)\n", dwUserIndex, pState);

1 0