July 2015 - Wine-commits - list.winehq.org

Sebastian Lackner : ntdll/tests: Add tests for ThreadQuerySetWin32StartAddress info class.
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: 22f0611cf9070a6bbff90f5c18328399ccc13dc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22f0611cf9070a6bbff90f5c1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 27 18:31:47 2015 +0200 ntdll/tests: Add tests for ThreadQuerySetWin32StartAddress info class. --- dlls/ntdll/tests/info.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 5fff490..83e8757 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1695,6 +1695,61 @@ static void test_NtGetCurrentProcessorNumber(void) ok(status == STATUS_SUCCESS, "got 0x%x (expected STATUS_SUCCESS)\n", status); } +static DWORD WINAPI start_address_thread(void *arg) +{ + PRTL_THREAD_START_ROUTINE entry; + NTSTATUS status; + DWORD ret; + + entry = NULL; + ret = 0xdeadbeef; + status = pNtQueryInformationThread(GetCurrentThread(), ThreadQuerySetWin32StartAddress, + &entry, sizeof(entry), &ret); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); + ok(ret == sizeof(entry), "NtQueryInformationThread returned %u bytes\n", ret); + ok(entry == (void *)start_address_thread, "expected %p, got %p\n", start_address_thread, entry); + return 0; +} + +static void test_thread_start_address(void) +{ + PRTL_THREAD_START_ROUTINE entry; + NTSTATUS status; + HANDLE thread; + DWORD ret; + + entry = NULL; + ret = 0xdeadbeef; + status = pNtQueryInformationThread(GetCurrentThread(), ThreadQuerySetWin32StartAddress, + &entry, sizeof(entry), &ret); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); + ok(ret == sizeof(entry), "NtQueryInformationThread returned %u bytes\n", ret); + ok(entry != NULL, "expected non-NULL entry point\n"); + + entry = (void *)0xdeadbeef; + status = pNtSetInformationThread(GetCurrentThread(), ThreadQuerySetWin32StartAddress, + &entry, sizeof(entry)); + ok(status == STATUS_SUCCESS || status == STATUS_INVALID_PARAMETER, /* >= Vista */ + "expected STATUS_SUCCESS or STATUS_INVALID_PARAMETER, got %08x\n", status); + + if (status == STATUS_SUCCESS) + { + entry = NULL; + ret = 0xdeadbeef; + status = pNtQueryInformationThread(GetCurrentThread(), ThreadQuerySetWin32StartAddress, + &entry, sizeof(entry), &ret); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); + ok(ret == sizeof(entry), "NtQueryInformationThread returned %u bytes\n", ret); + ok(entry == (void *)0xdeadbeef, "expected 0xdeadbeef, got %p\n", entry); + } + + thread = CreateThread(NULL, 0, start_address_thread, NULL, 0, NULL); + ok(thread != INVALID_HANDLE_VALUE, "CreateThread failed with %d\n", GetLastError()); + ret = WaitForSingleObject(thread, 1000); + ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", ret); + CloseHandle(thread); +} + START_TEST(info) { char **argv; @@ -1820,5 +1875,10 @@ START_TEST(info) trace("Starting test_affinity()\n"); test_affinity(); + + trace("Starting test_NtGetCurrentProcessorNumber()\n"); test_NtGetCurrentProcessorNumber(); + + trace("Starting test_thread_start_address()\n"); + test_thread_start_address(); }

1 0

Daniel Lehman : msvcr110: Add Concurrency::details::_GetConcurrency.
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: a7c7bc9180f8ac6e4f1ef9d7a9f53d4eaa5a4e24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7c7bc9180f8ac6e4f1ef9d7a… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jul 24 00:13:19 2015 -0700 msvcr110: Add Concurrency::details::_GetConcurrency. --- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120/tests/msvcr120.c | 13 +++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/lock.c | 18 ++++++++++++++++++ 5 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 3faca07..51eddfb 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -533,7 +533,7 @@ @ stub ?_Get(a)_CurrentScheduler@details(a)Concurrency@@SA?AV_Scheduler(a)23@XZ @ stub -arch=win32 ?_GetConcRTTraceInfo(a)Concurrency@@YAPBU_CONCRT_TRACE_INFO(a)details@1(a)XZ @ stub -arch=win64 ?_GetConcRTTraceInfo(a)Concurrency@@YAPEBU_CONCRT_TRACE_INFO(a)details@1(a)XZ -@ stub ?_GetConcurrency(a)details@Concurrency@@YAIXZ +@ cdecl ?_GetConcurrency(a)details@Concurrency@@YAIXZ() _GetConcurrency @ stub -arch=win32 ?_GetCurrentInlineDepth(a)_StackGuard@details(a)Concurrency@@CAAAIXZ @ stub -arch=win64 ?_GetCurrentInlineDepth(a)_StackGuard@details(a)Concurrency@@CAAEA_KXZ @ stub ?_GetNumberOfVirtualProcessors(a)_CurrentScheduler@details(a)Concurrency@@SAIXZ diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 5077a67..c2aacac 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -524,7 +524,7 @@ @ stub ?_Get(a)_CurrentScheduler@details(a)Concurrency@@SA?AV_Scheduler(a)23@XZ @ stub -arch=win32 ?_GetConcRTTraceInfo(a)Concurrency@@YAPBU_CONCRT_TRACE_INFO(a)details@1(a)XZ @ stub -arch=win64 ?_GetConcRTTraceInfo(a)Concurrency@@YAPEBU_CONCRT_TRACE_INFO(a)details@1(a)XZ -@ stub ?_GetConcurrency(a)details@Concurrency@@YAIXZ +@ cdecl ?_GetConcurrency(a)details@Concurrency@@YAIXZ() _GetConcurrency @ stub -arch=win32 ?_GetCurrentInlineDepth(a)_StackGuard@details(a)Concurrency@@CAAAIXZ @ stub -arch=win64 ?_GetCurrentInlineDepth(a)_StackGuard@details(a)Concurrency@@CAAEA_KXZ @ stub ?_GetNumberOfVirtualProcessors(a)_CurrentScheduler@details(a)Concurrency@@SAIXZ diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index d334b51..330c6b1 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -64,6 +64,7 @@ static size_t (CDECL *p_wcstombs_s)(size_t *ret, char* dest, size_t sz, const wc static int (CDECL *p__dsign)(double); static int (CDECL *p__fdsign)(float); static wchar_t** (CDECL *p____lc_locale_name_func)(void); +static unsigned int (CDECL *p__GetConcurrency)(void); static BOOL init(void) { @@ -82,6 +83,7 @@ static BOOL init(void) p__dsign = (void*)GetProcAddress(module, "_dsign"); p__fdsign = (void*)GetProcAddress(module, "_fdsign"); p____lc_locale_name_func = (void*)GetProcAddress(module, "___lc_locale_name_func"); + p__GetConcurrency = (void*)GetProcAddress(module,"?_GetConcurrency(a)details@Concurrency@@YAIXZ"); return TRUE; } @@ -221,10 +223,21 @@ static void test____lc_locale_name_func(void) ok(!lc_names[1], "___lc_locale_name_func()[1] = %s\n", wine_dbgstr_w(lc_names[1])); } +static void test__GetConcurrency(void) +{ + SYSTEM_INFO si; + unsigned int c; + + GetSystemInfo(&si); + c = (*p__GetConcurrency)(); + ok(c == si.dwNumberOfProcessors, "expected %u, got %u\n", si.dwNumberOfProcessors, c); +} + START_TEST(msvcr120) { if (!init()) return; test_lconv(); test__dsign(); test____lc_locale_name_func(); + test__GetConcurrency(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 3ff423d..392c3f7 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -522,7 +522,7 @@ @ stub ?_Get(a)_CurrentScheduler@details(a)Concurrency@@SA?AV_Scheduler(a)23@XZ @ stub -arch=win32 ?_GetConcRTTraceInfo(a)Concurrency@@YAPBU_CONCRT_TRACE_INFO(a)details@1(a)XZ @ stub -arch=win64 ?_GetConcRTTraceInfo(a)Concurrency@@YAPEBU_CONCRT_TRACE_INFO(a)details@1(a)XZ -@ stub ?_GetConcurrency(a)details@Concurrency@@YAIXZ +@ cdecl ?_GetConcurrency(a)details@Concurrency@@YAIXZ() msvcr120.?_GetConcurrency(a)details@Concurrency@@YAIXZ @ stub -arch=win32 ?_GetCurrentInlineDepth(a)_StackGuard@details(a)Concurrency@@CAAAIXZ @ stub -arch=win64 ?_GetCurrentInlineDepth(a)_StackGuard@details(a)Concurrency@@CAAEA_KXZ @ stub ?_GetNumberOfVirtualProcessors(a)_CurrentScheduler@details(a)Concurrency@@SAIXZ diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index 6d903dc..e69e1b9 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -537,6 +537,24 @@ void __thiscall critical_section_scoped_lock_dtor(critical_section_scoped_lock * TRACE("(%p)\n", this); critical_section_unlock(this->cs); } + +/* ?_GetConcurrency(a)details@Concurrency@@YAIXZ */ +unsigned int __cdecl _GetConcurrency(void) +{ + static unsigned int val = -1; + + TRACE("()\n"); + + if(val == -1) { + SYSTEM_INFO si; + + GetSystemInfo(&si); + val = si.dwNumberOfProcessors; + } + + return val; +} + #endif /**********************************************************************

1 0

Martin Storsjo : ntdll: Handle partial image load config structs.
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: 2a904d3bb379282831035e76bf9d30d347511bab URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a904d3bb379282831035e76b… Author: Martin Storsjo <martin(a)martin.st> Date: Thu Jul 23 10:36:06 2015 +0300 ntdll: Handle partial image load config structs. --- dlls/ntdll/virtual.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index ff947da..479ca79 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1320,7 +1320,8 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz loadcfg = RtlImageDirectoryEntryToData( (HMODULE)ptr, TRUE, IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, &loadcfg_size ); - if (loadcfg && loadcfg_size >= sizeof(*loadcfg)) + if (loadcfg && + loadcfg_size >= offsetof(IMAGE_LOAD_CONFIG_DIRECTORY, SecurityCookie) + sizeof(loadcfg->SecurityCookie)) set_security_cookie((ULONG_PTR *)loadcfg->SecurityCookie); /* set the image protections */

1 0

Dmitry Timoshkov : setupapi: Avoid shadowing devInst variable.
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: 14650b939cf4ccae964337a3e0ff07945fb4f84f URL: http://source.winehq.org/git/wine.git/?a=commit;h=14650b939cf4ccae964337a3e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 22 17:57:07 2015 +0800 setupapi: Avoid shadowing devInst variable. --- dlls/setupapi/devinst.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 2a97eab..b084a5e 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -535,7 +535,7 @@ static void SETUPDI_FreeDeviceInfo(struct DeviceInfo *devInfo) */ static BOOL SETUPDI_AddDeviceToSet(struct DeviceInfoSet *set, const GUID *guid, - DWORD devInst, + DWORD dev_inst, LPCWSTR instanceId, BOOL phantom, SP_DEVINFO_DATA **dev) @@ -544,7 +544,7 @@ static BOOL SETUPDI_AddDeviceToSet(struct DeviceInfoSet *set, struct DeviceInfo *devInfo = SETUPDI_AllocateDeviceInfo(set, set->cDevices, instanceId, phantom); - TRACE("%p, %s, %d, %s, %d\n", set, debugstr_guid(guid), devInst, + TRACE("%p, %s, %d, %s, %d\n", set, debugstr_guid(guid), dev_inst, debugstr_w(instanceId), phantom); if (devInfo)

1 0

Dmitry Timoshkov : setupapi: SetupDiGetClassDevsEx returns INVALID_HANDLE_VALUE on error.
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: afa912b4f2bd31b2ba58a607f310ab3b761b58e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afa912b4f2bd31b2ba58a607f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 22 17:57:14 2015 +0800 setupapi: SetupDiGetClassDevsEx returns INVALID_HANDLE_VALUE on error. --- dlls/setupapi/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index b084a5e..5a18937 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2340,7 +2340,7 @@ HDEVINFO WINAPI SetupDiGetClassDevsExW(const GUID *class, PCWSTR enumstr, HWND p if (!(flags & DIGCF_ALLCLASSES) && !class) { SetLastError(ERROR_INVALID_PARAMETER); - return NULL; + return INVALID_HANDLE_VALUE; } if (flags & unsupportedFlags) WARN("unsupported flags %08x\n", flags & unsupportedFlags);

1 0

Dmitry Timoshkov : setupapi: SetupDiCreateDeviceInfoListEx returns INVALID_HANDLE_VALUE on error.
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: ab92627e19f10d7ad23abb101b21ec7bd122628c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab92627e19f10d7ad23abb101… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 22 17:57:19 2015 +0800 setupapi: SetupDiCreateDeviceInfoListEx returns INVALID_HANDLE_VALUE on error. --- dlls/setupapi/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 5a18937..318dcdf 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2348,7 +2348,7 @@ HDEVINFO WINAPI SetupDiGetClassDevsExW(const GUID *class, PCWSTR enumstr, HWND p set = deviceset; else set = SetupDiCreateDeviceInfoListExW(class, parent, machine, reserved); - if (set) + if (set != INVALID_HANDLE_VALUE) { if (machine && *machine) FIXME("%s: unimplemented for remote machines\n",

1 0

Hao Peng : regsvr32: Change regsvr32 to a GUI program.
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: e48c3e466cb49e556db44725be19aabc58b9ce26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e48c3e466cb49e556db44725b… Author: Hao Peng <penghao(a)linuxdeepin.com> Date: Wed Jul 22 09:38:42 2015 +0800 regsvr32: Change regsvr32 to a GUI program. --- programs/regsvr32/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regsvr32/Makefile.in b/programs/regsvr32/Makefile.in index b99db28..15646a6 100644 --- a/programs/regsvr32/Makefile.in +++ b/programs/regsvr32/Makefile.in @@ -1,5 +1,5 @@ MODULE = regsvr32.exe -APPMODE = -mconsole -municode +APPMODE = -mwindows -municode IMPORTS = ole32 user32 C_SRCS = \

1 0

Sebastian Lackner : ntdll: Mark newly spawned worker threads as busy.
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: 5bd9d58016236da3142e030add2efbb2789fa2e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bd9d58016236da3142e030ad… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 29 22:10:01 2015 +0200 ntdll: Mark newly spawned worker threads as busy. --- dlls/ntdll/threadpool.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index ad4951f..8605a22 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -379,6 +379,8 @@ NTSTATUS WINAPI RtlQueueWorkItem( PRTL_WORK_ITEM_ROUTINE function, PVOID context struct rtl_work_item *item; NTSTATUS status; + TRACE( "%p %p %u\n", function, context, flags ); + item = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*item) ); if (!item) return STATUS_NO_MEMORY; @@ -1716,6 +1718,7 @@ static NTSTATUS tp_threadpool_lock( struct threadpool **out, TP_CALLBACK_ENVIRON { interlocked_inc( &pool->refcount ); pool->num_workers++; + pool->num_busy_workers++; NtClose( thread ); } } @@ -1915,6 +1918,7 @@ static void tp_object_submit( struct threadpool_object *object, BOOL signaled ) { interlocked_inc( &pool->refcount ); pool->num_workers++; + pool->num_busy_workers++; NtClose( thread ); } } @@ -2070,6 +2074,7 @@ static void CALLBACK threadpool_worker_proc( void *param ) TRACE( "starting worker thread for pool %p\n", pool ); RtlEnterCriticalSection( &pool->cs ); + pool->num_busy_workers--; for (;;) { while ((ptr = list_head( &pool->pool ))) @@ -2412,6 +2417,7 @@ NTSTATUS WINAPI TpCallbackMayRunLong( TP_CALLBACK_INSTANCE *instance ) { interlocked_inc( &pool->refcount ); pool->num_workers++; + pool->num_busy_workers++; NtClose( thread ); } } @@ -2699,6 +2705,7 @@ BOOL WINAPI TpSetPoolMinThreads( TP_POOL *pool, DWORD minimum ) interlocked_inc( &this->refcount ); this->num_workers++; + this->num_busy_workers++; NtClose( thread ); }

1 0

Matteo Bruni : d3d9/tests: Fix caps check in texdepth_test().
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: 149b1549be7c70683ba76a71a1072801d4f40d0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=149b1549be7c70683ba76a71a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jul 28 23:14:35 2015 +0200 d3d9/tests: Fix caps check in texdepth_test(). --- dlls/d3d9/tests/visual.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 67e0733..df29221 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5331,9 +5331,9 @@ static void texdepth_test(void) hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); - if (caps.PixelShaderVersion < D3DPS_VERSION(1, 1)) + if (caps.PixelShaderVersion < D3DPS_VERSION(1, 4)) { - skip("No ps_1_1 support, skipping tests.\n"); + skip("No ps_1_4 support, skipping tests.\n"); IDirect3DDevice9_Release(device); goto done; }

1 0

Matteo Bruni : d3d9/tests: Don' t call SetVertexShaderConstantF if vertex shaders aren't supported.
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: 68e2503965fca947330b3c5dcec21784dfb6770a URL: http://source.winehq.org/git/wine.git/?a=commit;h=68e2503965fca947330b3c5dc… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jul 28 23:14:36 2015 +0200 d3d9/tests: Don't call SetVertexShaderConstantF if vertex shaders aren't supported. Also slightly change attenuation factors to try to stay away from the (possible) implementation max size of 64. --- dlls/d3d9/tests/visual.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index df29221..13cc27c 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10143,7 +10143,7 @@ static BOOL point_match(IDirect3DDevice9 *device, UINT x, UINT y, UINT r) static void pointsize_test(void) { - static const float a = 0.5f, b = 0.5f, c = 0.5f; + static const float a = 1.0f, b = 1.0f, c = 1.0f; float ptsize, ptsizemax_orig, ptsizemin_orig; IDirect3DSurface9 *rt, *backbuffer; IDirect3DTexture9 *tex1, *tex2; @@ -10315,17 +10315,17 @@ static void pointsize_test(void) } test_setups[] = { - {&novs, &nops, D3DFVF_XYZ, 32, 62, FALSE, FALSE}, + {&novs, &nops, D3DFVF_XYZ, 32, 45, FALSE, FALSE}, {&vs1, &ps1, D3DFVF_XYZ, 32, 32, FALSE, FALSE}, - {&novs, &ps1, D3DFVF_XYZ, 32, 62, FALSE, FALSE}, + {&novs, &ps1, D3DFVF_XYZ, 32, 45, FALSE, FALSE}, {&vs1, &nops, D3DFVF_XYZ, 32, 32, FALSE, FALSE}, - {&novs, &ps2, D3DFVF_XYZ, 32, 62, FALSE, TRUE}, - {&novs, &ps2_zw, D3DFVF_XYZ, 32, 62, TRUE, FALSE}, + {&novs, &ps2, D3DFVF_XYZ, 32, 45, FALSE, TRUE}, + {&novs, &ps2_zw, D3DFVF_XYZ, 32, 45, TRUE, FALSE}, {&vs1, &ps2, D3DFVF_XYZ, 32, 32, FALSE, TRUE}, {&vs1, &ps2_zw, D3DFVF_XYZ, 32, 32, TRUE, FALSE}, {&vs3, &ps3, D3DFVF_XYZ, 32, 32, FALSE, TRUE}, {&vs3, &ps3_zw, D3DFVF_XYZ, 32, 32, TRUE, FALSE}, - {&novs, &nops, D3DFVF_XYZ | D3DFVF_PSIZE, 48, 48, FALSE, FALSE}, + {&novs, &nops, D3DFVF_XYZ | D3DFVF_PSIZE, 48, 33, FALSE, FALSE}, {&vs1_psize, &ps1, D3DFVF_XYZ | D3DFVF_PSIZE, 48, 24, FALSE, FALSE}, {&vs3_psize, &ps3, D3DFVF_XYZ | D3DFVF_PSIZE, 48, 24, FALSE, TRUE}, }; @@ -10564,8 +10564,11 @@ static void pointsize_test(void) ok(SUCCEEDED(hr), "Failed setting point scale attenuation coefficient, hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_POINTSCALE_C, *(DWORD *)&c); ok(SUCCEEDED(hr), "Failed setting point scale attenuation coefficient, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 0, &S(U(matrix))._11, 4); - ok(SUCCEEDED(hr), "Failed to set vertex shader constants, hr %#x.\n", hr); + if (caps.VertexShaderVersion >= D3DVS_VERSION(1, 1)) + { + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 0, &S(U(matrix))._11, 4); + ok(SUCCEEDED(hr), "Failed to set vertex shader constants, hr %#x.\n", hr); + } if (caps.MaxPointSize < 63.0f) {

1 0