November 2008 - Wine-Commits

Christian Costa : d3dxof: Increase max objects and check limit.
by Alexandre Julliard Nov. 11, 2008

Nov. 11, 2008

Module: wine Branch: master Commit: 3b30fd9d3a14043dde883e8cf8a72d850dbfa894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b30fd9d3a14043dde883e8cf… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Nov 11 12:39:46 2008 +0100 d3dxof: Increase max objects and check limit. --- dlls/d3dxof/d3dxof.c | 6 ++++++ dlls/d3dxof/d3dxof_private.h | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 42149c9..1c3c99b 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -2077,6 +2077,12 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE TRACE("(%p/%p)->(%p)\n", This, iface, ppDataObj); + if (This->nb_xobjects >= MAX_OBJECTS) + { + ERR("Too many objects\n"); + return DXFILEERR_NOMOREOBJECTS; + } + if (!This->buf.rem_bytes) return DXFILEERR_NOMOREOBJECTS; diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index f70eb67..80f67a2 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -38,7 +38,7 @@ #define MAX_MEMBERS 50 #define MAX_CHILDS 20 #define MAX_TEMPLATES 200 -#define MAX_OBJECTS 200 +#define MAX_OBJECTS 500 #define MAX_SUBOBJECTS 120 #define MAX_STRINGS_BUFFER 200

1 0

Christian Costa : d3dxof: Support also xfile version 3.03.
by Alexandre Julliard Nov. 11, 2008

Nov. 11, 2008

Module: wine Branch: master Commit: ba11e60e8ba4e6c0287e81b5522ecf3672f9cffb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba11e60e8ba4e6c0287e81b55… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Nov 11 12:38:52 2008 +0100 d3dxof: Support also xfile version 3.03. --- dlls/d3dxof/d3dxof.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index a953573..42149c9 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -38,7 +38,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dxof); #define MAKEFOUR(a,b,c,d) ((DWORD)a + ((DWORD)b << 8) + ((DWORD)c << 16) + ((DWORD)d << 24)) #define XOFFILE_FORMAT_MAGIC MAKEFOUR('x','o','f',' ') -#define XOFFILE_FORMAT_VERSION MAKEFOUR('0','3','0','2') +#define XOFFILE_FORMAT_VERSION_302 MAKEFOUR('0','3','0','2') +#define XOFFILE_FORMAT_VERSION_303 MAKEFOUR('0','3','0','3') #define XOFFILE_FORMAT_BINARY MAKEFOUR('b','i','n',' ') #define XOFFILE_FORMAT_TEXT MAKEFOUR('t','x','t',' ') #define XOFFILE_FORMAT_COMPRESSED MAKEFOUR('c','m','p',' ') @@ -254,7 +255,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV goto error; } - if (header[1] != XOFFILE_FORMAT_VERSION) + if ((header[1] != XOFFILE_FORMAT_VERSION_302) && (header[1] != XOFFILE_FORMAT_VERSION_303)) { hr = DXFILEERR_BADFILEVERSION; goto error; @@ -1153,7 +1154,7 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP read_bytes(&buf, &token_header, 4); - if (token_header != XOFFILE_FORMAT_VERSION) + if ((token_header != XOFFILE_FORMAT_VERSION_302) && (token_header != XOFFILE_FORMAT_VERSION_303)) return DXFILEERR_BADFILEVERSION; read_bytes(&buf, &token_header, 4);

1 0

Francois Gouget : shell32/tests: Remove spaces before '\n' in ok() calls.
by Alexandre Julliard Nov. 11, 2008

Nov. 11, 2008

Module: wine Branch: master Commit: eae202c7ec809ebef009632301678c3a2146f82a URL: http://source.winehq.org/git/wine.git/?a=commit;h=eae202c7ec809ebef00963230… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 11 11:59:52 2008 +0100 shell32/tests: Remove spaces before '\n' in ok() calls. --- dlls/shell32/tests/shlfileop.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 2607c63..81f893c 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -314,14 +314,14 @@ static void test_get_file_info_iconlist(void) hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON); ok(hr != 0, "SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON Failed\n"); - ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing \n"); + ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing\n"); ok(shInfow.dwAttributes==0xcfcfcfcf,"dwAttributes modified\n"); memset(&shInfow, 0xcf, sizeof(shInfow)); hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), SHGFI_ICON|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON); ok(hr != 0, " SHGFI_ICON|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON Failed\n"); - ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing \n"); + ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing\n"); ok(shInfow.hIcon!=(HICON)0xcfcfcfcf && shInfow.hIcon!=0,"hIcon invalid\n"); if (shInfow.hIcon!=(HICON)0xcfcfcfcf) DestroyIcon(shInfow.hIcon); todo_wine ok(shInfow.dwAttributes==0,"dwAttributes not set\n"); @@ -330,7 +330,7 @@ static void test_get_file_info_iconlist(void) hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), SHGFI_ICON|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_LARGEICON); ok(hr != 0, "SHGFI_ICON|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_LARGEICON Failed\n"); - ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing \n"); + ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing\n"); ok(shInfow.hIcon!=(HICON)0xcfcfcfcf && shInfow.hIcon!=0,"hIcon invalid\n"); if (shInfow.hIcon != (HICON)0xcfcfcfcf) DestroyIcon(shInfow.hIcon); todo_wine ok(shInfow.dwAttributes==0,"dwAttributes not set\n"); @@ -339,7 +339,7 @@ static void test_get_file_info_iconlist(void) hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_LARGEICON); ok(hr != 0, "SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_LARGEICON Failed\n"); - ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing \n"); + ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing\n"); ok(shInfow.dwAttributes==0xcfcfcfcf,"dwAttributes modified\n"); memset(&shInfow, 0xcf, sizeof(shInfow)); @@ -368,7 +368,7 @@ static void test_get_file_info_iconlist(void) SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON| SHGFI_ATTRIBUTES); ok(hr != 0, "SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON|SHGFI_ATTRIBUTES Failed\n"); - ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing \n"); + ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing\n"); ok(shInfow.dwAttributes!=0xcfcfcfcf,"dwAttributes not set\n"); memset(&shInfow, 0xcf, sizeof(shInfow)); @@ -376,7 +376,7 @@ static void test_get_file_info_iconlist(void) SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON| SHGFI_EXETYPE); todo_wine ok(hr != 0, "SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON|SHGFI_EXETYPE Failed\n"); - ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing \n"); + ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing\n"); ok(shInfow.dwAttributes==0xcfcfcfcf,"dwAttributes modified\n"); memset(&shInfow, 0xcf, sizeof(shInfow)); @@ -398,14 +398,14 @@ static void test_get_file_info_iconlist(void) SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL| SHGFI_ATTRIBUTES); ok(hr != 0, "SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_ATTRIBUTES Failed\n"); - ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing \n"); + ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing\n"); ok(shInfow.dwAttributes!=0xcfcfcfcf,"dwAttributes not set\n"); memset(&shInfow, 0xcf, sizeof(shInfow)); hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_EXETYPE); todo_wine ok(hr != 0, "SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_EXETYPE Failed\n"); - ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing \n"); + ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing\n"); ok(shInfow.dwAttributes==0xcfcfcfcf,"dwAttributes modified\n"); memset(&shInfow, 0xcf, sizeof(shInfow));

1 0

Francois Gouget : gdiplus: Add a trailing '\n' to a Wine trace.
by Alexandre Julliard Nov. 11, 2008

Nov. 11, 2008

Module: wine Branch: master Commit: 545b7764f4b9600f5a81a2d7f48bc8dd50f09fd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=545b7764f4b9600f5a81a2d7f… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 11 11:59:42 2008 +0100 gdiplus: Add a trailing '\n' to a Wine trace. --- dlls/gdiplus/pen.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index ea41a3a..61f1898 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -106,7 +106,7 @@ GpStatus WINGDIPAPI GdipCreatePen2(GpBrush *brush, REAL width, GpUnit unit, GpPen *gp_pen; GpBrush *clone_brush; - TRACE("(%p, %.2f, %d, %p)", brush, width, unit, pen); + TRACE("(%p, %.2f, %d, %p)\n", brush, width, unit, pen); if(!pen || !brush) return InvalidParameter;

1 0

Paul Vriens : msi/tests: Fix some test failures on Win9x and WinMe.
by Alexandre Julliard Nov. 11, 2008

Nov. 11, 2008

Module: wine Branch: master Commit: b4874a8921e76d95009a9dd26f0490ca53d6fd4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4874a8921e76d95009a9dd26… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 11 13:37:30 2008 +0100 msi/tests: Fix some test failures on Win9x and WinMe. --- dlls/msi/tests/automation.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 4e82e9f..9568fbf 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1816,9 +1816,18 @@ static void test_Installer_RegistryValue(void) HKEY curr_user = (HKEY)1; HRESULT hr; BOOL bRet; + LONG lRet; /* Delete keys */ - if (!RegOpenKeyW( HKEY_CURRENT_USER, szKey, &hkey )) delete_key( hkey ); + SetLastError(0xdeadbeef); + lRet = RegOpenKeyW( HKEY_CURRENT_USER, szKey, &hkey ); + if (!lRet && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("Needed W-functions are not implemented\n"); + return; + } + if (!lRet) + delete_key( hkey ); /* Does our key exist? Shouldn't; check with all three possible value parameter types */ hr = Installer_RegistryValueE(curr_user, szKey, &bRet);

1 0

Paul Vriens : wininet/tests: Fix a test failure on some Win98 boxes.
by Alexandre Julliard Nov. 11, 2008

Nov. 11, 2008

Module: wine Branch: master Commit: e7da58468b7a580a92114eeb5d3cb5fa59d5818a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7da58468b7a580a92114eeb5… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Nov 10 19:18:14 2008 +0100 wininet/tests: Fix a test failure on some Win98 boxes. --- dlls/wininet/tests/ftp.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index 34aa68f..335215e 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -385,7 +385,9 @@ static void test_openfile(HINTERNET hFtp, HINTERNET hConnect) SetLastError(0xdeadbeef); hOpenFile = FtpOpenFileA(hFtp, "welcome.msg", GENERIC_READ, FTP_TRANSFER_TYPE_ASCII, 0); ok ( hOpenFile != NULL, "Expected FtpOpenFileA to succeed\n"); - ok ( GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", GetLastError()); + ok ( GetLastError() == ERROR_SUCCESS || + broken(GetLastError() == ERROR_FILE_NOT_FOUND), /* Win98 */ + "Expected ERROR_SUCCESS, got %u\n", GetLastError()); if (hOpenFile) {

1 0

Eric Pouech : dbghelp: Properly add CPU info to minidump.
by Alexandre Julliard Nov. 11, 2008

Nov. 11, 2008

Module: wine Branch: master Commit: 9bac505f2a96d9fdc8fe8c86a7feb66a0ed3704e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bac505f2a96d9fdc8fe8c86a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Nov 10 11:27:52 2008 +0100 dbghelp: Properly add CPU info to minidump. --- dlls/dbghelp/minidump.c | 75 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 73 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index c506be4..cc12415 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -556,6 +556,44 @@ static unsigned dump_modules(struct dump_context* dc, BOOL dump_elf) return sz; } +/* Calls cpuid with an eax of 'ax' and returns the 16 bytes in *p + * We are compiled with -fPIC, so we can't clobber ebx. + */ +static inline void do_x86cpuid(unsigned int ax, unsigned int *p) +{ +#if defined(__GNUC__) && defined(__i386__) + __asm__("pushl %%ebx\n\t" + "cpuid\n\t" + "movl %%ebx, %%esi\n\t" + "popl %%ebx" + : "=a" (p[0]), "=S" (p[1]), "=c" (p[2]), "=d" (p[3]) + : "0" (ax)); +#endif +} + +/* From xf86info havecpuid.c 1.11 */ +static inline int have_x86cpuid(void) +{ +#if defined(__GNUC__) && defined(__i386__) + unsigned int f1, f2; + __asm__("pushfl\n\t" + "pushfl\n\t" + "popl %0\n\t" + "movl %0,%1\n\t" + "xorl %2,%0\n\t" + "pushl %0\n\t" + "popfl\n\t" + "pushfl\n\t" + "popl %0\n\t" + "popfl" + : "=&r" (f1), "=&r" (f2) + : "ir" (0x00200000)); + return ((f1^f2) & 0x00200000) != 0; +#else + return 0; +#endif +} + /****************************************************************** * dump_system_info * @@ -587,9 +625,42 @@ static unsigned dump_system_info(struct dump_context* dc) mdSysInfo.u1.Reserved1 = 0; mdSysInfo.u1.s.SuiteMask = VER_SUITE_TERMINAL; - FIXME("fill in CPU vendorID and feature set\n"); - memset(&mdSysInfo.Cpu, 0, sizeof(mdSysInfo.Cpu)); + if (have_x86cpuid()) + { + unsigned regs0[4], regs1[4]; + + do_x86cpuid(0, regs0); + mdSysInfo.Cpu.X86CpuInfo.VendorId[0] = regs0[1]; + mdSysInfo.Cpu.X86CpuInfo.VendorId[1] = regs0[2]; + mdSysInfo.Cpu.X86CpuInfo.VendorId[2] = regs0[3]; + do_x86cpuid(1, regs1); + mdSysInfo.Cpu.X86CpuInfo.VersionInformation = regs1[0]; + mdSysInfo.Cpu.X86CpuInfo.FeatureInformation = regs1[3]; + mdSysInfo.Cpu.X86CpuInfo.AMDExtendedCpuFeatures = 0; + if (regs0[1] == 0x68747541 /* "Auth" */ && + regs0[3] == 0x69746e65 /* "enti" */ && + regs0[2] == 0x444d4163 /* "cAMD" */) + { + do_x86cpuid(0x80000000, regs1); /* get vendor cpuid level */ + if (regs1[0] >= 0x80000001) + { + do_x86cpuid(0x80000001, regs1); /* get vendor features */ + mdSysInfo.Cpu.X86CpuInfo.AMDExtendedCpuFeatures = regs1[3]; + } + } + } + else + { + unsigned i; + ULONG64 one = 1; + mdSysInfo.Cpu.OtherCpuInfo.ProcessorFeatures[0] = 0; + mdSysInfo.Cpu.OtherCpuInfo.ProcessorFeatures[1] = 0; + + for (i = 0; i < sizeof(mdSysInfo.Cpu.OtherCpuInfo.ProcessorFeatures[0]) * 8; i++) + if (IsProcessorFeaturePresent(i)) + mdSysInfo.Cpu.OtherCpuInfo.ProcessorFeatures[0] |= one << i; + } append(dc, &mdSysInfo, sizeof(mdSysInfo)); /* write the service pack version string after this stream. It is referenced within the

1 0

Nicolas Le Cam : winspool.drv/tests: Fix a test on all platforms.
by Alexandre Julliard Nov. 11, 2008

Nov. 11, 2008

Module: wine Branch: master Commit: 094085dd7e45d0c88d51c374d51362f0729f2216 URL: http://source.winehq.org/git/wine.git/?a=commit;h=094085dd7e45d0c88d51c374d… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Thu Nov 6 13:58:34 2008 +0100 winspool.drv/tests: Fix a test on all platforms. --- dlls/winspool.drv/tests/info.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index d1f4dea..fb6dc40 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2363,7 +2363,9 @@ static void test_DeviceCapabilities(void) fields = DeviceCapabilities(device, port, DC_FIELDS, NULL, NULL); ok(fields != (DWORD)-1, "DeviceCapabilities DC_FIELDS failed\n"); - ok(fields == dm->dmFields, "fields %x != dm->dmFields %x\n", fields, dm->dmFields); + todo_wine + ok(fields == (dm->dmFields | DM_FORMNAME), + "fields %x != (dm->dmFields | DM_FORMNAME) %x\n", fields, dm->dmFields); GlobalUnlock(prn_dlg.hDevMode); GlobalFree(prn_dlg.hDevMode);

1 0

Andrew Fenn : xinput: Added XInputGetCapabilities function with test case.
by Alexandre Julliard Nov. 11, 2008

Nov. 11, 2008

Module: wine Branch: master Commit: 611ebb53e315518c5580b26c8aea014a4c749cb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=611ebb53e315518c5580b26c8… Author: Andrew Fenn <andrewfenn(a)gmail.com> Date: Mon Nov 10 16:33:15 2008 +0000 xinput: Added XInputGetCapabilities function with test case. --- dlls/xinput1_3/tests/xinput.c | 27 +++++++++++++++++++++++++++ dlls/xinput1_3/xinput1_3.spec | 2 +- dlls/xinput1_3/xinput1_3_main.c | 12 ++++++++++++ 3 files changed, 40 insertions(+), 1 deletions(-) diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index 2cdc168..ffc0d33 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -24,6 +24,7 @@ #include "wine/test.h" static DWORD (WINAPI *pXInputGetState)(DWORD, XINPUT_STATE*); +static DWORD (WINAPI *pXInputGetCapabilities)(DWORD,DWORD,XINPUT_CAPABILITIES*); static void test_get_state(void) { @@ -64,6 +65,30 @@ static void test_get_state(void) ok(result == ERROR_BAD_ARGUMENTS, "XInputGetState returned (%d)\n", result); } +static void test_get_capabilities(void) +{ + XINPUT_CAPABILITIES capabilities; + DWORD controllerNum; + DWORD result; + + for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + { + ZeroMemory(&capabilities, sizeof(XINPUT_CAPABILITIES)); + + result = pXInputGetCapabilities(controllerNum, XINPUT_FLAG_GAMEPAD, &capabilities); + ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputGetCapabilities failed with (%d)\n", result); + + if (ERROR_DEVICE_NOT_CONNECTED == result) + { + skip("Controller %d is not connected\n", controllerNum); + } + } + + ZeroMemory(&capabilities, sizeof(XINPUT_CAPABILITIES)); + result = pXInputGetCapabilities(XUSER_MAX_COUNT+1, XINPUT_FLAG_GAMEPAD, &capabilities); + ok(result == ERROR_BAD_ARGUMENTS, "XInputGetCapabilities returned (%d)\n", result); +} + START_TEST(xinput) { HMODULE hXinput; @@ -72,7 +97,9 @@ START_TEST(xinput) if (hXinput) { pXInputGetState = (void*)GetProcAddress(hXinput, "XInputGetState"); + pXInputGetCapabilities = (void*)GetProcAddress(hXinput, "XInputGetCapabilities"); test_get_state(); + test_get_capabilities(); } else { diff --git a/dlls/xinput1_3/xinput1_3.spec b/dlls/xinput1_3/xinput1_3.spec index 8fb6353..92d45e9 100644 --- a/dlls/xinput1_3/xinput1_3.spec +++ b/dlls/xinput1_3/xinput1_3.spec @@ -2,6 +2,6 @@ @ stub XInputSetState #(long ptr) @ stdcall XInputGetState(long ptr) @ stub XInputGetKeystroke #(long long ptr) -@ stub XInputGetCapabilities #(long long ptr) +@ stdcall XInputGetCapabilities(long long ptr) @ stub XInputGetDSoundAudioDeviceGuids #(long ptr ptr) @ stub XInputGetBatteryInformation diff --git a/dlls/xinput1_3/xinput1_3_main.c b/dlls/xinput1_3/xinput1_3_main.c index f2b6500..c25c0d7 100644 --- a/dlls/xinput1_3/xinput1_3_main.c +++ b/dlls/xinput1_3/xinput1_3_main.c @@ -57,3 +57,15 @@ DWORD WINAPI XInputGetState(DWORD dwUserIndex, XINPUT_STATE* pState) } return ERROR_BAD_ARGUMENTS; } + +DWORD WINAPI XInputGetCapabilities(DWORD dwUserIndex, DWORD dwFlags, XINPUT_CAPABILITIES* pCapabilities) +{ + FIXME("(%d %d %p)\n", dwUserIndex, dwFlags, pCapabilities); + + if (dwUserIndex < XUSER_MAX_COUNT) + { + return ERROR_DEVICE_NOT_CONNECTED; + /* If controller exists then return ERROR_SUCCESS */ + } + return ERROR_BAD_ARGUMENTS; +}

1 0

Nicolas Le Cam : crypt32/tests: Fix a failing test on win2000.
by Alexandre Julliard Nov. 11, 2008

Nov. 11, 2008

Module: wine Branch: master Commit: ed364027e7c352904a5fb4f0cafb947daf4321bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed364027e7c352904a5fb4f0c… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Mon Nov 10 18:44:40 2008 +0100 crypt32/tests: Fix a failing test on win2000. --- dlls/crypt32/tests/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c index 67d4725..7a7d458 100644 --- a/dlls/crypt32/tests/main.c +++ b/dlls/crypt32/tests/main.c @@ -452,7 +452,7 @@ static void test_format_object(void) ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, encodedBigInt, sizeof(encodedBigInt), str, &size); ok(ret, "CryptFormatObject failed: %d\n", GetLastError()); - ok(!lstrcmpW(str, encodedBigIntStr), "unexpected format string\n"); + ok(!lstrcmpiW(str, encodedBigIntStr), "unexpected format string\n"); HeapFree(GetProcessHeap(), 0, str); } /* When called with the default encoding type for any undefined struct

1 0