December 2019 - Wine-commits

Alexandre Julliard : server: Add status code for ELOOP error.
by Alexandre Julliard 11 Dec '19

11 Dec '19

Module: wine Branch: master Commit: b851f1ca2bb488d5f957b27abf59680b0adea2ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=b851f1ca2bb488d5f957b27a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 11 10:28:49 2019 +0100 server: Add status code for ELOOP error. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/file.c | 1 + server/trace.c | 1 + 2 files changed, 2 insertions(+) diff --git a/server/file.c b/server/file.c index 4f34857514..71b84486b0 100644 --- a/server/file.c +++ b/server/file.c @@ -678,6 +678,7 @@ void file_set_error(void) case ENODEV: set_error( STATUS_NO_SUCH_DEVICE ); break; case ENXIO: set_error( STATUS_NO_SUCH_DEVICE ); break; case EXDEV: set_error( STATUS_NOT_SAME_DEVICE ); break; + case ELOOP: set_error( STATUS_REPARSE_POINT_NOT_RESOLVED ); break; #ifdef EOVERFLOW case EOVERFLOW: set_error( STATUS_INVALID_PARAMETER ); break; #endif diff --git a/server/trace.c b/server/trace.c index 411369a4f6..5b1d3ddea9 100644 --- a/server/trace.c +++ b/server/trace.c @@ -5619,6 +5619,7 @@ static const struct { "PROCESS_IN_JOB", STATUS_PROCESS_IN_JOB }, { "PROCESS_IS_TERMINATING", STATUS_PROCESS_IS_TERMINATING }, { "PROCESS_NOT_IN_JOB", STATUS_PROCESS_NOT_IN_JOB }, + { "REPARSE_POINT_NOT_RESOLVED", STATUS_REPARSE_POINT_NOT_RESOLVED }, { "SECTION_TOO_BIG", STATUS_SECTION_TOO_BIG }, { "SEMAPHORE_LIMIT_EXCEEDED", STATUS_SEMAPHORE_LIMIT_EXCEEDED }, { "SHARING_VIOLATION", STATUS_SHARING_VIOLATION },

1 0

Alexandre Julliard : ntdll: Add status code for ELOOP error.
by Alexandre Julliard 11 Dec '19

11 Dec '19

Module: wine Branch: master Commit: 6731f33d40e3347f7e11614fa1f1be845916456b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6731f33d40e3347f7e11614f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 11 10:28:59 2019 +0100 ntdll: Add status code for ELOOP error. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index dd6d1341b0..a65703d6f9 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -495,6 +495,7 @@ NTSTATUS FILE_GetNtStatus(void) case ECONNRESET:return STATUS_PIPE_DISCONNECTED; case EFAULT: return STATUS_ACCESS_VIOLATION; case ESPIPE: return STATUS_ILLEGAL_FUNCTION; + case ELOOP: return STATUS_REPARSE_POINT_NOT_RESOLVED; #ifdef ETIME /* Missing on FreeBSD */ case ETIME: return STATUS_IO_TIMEOUT; #endif

1 0

Alexandre Julliard : kernel32: Move FindFirst/NextFile functions to kernelbase.
by Alexandre Julliard 11 Dec '19

11 Dec '19

Module: wine Branch: master Commit: 9b0877db4ada321b0f8a93f0620a7a4fbdae29f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b0877db4ada321b0f8a93f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 11 10:48:34 2019 +0100 kernel32: Move FindFirst/NextFile functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 473 ---------------------------------------- dlls/kernel32/kernel32.spec | 14 +- dlls/kernelbase/file.c | 400 +++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 14 +- 4 files changed, 414 insertions(+), 487 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9b0877db4ada321b0f8a…

1 0

Jacek Caban : winnt.h: Add missing NTSYSAPI attributes.
by Alexandre Julliard 11 Dec '19

11 Dec '19

Module: wine Branch: master Commit: 7ceca2183508a5d61d1a309b5e69405dabccde7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ceca2183508a5d61d1a309b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 11 14:30:53 2019 +0100 winnt.h: Add missing NTSYSAPI attributes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index d18b2e03b4..1db7fdd28e 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1262,7 +1262,7 @@ typedef struct _DISPATCHER_CONTEXT typedef LONG (CALLBACK *PEXCEPTION_FILTER)(struct _EXCEPTION_POINTERS*,PVOID); typedef void (CALLBACK *PTERMINATION_HANDLER)(BOOLEAN,PVOID); -PVOID WINAPI RtlVirtualUnwind(ULONG,ULONG64,ULONG64,RUNTIME_FUNCTION*,CONTEXT*,PVOID*,ULONG64*,KNONVOLATILE_CONTEXT_POINTERS*); +NTSYSAPI PVOID WINAPI RtlVirtualUnwind(ULONG,ULONG64,ULONG64,RUNTIME_FUNCTION*,CONTEXT*,PVOID*,ULONG64*,KNONVOLATILE_CONTEXT_POINTERS*); #define UNW_FLAG_NHANDLER 0 #define UNW_FLAG_EHANDLER 1 @@ -1580,7 +1580,7 @@ typedef struct _KNONVOLATILE_CONTEXT_POINTERS PULONGLONG Cflag; } KNONVOLATILE_CONTEXT_POINTERS, *PKNONVOLATILE_CONTEXT_POINTERS; -ULONGLONG WINAPI RtlVirtualUnwind(ULONGLONG,ULONGLONG,RUNTIME_FUNCTION*,CONTEXT*,BOOLEAN*,FRAME_POINTERS*,KNONVOLATILE_CONTEXT_POINTERS*); +NTSYSAPI ULONGLONG WINAPI RtlVirtualUnwind(ULONGLONG,ULONGLONG,RUNTIME_FUNCTION*,CONTEXT*,BOOLEAN*,FRAME_POINTERS*,KNONVOLATILE_CONTEXT_POINTERS*); #endif /* __ia64__ */ @@ -1829,7 +1829,7 @@ typedef struct _DISPATCHER_CONTEXT typedef LONG (CALLBACK *PEXCEPTION_FILTER)(struct _EXCEPTION_POINTERS*,DWORD); typedef void (CALLBACK *PTERMINATION_HANDLER)(BOOLEAN,DWORD); -PVOID WINAPI RtlVirtualUnwind(DWORD,DWORD,DWORD,RUNTIME_FUNCTION*,CONTEXT*,PVOID*,DWORD*,KNONVOLATILE_CONTEXT_POINTERS*); +NTSYSAPI PVOID WINAPI RtlVirtualUnwind(DWORD,DWORD,DWORD,RUNTIME_FUNCTION*,CONTEXT*,PVOID*,DWORD*,KNONVOLATILE_CONTEXT_POINTERS*); #define UNW_FLAG_NHANDLER 0 #define UNW_FLAG_EHANDLER 1 @@ -2007,7 +2007,7 @@ typedef struct _DISPATCHER_CONTEXT typedef LONG (CALLBACK *PEXCEPTION_FILTER)(struct _EXCEPTION_POINTERS*,DWORD64); typedef void (CALLBACK *PTERMINATION_HANDLER)(BOOLEAN,DWORD64); -PVOID WINAPI RtlVirtualUnwind(DWORD,ULONG_PTR,ULONG_PTR,RUNTIME_FUNCTION*,CONTEXT*,PVOID*,ULONG_PTR*,KNONVOLATILE_CONTEXT_POINTERS*); +NTSYSAPI PVOID WINAPI RtlVirtualUnwind(DWORD,ULONG_PTR,ULONG_PTR,RUNTIME_FUNCTION*,CONTEXT*,PVOID*,ULONG_PTR*,KNONVOLATILE_CONTEXT_POINTERS*); #define UNW_FLAG_NHANDLER 0 #define UNW_FLAG_EHANDLER 1 @@ -2326,14 +2326,14 @@ typedef struct _WOW64_CONTEXT typedef PRUNTIME_FUNCTION (CALLBACK *PGET_RUNTIME_FUNCTION_CALLBACK)(DWORD_PTR,PVOID); -BOOLEAN CDECL RtlAddFunctionTable(RUNTIME_FUNCTION*,DWORD,DWORD_PTR); -DWORD WINAPI RtlAddGrowableFunctionTable(void**,PRUNTIME_FUNCTION,DWORD,DWORD,ULONG_PTR,ULONG_PTR); -BOOLEAN CDECL RtlDeleteFunctionTable(RUNTIME_FUNCTION*); -void WINAPI RtlDeleteGrowableFunctionTable(void*); -void WINAPI RtlGrowFunctionTable(void*,DWORD); -BOOLEAN CDECL RtlInstallFunctionTableCallback(DWORD_PTR,DWORD_PTR,DWORD,PGET_RUNTIME_FUNCTION_CALLBACK,PVOID,PCWSTR); -PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry(DWORD_PTR,DWORD_PTR*,UNWIND_HISTORY_TABLE*); -void WINAPI RtlUnwindEx(PVOID,PVOID,struct _EXCEPTION_RECORD*,PVOID,CONTEXT*,UNWIND_HISTORY_TABLE*); +NTSYSAPI BOOLEAN CDECL RtlAddFunctionTable(RUNTIME_FUNCTION*,DWORD,DWORD_PTR); +NTSYSAPI DWORD WINAPI RtlAddGrowableFunctionTable(void**,PRUNTIME_FUNCTION,DWORD,DWORD,ULONG_PTR,ULONG_PTR); +NTSYSAPI BOOLEAN CDECL RtlDeleteFunctionTable(RUNTIME_FUNCTION*); +NTSYSAPI void WINAPI RtlDeleteGrowableFunctionTable(void*); +NTSYSAPI void WINAPI RtlGrowFunctionTable(void*,DWORD); +NTSYSAPI BOOLEAN CDECL RtlInstallFunctionTableCallback(DWORD_PTR,DWORD_PTR,DWORD,PGET_RUNTIME_FUNCTION_CALLBACK,PVOID,PCWSTR); +NTSYSAPI PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry(DWORD_PTR,DWORD_PTR*,UNWIND_HISTORY_TABLE*); +NTSYSAPI void WINAPI RtlUnwindEx(PVOID,PVOID,struct _EXCEPTION_RECORD*,PVOID,CONTEXT*,UNWIND_HISTORY_TABLE*); #endif /*

1 0

Nikolay Sivov : user32/listbox: Scroll to specified caret index.
by Alexandre Julliard 11 Dec '19

11 Dec '19

Module: wine Branch: master Commit: b37b3f00a646d3836a4a26398b02a95612340699 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b37b3f00a646d3836a4a2639… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 11 15:17:49 2019 +0300 user32/listbox: Scroll to specified caret index. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 3949610e50..95f6a23a28 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -1473,19 +1473,23 @@ static void LISTBOX_MakeItemVisible( LB_DESCR *descr, INT index, BOOL fully ) */ static LRESULT LISTBOX_SetCaretIndex( LB_DESCR *descr, INT index, BOOL fully_visible ) { - INT oldfocus = descr->focus_item; + BOOL focus_changed = descr->focus_item != index; - TRACE("old focus %d, index %d\n", oldfocus, index); + TRACE("old focus %d, index %d\n", descr->focus_item, index); if (descr->style & LBS_NOSEL) return LB_ERR; if ((index < 0) || (index >= descr->nb_items)) return LB_ERR; - if (index == oldfocus) return LB_OKAY; - LISTBOX_DrawFocusRect( descr, FALSE ); - descr->focus_item = index; + if (focus_changed) + { + LISTBOX_DrawFocusRect( descr, FALSE ); + descr->focus_item = index; + } LISTBOX_MakeItemVisible( descr, index, fully_visible ); - LISTBOX_DrawFocusRect( descr, TRUE ); + + if (focus_changed) + LISTBOX_DrawFocusRect( descr, TRUE ); return LB_OKAY; }

1 0

Francois Gouget : winex11.drv: Fix the spelling of a WARN() message.
by Alexandre Julliard 11 Dec '19

11 Dec '19

Module: wine Branch: master Commit: aee91dc4ac08428e74fbd21f97438db38f84dbe5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aee91dc4ac08428e74fbd21f… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 11 02:56:53 2019 +0100 winex11.drv: Fix the spelling of a WARN() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xrandr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 5616857347..930e0282be 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -622,7 +622,7 @@ fallback: if (output_info) pXRRFreeOutputInfo( output_info ); - WARN("Primary is set to a disconneted XRandR output.\n"); + WARN("Primary is set to a disconnected XRandR output.\n"); for (i = 0; i < resources->ncrtc; ++i) { crtc_info = pXRRGetCrtcInfo( gdi_display, resources, resources->crtcs[i] );

1 0

Francois Gouget : dmime/tests: Fix the spelling of a performance ok() message.
by Alexandre Julliard 11 Dec '19

11 Dec '19

Module: wine Branch: master Commit: a83cbafce5ed064957fd9a62b7294922303b20bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=a83cbafce5ed064957fd9a62… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 11 02:57:11 2019 +0100 dmime/tests: Fix the spelling of a performance ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tests/performance.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index 073625f04b..1d17e5200e 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -472,7 +472,7 @@ static void test_notification_type(void) IDirectMusicPerformance8_FreePMsg(perf, (DMUS_PMSG*)msg); } todo_wine ok(prime_segment8 == segment8, "Wrong end segment\n"); - todo_wine ok(found_end, "Didn't recieve DMUS_NOTIFICATION_SEGEND message\n"); + todo_wine ok(found_end, "Didn't receive DMUS_NOTIFICATION_SEGEND message\n"); CloseHandle(messages);

1 0

Francois Gouget : testbot: Keep the StepTask methods in sync with the Step/Task ones.
by Alexandre Julliard 11 Dec '19

11 Dec '19

Module: tools Branch: master Commit: 3c45669b386688ee971341f0e64115b944776d4b URL: https://source.winehq.org/git/tools.git/?a=commit;h=3c45669b386688ee971341f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 10 10:30:55 2019 +0100 testbot: Keep the StepTask methods in sync with the Step/Task ones. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/StepsTasks.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 19bedaa..463f150 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -33,6 +33,7 @@ use WineTestBot::Config; use WineTestBot::Missions; +# Keep in sync with WineTestBot::Step::GetDir() sub GetStepDir($) { my ($self) = @_; @@ -40,7 +41,7 @@ sub GetStepDir($) return "$DataDir/jobs/$JobId/". $self->StepNo; } -# See WineTestBot::Step::GetFullFileName() +# Keep in sync with WineTestBot::Step::GetFullFileName() sub GetFullFileName($;$) { my ($self, $FileName) = @_; @@ -59,6 +60,7 @@ sub GetFullFileName($;$) return $Path . $FileName; } +# Keep in sync with WineTestBot::Task::GetDir() sub GetTaskDir($) { my ($self) = @_;

1 0

Francois Gouget : testbot/WineSendLog: Skip checking for new errors if there are no errors.
by Alexandre Julliard 11 Dec '19

11 Dec '19

Module: tools Branch: master Commit: 98c234f57c021abda4f07af80549f638e1188744 URL: https://source.winehq.org/git/tools.git/?a=commit;h=98c234f57c021abda4f07af… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 10 10:35:19 2019 +0100 testbot/WineSendLog: Skip checking for new errors if there are no errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 95cc036..98bfc4c 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -287,6 +287,9 @@ EOF foreach my $LogName (@{$JobErrors->{$Key}->{LogNames}}) { my $LogErrors = $JobErrors->{$Key}->{$LogName}; + # Skip if there are no errors + next if (!$LogErrors->{Groups}); + my $RefFileName = $StepTask->GetFullFileName($StepTask->VM->Name ."_$LogName"); my ($NewGroups, $NewErrors, $_NewIndices) = GetNewLogErrors($RefFileName, $LogErrors->{Groups}, $LogErrors->{Errors}); if (!$NewGroups)

1 0

Akihiro Sagawa : d3d8: Support texture dirty regions.
by Alexandre Julliard 10 Dec '19

10 Dec '19

Module: wine Branch: master Commit: 513d3e1376761889a792719d4dccaf41bc6d2829 URL: https://source.winehq.org/git/wine.git/?a=commit;h=513d3e1376761889a792719d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Dec 10 21:44:17 2019 +0330 d3d8: Support texture dirty regions. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 12 ++++++------ dlls/d3d8/texture.c | 12 +++++++++++- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 4477184b57..ab194b9ced 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5529,7 +5529,7 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x00ff0000, 1), + ok(color_match(color, 0x00ff0000, 1), "Expected color 0x00ff0000, got 0x%08x.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); @@ -5542,7 +5542,7 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x00ff0000, 1), + ok(color_match(color, 0x00ff0000, 1), "Expected color 0x00ff0000, got 0x%08x.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); @@ -5554,7 +5554,7 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x00ff0000, 1), + ok(color_match(color, 0x00ff0000, 1), "Expected color 0x00ff0000, got 0x%08x.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); @@ -5571,7 +5571,7 @@ static void add_dirty_rect_test(void) ok(color_match(color, 0x0000ff00, 1), "Expected color 0x0000ff00, got 0x%08x.\n", color); color = getPixelColor(device, 1, 1); - todo_wine ok(color_match(color, 0x00ff0000, 1), + ok(color_match(color, 0x00ff0000, 1), "Expected color 0x00ff0000, got 0x%08x.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); @@ -5593,7 +5593,7 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x0000ff00, 1), + ok(color_match(color, 0x0000ff00, 1), "Expected color 0x0000ff00, got 0x%08x.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); @@ -5605,7 +5605,7 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x0000ff00, 1), + ok(color_match(color, 0x0000ff00, 1), "Expected color 0x0000ff00, got 0x%08x.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index e34ae8a9c1..c82a75d87a 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1124,6 +1124,9 @@ HRESULT texture_init(struct d3d8_texture *texture, struct d3d8_device *device, if (!levels) levels = wined3d_log2i(max(width, height)) + 1; + if (pool == D3DPOOL_SYSTEMMEM) + flags |= WINED3D_TEXTURE_CREATE_RECORD_DIRTY_REGIONS; + wined3d_mutex_lock(); hr = wined3d_texture_create(device->wined3d_device, &desc, 1, levels, flags, NULL, texture, &d3d8_texture_wined3d_parent_ops, &texture->wined3d_texture); @@ -1175,6 +1178,9 @@ HRESULT cubetexture_init(struct d3d8_texture *texture, struct d3d8_device *devic if (!levels) levels = wined3d_log2i(edge_length) + 1; + if (pool == D3DPOOL_SYSTEMMEM) + flags |= WINED3D_TEXTURE_CREATE_RECORD_DIRTY_REGIONS; + wined3d_mutex_lock(); hr = wined3d_texture_create(device->wined3d_device, &desc, 6, levels, flags, NULL, texture, &d3d8_texture_wined3d_parent_ops, &texture->wined3d_texture); @@ -1195,6 +1201,7 @@ HRESULT volumetexture_init(struct d3d8_texture *texture, struct d3d8_device *dev UINT width, UINT height, UINT depth, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool) { struct wined3d_resource_desc desc; + DWORD flags = 0; HRESULT hr; /* In d3d8, 3D textures can't be used as rendertarget or depth/stencil buffer. */ @@ -1228,8 +1235,11 @@ HRESULT volumetexture_init(struct d3d8_texture *texture, struct d3d8_device *dev if (!levels) levels = wined3d_log2i(max(max(width, height), depth)) + 1; + if (pool == D3DPOOL_SYSTEMMEM) + flags |= WINED3D_TEXTURE_CREATE_RECORD_DIRTY_REGIONS; + wined3d_mutex_lock(); - hr = wined3d_texture_create(device->wined3d_device, &desc, 1, levels, 0, + hr = wined3d_texture_create(device->wined3d_device, &desc, 1, levels, flags, NULL, texture, &d3d8_texture_wined3d_parent_ops, &texture->wined3d_texture); wined3d_mutex_unlock(); if (FAILED(hr))

1 0