- wine-devel - winehq.org

[PATCH 3/4] ntdll: Use syscall frame for handling x86 YMM context in NtSetContextThread.
by Jacek Caban 02 Mar '21

02 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/signal_i386.c | 61 ++++++++++++++--------------------- 1 file changed, 25 insertions(+), 36 deletions(-)

1 0

[PATCH 2/4] ntdll: Use syscall frame for x86 YMM context in NtGetContextThread.
by Jacek Caban 02 Mar '21

02 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/signal_i386.c | 81 +++++++++++------------------------ 1 file changed, 25 insertions(+), 56 deletions(-)

1 0

[PATCH 1/4] ntdll: Store x86 YMM context insyscall dispatcher.
by Jacek Caban 02 Mar '21

02 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/signal_i386.c | 14 ++++++++++++-- tools/winebuild/import.c | 18 +++++++++++++++--- 2 files changed, 27 insertions(+), 5 deletions(-)

1 0

[PATCH v2] kernelbase: Fix GetFileVersionInfo*() crashes with malformed resources.
by Arkadiusz Hiler 02 Mar '21

02 Mar '21

Some Unity games ship with an encrypted Assembly-CSharp.dll, including the resources directory, yet the engine still calls GetFileVersionInfoSizeW() on those files. This may results in a page fault when trying to find the version resource and takes the whole process down. The change fixes crashes when launching Home Behind 2 and Crown Trick. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50075 Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/kernelbase/version.c | … [View More]28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c index 58c49aa148b..04c15372c97 100644 --- a/dlls/kernelbase/version.c +++ b/dlls/kernelbase/version.c @@ -240,19 +240,29 @@ done: * Copied from loader/pe_resource.c */ static const IMAGE_RESOURCE_DIRECTORY *find_entry_by_id( const IMAGE_RESOURCE_DIRECTORY *dir, - WORD id, const void *root ) + WORD id, const void *root, + DWORD root_size ) { const IMAGE_RESOURCE_DIRECTORY_ENTRY *entry; int min, max, pos; + DWORD offset; entry = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(dir + 1); min = dir->NumberOfNamedEntries; max = min + dir->NumberOfIdEntries - 1; + + if (max >= (root_size - ((INT_PTR)dir - (INT_PTR)root) - sizeof(*dir)) / sizeof(*entry)) + return NULL; + while (min <= max) { pos = (min + max) / 2; if (entry[pos].u.Id == id) - return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry[pos].u2.s2.OffsetToDirectory); + { + offset = entry[pos].u2.s2.OffsetToDirectory; + if (offset >= root_size) return NULL; + return (const IMAGE_RESOURCE_DIRECTORY *)((char *)root + offset); + } if (entry[pos].u.Id > id) max = pos - 1; else min = pos + 1; } @@ -294,7 +304,8 @@ static inline int push_language( WORD *list, int pos, WORD lang ) * find_entry_language */ static const IMAGE_RESOURCE_DIRECTORY *find_entry_language( const IMAGE_RESOURCE_DIRECTORY *dir, - const void *root, DWORD flags ) + const void *root, DWORD root_size, + DWORD flags ) { const IMAGE_RESOURCE_DIRECTORY *ret; WORD list[9]; @@ -319,7 +330,7 @@ static const IMAGE_RESOURCE_DIRECTORY *find_entry_language( const IMAGE_RESOURCE pos = push_language( list, pos, MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ) ); } - for (i = 0; i < pos; i++) if ((ret = find_entry_by_id( dir, list[i], root ))) return ret; + for (i = 0; i < pos; i++) if ((ret = find_entry_by_id( dir, list[i], root, root_size ))) return ret; return find_entry_default( dir, root ); } @@ -413,7 +424,7 @@ static BOOL find_pe_resource( HANDLE handle, DWORD *resLen, DWORD *resOff, DWORD PIMAGE_DATA_DIRECTORY resDataDir; PIMAGE_SECTION_HEADER sections; LPBYTE resSection; - DWORD len, section_size, data_size; + DWORD len, section_size, data_size, resDirSize; const void *resDir; const IMAGE_RESOURCE_DIRECTORY *resPtr; const IMAGE_RESOURCE_DATA_ENTRY *resData; @@ -486,21 +497,22 @@ static BOOL find_pe_resource( HANDLE handle, DWORD *resLen, DWORD *resOff, DWORD /* Find resource */ resDir = resSection + (resDataDir->VirtualAddress - sections[i].VirtualAddress); + resDirSize = section_size - (resDataDir->VirtualAddress - sections[i].VirtualAddress); resPtr = resDir; - resPtr = find_entry_by_id( resPtr, VS_FILE_INFO, resDir ); + resPtr = find_entry_by_id( resPtr, VS_FILE_INFO, resDir, resDirSize ); if ( !resPtr ) { TRACE("No typeid entry found\n" ); goto done; } - resPtr = find_entry_by_id( resPtr, VS_VERSION_INFO, resDir ); + resPtr = find_entry_by_id( resPtr, VS_VERSION_INFO, resDir, resDirSize ); if ( !resPtr ) { TRACE("No resid entry found\n" ); goto done; } - resPtr = find_entry_language( resPtr, resDir, flags ); + resPtr = find_entry_language( resPtr, resDir, resDirSize, flags ); if ( !resPtr ) { TRACE("No default language entry found\n" ); -- 2.30.1 [View Less]

1 0

[PATCH] d3dx9: Implement D3DXComputeTangent().
by Zebediah Figura 02 Mar '21

02 Mar '21

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41697 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_25/d3dx9_25.spec | 2 +- dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_29/d3dx9_29.spec | 2 +- dlls/… [View More]d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_31/d3dx9_31.spec | 2 +- dlls/d3dx9_32/d3dx9_32.spec | 2 +- dlls/d3dx9_33/d3dx9_33.spec | 2 +- dlls/d3dx9_34/d3dx9_34.spec | 2 +- dlls/d3dx9_35/d3dx9_35.spec | 2 +- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 16 ++++++++++++++++ dlls/d3dx9_37/d3dx9_37.spec | 2 +- dlls/d3dx9_38/d3dx9_38.spec | 2 +- dlls/d3dx9_39/d3dx9_39.spec | 2 +- dlls/d3dx9_40/d3dx9_40.spec | 2 +- dlls/d3dx9_41/d3dx9_41.spec | 2 +- dlls/d3dx9_42/d3dx9_42.spec | 2 +- dlls/d3dx9_43/d3dx9_43.spec | 2 +- 21 files changed, 36 insertions(+), 20 deletions(-) diff --git a/dlls/d3dx9_24/d3dx9_24.spec b/dlls/d3dx9_24/d3dx9_24.spec index d617d766f85..bf7ec17e597 100644 --- a/dlls/d3dx9_24/d3dx9_24.spec +++ b/dlls/d3dx9_24/d3dx9_24.spec @@ -20,7 +20,7 @@ @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dlls/d3dx9_25/d3dx9_25.spec b/dlls/d3dx9_25/d3dx9_25.spec index f13923dcb3a..3016ea8bee9 100644 --- a/dlls/d3dx9_25/d3dx9_25.spec +++ b/dlls/d3dx9_25/d3dx9_25.spec @@ -20,7 +20,7 @@ @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dlls/d3dx9_26/d3dx9_26.spec b/dlls/d3dx9_26/d3dx9_26.spec index 286a9a094a0..1f3af10c1bb 100644 --- a/dlls/d3dx9_26/d3dx9_26.spec +++ b/dlls/d3dx9_26/d3dx9_26.spec @@ -24,7 +24,7 @@ @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dlls/d3dx9_27/d3dx9_27.spec b/dlls/d3dx9_27/d3dx9_27.spec index 286a9a094a0..1f3af10c1bb 100644 --- a/dlls/d3dx9_27/d3dx9_27.spec +++ b/dlls/d3dx9_27/d3dx9_27.spec @@ -24,7 +24,7 @@ @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dlls/d3dx9_28/d3dx9_28.spec b/dlls/d3dx9_28/d3dx9_28.spec index 06ced20df61..33703aa9687 100644 --- a/dlls/d3dx9_28/d3dx9_28.spec +++ b/dlls/d3dx9_28/d3dx9_28.spec @@ -24,7 +24,7 @@ @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dlls/d3dx9_29/d3dx9_29.spec b/dlls/d3dx9_29/d3dx9_29.spec index 06ced20df61..33703aa9687 100644 --- a/dlls/d3dx9_29/d3dx9_29.spec +++ b/dlls/d3dx9_29/d3dx9_29.spec @@ -24,7 +24,7 @@ @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dlls/d3dx9_30/d3dx9_30.spec b/dlls/d3dx9_30/d3dx9_30.spec index 06ced20df61..33703aa9687 100644 --- a/dlls/d3dx9_30/d3dx9_30.spec +++ b/dlls/d3dx9_30/d3dx9_30.spec @@ -24,7 +24,7 @@ @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dlls/d3dx9_31/d3dx9_31.spec b/dlls/d3dx9_31/d3dx9_31.spec index c9aca309a35..28727460d51 100644 --- a/dlls/d3dx9_31/d3dx9_31.spec +++ b/dlls/d3dx9_31/d3dx9_31.spec @@ -24,7 +24,7 @@ @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dlls/d3dx9_32/d3dx9_32.spec b/dlls/d3dx9_32/d3dx9_32.spec index f541f6f2ef1..f3ea989707b 100644 --- a/dlls/d3dx9_32/d3dx9_32.spec +++ b/dlls/d3dx9_32/d3dx9_32.spec @@ -24,7 +24,7 @@ @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dlls/d3dx9_33/d3dx9_33.spec b/dlls/d3dx9_33/d3dx9_33.spec index f541f6f2ef1..f3ea989707b 100644 --- a/dlls/d3dx9_33/d3dx9_33.spec +++ b/dlls/d3dx9_33/d3dx9_33.spec @@ -24,7 +24,7 @@ @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dlls/d3dx9_34/d3dx9_34.spec b/dlls/d3dx9_34/d3dx9_34.spec index f541f6f2ef1..f3ea989707b 100644 --- a/dlls/d3dx9_34/d3dx9_34.spec +++ b/dlls/d3dx9_34/d3dx9_34.spec @@ -24,7 +24,7 @@ @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dlls/d3dx9_35/d3dx9_35.spec b/dlls/d3dx9_35/d3dx9_35.spec index f541f6f2ef1..f3ea989707b 100644 --- a/dlls/d3dx9_35/d3dx9_35.spec +++ b/dlls/d3dx9_35/d3dx9_35.spec @@ -24,7 +24,7 @@ @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index e1f44261610..093cea01763 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -24,7 +24,7 @@ @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 8f7c926c32a..a8b7b5e26e8 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -7507,6 +7507,22 @@ done: return hr; } +/************************************************************************* + * D3DXComputeTangent (D3DX9_36.@) + */ +HRESULT WINAPI D3DXComputeTangent(ID3DXMesh *mesh, DWORD stage_idx, DWORD tangent_idx, + DWORD binorm_idx, DWORD wrap, const DWORD *adjacency) +{ + TRACE("mesh %p, stage_idx %d, tangent_idx %d, binorm_idx %d, wrap %d, adjacency %p.\n", + mesh, stage_idx, tangent_idx, binorm_idx, wrap, adjacency); + + return D3DXComputeTangentFrameEx(mesh, D3DDECLUSAGE_TEXCOORD, stage_idx, + (binorm_idx == D3DX_DEFAULT) ? D3DX_DEFAULT : D3DDECLUSAGE_BINORMAL, binorm_idx, + (tangent_idx == D3DX_DEFAULT) ? D3DX_DEFAULT : D3DDECLUSAGE_TANGENT, tangent_idx, D3DX_DEFAULT, 0, + (wrap ? D3DXTANGENT_WRAP_UV : 0) | D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_ORTHOGONALIZE_FROM_U, + adjacency, -1.01f, -0.01f, -1.01f, NULL, NULL); +} + /************************************************************************* * D3DXComputeNormals (D3DX9_36.@) */ diff --git a/dlls/d3dx9_37/d3dx9_37.spec b/dlls/d3dx9_37/d3dx9_37.spec index e1f44261610..093cea01763 100644 --- a/dlls/d3dx9_37/d3dx9_37.spec +++ b/dlls/d3dx9_37/d3dx9_37.spec @@ -24,7 +24,7 @@ @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dlls/d3dx9_38/d3dx9_38.spec b/dlls/d3dx9_38/d3dx9_38.spec index e1f44261610..093cea01763 100644 --- a/dlls/d3dx9_38/d3dx9_38.spec +++ b/dlls/d3dx9_38/d3dx9_38.spec @@ -24,7 +24,7 @@ @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dlls/d3dx9_39/d3dx9_39.spec b/dlls/d3dx9_39/d3dx9_39.spec index e1f44261610..093cea01763 100644 --- a/dlls/d3dx9_39/d3dx9_39.spec +++ b/dlls/d3dx9_39/d3dx9_39.spec @@ -24,7 +24,7 @@ @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dlls/d3dx9_40/d3dx9_40.spec b/dlls/d3dx9_40/d3dx9_40.spec index e1f44261610..093cea01763 100644 --- a/dlls/d3dx9_40/d3dx9_40.spec +++ b/dlls/d3dx9_40/d3dx9_40.spec @@ -24,7 +24,7 @@ @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dlls/d3dx9_41/d3dx9_41.spec b/dlls/d3dx9_41/d3dx9_41.spec index e1f44261610..093cea01763 100644 --- a/dlls/d3dx9_41/d3dx9_41.spec +++ b/dlls/d3dx9_41/d3dx9_41.spec @@ -24,7 +24,7 @@ @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dlls/d3dx9_42/d3dx9_42.spec b/dlls/d3dx9_42/d3dx9_42.spec index 0851945d36b..43c301763d9 100644 --- a/dlls/d3dx9_42/d3dx9_42.spec +++ b/dlls/d3dx9_42/d3dx9_42.spec @@ -24,7 +24,7 @@ @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dlls/d3dx9_43/d3dx9_43.spec b/dlls/d3dx9_43/d3dx9_43.spec index 0851945d36b..43c301763d9 100644 --- a/dlls/d3dx9_43/d3dx9_43.spec +++ b/dlls/d3dx9_43/d3dx9_43.spec @@ -24,7 +24,7 @@ @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) -- 2.20.1 [View Less]

3 2

[PATCH 1/2] reg/tests: Fix copy/paste typo in reg.exe availability check
by Hugh McMaster 02 Mar '21

02 Mar '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/tests/add.c | 2 +- programs/reg/tests/copy.c | 2 +- programs/reg/tests/export.c | 2 +- programs/reg/tests/import.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index bdfd429367c..bd0888ae831 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -630,7 +630,7 @@ START_TEST(add) DWORD r; if (!… [View More]

2 3

[tools] testbot/TestWTBS: Allow ignoring inherited error lists.
by Francois Gouget 02 Mar '21

02 Mar '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/tests/TestWTBS | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index e9fa98edc..81b56c470 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -678,6 +678,17 @@ Finally, note that while the error directives are inherited by subcategories, they are not merged. So if if both win and win32 have error-matching … [View More]

1 0

[tools] testbot/web: Use .errors files to highlight errors in full logs.
by Francois Gouget 02 Mar '21

02 Mar '21

Instead of relying on Get*LineCategory() to identify error lines and only using the .errors information to single out new errors; JobDetails now uses the .errors file for both and only uses Get*LineCategory() to highlight warnings, informational messages, etc. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/JobDetails.pl | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/… [View More]

1 0

[PATCH 1/4] msvcr120: Add fegetexceptflag.
by Daniel Lehman 02 Mar '21

02 Mar '21

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120/tests/msvcr120.c | 37 ++++++++++++++++++- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/math.c | 13 +++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- include/msvcrt/fenv.h | 3 ++ 7 files changed, 56 … [View More]insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 74d682b33bf..59b0c567216 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -89,7 +89,7 @@ @ cdecl exit(long) ucrtbase.exit @ stub feclearexcept @ cdecl fegetenv(ptr) ucrtbase.fegetenv -@ stub fegetexceptflag +@ cdecl fegetexceptflag(ptr long) ucrtbase.fegetexceptflag @ cdecl fegetround() ucrtbase.fegetround @ stub feholdexcept @ cdecl fesetenv(ptr) ucrtbase.fesetenv diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 0e1c7705166..776d701e780 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2145,7 +2145,7 @@ @ cdecl fdiml(double double) fdim @ stub feclearexcept @ cdecl fegetenv(ptr) -@ stub fegetexceptflag +@ cdecl fegetexceptflag(ptr long) @ cdecl fegetround() @ stub feholdexcept @ cdecl feof(ptr) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index e8ef2be3520..d6e93b97629 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -182,6 +182,7 @@ static int (CDECL *p_fegetenv)(fenv_t*); static int (CDECL *p_fesetenv)(const fenv_t*); static int (CDECL *p_fegetround)(void); static int (CDECL *p_fesetround)(int); +static int (CDECL *p_fegetexceptflag)(fexcept_t*,int); static int (CDECL *p__clearfp)(void); static _locale_t (__cdecl *p_wcreate_locale)(int, const wchar_t *); static void (__cdecl *p_free_locale)(_locale_t); @@ -257,6 +258,7 @@ static BOOL init(void) SET(p_fesetenv, "fesetenv"); SET(p_fegetround, "fegetround"); SET(p_fesetround, "fesetround"); + SET(p_fegetexceptflag, "fegetexceptflag"); SET(p__clearfp, "_clearfp"); SET(p_vsscanf, "vsscanf"); @@ -788,8 +790,25 @@ static void test_critical_section(void) static void test_feenv(void) { + static const struct { + unsigned long set; + unsigned long get; + fexcept_t expect; + } tests[] = { + { 0, 0, 0 }, + { FE_INEXACT, 0, 0 }, + { FE_INEXACT, FE_ALL_EXCEPT, FE_INEXACT }, + { FE_INEXACT, FE_INEXACT, FE_INEXACT }, + { FE_INEXACT, FE_OVERFLOW, 0 }, + { FE_ALL_EXCEPT, FE_ALL_EXCEPT, FE_ALL_EXCEPT }, + { FE_ALL_EXCEPT, FE_INEXACT, FE_INEXACT }, + { FE_ALL_EXCEPT, 0, 0 }, + { FE_ALL_EXCEPT, ~0, FE_ALL_EXCEPT }, + { FE_ALL_EXCEPT, ~FE_ALL_EXCEPT, 0 }, + }; fenv_t env, env2; - int ret; + fexcept_t except; + int i, ret; p__clearfp(); @@ -807,6 +826,22 @@ static void test_feenv(void) ok(!ret, "fesetenv returned %x\n", ret); ret = p_fegetround(); ok(ret == FE_TONEAREST, "Got unexpected round mode %#x.\n", ret); + + if(0) /* crashes on windows */ + p_fegetexceptflag(NULL, 0); + + for(i=0; i<ARRAY_SIZE(tests); i++) { + env._Fe_stat = tests[i].set; + ret = p_fesetenv(&env); + ok(!ret, "fesetenv returned %x\n", ret); + + except = ~0; + ret = p_fegetexceptflag(&except, tests[i].get); + ok(!ret, "fegetexceptflag returned %x.\n", ret); + ok(except == tests[i].expect, "expected %lx, got %lx\n", tests[i].expect, except); + } + + p__clearfp(); } static void test__wcreate_locale(void) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 05b8a97a084..a3be94e4a6c 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1811,7 +1811,7 @@ @ cdecl fdiml(double double) msvcr120.fdiml @ stub feclearexcept @ cdecl fegetenv(ptr) msvcr120.fegetenv -@ stub fegetexceptflag +@ cdecl fegetexceptflag(ptr long) msvcr120.fegetexceptflag @ cdecl fegetround() msvcr120.fegetround @ stub feholdexcept @ cdecl feof(ptr) msvcr120.feof diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index d6b0d9422e7..996059cc036 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2214,6 +2214,19 @@ int CDECL fegetenv(fenv_t *env) env->_Fe_stat = _statusfp(); return 0; } + +/********************************************************************* + * fegetexceptflag (MSVCR120.@) + */ +int CDECL fegetexceptflag(fexcept_t *status, int excepts) +{ + fenv_t env; + int rc; + + rc = fegetenv(&env); + *status = env._Fe_stat & excepts & FE_ALL_EXCEPT; + return rc; +} #endif #if _MSVCR_VER>=140 diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 0a8d74521f5..41b1b79896d 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2288,7 +2288,7 @@ @ cdecl fdiml(double double) fdim @ stub feclearexcept @ cdecl fegetenv(ptr) -@ stub fegetexceptflag +@ cdecl fegetexceptflag(ptr long) @ cdecl fegetround() @ stub feholdexcept @ cdecl feof(ptr) diff --git a/include/msvcrt/fenv.h b/include/msvcrt/fenv.h index 92b341bd46b..56db8ea28b8 100644 --- a/include/msvcrt/fenv.h +++ b/include/msvcrt/fenv.h @@ -30,8 +30,11 @@ typedef struct __msvcrt_ulong _Fe_stat; } fenv_t; +typedef __msvcrt_ulong fexcept_t; + _ACRTIMP int __cdecl fegetenv(fenv_t*); _ACRTIMP int __cdecl fesetenv(const fenv_t*); +_ACRTIMP int __cdecl fegetexceptflag(fexcept_t*, int); _ACRTIMP int __cdecl fegetround(void); _ACRTIMP int __cdecl fesetround(int); -- 2.25.1 [View Less]

3 9

[PATCH vkd3d v3 1/6] vkd3d-shader: Return a vkd3d_string_buffer from hlsl_type_to_string().
by Zebediah Figura 02 Mar '21

02 Mar '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 62 +++++++++++++----------- libs/vkd3d-shader/hlsl.h | 4 +- libs/vkd3d-shader/hlsl.y | 20 +++++--- libs/vkd3d-shader/vkd3d_shader_main.c | 60 +++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 11 +++++ 5 files changed, 120 insertions(+), 37 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index … [View More]52b3dd10..e2a77707 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -648,10 +648,10 @@ static int compare_function_decl_rb(const void *key, const struct rb_entry *entr return 0; } -char *hlsl_type_to_string(const struct hlsl_type *type) +struct vkd3d_string_buffer *hlsl_type_to_string(struct vkd3d_string_buffer_cache *string_buffers, + const struct hlsl_type *type) { - const char *name; - char *string; + struct vkd3d_string_buffer *string; static const char base_types[HLSL_TYPE_LAST_SCALAR + 1][7] = { @@ -663,66 +663,70 @@ char *hlsl_type_to_string(const struct hlsl_type *type) "bool", }; + if (!(string = vkd3d_string_buffer_get(string_buffers))) + return NULL; + if (type->name) - return vkd3d_strdup(type->name); + { + vkd3d_string_buffer_printf(string, "%s", type->name); + return string; + } switch (type->type) { case HLSL_CLASS_SCALAR: - return vkd3d_strdup(base_types[type->base_type]); + vkd3d_string_buffer_printf(string, "%s", base_types[type->base_type]); + return string; case HLSL_CLASS_VECTOR: - name = base_types[type->base_type]; - if ((string = malloc(strlen(name) + 2))) - sprintf(string, "%s%u", name, type->dimx); + vkd3d_string_buffer_printf(string, "%s%u", base_types[type->base_type], type->dimx); return string; case HLSL_CLASS_MATRIX: - name = base_types[type->base_type]; - if ((string = malloc(strlen(name) + 4))) - sprintf(string, "%s%ux%u", name, type->dimx, type->dimy); + vkd3d_string_buffer_printf(string, "%s%ux%u", base_types[type->base_type], type->dimx, type->dimy); return string; case HLSL_CLASS_ARRAY: { + struct vkd3d_string_buffer *inner_string; const struct hlsl_type *t; - char *inner_string; - size_t len = 1; for (t = type; t->type == HLSL_CLASS_ARRAY; t = t->e.array.type) - len += 14; - if (!(inner_string = hlsl_type_to_string(t))) - return NULL; - len += strlen(inner_string); + ; - if ((string = malloc(len))) + if ((inner_string = hlsl_type_to_string(string_buffers, t))) { - strcpy(string, inner_string); - for (t = type; t->type == HLSL_CLASS_ARRAY; t = t->e.array.type) - sprintf(string + strlen(string), "[%u]", t->e.array.elements_count); + vkd3d_string_buffer_printf(string, "%s", inner_string->buffer); + vkd3d_string_buffer_release(string_buffers, inner_string); } - vkd3d_free(inner_string); + for (t = type; t->type == HLSL_CLASS_ARRAY; t = t->e.array.type) + vkd3d_string_buffer_printf(string, "[%u]", t->e.array.elements_count); return string; } case HLSL_CLASS_STRUCT: - return vkd3d_strdup("<anonymous struct>"); + vkd3d_string_buffer_printf(string, "<anonymous struct>"); + return string; default: - return vkd3d_strdup("<unexpected type>"); + vkd3d_string_buffer_printf(string, "<unexpected type>"); + return string; } } const char *debug_hlsl_type(const struct hlsl_type *type) { + struct vkd3d_string_buffer_cache string_buffers; + struct vkd3d_string_buffer *string; const char *ret; - char *string; - if (!(string = hlsl_type_to_string(type))) + vkd3d_string_buffer_cache_init(&string_buffers); + if (!(string = hlsl_type_to_string(&string_buffers, type))) return NULL; - ret = vkd3d_dbg_sprintf("%s", string); - vkd3d_free(string); + ret = vkd3d_dbg_sprintf("%s", string->buffer); + vkd3d_string_buffer_release(&string_buffers, string); + vkd3d_string_buffer_cache_cleanup(&string_buffers); return ret; } @@ -1526,6 +1530,7 @@ static bool hlsl_ctx_init(struct hlsl_ctx *ctx, struct vkd3d_shader_message_cont ctx->source_files_count = 1; ctx->location.source_name = ctx->source_files[0]; ctx->location.line = ctx->location.column = 1; + vkd3d_string_buffer_cache_init(&ctx->string_buffers); ctx->matrix_majority = HLSL_COLUMN_MAJOR; @@ -1553,6 +1558,7 @@ static void hlsl_ctx_cleanup(struct hlsl_ctx *ctx) for (i = 0; i < ctx->source_files_count; ++i) vkd3d_free((void *)ctx->source_files[i]); vkd3d_free(ctx->source_files); + vkd3d_string_buffer_cache_cleanup(&ctx->string_buffers); rb_destroy(&ctx->functions, free_function_rb, NULL); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index a374f54a..5a0470b9 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -390,6 +390,7 @@ struct hlsl_ctx unsigned int source_files_count; struct vkd3d_shader_location location; struct vkd3d_shader_message_context *message_context; + struct vkd3d_string_buffer_cache string_buffers; bool failed; void *scanner; @@ -496,7 +497,8 @@ static inline void hlsl_src_remove(struct hlsl_src *src) const char *debug_hlsl_type(const struct hlsl_type *type) DECLSPEC_HIDDEN; -char *hlsl_type_to_string(const struct hlsl_type *type) DECLSPEC_HIDDEN; +struct vkd3d_string_buffer *hlsl_type_to_string(struct vkd3d_string_buffer_cache *string_buffers, + const struct hlsl_type *type) DECLSPEC_HIDDEN; char *hlsl_modifiers_to_string(unsigned int modifiers) DECLSPEC_HIDDEN; const char *hlsl_node_type_to_string(enum hlsl_ir_node_type type) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index ea640b94..1fb1b7f3 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -255,13 +255,15 @@ static struct hlsl_ir_node *add_implicit_conversion(struct hlsl_ctx *ctx, struct if (!implicit_compatible_data_types(src_type, dst_type)) { - char *src_string = hlsl_type_to_string(src_type), *dst_string = hlsl_type_to_string(dst_type); + struct vkd3d_string_buffer *src_string, *dst_string; + src_string = hlsl_type_to_string(&ctx->string_buffers, src_type); + dst_string = hlsl_type_to_string(&ctx->string_buffers, dst_type); if (src_string && dst_string) hlsl_error(ctx, *loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "Can't implicitly convert from %s to %s.", src_string, dst_string); - vkd3d_free(src_string); - vkd3d_free(dst_string); + "Can't implicitly convert from %s to %s.", src_string->buffer, dst_string->buffer); + vkd3d_string_buffer_release(&ctx->string_buffers, src_string); + vkd3d_string_buffer_release(&ctx->string_buffers, dst_string); return NULL; } @@ -2744,13 +2746,15 @@ unary_expr: if (!compatible_data_types(src_type, dst_type)) { - char *src_string = hlsl_type_to_string(src_type), *dst_string = hlsl_type_to_string(dst_type); + struct vkd3d_string_buffer *src_string, *dst_string; + src_string = hlsl_type_to_string(&ctx->string_buffers, src_type); + dst_string = hlsl_type_to_string(&ctx->string_buffers, dst_type); if (src_string && dst_string) hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, "Can't cast from %s to %s.", - src_string, dst_string); - vkd3d_free(src_string); - vkd3d_free(dst_string); + src_string->buffer, dst_string->buffer); + vkd3d_string_buffer_release(&ctx->string_buffers, src_string); + vkd3d_string_buffer_release(&ctx->string_buffers, dst_string); YYABORT; } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index bae2852a..51136243 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -33,6 +33,12 @@ void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) vkd3d_free(buffer->buffer); } +static void vkd3d_string_buffer_clear(struct vkd3d_string_buffer *buffer) +{ + buffer->buffer[0] = '\0'; + buffer->content_size = 0; +} + static bool vkd3d_string_buffer_resize(struct vkd3d_string_buffer *buffer, int rc) { unsigned int new_buffer_size = buffer->buffer_size * 2; @@ -107,6 +113,60 @@ void vkd3d_string_buffer_trace_(const struct vkd3d_string_buffer *buffer, const } } +void vkd3d_string_buffer_cache_init(struct vkd3d_string_buffer_cache *cache) +{ + memset(cache, 0, sizeof(*cache)); +} + +void vkd3d_string_buffer_cache_cleanup(struct vkd3d_string_buffer_cache *cache) +{ + unsigned int i; + + for (i = 0; i < cache->count; ++i) + { + vkd3d_string_buffer_cleanup(cache->buffers[i]); + vkd3d_free(cache->buffers[i]); + } + vkd3d_free(cache->buffers); + vkd3d_string_buffer_cache_init(cache); +} + +struct vkd3d_string_buffer *vkd3d_string_buffer_get(struct vkd3d_string_buffer_cache *cache) +{ + struct vkd3d_string_buffer *buffer; + + if (!cache->count) + { + if (!vkd3d_array_reserve((void **)&cache->buffers, &cache->capacity, + cache->max_count + 1, sizeof(*cache->buffers))) + return NULL; + ++cache->max_count; + + if (!(buffer = vkd3d_malloc(sizeof(*buffer)))) + return NULL; + vkd3d_string_buffer_init(buffer); + if (!vkd3d_string_buffer_resize(buffer, 1)) + { + vkd3d_free(buffer); + return NULL; + } + } + else + { + buffer = cache->buffers[--cache->count]; + } + vkd3d_string_buffer_clear(buffer); + return buffer; +} + +void vkd3d_string_buffer_release(struct vkd3d_string_buffer_cache *cache, struct vkd3d_string_buffer *buffer) +{ + if (!buffer) + return; + assert(cache->count + 1 <= cache->max_count); + cache->buffers[cache->count++] = buffer; +} + void vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context, enum vkd3d_shader_log_level log_level) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index e837dbcd..cf66c67a 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -870,12 +870,23 @@ struct vkd3d_string_buffer unsigned int content_size; }; +struct vkd3d_string_buffer_cache +{ + struct vkd3d_string_buffer **buffers; + size_t count, max_count, capacity; +}; + enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out) DECLSPEC_HIDDEN; void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; +struct vkd3d_string_buffer *vkd3d_string_buffer_get(struct vkd3d_string_buffer_cache *list) DECLSPEC_HIDDEN; void vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; +void vkd3d_string_buffer_cache_cleanup(struct vkd3d_string_buffer_cache *list) DECLSPEC_HIDDEN; +void vkd3d_string_buffer_cache_init(struct vkd3d_string_buffer_cache *list) DECLSPEC_HIDDEN; int vkd3d_string_buffer_printf(struct vkd3d_string_buffer *buffer, const char *format, ...) VKD3D_PRINTF_FUNC(2, 3) DECLSPEC_HIDDEN; +void vkd3d_string_buffer_release(struct vkd3d_string_buffer_cache *list, + struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; #define vkd3d_string_buffer_trace(buffer) \ vkd3d_string_buffer_trace_(buffer, __FUNCTION__) void vkd3d_string_buffer_trace_(const struct vkd3d_string_buffer *buffer, const char *function) DECLSPEC_HIDDEN; -- 2.30.1 [View Less]

3 17

[PATCH 1/1] msvcrt: Null widechar pointer when wcsrtombs_l() is successful.
by Bernhard Kölbl 02 Mar '21

02 Mar '21

Mimic how the function works on Windows. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50698 Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/msvcrt/wcs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 9a30e0fe149..7c8f50891cc 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -610,6 +610,7 @@ static size_t wcsrtombs_l(char *mbstr, const wchar_t **wcstr, mbstr[i] = (*wcstr)[i]; … [View More]

3 2

[PATCH v2] msvcrt: Update source pointer in wcsrtombs in C locale.
by Piotr Caban 02 Mar '21

02 Mar '21

From: Bernhard Kölbl <besentv(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50698 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/string.c | 16 ++++++++++++++++ dlls/msvcrt/wcs.c | 3 +++ 2 files changed, 19 insertions(+)

1 0

[PATCH 1/5] wbemdisp: Iterate properties and methods once when collecting supported member names.
by Nikolay Sivov 02 Mar '21

02 Mar '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wbemdisp/locator.c | 82 ++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 867a19c1ab2..deef4d83fb8 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -1059,50 +1059,52 @@ static HRESULT WINAPI object_GetTypeInfo( return E_NOTIMPL; } +static BOOL object_reserve_member( struct object *… [View More]object, unsigned int count, unsigned int *capacity ) +{ + unsigned int new_capacity, max_capacity; + struct member *new_members; + + if (count <= *capacity) + return TRUE; + + max_capacity = ~0u / sizeof(*object->members); + if (count > max_capacity) + return FALSE; + + new_capacity = max(4, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = max_capacity; + + if (!(new_members = heap_realloc( object->members, new_capacity * sizeof(*new_members) ))) + return FALSE; + + object->members = new_members; + *capacity = new_capacity; + + return TRUE; +} + static HRESULT init_members( struct object *object ) { IWbemClassObject *sig_in, *sig_out; - LONG i = 0, count = 0; - BSTR name; + unsigned int i, capacity = 0, count = 0; HRESULT hr; + BSTR name; if (object->members) return S_OK; - hr = IWbemClassObject_BeginEnumeration( object->object, 0 ); - if (SUCCEEDED( hr )) - { - while (IWbemClassObject_Next( object->object, 0, NULL, NULL, NULL, NULL ) == S_OK) count++; - IWbemClassObject_EndEnumeration( object->object ); - } - - hr = IWbemClassObject_BeginMethodEnumeration( object->object, 0 ); - if (SUCCEEDED( hr )) - { - while (IWbemClassObject_NextMethod( object->object, 0, &name, &sig_in, &sig_out ) == S_OK) - { - count++; - SysFreeString( name ); - if (sig_in) IWbemClassObject_Release( sig_in ); - if (sig_out) IWbemClassObject_Release( sig_out ); - } - IWbemClassObject_EndMethodEnumeration( object->object ); - } - - if (!(object->members = heap_alloc( sizeof(struct member) * count ))) return E_OUTOFMEMORY; - hr = IWbemClassObject_BeginEnumeration( object->object, 0 ); if (SUCCEEDED( hr )) { while (IWbemClassObject_Next( object->object, 0, &name, NULL, NULL, NULL ) == S_OK) { - object->members[i].name = name; - object->members[i].is_method = FALSE; - object->members[i].dispid = 0; - if (++i > count) - { - IWbemClassObject_EndEnumeration( object->object ); - goto error; - } + if (!object_reserve_member( object, count + 1, &capacity )) goto error; + object->members[count].name = name; + object->members[count].is_method = FALSE; + object->members[count].dispid = 0; + count++; TRACE( "added property %s\n", debugstr_w(name) ); } IWbemClassObject_EndEnumeration( object->object ); @@ -1113,14 +1115,11 @@ static HRESULT init_members( struct object *object ) { while (IWbemClassObject_NextMethod( object->object, 0, &name, &sig_in, &sig_out ) == S_OK) { - object->members[i].name = name; - object->members[i].is_method = TRUE; - object->members[i].dispid = 0; - if (++i > count) - { - IWbemClassObject_EndMethodEnumeration( object->object ); - goto error; - } + if (!object_reserve_member( object, count + 1, &capacity )) goto error; + object->members[count].name = name; + object->members[count].is_method = TRUE; + object->members[count].dispid = 0; + count++; if (sig_in) IWbemClassObject_Release( sig_in ); if (sig_out) IWbemClassObject_Release( sig_out ); TRACE( "added method %s\n", debugstr_w(name) ); @@ -1133,7 +1132,8 @@ static HRESULT init_members( struct object *object ) return S_OK; error: - for (--i; i >= 0; i--) SysFreeString( object->members[i].name ); + for (i = 0; i < count; ++i) + SysFreeString( object->members[i].name ); heap_free( object->members ); object->members = NULL; object->nb_members = 0; -- 2.30.1 [View Less]

3 14

[PATCH] oleaut32: Fix Var*FromDec() prototypes.
by Nikolay Sivov 02 Mar '21

02 Mar '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/vartype.c | 26 +++++++++++++------------- include/oleauto.h | 26 +++++++++++++------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 90b3fcaa1a9..06bc70e0a89 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -517,7 +517,7 @@ HRESULT WINAPI VarI1FromUI4(ULONG ulIn, signed char* pcOut) * Failure: … [View More]E_INVALIDARG, if the source value is invalid * DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarI1FromDec(DECIMAL *pdecIn, signed char* pcOut) +HRESULT WINAPI VarI1FromDec(const DECIMAL *pdecIn, signed char* pcOut) { LONG64 i64; HRESULT hRet; @@ -828,7 +828,7 @@ HRESULT WINAPI VarUI1FromUI4(ULONG ulIn, BYTE* pbOut) * Failure: E_INVALIDARG, if the source value is invalid * DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarUI1FromDec(DECIMAL *pdecIn, BYTE* pbOut) +HRESULT WINAPI VarUI1FromDec(const DECIMAL *pdecIn, BYTE* pbOut) { LONG64 i64; HRESULT hRet; @@ -1125,7 +1125,7 @@ HRESULT WINAPI VarI2FromUI4(ULONG ulIn, SHORT* psOut) * Failure: E_INVALIDARG, if the source value is invalid * DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarI2FromDec(DECIMAL *pdecIn, SHORT* psOut) +HRESULT WINAPI VarI2FromDec(const DECIMAL *pdecIn, SHORT* psOut) { LONG64 i64; HRESULT hRet; @@ -1422,7 +1422,7 @@ HRESULT WINAPI VarUI2FromUI4(ULONG ulIn, USHORT* pusOut) * Failure: E_INVALIDARG, if the source value is invalid * DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarUI2FromDec(DECIMAL *pdecIn, USHORT* pusOut) +HRESULT WINAPI VarUI2FromDec(const DECIMAL *pdecIn, USHORT* pusOut) { LONG64 i64; HRESULT hRet; @@ -1714,7 +1714,7 @@ HRESULT WINAPI VarI4FromUI4(ULONG ulIn, LONG *piOut) * Failure: E_INVALIDARG, if pdecIn is invalid * DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarI4FromDec(DECIMAL *pdecIn, LONG *piOut) +HRESULT WINAPI VarI4FromDec(const DECIMAL *pdecIn, LONG *piOut) { LONG64 i64; HRESULT hRet; @@ -2006,7 +2006,7 @@ HRESULT WINAPI VarUI4FromUI2(USHORT usIn, ULONG *pulOut) * Failure: E_INVALIDARG, if pdecIn is invalid * DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarUI4FromDec(DECIMAL *pdecIn, ULONG *pulOut) +HRESULT WINAPI VarUI4FromDec(const DECIMAL *pdecIn, ULONG *pulOut) { LONG64 i64; HRESULT hRet; @@ -2329,7 +2329,7 @@ HRESULT WINAPI VarI8FromUI4(ULONG ulIn, LONG64* pi64Out) * Failure: E_INVALIDARG, if the source value is invalid * DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarI8FromDec(DECIMAL *pdecIn, LONG64* pi64Out) +HRESULT WINAPI VarI8FromDec(const DECIMAL *pdecIn, LONG64* pi64Out) { if (!DEC_SCALE(pdecIn)) { @@ -2664,7 +2664,7 @@ HRESULT WINAPI VarUI8FromUI4(ULONG ulIn, ULONG64* pui64Out) * with DISP_E_OVERFLOW. This bug has been fixed in Wine's implementation * (use VarAbs() on pDecIn first if you really want this behaviour). */ -HRESULT WINAPI VarUI8FromDec(DECIMAL *pdecIn, ULONG64* pui64Out) +HRESULT WINAPI VarUI8FromDec(const DECIMAL *pdecIn, ULONG64* pui64Out) { if (!DEC_SCALE(pdecIn)) { @@ -2940,7 +2940,7 @@ HRESULT WINAPI VarR4FromUI4(ULONG ulIn, float *pFltOut) * Success: S_OK. * Failure: E_INVALIDARG, if the source value is invalid. */ -HRESULT WINAPI VarR4FromDec(DECIMAL* pDecIn, float *pFltOut) +HRESULT WINAPI VarR4FromDec(const DECIMAL* pDecIn, float *pFltOut) { BYTE scale = DEC_SCALE(pDecIn); double divisor = 1.0; @@ -3698,7 +3698,7 @@ HRESULT WINAPI VarCyFromUI4(ULONG ulIn, CY* pCyOut) * DISP_E_OVERFLOW, if the value will not fit in the destination * DISP_E_TYPEMISMATCH, if the type cannot be converted */ -HRESULT WINAPI VarCyFromDec(DECIMAL* pdecIn, CY* pCyOut) +HRESULT WINAPI VarCyFromDec(const DECIMAL* pdecIn, CY* pCyOut) { DECIMAL rounded; HRESULT hRet; @@ -6269,7 +6269,7 @@ HRESULT WINAPI VarBoolFromUI4(ULONG ulIn, VARIANT_BOOL *pBoolOut) * Success: S_OK. * Failure: E_INVALIDARG, if pDecIn is invalid. */ -HRESULT WINAPI VarBoolFromDec(DECIMAL* pDecIn, VARIANT_BOOL *pBoolOut) +HRESULT WINAPI VarBoolFromDec(const DECIMAL* pDecIn, VARIANT_BOOL *pBoolOut) { if (DEC_SCALE(pDecIn) > DEC_MAX_SCALE || (DEC_SIGN(pDecIn) & ~DECIMAL_NEG)) return E_INVALIDARG; @@ -6984,7 +6984,7 @@ HRESULT WINAPI VarBstrFromUI4(ULONG ulIn, LCID lcid, ULONG dwFlags, BSTR* pbstrO * Failure: E_INVALIDARG, if pbstrOut is invalid. * E_OUTOFMEMORY, if memory allocation fails. */ -HRESULT WINAPI VarBstrFromDec(DECIMAL* pDecIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut) +HRESULT WINAPI VarBstrFromDec(const DECIMAL* pDecIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut) { WCHAR buff[256]; VARIANT_DI temp; @@ -7998,7 +7998,7 @@ HRESULT WINAPI VarDateFromUI4(ULONG ulIn, DATE* pdateOut) * RETURNS * S_OK. */ -HRESULT WINAPI VarDateFromDec(DECIMAL *pdecIn, DATE* pdateOut) +HRESULT WINAPI VarDateFromDec(const DECIMAL *pdecIn, DATE* pdateOut) { return VarR8FromDec(pdecIn, pdateOut); } diff --git a/include/oleauto.h b/include/oleauto.h index 45edfbb84af..f00bfa0c7f8 100644 --- a/include/oleauto.h +++ b/include/oleauto.h @@ -239,7 +239,7 @@ HRESULT WINAPI VarUI1FromUI4(ULONG,BYTE*); HRESULT WINAPI VarUI1FromUI8(ULONG64,BYTE*); HRESULT WINAPI VarUI1FromStr(OLECHAR*,LCID,ULONG,BYTE*); HRESULT WINAPI VarUI1FromCy(CY,BYTE*); -HRESULT WINAPI VarUI1FromDec(DECIMAL*,BYTE*); +HRESULT WINAPI VarUI1FromDec(const DECIMAL*,BYTE*); HRESULT WINAPI VarUI1FromDisp(IDispatch*,LCID,BYTE*); HRESULT WINAPI VarI2FromUI1(BYTE,SHORT*); @@ -255,7 +255,7 @@ HRESULT WINAPI VarI2FromUI4(ULONG,SHORT*); HRESULT WINAPI VarI2FromUI8(ULONG64,SHORT*); HRESULT WINAPI VarI2FromStr(OLECHAR*,LCID,ULONG,SHORT*); HRESULT WINAPI VarI2FromCy(CY,SHORT*); -HRESULT WINAPI VarI2FromDec(DECIMAL*,SHORT*); +HRESULT WINAPI VarI2FromDec(const DECIMAL*,SHORT*); HRESULT WINAPI VarI2FromDisp(IDispatch*,LCID,SHORT*); HRESULT WINAPI VarI4FromUI1(BYTE,LONG*); @@ -271,7 +271,7 @@ HRESULT WINAPI VarI4FromUI4(ULONG,LONG*); HRESULT WINAPI VarI4FromUI8(ULONG64,LONG*); HRESULT WINAPI VarI4FromStr(OLECHAR*,LCID,ULONG,LONG*); HRESULT WINAPI VarI4FromCy(CY,LONG*); -HRESULT WINAPI VarI4FromDec(DECIMAL*,LONG*); +HRESULT WINAPI VarI4FromDec(const DECIMAL*,LONG*); HRESULT WINAPI VarI4FromDisp(IDispatch*,LCID,LONG*); HRESULT WINAPI VarI8FromUI1(BYTE,LONG64*); @@ -286,7 +286,7 @@ HRESULT WINAPI VarI8FromI1(signed char,LONG64*); HRESULT WINAPI VarI8FromUI2(USHORT,LONG64*); HRESULT WINAPI VarI8FromUI4(ULONG,LONG64*); HRESULT WINAPI VarI8FromUI8(ULONG64,LONG64*); -HRESULT WINAPI VarI8FromDec(DECIMAL *pdecIn,LONG64*); +HRESULT WINAPI VarI8FromDec(const DECIMAL *pdecIn,LONG64*); HRESULT WINAPI VarI8FromInt(INT intIn,LONG64*); HRESULT WINAPI VarI8FromCy(CY,LONG64*); HRESULT WINAPI VarI8FromDisp(IDispatch*,LCID,LONG64*); @@ -304,7 +304,7 @@ HRESULT WINAPI VarR4FromUI4(ULONG,FLOAT*); HRESULT WINAPI VarR4FromUI8(ULONG64,FLOAT*); HRESULT WINAPI VarR4FromStr(OLECHAR*,LCID,ULONG,FLOAT*); HRESULT WINAPI VarR4FromCy(CY,FLOAT*); -HRESULT WINAPI VarR4FromDec(DECIMAL*,FLOAT*); +HRESULT WINAPI VarR4FromDec(const DECIMAL*,FLOAT*); HRESULT WINAPI VarR4FromDisp(IDispatch*,LCID,FLOAT*); HRESULT WINAPI VarR8FromUI1(BYTE,double*); @@ -336,7 +336,7 @@ HRESULT WINAPI VarDateFromUI4(ULONG,DATE*); HRESULT WINAPI VarDateFromUI8(ULONG64,DATE*); HRESULT WINAPI VarDateFromBool(VARIANT_BOOL,DATE*); HRESULT WINAPI VarDateFromCy(CY,DATE*); -HRESULT WINAPI VarDateFromDec(DECIMAL*,DATE*); +HRESULT WINAPI VarDateFromDec(const DECIMAL*,DATE*); HRESULT WINAPI VarDateFromDisp(IDispatch*,LCID,DATE*); HRESULT WINAPI VarCyFromUI1(BYTE,CY*); @@ -352,7 +352,7 @@ HRESULT WINAPI VarCyFromI1(signed char,CY*); HRESULT WINAPI VarCyFromUI2(USHORT,CY*); HRESULT WINAPI VarCyFromUI4(ULONG,CY*); HRESULT WINAPI VarCyFromUI8(ULONG64,CY*); -HRESULT WINAPI VarCyFromDec(DECIMAL*,CY*); +HRESULT WINAPI VarCyFromDec(const DECIMAL*,CY*); HRESULT WINAPI VarCyFromDisp(IDispatch*,LCID,CY*); HRESULT WINAPI VarBstrFromUI1(BYTE,LCID,ULONG,BSTR*); @@ -368,7 +368,7 @@ HRESULT WINAPI VarBstrFromUI2(USHORT,LCID,ULONG,BSTR*); HRESULT WINAPI VarBstrFromUI8(ULONG64,LCID,ULONG,BSTR*); HRESULT WINAPI VarBstrFromUI4(ULONG,LCID,ULONG,BSTR*); HRESULT WINAPI VarBstrFromCy(CY,LCID,ULONG,BSTR*); -HRESULT WINAPI VarBstrFromDec(DECIMAL*,LCID,ULONG,BSTR*); +HRESULT WINAPI VarBstrFromDec(const DECIMAL*,LCID,ULONG,BSTR*); HRESULT WINAPI VarBstrFromDisp(IDispatch*,LCID,ULONG,BSTR*); HRESULT WINAPI VarBoolFromUI1(BYTE,VARIANT_BOOL*); @@ -384,7 +384,7 @@ HRESULT WINAPI VarBoolFromUI2(USHORT,VARIANT_BOOL*); HRESULT WINAPI VarBoolFromUI4(ULONG,VARIANT_BOOL*); HRESULT WINAPI VarBoolFromUI8(ULONG64,VARIANT_BOOL*); HRESULT WINAPI VarBoolFromCy(CY,VARIANT_BOOL*); -HRESULT WINAPI VarBoolFromDec(DECIMAL*,VARIANT_BOOL*); +HRESULT WINAPI VarBoolFromDec(const DECIMAL*,VARIANT_BOOL*); HRESULT WINAPI VarBoolFromDisp(IDispatch*,LCID,VARIANT_BOOL*); HRESULT WINAPI VarI1FromUI1(BYTE,signed char*); @@ -400,7 +400,7 @@ HRESULT WINAPI VarI1FromUI2(USHORT,signed char*); HRESULT WINAPI VarI1FromUI4(ULONG,signed char*); HRESULT WINAPI VarI1FromUI8(ULONG64,signed char*); HRESULT WINAPI VarI1FromCy(CY,signed char*); -HRESULT WINAPI VarI1FromDec(DECIMAL*,signed char*); +HRESULT WINAPI VarI1FromDec(const DECIMAL*,signed char*); HRESULT WINAPI VarI1FromDisp(IDispatch*,LCID,signed char*); HRESULT WINAPI VarUI2FromUI1(BYTE,USHORT*); @@ -416,7 +416,7 @@ HRESULT WINAPI VarUI2FromI1(signed char,USHORT*); HRESULT WINAPI VarUI2FromUI4(ULONG,USHORT*); HRESULT WINAPI VarUI2FromUI8(ULONG64,USHORT*); HRESULT WINAPI VarUI2FromCy(CY,USHORT*); -HRESULT WINAPI VarUI2FromDec(DECIMAL*,USHORT*); +HRESULT WINAPI VarUI2FromDec(const DECIMAL*,USHORT*); HRESULT WINAPI VarUI2FromDisp(IDispatch*,LCID,USHORT*); HRESULT WINAPI VarUI4FromStr(OLECHAR*,LCID,ULONG,ULONG*); @@ -432,7 +432,7 @@ HRESULT WINAPI VarUI4FromI1(signed char,ULONG*); HRESULT WINAPI VarUI4FromUI2(USHORT,ULONG*); HRESULT WINAPI VarUI4FromUI8(ULONG64,ULONG*); HRESULT WINAPI VarUI4FromCy(CY,ULONG*); -HRESULT WINAPI VarUI4FromDec(DECIMAL*,ULONG*); +HRESULT WINAPI VarUI4FromDec(const DECIMAL*,ULONG*); HRESULT WINAPI VarUI4FromDisp(IDispatch*,LCID,ULONG*); HRESULT WINAPI VarUI8FromUI1(BYTE,ULONG64*); @@ -447,7 +447,7 @@ HRESULT WINAPI VarUI8FromBool(VARIANT_BOOL,ULONG64*); HRESULT WINAPI VarUI8FromI1(signed char,ULONG64*); HRESULT WINAPI VarUI8FromUI2(USHORT,ULONG64*); HRESULT WINAPI VarUI8FromUI4(ULONG,ULONG64*); -HRESULT WINAPI VarUI8FromDec(DECIMAL*,ULONG64*); +HRESULT WINAPI VarUI8FromDec(const DECIMAL*,ULONG64*); HRESULT WINAPI VarUI8FromInt(INT,ULONG64*); HRESULT WINAPI VarUI8FromCy(CY,ULONG64*); HRESULT WINAPI VarUI8FromDisp(IDispatch*,LCID,ULONG64*); -- 2.30.1 [View Less]

2 1

[PATCH 2/5] comctl32/button: Use themed painting when possible for handling WM_SETTEXT.
by Zhiyi Zhang 02 Mar '21

02 Mar '21

Fix an issue that themed buttons are drawn unthemed after receiving a WM_SETTEXT message. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 2 ++ dlls/comctl32/tests/button.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 0dcbb38d202..b5a9ee7f7f6 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -743,6 +743,8 @@ static LRESULT CALLBACK BUTTON_WindowProc(… [View More]

2 1

[PATCH 1/5] comctl32/tests: Test themed painting after a WM_SETTEXT message.
by Zhiyi Zhang 02 Mar '21

02 Mar '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/button.c | 82 ++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 93b6ddcec36..b5e145077e7 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -29,6 +29,8 @@ #define IS_WNDPROC_HANDLE(x) (((ULONG_PTR)(x) >> 16) == (~0u >> 16)) +static BOOL is_theme_active; + static … [View More]BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); static BOOL (WINAPI *pRemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR); static LRESULT (WINAPI *pDefSubclassProc)(HWND, UINT, WPARAM, LPARAM); @@ -118,6 +120,22 @@ static BOOL ignore_message( UINT message ) message == WM_GETTEXT); } +static BOOL equal_dc(HDC hdc1, HDC hdc2, int width, int height) +{ + int x, y; + + for (x = 0; x < width; ++x) + { + for (y = 0; y < height; ++y) + { + if (GetPixel(hdc1, x, y) != GetPixel(hdc2, x, y)) + return FALSE; + } + } + + return TRUE; +} + static LRESULT CALLBACK button_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, UINT_PTR id, DWORD_PTR ref_data) { static LONG defwndproc_counter = 0; @@ -2304,14 +2322,77 @@ static void test_style(void) } } +static void test_visual(void) +{ + HBITMAP mem_bitmap1, mem_bitmap2; + HDC mem_dc1, mem_dc2, button_dc; + HWND button, parent; + int width, height; + DWORD type; + RECT rect; + + parent = CreateWindowA("TestParentClass", "Test parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, + 100, 200, 200, 0, 0, 0, NULL); + ok(!!parent, "Failed to create the parent window.\n"); + for (type = BS_PUSHBUTTON; type <= BS_DEFCOMMANDLINK; ++type) + { + /* Use WS_DISABLED to avoid glowing animations on Vista and Win7 */ + button = create_button(type | WS_VISIBLE | WS_DISABLED, parent); + flush_events(); + + button_dc = GetDC(button); + GetClientRect(button, &rect); + width = rect.right - rect.left; + height = rect.bottom - rect.top; + + mem_dc1 = CreateCompatibleDC(button_dc); + mem_bitmap1 = CreateCompatibleBitmap(button_dc, width, height); + SelectObject(mem_dc1, mem_bitmap1); + BitBlt(mem_dc1, 0, 0, width, height, button_dc, 0, 0, SRCCOPY); + + /* Send WM_SETTEXT with the same window name */ + SendMessageA(button, WM_SETTEXT, 0, (LPARAM)"test"); + flush_events(); + + mem_dc2 = CreateCompatibleDC(button_dc); + mem_bitmap2 = CreateCompatibleBitmap(button_dc, width, height); + SelectObject(mem_dc2, mem_bitmap2); + BitBlt(mem_dc2, 0, 0, width, height, button_dc, 0, 0, SRCCOPY); + + todo_wine_if(type == BS_PUSHBOX || (is_theme_active && !(type == BS_OWNERDRAW + || type == BS_COMMANDLINK || type == BS_DEFCOMMANDLINK))) + ok(equal_dc(mem_dc1, mem_dc2, width, height), "Type %#x: Expected content unchanged.\n", type); + + DeleteObject(mem_bitmap2); + DeleteObject(mem_bitmap1); + DeleteDC(mem_dc2); + DeleteDC(mem_dc1); + ReleaseDC(button, button_dc); + DestroyWindow(button); + } + + DestroyWindow(parent); +} + START_TEST(button) { + BOOL (WINAPI * pIsThemeActive)(VOID); ULONG_PTR ctx_cookie; + HMODULE uxtheme; HANDLE hCtx; if (!load_v6_module(&ctx_cookie, &hCtx)) return; + uxtheme = LoadLibraryA("uxtheme.dll"); + if (uxtheme) + { + pIsThemeActive = (void*)GetProcAddress(uxtheme, "IsThemeActive"); + if (pIsThemeActive) + is_theme_active = pIsThemeActive(); + FreeLibrary(uxtheme); + } + register_parent_class(); init_functions(); @@ -2327,6 +2408,7 @@ START_TEST(button) test_state(); test_bcm_get_ideal_size(); test_style(); + test_visual(); unload_v6_module(ctx_cookie, hCtx); } -- 2.27.0 [View Less]

2 1

[PATCH 5/5] comctl32/edit: Call GetWindowTheme() only when necessary.
by Zhiyi Zhang 02 Mar '21

02 Mar '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/edit.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 05920893c93..639443bc338 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -4597,7 +4597,6 @@ static LRESULT EDIT_WM_NCDestroy(EDITSTATE *es) static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { EDITSTATE *es = (EDITSTATE *)… [View More]

2 1

[PATCH 4/5] comctl32/ipaddress: Do not open theme data in IPADDRESS_Draw().
by Zhiyi Zhang 02 Mar '21

02 Mar '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/ipaddress.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index c7b9ada1f6a..b6302a89ba6 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -145,7 +145,7 @@ static LRESULT IPADDRESS_Draw (const IPADDRESS_INFO *infoPtr, HDC hdc) GetClientRect (infoPtr->Self, &rect); - theme = … [View More]

2 1

[PATCH 3/5] comctl32/combo: Subscribe to WM_MOUSELEAVE events.
by Zhiyi Zhang 02 Mar '21

02 Mar '21

Using WM_MOUSEMOVE events to determine whether the dropdown button is hovered is unreliable and thus the dropdown button may stay in hovered state even if mouse has left the window. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/combo.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/comctl32/combo.c b/dlls/comctl32/combo.c index 572740b5cfd..887587a053b 100644 --- a/dlls/comctl32/combo.c +++ b/dlls/comctl32/combo.c @@ -1632,6 +… [View More]

2 1

[PATCH] advapi32: Don't revoke ACCESS_DENIED_ACE.
by Adam Gashlin 02 Mar '21

02 Mar '21

REVOKE_ACCESS is only documented to remove ACCESS_ALLOWED_ACE and SYSTEM_AUDIT_ACE. Signed-off-by: Adam Gashlin <agashlin(a)gmail.com> --- I wasn't sure what to do with SYSTEM_ALARM_ACE, so I left it alone. This is my first patch to Wine, I hope it's not too far from acceptable! --- dlls/advapi32/security.c | 3 +-- dlls/advapi32/tests/security.c | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/… [View More]advapi32/security.c index 9f80a846966..6246cd21a62 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2314,8 +2314,7 @@ DWORD WINAPI SetEntriesInAclW( ULONG count, PEXPLICIT_ACCESSW pEntries, add = FALSE; break; case ACCESS_DENIED_ACE_TYPE: - if (EqualSid(ppsid[j], &((ACCESS_DENIED_ACE *)old_ace_header)->SidStart)) - add = FALSE; + /* REVOKE_ACCESS does not affect ACCESS_DENIED_ACE. */ break; case SYSTEM_AUDIT_ACE_TYPE: if (EqualSid(ppsid[j], &((SYSTEM_AUDIT_ACE *)old_ace_header)->SidStart)) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index f43ac2431e1..fdac67aecb8 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -7437,6 +7437,32 @@ static void test_GetExplicitEntriesFromAclW(void) ok(access2 == NULL, "access2 was not NULL\n"); LocalFree(new_acl); + /* Make the ACL both Allow and Deny Everyone. */ + res = AddAccessAllowedAce(old_acl, ACL_REVISION, KEY_READ, everyone_sid); + ok(res, "AddAccessAllowedAce failed with error %d\n", GetLastError()); + res = AddAccessDeniedAce(old_acl, ACL_REVISION, KEY_WRITE, everyone_sid); + ok(res, "AddAccessDeniedAce failed with error %d\n", GetLastError()); + /* Revoke Everyone. */ + access.Trustee.ptstrName = everyone_sid; + access.Trustee.TrusteeType = TRUSTEE_IS_WELL_KNOWN_GROUP; + access.grfAccessPermissions = 0; + new_acl = NULL; + res = pSetEntriesInAclW(1, &access, old_acl, &new_acl); + ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res); + ok(new_acl != NULL, "returned acl was NULL\n"); + /* Deny Everyone should remain (along with Grant Users from earlier). */ + access2 = NULL; + res = pGetExplicitEntriesFromAclW(new_acl, &count, &access2); + ok(res == ERROR_SUCCESS, "GetExplicitEntriesFromAclW failed with error %d\n", GetLastError()); + ok(count == 2, "Expected count == 2, got %d\n", count); + ok(access2[0].grfAccessMode == GRANT_ACCESS, "Expected GRANT_ACCESS, got %d\n", access2[0].grfAccessMode); + ok(access2[0].grfAccessPermissions == KEY_READ , "Expected KEY_READ, got %d\n", access2[0].grfAccessPermissions); + ok(EqualSid(access2[0].Trustee.ptstrName, users_sid), "Expected equal SIDs\n"); + ok(access2[1].grfAccessMode == DENY_ACCESS, "Expected DENY_ACCESS, got %d\n", access2[1].grfAccessMode); + ok(access2[1].grfAccessPermissions == KEY_WRITE, "Expected KEY_WRITE, got %d\n", access2[1].grfAccessPermissions); + ok(EqualSid(access2[1].Trustee.ptstrName, everyone_sid), "Expected equal SIDs\n"); + LocalFree(access2); + FreeSid(users_sid); FreeSid(everyone_sid); HeapFree(GetProcessHeap(), 0, old_acl); -- 2.17.1 [View Less]

2 1

[PATCH] msctf: Quiet a spammy fixme in InputProcessorProfileMgr_GetActiveProfile
by Dmitry Kislyuk 02 Mar '21

02 Mar '21

2 2

[RFC] Wayland driver development update
by Alexandros Frantzis 01 Mar '21

01 Mar '21

Hi all, I would like to provide an update and get some feedback on the current state of the experimental Wayland driver, which was first announced two months ago [1]. The goal of this driver is to allow Windows applications to run directly on Wayland compositors, eventually removing the need for XWayland for many use cases. XWayland, like X11 in general, is receiving less and less developer attention and is unlikely to support modern features like improved fence synchronization or HDR. In … [View More]addition, since it's yet another layer to go through, it's a source of complexity and potentially of inefficiency. Some more details and thoughts about XWayland vs direct Wayland in the context of Wine can be found here [2]. The focus of this update is to support a number of new features that are useful for applications and games, and which have also been considered potential integration pain points for the Wayland driver. These are copy/paste, drag-and-drop and support for changing the display mode. More detailed instructions for building were included in the first announcement email, but here is a quick version: $ git clone -b wayland https://gitlab.collabora.com/alf/wine/ $ ./configure --with-wayland $ DISPLAY= WAYLAND_DISPLAY=wayland-0 ./wine ... I have uploaded a video showcasing the new features here: https://youtu.be/rRss-Fdap7o Copy/paste support works well in both directions (native Wayland apps <=> Wine apps) with many common formats already supported. Drag and drop also works in the direction of native Wayland apps to Wine apps for many common formats, but not the other way around. My understanding is that drag and drop in both the X11 and Mac drivers also works only in one direction. Implementing the display mode change is particularly interesting since Wayland doesn't allow applications to directly change the display mode in the display hardware, but a similar effect can be achieved for particular surfaces by scaling in the compositor (typically using the GPU). In case of a Wine mode that doesn't match the current compositor mode, the driver instructs the compositor to scale the window contents so that they appear as if the hardware display mode had been changed while respecting the aspect ratio. There are still some rough edges in the implementation of display mode changes, like proper interactions with real mode changes from the Wayland side, which are being worked on. --- In previous discussions there were some concerns about accepting the Wayland driver into staging, unless there was more confidence that it would eventually be accepted upstream. What's the best way to get an answer to this question of (eventual) upstream acceptance? Even in this somewhat experimental state the driver is viable for many use cases. What would be required to drive this effort forward on the path to staging and, later, upstream inclusion? Thanks, Alexandros [1] https://www.winehq.org/pipermail/wine-devel/2020-December/178575.html [2] https://www.winehq.org/pipermail/wine-devel/2020-December/178633.html [View Less]

5 11

[PATCH 5/5] ntdll: Use syscall frame for FPU and XMM contexts in NtSetContextThread.
by Jacek Caban 01 Mar '21

01 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/signal_i386.c | 73 ++++++++++++++++++++++++++--------- 1 file changed, 54 insertions(+), 19 deletions(-)

1 0

[PATCH 4/5] ntdll: Use syscall frame for FPU and XMM contexts in NtGetContextThread.
by Jacek Caban 01 Mar '21

01 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/signal_i386.c | 38 +++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-)

1 0

[PATCH 3/5] ntdll: Store FPU and XMM contexts in x86 syscall frame.
by Jacek Caban 01 Mar '21

01 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/signal_arm.c | 1 + dlls/ntdll/unix/signal_i386.c | 23 ++++++++++++++++++++++- dlls/ntdll/unix/virtual.c | 1 - tools/winebuild/import.c | 28 +++++++++++++++++++++++++++- 4 files changed, 50 insertions(+), 3 deletions(-)

1 0

[PATCH 2/5] ntdll: Use syscall frame in x86 call_raise_user_exception_dispatcher implementation.
by Jacek Caban 01 Mar '21

01 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/signal_i386.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)

1 0

[PATCH 1/5] ntdll: Restore all non-volatile i386 registers in syscall dispatcher.
by Jacek Caban 01 Mar '21

01 Mar '21

Based on set_full_cpu_context. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winebuild/import.c | 63 +++++++++++++++++++++++++++++++--------- 1 file changed, 49 insertions(+), 14 deletions(-)

1 0

[website] German translation for release 6.3
by Julian Rüger 01 Mar '21

01 Mar '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 6.2
by Julian Rüger 01 Mar '21

01 Mar '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 6.1
by Julian Rüger 01 Mar '21

01 Mar '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[tools] testbot/LibvirtTool: Allow cleanly powering off VMs.
by Francois Gouget 01 Mar '21

01 Mar '21

If a snapshot has the '-off' suffix, try cleanly powering of the VM after running the tests. This may avoid perma-crashing the GPU when using PCI-passthrough. Forcefully power of the VM as usual if it does not cleanly shuts down within $WaitForShutdown seconds. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 50 +++++++++++++++++++++++++++++-- testbot/lib/WineTestBot/Config.pm | 9 ++++-- 2 files changed, 54 insertions(+), 5 deletions(-… [View More]) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index a2939e738..59adf2f7f 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -323,9 +323,55 @@ sub Monitor() sub PowerOff() { - # Power off VMs no matter what their initial status is + my $Domain = $VM->GetDomain(); + if ($VM->IdleSnapshot =~ /-off$/ and $Domain->IsPoweredOn()) + { + # Attempt to perform a clean shutdown. + # Use SetTime() to detect if privileged operations are allowed. + my $TA = $VM->GetAgent(); + if (!$TA->SetTime()) + { + # Not a fatal error. Try the next port in case the VM runs a privileged + # TestAgentd daemon there. + $TA->Disconnect(); + $TA = $VM->GetAgent(1); + if (!$TA->SetTime()) + { + Error "Unable to get a privileged TestAgent: ". $TA->GetLastError() ."\n"; + $TA->Disconnect(); + $TA = undef; + } + } + if ($TA) + { + my $Cmd = $VM->Type =~ /^win(?:32|64)$/ ? + ["shutdown.exe", "/p", "/d", "00:00"] : + ["/sbin/shutdown", "--poweroff", "now"]; + Debug(Elapsed($Start), " Running @$Cmd\n"); + if (!$TA->Run($Cmd, 0)) + { + Error "Could not run @$Cmd: ". $TA->GetLastError() ."\n"; + } + else + { + Debug(Elapsed($Start), " Waiting for the VM to power off\n"); + my $Deadline = time() + $WaitForShutdown; + while ($Domain->IsPoweredOn()) + { + if (time() >= $Deadline) + { + Error "Timed out waiting for ". $VM->Name ." to perform a clean shutdown. Forcefully shutting down now...\n"; + last; + } + sleep(1); + } + } + } + } + + # Power off the VM no matter what its initial status is $CurrentStatus = $VM->Status; - my $ErrMessage = $VM->GetDomain()->PowerOff(); + my $ErrMessage = $Domain->PowerOff(); FatalError("$ErrMessage\n") if (defined $ErrMessage); return ChangeStatus(undef, "off", "done"); diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 312797229..a4aba2c55 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -29,7 +29,8 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir %RepoURLs $DbDataSource $DbUsername $DbPassword $MaxRevertingVMs $MaxRevertsWhileRunningVMs $MaxActiveVMs $MaxRunningVMs $MaxVMsWhenIdle $WaitForBoot $SleepAfterBoot $SleepAfterRevert - $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail + $VMToolTimeout $WaitForShutdown $MaxVMErrors $MaxTaskTries + $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $ReconfigBuildTimeout $ExeBuildTimeout $ExeModuleTimeout $WineBuildTimeout $WineModuleTimeout $TimeoutMargin @@ -45,8 +46,8 @@ require Exporter; @EXPORT = qw($UseSSL $LogDir $DataDir $BinDir %RepoURLs $MaxRevertingVMs $MaxRevertsWhileRunningVMs $MaxActiveVMs $MaxRunningVMs $MaxVMsWhenIdle $WaitForBoot $SleepAfterBoot - $SleepAfterRevert - $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail + $SleepAfterRevert $VMToolTimeout $WaitForShutdown + $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout $ReconfigBuildTimeout $ExeBuildTimeout $ExeModuleTimeout $WineBuildTimeout $WineModuleTimeout $TimeoutMargin @@ -101,6 +102,8 @@ $SleepAfterRevert = 0; # How long to wait before considering a VM operation is stuck. In particular # for reverts this should take into account the time it may need to boot. $VMToolTimeout = 6 * 60; +# How long to wait for the VM to perform a clean shutdown. +$WaitForShutdown = 30; # Notify the administrator that a VM probably needs manual fixing after # $MaxVMErrors consecutive revert errors. -- 2.20.1 [View Less]

1 0

[tools] testbot/TestWTBS: Fix the TestFailures checks for pure wine:build tasks.
by Francois Gouget 01 Mar '21

01 Mar '21

Such tasks will obviously not have any failure from the test units so take that into account. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/tests/TestWTBS | 74 +++++++++++++++++++++++++++--------------- 1 file changed, 48 insertions(+), 26 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 1467c4b4e..edf097de2 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -859,18 +859,6 @@ sub CheckTask($$$$) { my ($Task, $… [View More]TaskType, $TestInfo, $TestUnits) = @_; - my $TaskInfo = $TestInfo->{$TaskType}; - if (CheckValue($TaskInfo->{Status})) - { - is($Task->Status, $TaskInfo->{Status}, "Check Status of task ". TaskKeyStr($Task)); - } - if ($Task->Status =~ /^bad/) - { - # It makes no sense to check which test units were run in case of a build - # error. - $TestUnits->{$TaskType}->{"*skipped*"} = 1; - } - # Assume the VM's Missions field has not changed since the tests were run my ($ErrMessage, $Missions) = ParseMissionStatement($Task->Missions); if (@$Missions != 1) @@ -879,22 +867,42 @@ sub CheckTask($$$$) return; } - my %ReportTypes; + my (%ReportTypes, $IsTestTask); if ($TaskType =~ /^win/) { + $IsTestTask = 1 if ($TaskType =~ /^win(?:32|64)$/); foreach my $Mission (@{$Missions->[0]->{Missions}}) { my $ReportName = GetMissionBaseName($Mission) .".report"; my $MissionType = $TaskType; - $MissionType .= ":". ($Mission->{test} || "test") if ($TaskType eq "wine"); + if ($TaskType eq "wine") + { + my $Test = $Mission->{test} || "test"; + $IsTestTask = 1 if ($Test =~ /^(?:test|module)/); + $MissionType .= ":$Test"; + } $ReportTypes{$ReportName} = $MissionType; } } + my $TestType = ($TaskType eq "wine" and !$IsTestTask) ? + "wine:build" : $TaskType; + my $TaskInfo = $TestInfo->{$TestType}; + + if (CheckValue($TaskInfo->{Status})) + { + is($Task->Status, $TaskInfo->{Status}, "Check Status of task ". TaskKeyStr($Task)); + } + if ($Task->Status =~ /^bad/) + { + # It makes no sense to check which test units were run in case of a build + # error. + $TestUnits->{$TaskType}->{"*skipped*"} = 1; + } my $CheckTimeouts = ($Task->Status eq "completed" and CheckValue($TaskInfo->{HasTimeout})); - my $ExpectedFailures; + my ($ReportFailures, $IgnoreFailures); my ($ReportCount, $TimeoutCount, $NewFailures) = (0, 0, 0); foreach my $LogName (@{GetLogFileNames($Task->GetDir())}) { @@ -903,7 +911,7 @@ sub CheckTask($$$$) $NewFailures += $LogInfo->{NewCount} || 0; # Get the mission-specific "wine:xxx" report directives - my $MissionType = $ReportTypes{$LogName} || $TaskType; + my $MissionType = $ReportTypes{$LogName} || $TestType; my $MissionInfo = $TestInfo->{$MissionType}; my $LogType = "log"; if ($LogName =~ /\.report$/) @@ -924,11 +932,11 @@ sub CheckTask($$$$) ok(($LogInfo->{ErrCount} || 0) <= $MissionInfo->{TestFailures}, "Check Failures of $LogName in task ". TaskKeyStr($Task)) or diag("report error count = ", ($LogInfo->{ErrCount} || 0), ", expected at most $MissionInfo->{TestFailures}"); - $ExpectedFailures += $MissionInfo->{TestFailures}; + $ReportFailures += $MissionInfo->{TestFailures}; } else { - $ExpectedFailures = undef; + $IgnoreFailures = 1; } } elsif ($LogName =~ /^testbot\./) @@ -951,20 +959,34 @@ sub CheckTask($$$$) } if ($Task->Status eq "completed") { - if (defined $ExpectedFailures) + if ($IsTestTask and ($ReportCount or CheckValue($TaskInfo->{TestUnits}))) + { + if ($IgnoreFailures) + { + # For some mission types (typically test=module) the failure count + # is unpredictable and cannot be checked. + ; # Nothing to do + } + elsif ($ReportCount) + { + # The task's failure count must be compared to the sum of the failure + # counts of each test report. + is($Task->TestFailures, $ReportFailures, "Check Failures of task ". TaskKeyStr($Task)); + } + elsif (CheckValue($TaskInfo->{TestFailures})) + { + # There is no report if the VM crashed / rebooted + is($Task->TestFailures, $TaskInfo->{TestFailures}, "Check Failures of task ". TaskKeyStr($Task)); + } + } + elsif (!$IsTestTask and $ReportCount) { - is($Task->TestFailures, $ExpectedFailures, "Check Failures of task ". TaskKeyStr($Task)); + fail("A $TestType task should not have $ReportCount test reports"); } elsif (CheckValue($TaskInfo->{TestFailures}) and !$ReportCount) { - # Scale the expected TestFailures count with the number of times the test - # was run, i.e. $ReportCount, or take it as is if no report is available. is($Task->TestFailures, $TaskInfo->{TestFailures}, "Check Failures of task ". TaskKeyStr($Task)); } - # else there are reports for which we cannot check the TestFailures count. - # In particular this can happen if the test failure count can be checked - # for test=test but not for test=module. Then whether TestFailures can be - # checked or not depends on the missions mix. } return $NewFailures; } -- 2.20.1 [View Less]

1 0

[tools] testbot/TestWTBS: Adjust the TestUnits check to the wine test/module missions.
by Francois Gouget 01 Mar '21

01 Mar '21

Don't complain that the test=test or test=module case is missing test units if there was no mission of that type. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/tests/TestWTBS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index edf097de2..04487c4bc 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -882,6 +882,7 @@ sub CheckTask($$$$) $MissionType .= ":$Test"; } $… [View More]

1 0

[tools] testbot/TestWTBS: Tweak the message for failed TestUnits module matches.
by Francois Gouget 01 Mar '21

01 Mar '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/tests/TestWTBS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 04487c4bc..e3b0a3ce6 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -1217,7 +1217,7 @@ sub CheckJobTree($;$) $TestUnits->{$MissionType}->{$TestUnit} = 0; $Matched = 1; } - ok($Matched, "Check that $MissionType … [View More]

1 0

[tools] testbot/TestWTBS: Don't report failed test unit matches twice.
by Francois Gouget 01 Mar '21

01 Mar '21

If a module:unit entry did not match, it's certainly not going to match as a module name. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This issue was found thanks to the testwtbsuite test suite. --- testbot/tests/TestWTBS | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index e3b0a3ce6..2a6b66e6d 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -1209,6 +1209,7 @@ sub CheckJobTree($;$) } … [View More]

1 0

[tools] testbot/TestWTBS: Improve the error checking documentation.
by Francois Gouget 01 Mar '21

01 Mar '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/tests/TestWTBS | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 2a6b66e6d..6a19f138b 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -654,14 +654,23 @@ n 0 comm.c:2210: Test failed: WTBS Simulate an unreported test failure g 0 tests.report.Report validation errors n 0 kernel32:comm has unaccounted for … [View More]

1 0

[tools] testbot/TestWTBS: Fix matching regexps in patches.
by Francois Gouget 01 Mar '21

01 Mar '21

That step was getting skipped for patches submitted through the mailing list, i.e. whenever CheckJobTree() was first called from CheckPatch() (which checks the patches/* files) rather than straight from CheckJobs(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Sending the 100+ wtbsuite test cases is normally done through WinePatches*Submit.pl, that is as if coming from the mailing list, resulting in that check being skipped. Found thanks to the testwtbsuite test suite. -… [View More]

1 0

[tools] testbot/TestWTBS: wine:build should inherit from build.
by Francois Gouget 01 Mar '21

01 Mar '21

wine:build tasks are very similar to regular build tasks so it makes sense to have them inherit from them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/tests/TestWTBS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index daeb36eaa..7a5f29f3d 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -370,7 +370,8 @@ sub LoadTestInfo($) foreach my $Pair (["tasks", ["build", "tests"]… [View More]

1 0

[tools] testbot/TestWTBS: The build tasks should not have test units.
by Francois Gouget 01 Mar '21

01 Mar '21

First check that TestUnits was not accidentally set for build and wine:build tasks, and then set it to an empty string (which is not possible from via regular directives) which means any test unit will show up as an error. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/tests/TestWTBS | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 7a5f29f3d..e9fa98edc 100755 --- a/testbot/tests/… [View More]

1 0

[tools] testbot/web: Limit the number of days shown on the index page.
by Francois Gouget 01 Mar '21

01 Mar '21

By default only show jobs from the last 4 days to speed up generating and loading the page. The limit can of course be changed through the page to access older jobs. One can also get their own default by adding '?Days=N' at the end of the bookmarked TestBot URL. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The 4 day default is arbitrary and could be adjusted. Setting it too short would frequently force reloading the page with a longer period which would be annoying. … [View More]Setting it too long would unnecessarily increase the load on the web server and slow page load. Four days seems like a good compromise because it is the shortest time that allows sending a patch on a friday morning, going offline for the week-end, and checking the results on monday afternoon without hitting the limit. One could also pick 1 week as the default but I'm not sure it would bring much benefit. Here this typically reduces the page generation time to about 0.3 s (from 2.4 s). Obviously how much benefit one gets depends on how many jobs were submitted each day (in my case ~3x the normal volume on wtbsuite days so it's quite variable). --- testbot/lib/WineTestBot/Config.pm | 5 ++-- testbot/web/index.pl | 45 +++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index a4aba2c55..fe4a27cd6 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -38,7 +38,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir $TagPrefix $ProjectName $PatchesMailingList $LDAPServer $LDAPBindDN $LDAPSearchBase $LDAPSearchFilter $LDAPRealNameAttribute $LDAPEMailAttribute $AgentPort $Tunnel - $TunnelDefaults $PrettyHostNames $JobPurgeDays + $TunnelDefaults $PrettyHostNames $DefaultIndexDays $JobPurgeDays $WebHostName $RegistrationQ $RegistrationARE $MuninAPIKey); require Exporter; @@ -55,7 +55,7 @@ require Exporter; $TagPrefix $ProjectName $PatchesMailingList $LDAPServer $LDAPBindDN $LDAPSearchBase $LDAPSearchFilter $LDAPRealNameAttribute $LDAPEMailAttribute $AgentPort $Tunnel - $TunnelDefaults $PrettyHostNames $JobPurgeDays + $TunnelDefaults $PrettyHostNames $DefaultIndexDays $JobPurgeDays $WebHostName $RegistrationQ $RegistrationARE $MuninAPIKey); @EXPORT_OK = qw($DbDataSource $DbUsername $DbPassword); @@ -152,6 +152,7 @@ $LDAPSearchFilter = undef; $LDAPRealNameAttribute = undef; $LDAPEMailAttribute = undef; +$DefaultIndexDays = 4; $JobPurgeDays = 30; if (!$::BuildEnv) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index cc32bdbeb..603f295d5 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -236,8 +236,8 @@ sub GetDetailsPage($) package StatusPage; -use ObjectModel::CGI::Page; -our @ISA = qw(ObjectModel::CGI::Page); +use ObjectModel::CGI::FreeFormPage; +our @ISA = qw(ObjectModel::CGI::FreeFormPage); use WineTestBot::Config; use WineTestBot::Engine::Notify; @@ -251,10 +251,31 @@ sub _initialize($$$) { my ($self, $Request, $RequiredRole) = @_; + $self->{Days} = $self->GetParam("Days"); + $self->Validate(); + $self->{start} = Time(); $self->SUPER::_initialize($Request, $RequiredRole); } +sub Validate($) +{ + my ($self) = @_; + + if (!defined $self->{Days} or !$self->{Days}) + { + $self->{Days} = $DefaultIndexDays; + } + elsif ($self->{Days} !~ /^[0-9]{1,2}$/) + { + $self->{ErrField} = "Days"; + $self->{ErrMessage} = "The number of days must be between 1 and 99"; + $self->{Days} = $DefaultIndexDays; + return undef; + } + return $self->SUPER::Validate(); +} + sub OutputDot($$) { my ($self, $DotColor) = @_; @@ -328,12 +349,15 @@ sub GenerateBody($) print "<h2><a name='jobs'></a>Jobs</h2>\n"; my $Jobs = CreateJobs(); + my $CutOff = time() - $self->{Days} * 24 * 60 * 60; + $Jobs->AddFilter("Submitted", [$CutOff], ">="); my $JobsCollectionBlock = new JobStatusBlock($Jobs, $self); # We need to collect information about the tasks of all jobs except the # pretty rare queued jobs. But doing so one job at a time is inefficient so # do it all at once now and store the results in ...->{JobsInfo}. my $Tasks = CreateTasks(); + $Tasks->AddFilter("Started", [$CutOff], ">="); foreach my $Task (@{$Tasks->GetItems()}) { my $JobInfo = ($JobsCollectionBlock->{JobsInfo}->{$Task->JobId} ||= {}); @@ -353,6 +377,18 @@ sub GenerateBody($) $JobsCollectionBlock->GenerateList(); + print <<EOF; +<p></p> +<form id="Days" action='/' method='get'> + <div class='ItemProperty'><label>Show jobs for the past</label> + <div class='ItemValue'> + <input type='text' name='Days' maxlength='2' size='2' value='$self->{Days}' /> days + <input type='submit' value='Update'/> + </div> + </div> +</form> +EOF + print "<h2><a name='vms'></a>VMs</h2>\n"; my $VMsCollectionBlock = new VMStatusBlock(CreateVMs(), $self); $VMsCollectionBlock->GenerateList(); @@ -361,6 +397,11 @@ sub GenerateBody($) print "<p class='GeneralFooterText'>Generated in ", Elapsed($self->{start}), " s</p>\n"; } +sub OnAction($$) +{ + my ($self, $Action) = @_; + return $self->Validate() ? 1 : undef; +} package main; -- 2.20.1 [View Less]

1 0

[tools] testbot/LogUtils: Let ParseWineTestReport() do the error detection.
by Francois Gouget 01 Mar '21

01 Mar '21

This reduces duplication and lets ParseWineTestReport()'s more sophisticated analysis have the last word on which report lines contain errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This is needed to allow proper handling of IgnoreExceptions lines. testbot/lib/WineTestBot/LogUtils.pm | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 267dcd9ec..4d2619ccc 100644 --- … [View More]

1 0

[PATCH 1/9] reg/tests: Split 'delete' tests from reg.c
by Hugh McMaster 01 Mar '21

01 Mar '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/tests/Makefile.in | 3 +- programs/reg/tests/delete.c | 123 ++++++++++++++++++++++++++++++++ programs/reg/tests/reg.c | 125 +++------------------------------ programs/reg/tests/reg_test.h | 56 +++++++++++++++ 4 files changed, 191 insertions(+), 116 deletions(-) create mode 100644 programs/reg/tests/delete.c create mode 100644 programs/reg/tests/reg_test.h diff --git a/programs/reg/tests/… [View More]Makefile.in b/programs/reg/tests/Makefile.in index c5ce9f3a06b..791a8cfc4e3 100644 --- a/programs/reg/tests/Makefile.in +++ b/programs/reg/tests/Makefile.in @@ -2,4 +2,5 @@ TESTDLL = reg.exe IMPORTS = advapi32 C_SRCS = \ - reg.c + reg.c \ + delete.c diff --git a/programs/reg/tests/delete.c b/programs/reg/tests/delete.c new file mode 100644 index 00000000000..fff3c5348b8 --- /dev/null +++ b/programs/reg/tests/delete.c @@ -0,0 +1,123 @@ +/* + * Copyright 2014 Akihiro Sagawa + * Copyright 2016-2018, 2021 Hugh McMaster + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "reg_test.h" + +static void test_delete(void) +{ + HKEY hkey, hsubkey; + DWORD r; + const DWORD deadbeef = 0xdeadbeef; + + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg delete", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg delete /?", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg delete /h", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg delete -H", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + /* Multiple /v* switches */ + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v Wine /ve", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v Wine /va", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /ve /va", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v Wine /v Test /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + /* No /v argument */ + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /f /v", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + /* Create a test key */ + add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); + add_value(hkey, "foo", REG_DWORD, &deadbeef, sizeof(deadbeef)); + add_value(hkey, "bar", REG_DWORD, &deadbeef, sizeof(deadbeef)); + add_value(hkey, NULL, REG_DWORD, &deadbeef, sizeof(deadbeef)); + + add_key(hkey, "subkey", &hsubkey); + close_key(hsubkey); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v bar /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "bar"); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /ve /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, ""); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /va /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "foo"); + verify_key(hkey, "subkey"); + + /* Test forward and back slashes */ + add_key(hkey, "https://winehq.org", &hsubkey); + close_key(hsubkey); + add_value(hkey, "count/up", REG_SZ, "one/two/three", 14); + add_value(hkey, "\\foo\\bar", REG_SZ, "", 1); + + run_reg_exe("reg delete HKCU\\" KEY_BASE "\\https://winehq.org /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(hkey, "https://winehq.org"); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v count/up /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "count/up"); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v \\foo\\bar /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "\\foo\\bar"); + + close_key(hkey); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); +} + +START_TEST(delete) +{ + DWORD r; + + if (!run_reg_exe("reg.exe /?", &r)) { + win_skip("reg.exe not available, skipping 'delete' tests\n"); + return; + } + + test_delete(); +} diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 538a274d54f..97766e191fa 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -16,22 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> -#include <windows.h> -#include "wine/test.h" +#include "reg_test.h" #define lok ok_(__FILE__,line) -#define KEY_WINE "Software\\Wine" -#define KEY_BASE KEY_WINE "\\reg_test" -#define REG_EXIT_SUCCESS 0 -#define REG_EXIT_FAILURE 1 #define TODO_REG_TYPE (0x0001u) #define TODO_REG_SIZE (0x0002u) #define TODO_REG_DATA (0x0004u) #define TODO_REG_COMPARE (0x0008u) -#define run_reg_exe(c,r) run_reg_exe_(__LINE__,c,r) -static BOOL run_reg_exe_(unsigned line, const char *cmd, DWORD *rc) +BOOL run_reg_exe_(unsigned line, const char *cmd, DWORD *rc) { STARTUPINFOA si = {sizeof(STARTUPINFOA)}; PROCESS_INFORMATION pi; @@ -86,8 +79,7 @@ static void verify_reg_(unsigned line, HKEY hkey, const char* value, } } -#define verify_reg_nonexist(k,v) verify_reg_nonexist_(__LINE__,k,v) -static void verify_reg_nonexist_(unsigned line, HKEY hkey, const char *value) +void verify_reg_nonexist_(unsigned line, HKEY hkey, const char *value) { LONG err; @@ -105,8 +97,7 @@ static void open_key_(unsigned line, const HKEY base, const char *path, const DW lok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", err); } -#define close_key(k) close_key_(__LINE__,k) -static void close_key_(unsigned line, HKEY hkey) +void close_key_(unsigned line, HKEY hkey) { LONG err; @@ -114,8 +105,7 @@ static void close_key_(unsigned line, HKEY hkey) lok(err == ERROR_SUCCESS, "RegCloseKey failed: %d\n", err); } -#define verify_key(k,s) verify_key_(__LINE__,k,s) -static void verify_key_(unsigned line, HKEY key_base, const char *subkey) +void verify_key_(unsigned line, HKEY key_base, const char *subkey) { HKEY hkey; LONG err; @@ -127,8 +117,7 @@ static void verify_key_(unsigned line, HKEY key_base, const char *subkey) RegCloseKey(hkey); } -#define verify_key_nonexist(k,s) verify_key_nonexist_(__LINE__,k,s) -static void verify_key_nonexist_(unsigned line, HKEY key_base, const char *subkey) +void verify_key_nonexist_(unsigned line, HKEY key_base, const char *subkey) { HKEY hkey; LONG err; @@ -141,8 +130,7 @@ static void verify_key_nonexist_(unsigned line, HKEY key_base, const char *subke RegCloseKey(hkey); } -#define add_key(k,p,s) add_key_(__LINE__,k,p,s) -static void add_key_(unsigned line, const HKEY hkey, const char *path, HKEY *subkey) +void add_key_(unsigned line, const HKEY hkey, const char *path, HKEY *subkey) { LONG err; @@ -163,7 +151,7 @@ static void delete_key_(unsigned line, const HKEY hkey, const char *path) } } -static LONG delete_tree(const HKEY key, const char *subkey) +LONG delete_tree(const HKEY key, const char *subkey) { HKEY hkey; LONG ret; @@ -205,9 +193,7 @@ cleanup: return ret; } -#define add_value(k,n,t,d,s) add_value_(__LINE__,k,n,t,d,s) -static void add_value_(unsigned line, HKEY hkey, const char *name, DWORD type, - const void *data, size_t size) +void add_value_(unsigned line, HKEY hkey, const char *name, DWORD type, const void *data, size_t size) { LONG err; @@ -631,97 +617,6 @@ static void test_add(void) delete_tree(HKEY_CURRENT_USER, KEY_BASE); } -static void test_delete(void) -{ - HKEY hkey, hsubkey; - DWORD r; - const DWORD deadbeef = 0xdeadbeef; - - delete_tree(HKEY_CURRENT_USER, KEY_BASE); - verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); - - run_reg_exe("reg delete", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg delete /?", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - - run_reg_exe("reg delete /h", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - - run_reg_exe("reg delete -H", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - - /* Multiple /v* switches */ - run_reg_exe("reg delete HKCU\\" KEY_BASE " /v Wine /ve", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg delete HKCU\\" KEY_BASE " /v Wine /va", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg delete HKCU\\" KEY_BASE " /ve /va", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg delete HKCU\\" KEY_BASE " /v Wine /v Test /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - /* No /v argument */ - run_reg_exe("reg delete HKCU\\" KEY_BASE " /v", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg delete HKCU\\" KEY_BASE " /f /v", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - /* Create a test key */ - add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); - add_value(hkey, "foo", REG_DWORD, &deadbeef, sizeof(deadbeef)); - add_value(hkey, "bar", REG_DWORD, &deadbeef, sizeof(deadbeef)); - add_value(hkey, NULL, REG_DWORD, &deadbeef, sizeof(deadbeef)); - - add_key(hkey, "subkey", &hsubkey); - close_key(hsubkey); - - run_reg_exe("reg delete HKCU\\" KEY_BASE " /v bar /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg_nonexist(hkey, "bar"); - - run_reg_exe("reg delete HKCU\\" KEY_BASE " /ve /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg_nonexist(hkey, ""); - - run_reg_exe("reg delete HKCU\\" KEY_BASE " /va /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg_nonexist(hkey, "foo"); - verify_key(hkey, "subkey"); - - /* Test forward and back slashes */ - add_key(hkey, "https://winehq.org", &hsubkey); - close_key(hsubkey); - add_value(hkey, "count/up", REG_SZ, "one/two/three", 14); - add_value(hkey, "\\foo\\bar", REG_SZ, "", 1); - - run_reg_exe("reg delete HKCU\\" KEY_BASE "\\https://winehq.org /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_key_nonexist(hkey, "https://winehq.org"); - - run_reg_exe("reg delete HKCU\\" KEY_BASE " /v count/up /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg_nonexist(hkey, "count/up"); - - run_reg_exe("reg delete HKCU\\" KEY_BASE " /v \\foo\\bar /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg_nonexist(hkey, "\\foo\\bar"); - - close_key(hkey); - - run_reg_exe("reg delete HKCU\\" KEY_BASE " /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); - - run_reg_exe("reg delete HKCU\\" KEY_BASE " /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); -} - static void test_query(void) { DWORD r; @@ -4851,13 +4746,13 @@ static void test_copy(void) START_TEST(reg) { DWORD r; + if (!run_reg_exe("reg.exe /?", &r)) { win_skip("reg.exe not available, skipping reg.exe tests\n"); return; } test_add(); - test_delete(); test_query(); test_import(); test_unicode_import(); diff --git a/programs/reg/tests/reg_test.h b/programs/reg/tests/reg_test.h new file mode 100644 index 00000000000..78d1098499a --- /dev/null +++ b/programs/reg/tests/reg_test.h @@ -0,0 +1,56 @@ +/* + * Copyright 2021 Hugh McMaster + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __REG_TEST_H__ +#define __REG_TEST_H__ + +#include <stdio.h> +#include <windows.h> +#include "wine/test.h" + +/* Common #defines */ +#define KEY_WINE "Software\\Wine" +#define KEY_BASE KEY_WINE "\\reg_test" +#define REG_EXIT_SUCCESS 0 +#define REG_EXIT_FAILURE 1 + +/* Helper functions */ +#define run_reg_exe(c,r) run_reg_exe_(__LINE__,c,r) +BOOL run_reg_exe_(unsigned line, const char *cmd, DWORD *rc); + +#define verify_reg_nonexist(k,v) verify_reg_nonexist_(__LINE__,k,v) +void verify_reg_nonexist_(unsigned line, HKEY hkey, const char *value); + +#define close_key(k) close_key_(__LINE__,k) +void close_key_(unsigned line, HKEY hkey); + +#define verify_key(k,s) verify_key_(__LINE__,k,s) +void verify_key_(unsigned line, HKEY key_base, const char *subkey); + +#define verify_key_nonexist(k,s) verify_key_nonexist_(__LINE__,k,s) +void verify_key_nonexist_(unsigned line, HKEY key_base, const char *subkey); + +#define add_key(k,p,s) add_key_(__LINE__,k,p,s) +void add_key_(unsigned line, const HKEY hkey, const char *path, HKEY *subkey); + +LONG delete_tree(const HKEY key, const char *subkey); + +#define add_value(k,n,t,d,s) add_value_(__LINE__,k,n,t,d,s) +void add_value_(unsigned line, HKEY hkey, const char *name, DWORD type, const void *data, size_t size); + +#endif /* __REG_TEST_H__ */ -- 2.30.1 [View Less]

3 16

[PATCH] dwrite/layout: Implement axis values property for the format object.
by Nikolay Sivov 01 Mar '21

01 Mar '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/layout.c | 79 +++++++++++++++++++++++++++++++------- dlls/dwrite/tests/layout.c | 38 ++++++++++++++++-- include/dwrite_3.idl | 2 +- 3 files changed, 100 insertions(+), 19 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 38be4eeb2da..99048b97a3c 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -62,6 +62,9 @@ struct dwrite_textformat_data … [View More]IDWriteFontCollection *collection; IDWriteFontFallback *fallback; + + DWRITE_FONT_AXIS_VALUE *axis_values; + unsigned int axis_values_count; }; enum layout_range_attr_kind { @@ -328,6 +331,7 @@ static void release_format_data(struct dwrite_textformat_data *data) if (data->trimmingsign) IDWriteInlineObject_Release(data->trimmingsign); heap_free(data->family_name); heap_free(data->locale); + heap_free(data->axis_values); } static inline struct dwrite_textlayout *impl_from_IDWriteTextLayout4(IDWriteTextLayout4 *iface) @@ -465,6 +469,41 @@ static inline HRESULT format_set_linespacing(struct dwrite_textformat_data *form return S_OK; } +static HRESULT format_set_font_axisvalues(struct dwrite_textformat_data *format, + DWRITE_FONT_AXIS_VALUE const *axis_values, unsigned int num_values) +{ + heap_free(format->axis_values); + format->axis_values = NULL; + format->axis_values_count = 0; + + if (num_values) + { + if (!(format->axis_values = heap_calloc(num_values, sizeof(*axis_values)))) + return E_OUTOFMEMORY; + memcpy(format->axis_values, axis_values, num_values * sizeof(*axis_values)); + format->axis_values_count = num_values; + } + + return S_OK; +} + +static HRESULT format_get_font_axisvalues(struct dwrite_textformat_data *format, + DWRITE_FONT_AXIS_VALUE *axis_values, unsigned int num_values) +{ + if (!format->axis_values_count) + { + if (num_values) memset(axis_values, 0, num_values * sizeof(*axis_values)); + return S_OK; + } + + if (num_values < format->axis_values_count) + return E_NOT_SUFFICIENT_BUFFER; + + memcpy(axis_values, format->axis_values, min(num_values, format->axis_values_count) * sizeof(*axis_values)); + + return S_OK; +} + static HRESULT get_fontfallback_from_format(const struct dwrite_textformat_data *format, IDWriteFontFallback **fallback) { *fallback = format->fallback; @@ -4922,24 +4961,30 @@ static HRESULT WINAPI dwritetextformat2_layout_GetLineSpacing(IDWriteTextFormat3 static HRESULT WINAPI dwritetextformat3_layout_SetFontAxisValues(IDWriteTextFormat3 *iface, DWRITE_FONT_AXIS_VALUE const *axis_values, UINT32 num_values) { - FIXME("%p, %p, %u.\n", iface, axis_values, num_values); + struct dwrite_textlayout *layout = impl_layout_from_IDWriteTextFormat3(iface); - return E_NOTIMPL; + TRACE("%p, %p, %u.\n", iface, axis_values, num_values); + + return format_set_font_axisvalues(&layout->format, axis_values, num_values); } static UINT32 WINAPI dwritetextformat3_layout_GetFontAxisValueCount(IDWriteTextFormat3 *iface) { - FIXME("%p.\n", iface); + struct dwrite_textlayout *layout = impl_layout_from_IDWriteTextFormat3(iface); - return 0; + TRACE("%p.\n", iface); + + return layout->format.axis_values_count; } static HRESULT WINAPI dwritetextformat3_layout_GetFontAxisValues(IDWriteTextFormat3 *iface, - DWRITE_FONT_AXIS_VALUE const *axis_values, UINT32 num_values) + DWRITE_FONT_AXIS_VALUE *axis_values, UINT32 num_values) { - FIXME("%p, %p, %u.\n", iface, axis_values, num_values); + struct dwrite_textlayout *layout = impl_layout_from_IDWriteTextFormat3(iface); - return E_NOTIMPL; + TRACE("%p, %p, %u.\n", iface, axis_values, num_values); + + return format_get_font_axisvalues(&layout->format, axis_values, num_values); } static DWRITE_AUTOMATIC_FONT_AXES WINAPI dwritetextformat3_layout_GetAutomaticFontAxes(IDWriteTextFormat3 *iface) @@ -6042,24 +6087,30 @@ static HRESULT WINAPI dwritetextformat2_GetLineSpacing(IDWriteTextFormat3 *iface static HRESULT WINAPI dwritetextformat3_SetFontAxisValues(IDWriteTextFormat3 *iface, DWRITE_FONT_AXIS_VALUE const *axis_values, UINT32 num_values) { - FIXME("%p, %p, %u.\n", iface, axis_values, num_values); + struct dwrite_textformat *format = impl_from_IDWriteTextFormat3(iface); - return E_NOTIMPL; + TRACE("%p, %p, %u.\n", iface, axis_values, num_values); + + return format_set_font_axisvalues(&format->format, axis_values, num_values); } static UINT32 WINAPI dwritetextformat3_GetFontAxisValueCount(IDWriteTextFormat3 *iface) { - FIXME("%p.\n", iface); + struct dwrite_textformat *format = impl_from_IDWriteTextFormat3(iface); - return 0; + TRACE("%p.\n", iface); + + return format->format.axis_values_count; } static HRESULT WINAPI dwritetextformat3_GetFontAxisValues(IDWriteTextFormat3 *iface, - DWRITE_FONT_AXIS_VALUE const *axis_values, UINT32 num_values) + DWRITE_FONT_AXIS_VALUE *axis_values, UINT32 num_values) { - FIXME("%p, %p, %u.\n", iface, axis_values, num_values); + struct dwrite_textformat *format = impl_from_IDWriteTextFormat3(iface); - return E_NOTIMPL; + TRACE("%p, %p, %u.\n", iface, axis_values, num_values); + + return format_get_font_axisvalues(&format->format, axis_values, num_values); } static DWRITE_AUTOMATIC_FONT_AXES WINAPI dwritetextformat3_GetAutomaticFontAxes(IDWriteTextFormat3 *iface) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 43e62a39956..cc4079faa14 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -5894,7 +5894,7 @@ static void test_text_format_axes(void) { IDWriteFontCollection *collection; IDWriteFontCollection2 *collection2; - DWRITE_FONT_AXIS_VALUE axis; + DWRITE_FONT_AXIS_VALUE axes[2]; IDWriteTextFormat3 *format3; DWRITE_FONT_STRETCH stretch; DWRITE_FONT_WEIGHT weight; @@ -5944,9 +5944,9 @@ if (SUCCEEDED(hr)) ok(weight == DWRITE_FONT_WEIGHT_NORMAL, "Unexpected font weight %d.\n", weight); /* Regular properties are not set from axis values. */ - axis.axisTag = DWRITE_FONT_AXIS_TAG_WEIGHT; - axis.value = 200.0f; - hr = IDWriteTextFormat3_SetFontAxisValues(format3, &axis, 1); + axes[0].axisTag = DWRITE_FONT_AXIS_TAG_WEIGHT; + axes[0].value = 200.0f; + hr = IDWriteTextFormat3_SetFontAxisValues(format3, axes, 1); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); weight = IDWriteTextFormat3_GetFontWeight(format3); @@ -5965,6 +5965,36 @@ if (SUCCEEDED(hr)) count = IDWriteTextFormat3_GetFontAxisValueCount(format3); ok(!count, "Unexpected axis count %u.\n", count); + axes[0].axisTag = DWRITE_FONT_AXIS_TAG_WEIGHT; + hr = IDWriteTextFormat3_GetFontAxisValues(format3, axes, 1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(axes[0].axisTag == 0 && axes[0].value == 0.0f, "Unexpected value.\n"); + + axes[0].axisTag = DWRITE_FONT_AXIS_TAG_WEIGHT; + axes[0].value = 200.0f; + axes[1].axisTag = DWRITE_FONT_AXIS_TAG_WIDTH; + axes[1].value = 2.0f; + hr = IDWriteTextFormat3_SetFontAxisValues(format3, axes, 2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = IDWriteTextFormat3_GetFontAxisValueCount(format3); + ok(count == 2, "Unexpected axis count %u.\n", count); + + hr = IDWriteTextFormat3_GetFontAxisValues(format3, axes, 1); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Unexpected hr %#x.\n", hr); + + hr = IDWriteTextFormat3_GetFontAxisValues(format3, axes, 0); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Unexpected hr %#x.\n", hr); + + hr = IDWriteTextFormat3_GetFontAxisValues(format3, axes, 2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDWriteTextFormat3_SetFontAxisValues(format3, axes, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = IDWriteTextFormat3_GetFontAxisValueCount(format3); + ok(!count, "Unexpected axis count %u.\n", count); + IDWriteTextFormat3_Release(format3); IDWriteTextFormat_Release(format); diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index 1b10454ec60..0db2de71cf1 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -562,7 +562,7 @@ interface IDWriteTextFormat3 : IDWriteTextFormat2 UINT32 num_values); UINT32 GetFontAxisValueCount(); HRESULT GetFontAxisValues( - DWRITE_FONT_AXIS_VALUE const *axis_values, + DWRITE_FONT_AXIS_VALUE *axis_values, UINT32 num_values); DWRITE_AUTOMATIC_FONT_AXES GetAutomaticFontAxes(); HRESULT SetAutomaticFontAxes(DWRITE_AUTOMATIC_FONT_AXES axes); -- 2.30.1 [View Less]

1 0

[PATCH 1/2] include: Fix IWMSyncReader2 uuid.
by Gijs Vermeulen 01 Mar '21

01 Mar '21

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- include/wmsdkidl.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index d1e0445470dc..716abe056db1 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -1093,7 +1093,7 @@ interface IWMReaderAllocatorEx : IUnknown [ object, - uuid(faed3d21-1b6b-4af7-8bc6-3e189bbc187b), + uuid(faed3d21-1b6b-4af7-8cb6-3e189bbc187b), pointer_default( unique )… [View More]

1 1

[PATCH] gdi32: The original family name should be obtained in find_matching_face_by_name().
by Haidong Yu 01 Mar '21

01 Mar '21

1 0

[PATCH 1/3] wbemdisp: Reference Services object in objects it's created.
by Nikolay Sivov 01 Mar '21

01 Mar '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wbemdisp/locator.c | 51 ++++++++++++++++++++++------------ dlls/wbemdisp/tests/wbemdisp.c | 11 ++++++++ 2 files changed, 45 insertions(+), 17 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 619f7e5c67f..9e191c07b49 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -43,9 +43,11 @@ static WCHAR *heap_strdupW( const WCHAR *src ) return dst; } -static … [View More]HRESULT EnumVARIANT_create( IEnumWbemClassObject *, IEnumVARIANT ** ); +struct services; + +static HRESULT EnumVARIANT_create( struct services *, IEnumWbemClassObject *, IEnumVARIANT ** ); static HRESULT ISWbemSecurity_create( ISWbemSecurity ** ); -static HRESULT SWbemObject_create( IWbemClassObject *, ISWbemObject ** ); +static HRESULT SWbemObject_create( struct services *, IWbemClassObject *, ISWbemObject ** ); enum type_id { @@ -513,6 +515,13 @@ static HRESULT SWbemPropertySet_create( IWbemClassObject *wbem_object, ISWbemPro return S_OK; } +struct services +{ + ISWbemServices ISWbemServices_iface; + LONG refs; + IWbemServices *services; +}; + struct member { BSTR name; @@ -529,6 +538,7 @@ struct object UINT nb_members; DISPID last_dispid; DISPID last_dispid_method; + struct services *services; }; struct methodset @@ -706,7 +716,7 @@ static HRESULT WINAPI method_get_InParameters( IWbemClassObject_Release( in_sign ); if (SUCCEEDED(hr)) { - hr = SWbemObject_create( instance, params ); + hr = SWbemObject_create( method->set->object->services, instance, params ); IWbemClassObject_Release( instance ); } } @@ -995,6 +1005,7 @@ static ULONG WINAPI object_Release( TRACE( "destroying %p\n", object ); IWbemClassObject_Release( object->object ); + ISWbemServices_Release( &object->services->ISWbemServices_iface ); for (i = 0; i < object->nb_members; i++) SysFreeString( object->members[i].name ); heap_free( object->members ); heap_free( object ); @@ -1557,7 +1568,8 @@ static const ISWbemObjectVtbl object_vtbl = object_get_Security_ }; -static HRESULT SWbemObject_create( IWbemClassObject *wbem_object, ISWbemObject **obj ) +static HRESULT SWbemObject_create( struct services *services, IWbemClassObject *wbem_object, + ISWbemObject **obj ) { struct object *object; @@ -1572,6 +1584,8 @@ static HRESULT SWbemObject_create( IWbemClassObject *wbem_object, ISWbemObject * object->nb_members = 0; object->last_dispid = DISPID_BASE; object->last_dispid_method = DISPID_BASE_METHOD; + object->services = services; + ISWbemServices_AddRef( &object->services->ISWbemServices_iface ); *obj = &object->ISWbemObject_iface; TRACE( "returning iface %p\n", *obj ); @@ -1584,6 +1598,7 @@ struct objectset LONG refs; IEnumWbemClassObject *objectenum; LONG count; + struct services *services; }; static inline struct objectset *impl_from_ISWbemObjectSet( @@ -1608,6 +1623,7 @@ static ULONG WINAPI objectset_Release( { TRACE( "destroying %p\n", objectset ); IEnumWbemClassObject_Release( objectset->objectenum ); + ISWbemServices_Release( &objectset->services->ISWbemServices_iface ); heap_free( objectset ); } return refs; @@ -1725,7 +1741,7 @@ static HRESULT WINAPI objectset_get__NewEnum( hr = IEnumWbemClassObject_Clone( objectset->objectenum, &objectenum ); if (FAILED( hr )) return hr; - hr = EnumVARIANT_create( objectenum, (IEnumVARIANT **)pUnk ); + hr = EnumVARIANT_create( objectset->services, objectenum, (IEnumVARIANT **)pUnk ); IEnumWbemClassObject_Release( objectenum ); return hr; } @@ -1824,7 +1840,8 @@ static LONG get_object_count( IEnumWbemClassObject *iter ) return count; } -static HRESULT SWbemObjectSet_create( IEnumWbemClassObject *wbem_objectenum, ISWbemObjectSet **obj ) +static HRESULT SWbemObjectSet_create( struct services *services, IEnumWbemClassObject *wbem_objectenum, + ISWbemObjectSet **obj ) { struct objectset *objectset; @@ -1836,6 +1853,8 @@ static HRESULT SWbemObjectSet_create( IEnumWbemClassObject *wbem_objectenum, ISW objectset->objectenum = wbem_objectenum; IEnumWbemClassObject_AddRef( objectset->objectenum ); objectset->count = get_object_count( objectset->objectenum ); + objectset->services = services; + ISWbemServices_AddRef( &services->ISWbemServices_iface ); *obj = &objectset->ISWbemObjectSet_iface; TRACE( "returning iface %p\n", *obj ); @@ -1847,6 +1866,7 @@ struct enumvar IEnumVARIANT IEnumVARIANT_iface; LONG refs; IEnumWbemClassObject *objectenum; + struct services *services; }; static inline struct enumvar *impl_from_IEnumVARIANT( @@ -1871,6 +1891,7 @@ static ULONG WINAPI enumvar_Release( { TRACE( "destroying %p\n", enumvar ); IEnumWbemClassObject_Release( enumvar->objectenum ); + ISWbemServices_Release( &enumvar->services->ISWbemServices_iface ); heap_free( enumvar ); } return refs; @@ -1913,7 +1934,7 @@ static HRESULT WINAPI enumvar_Next( IEnumVARIANT *iface, ULONG celt, VARIANT *va ISWbemObject *sobj; HRESULT hr; - hr = SWbemObject_create( obj, &sobj ); + hr = SWbemObject_create( enumvar->services, obj, &sobj ); IWbemClassObject_Release( obj ); if (FAILED( hr )) return hr; @@ -1959,7 +1980,8 @@ static const struct IEnumVARIANTVtbl enumvar_vtbl = enumvar_Clone }; -static HRESULT EnumVARIANT_create( IEnumWbemClassObject *objectenum, IEnumVARIANT **obj ) +static HRESULT EnumVARIANT_create( struct services *services, IEnumWbemClassObject *objectenum, + IEnumVARIANT **obj ) { struct enumvar *enumvar; @@ -1968,19 +1990,14 @@ static HRESULT EnumVARIANT_create( IEnumWbemClassObject *objectenum, IEnumVARIAN enumvar->refs = 1; enumvar->objectenum = objectenum; IEnumWbemClassObject_AddRef( enumvar->objectenum ); + enumvar->services = services; + ISWbemServices_AddRef( &services->ISWbemServices_iface ); *obj = &enumvar->IEnumVARIANT_iface; TRACE( "returning iface %p\n", *obj ); return S_OK; } -struct services -{ - ISWbemServices ISWbemServices_iface; - LONG refs; - IWbemServices *services; -}; - static inline struct services *impl_from_ISWbemServices( ISWbemServices *iface ) { @@ -2127,7 +2144,7 @@ static HRESULT WINAPI services_Get( hr = IWbemServices_GetObject( services->services, strObjectPath, iFlags, NULL, &obj, NULL ); if (hr != S_OK) return hr; - hr = SWbemObject_create( obj, objWbemObject ); + hr = SWbemObject_create( services, obj, objWbemObject ); IWbemClassObject_Release( obj ); return hr; } @@ -2256,7 +2273,7 @@ static HRESULT WINAPI services_ExecQuery( hr = IWbemServices_ExecQuery( services->services, strQueryLanguage, strQuery, iFlags, NULL, &iter ); if (hr != S_OK) return hr; - hr = SWbemObjectSet_create( iter, objWbemObjectSet ); + hr = SWbemObjectSet_create( services, iter, objWbemObjectSet ); IEnumWbemClassObject_Release( iter ); return hr; } diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index c38a0f14c9b..bf44f62329a 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -279,6 +279,15 @@ static void test_ParseDisplayName(void) IParseDisplayName_Release( displayname ); } +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) +static void _expect_ref(IUnknown* obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); +} + static void test_locator(void) { HRESULT hr; @@ -307,12 +316,14 @@ static void test_locator(void) SysFreeString( root_bstr ); SysFreeString( host_bstr ); + EXPECT_REF( services, 1 ); query_bstr = SysAllocString( L"Select ProcessorId from Win32_Processor" ); lang_bstr = SysAllocString( L"WQL" ); hr = ISWbemServices_ExecQuery( services, query_bstr, lang_bstr, wbemFlagForwardOnly, NULL, &object_set); ok( hr == S_OK, "got %x\n", hr ); SysFreeString( lang_bstr ); SysFreeString( query_bstr ); + EXPECT_REF( services, 2 ); hr = ISWbemLocator_get_Security_( locator, &security ); ok( hr == S_OK, "got %x\n", hr ); -- 2.30.1 [View Less]

3 7

[PATCH 1/3] wbemprox: Implement SetStringValue() method.
by Nikolay Sivov 01 Mar '21

01 Mar '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 15 +++++++- dlls/wbemprox/reg.c | 65 ++++++++++++++++++++++++++++++++ dlls/wbemprox/wbemprox_private.h | 1 + 3 files changed, 80 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 498e3f6fc79..47fc2fb7367 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -393,6 +393,7 @@ static const struct column … [View More]col_stdregprov[] = { L"EnumKey", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, { L"EnumValues", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, { L"GetStringValue", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { L"SetStringValue", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, }; static const struct column col_systemenclosure[] = { @@ -802,6 +803,7 @@ struct record_stdregprov class_method *enumkey; class_method *enumvalues; class_method *getstringvalue; + class_method *setstringvalue; }; struct record_sysrestore { @@ -898,6 +900,11 @@ static const struct record_param data_param[] = { L"StdRegProv", L"GetStringValue", 1, L"sValueName", CIM_STRING }, { L"StdRegProv", L"GetStringValue", -1, L"ReturnValue", CIM_UINT32 }, { L"StdRegProv", L"GetStringValue", -1, L"sValue", CIM_STRING }, + { L"StdRegProv", L"SetStringValue", 1, L"hDefKey", CIM_SINT32, 0x80000002 }, + { L"StdRegProv", L"SetStringValue", 1, L"sSubKeyName", CIM_STRING }, + { L"StdRegProv", L"SetStringValue", 1, L"sValueName", CIM_STRING }, + { L"StdRegProv", L"SetStringValue", 1, L"sValue", CIM_STRING }, + { L"StdRegProv", L"SetStringValue", -1, L"ReturnValue", CIM_UINT32 }, { L"SystemRestore", L"Disable", 1, L"Drive", CIM_STRING }, { L"SystemRestore", L"Disable", -1, L"ReturnValue", CIM_UINT32 }, { L"SystemRestore", L"Enable", 1, L"Drive", CIM_STRING }, @@ -930,7 +937,13 @@ static const struct record_quickfixengineering data_quickfixengineering[] = static const struct record_stdregprov data_stdregprov[] = { - { reg_create_key, reg_enum_key, reg_enum_values, reg_get_stringvalue } + { + reg_create_key, + reg_enum_key, + reg_enum_values, + reg_get_stringvalue, + reg_set_stringvalue, + } }; static const struct record_sysrestore data_sysrestore[] = diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c index ec5a8191424..46b089ca8e8 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -442,3 +442,68 @@ done: if (out_params) IWbemClassObject_Release( out_params ); return hr; } + +static void set_stringvalue( HKEY root, const WCHAR *subkey, const WCHAR *name, const WCHAR *value, VARIANT *retval ) +{ + LONG res; + + TRACE("%p, %s, %s, %s\n", root, debugstr_w(subkey), debugstr_w(name), debugstr_w(value)); + + res = RegSetKeyValueW( root, subkey, name, REG_SZ, value, (lstrlenW( value ) + 1) * sizeof(*value) ); + set_variant( VT_UI4, res, NULL, retval ); +} + +HRESULT reg_set_stringvalue( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + VARIANT defkey, subkey, name, value, retval; + IWbemClassObject *sig, *out_params = NULL; + HRESULT hr; + + TRACE("%p, %p\n", in, out); + + hr = IWbemClassObject_Get( in, L"hDefKey", 0, &defkey, NULL, NULL ); + if (hr != S_OK) return hr; + hr = IWbemClassObject_Get( in, L"sSubKeyName", 0, &subkey, NULL, NULL ); + if (hr != S_OK) return hr; + hr = IWbemClassObject_Get( in, L"sValueName", 0, &name, NULL, NULL ); + if (hr != S_OK) return hr; + hr = IWbemClassObject_Get( in, L"sValue", 0, &value, NULL, NULL ); + if (hr != S_OK) return hr; + + hr = create_signature( L"StdRegProv", L"SetStringValue", PARAM_OUT, &sig ); + if (hr != S_OK) + { + VariantClear( &name ); + VariantClear( &subkey ); + VariantClear( &value ); + return hr; + } + if (out) + { + hr = IWbemClassObject_SpawnInstance( sig, 0, &out_params ); + if (hr != S_OK) + { + VariantClear( &name ); + VariantClear( &subkey ); + VariantClear( &value ); + IWbemClassObject_Release( sig ); + return hr; + } + } + + set_stringvalue( (HKEY)(INT_PTR)V_I4(&defkey), V_BSTR(&subkey), V_BSTR(&name), V_BSTR(&value), &retval ); + if (out_params) + hr = IWbemClassObject_Put( out_params, L"ReturnValue", 0, &retval, CIM_UINT32 ); + + VariantClear( &name ); + VariantClear( &subkey ); + VariantClear( &value ); + IWbemClassObject_Release( sig ); + if (hr == S_OK && out) + { + *out = out_params; + IWbemClassObject_AddRef( out_params ); + } + if (out_params) IWbemClassObject_Release( out_params ); + return hr; +} diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index ac857b859e8..31f41e9fc81 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -248,6 +248,7 @@ HRESULT reg_create_key(IWbemClassObject *, IWbemClassObject *, IWbemClassObject HRESULT reg_enum_key(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT reg_enum_values(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT reg_get_stringvalue(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT reg_set_stringvalue(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT service_pause_service(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT service_resume_service(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT service_start_service(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; -- 2.30.1 [View Less]

2 5

[PATCH] ntdll: Fix loading .so dlls
by Andre Heider 01 Mar '21

01 Mar '21

Fixes: 93eb4dbd "ntdll: Add a separate helper for creating the initial ntdll module." Signed-off-by: Andre Heider <a.heider(a)gmail.com> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 644eee1e9d7..c21c62c10b0 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2325,7 +2325,7 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, … [View More]

2 1

[PATCH 5/5] comctl32: Remove unnecessary OffsetRect() calls.
by Zhiyi Zhang 01 Mar '21

01 Mar '21

Target rectangles are already offset by previous OffsetRect() calls. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/edit.c | 1 - dlls/comctl32/listbox.c | 1 - dlls/comctl32/listview.c | 1 - dlls/comctl32/treeview.c | 1 - 4 files changed, 4 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 4ad46357d96..06e0497ab98 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -3667,7 +3667,6 @@ static void EDIT_WM_NCPaint(HWND … [View More]

2 1

[PATCH 4/5] comdlg32: Fix a memory leak.
by Zhiyi Zhang 01 Mar '21

01 Mar '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comdlg32/colordlg.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index 7ab5efd0962..d5254736b24 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -523,6 +523,7 @@ static void CC_PaintCross(CCPRIV *infoPtr) int wc = GetDialogBaseUnits() * 3 / 4; RECT rect; POINT point, p; + HRGN region; HPEN hPen; int x, y;… [View More]

2 1

[PATCH 3/5] user32: Fix memory leaks.
by Zhiyi Zhang 01 Mar '21

01 Mar '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/edit.c | 5 ++++- dlls/user32/nonclient.c | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 515341f65ea..4e8e7f7db44 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -2633,7 +2633,10 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, const WCHAR *lpsz_r abs(es->selection_end - es->selection_start) - strl, hrgn)… [View More]

2 1

[PATCH 2/5] comctl32: Fix memory leaks.
by Zhiyi Zhang 01 Mar '21

01 Mar '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/edit.c | 7 ++++++- dlls/comctl32/listview.c | 1 + dlls/comctl32/treeview.c | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index f84ef1eb168..4ad46357d96 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -2514,7 +2514,10 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, const WCHAR *lpsz_r abs(es->selection_end -… [View More]

1 0

[PATCH 1/5] comctl32/listbox: Actually draw themed frame.
by Zhiyi Zhang 01 Mar '21

01 Mar '21

Previously, LISTBOX_NCPaint() is called and themed frame is drawn. And then DefWindowProcW() is called with original clip region, overwriting the drawn themed frame. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/listbox.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index b905beee325..137b08ce678 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1186,7 +… [View More]

1 0

[PATCH v2 2/2] ntdll: Allow getting/setting x86_64 context of x86 processes in wine64
by Rafał Harabień 28 Feb '21

28 Feb '21

WoW64 process has two separate contexts: - x86 context used most of the time (e.g. by application code) - x86_64 context used by system when it quits x86 emulation and jumps to the kernel code A notable exception are debug registers - their state is shared. Some debuggers make use of that fact and sets/gets debug registers of x86 processes using x86_64 thread context. This change adds support for setting and getting debug registers using x86_64 thread context. Getting other registers is … [View More]allowed too and will return values from x86 thread context. This change fixes hardware breakpoints in IDA 7.0 disassembler (x86_64 app) when debugging x86 (32 bit) applications. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/ntdll/tests/exception.c | 9 ----- dlls/ntdll/unix/signal_x86_64.c | 62 +++++++++++++++++++++++++++++++++ server/thread.c | 24 +++++++++++-- 3 files changed, 84 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 8f83a14f856..1eaadf9d01e 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -5841,7 +5841,6 @@ static void test_debug_registers_wow64(void) ZeroMemory(&ctx, sizeof(ctx)); ctx.ContextFlags = CONTEXT_ALL; bret = GetThreadContext(pi.hThread, &ctx); - todo_wine ok(bret, "GetThreadContext failed\n"); ctx.Dr0 = 0x12340000; @@ -5850,14 +5849,12 @@ static void test_debug_registers_wow64(void) ctx.Dr3 = 0x12340003; ctx.Dr7 = 0x155; // enable all breakpoints (local) bret = SetThreadContext(pi.hThread, &ctx); - todo_wine ok(bret, "SetThreadContext failed\n"); if (bret) { ZeroMemory(&ctx, sizeof(ctx)); ctx.ContextFlags = CONTEXT_ALL; bret = GetThreadContext(pi.hThread, &ctx); - todo_wine ok(bret, "GetThreadContext failed\n"); if (bret) { @@ -5896,22 +5893,16 @@ static void test_debug_registers_wow64(void) ok(ret == STATUS_SUCCESS, "Wow64GetThreadContext failed with %lx\n", ret); if (ret == STATUS_SUCCESS) { - todo_wine ok(wow64_ctx.Dr0 == 0x56780000, "expected 0x56780000, got %lx\n", wow64_ctx.Dr0); - todo_wine ok(wow64_ctx.Dr1 == 0x56780001, "expected 0x56780001, got %lx\n", wow64_ctx.Dr1); - todo_wine ok(wow64_ctx.Dr2 == 0x56780002, "expected 0x56780002, got %lx\n", wow64_ctx.Dr2); - todo_wine ok(wow64_ctx.Dr3 == 0x56780003, "expected 0x56780003, got %lx\n", wow64_ctx.Dr3); - todo_wine ok(wow64_ctx.Dr7 == 0x101, "expected 0x101, got %lx\n", wow64_ctx.Dr7); } ZeroMemory(&ctx, sizeof(ctx)); ctx.ContextFlags = CONTEXT_ALL; bret = GetThreadContext(pi.hThread, &ctx); - todo_wine ok(bret, "GetThreadContext failed\n"); if (bret) { diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index e62e958b4aa..51b324a1790 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1707,6 +1707,68 @@ NTSTATUS context_to_server( context_t *to, const CONTEXT *from ) */ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) { + if (from->cpu == CPU_x86) + { + // WoW64 process has two separate contexts: one 32 bit used when executing normal user code and one 64 bit + // used by WoW64 internals for talking with the kernel. Debug registers are shared between those contexts + // and some debuggers make use of that fact so handle getting them here. Other registers could be set to + // anything but to keep things sane lets copy them from 32 bit context. + to->ContextFlags = CONTEXT_AMD64; + if (from->flags & SERVER_CTX_CONTROL) + { + to->ContextFlags |= CONTEXT_CONTROL; + to->Rbp = from->ctl.i386_regs.ebp; + to->Rip = from->ctl.i386_regs.eip; + to->Rsp = from->ctl.i386_regs.esp; + to->SegCs = from->ctl.i386_regs.cs; + to->SegSs = from->ctl.i386_regs.ss; + to->EFlags = from->ctl.i386_regs.eflags; + } + + if (from->flags & SERVER_CTX_INTEGER) + { + to->ContextFlags |= CONTEXT_INTEGER; + to->Rax = from->integer.i386_regs.eax; + to->Rcx = from->integer.i386_regs.ecx; + to->Rdx = from->integer.i386_regs.edx; + to->Rbx = from->integer.i386_regs.ebx; + to->Rsi = from->integer.i386_regs.esi; + to->Rdi = from->integer.i386_regs.edi; + to->R8 = 0; + to->R9 = 0; + to->R10 = 0; + to->R11 = 0; + to->R12 = 0; + to->R13 = 0; + to->R14 = 0; + to->R15 = 0; + } + if (from->flags & SERVER_CTX_SEGMENTS) + { + to->ContextFlags |= CONTEXT_SEGMENTS; + to->SegDs = from->seg.i386_regs.ds; + to->SegEs = from->seg.i386_regs.es; + to->SegFs = from->seg.i386_regs.fs; + to->SegGs = from->seg.i386_regs.gs; + } + if (from->flags & SERVER_CTX_FLOATING_POINT) + { + to->ContextFlags |= CONTEXT_FLOATING_POINT; + memset(&to->u.FltSave, 0, sizeof(to->u.FltSave)); + } + if (from->flags & SERVER_CTX_DEBUG_REGISTERS) + { + to->ContextFlags |= CONTEXT_DEBUG_REGISTERS; + to->Dr0 = from->debug.i386_regs.dr0; + to->Dr1 = from->debug.i386_regs.dr1; + to->Dr2 = from->debug.i386_regs.dr2; + to->Dr3 = from->debug.i386_regs.dr3; + to->Dr6 = from->debug.i386_regs.dr6; + to->Dr7 = from->debug.i386_regs.dr7; + } + return STATUS_SUCCESS; + } + if (from->cpu != CPU_x86_64) return STATUS_INVALID_PARAMETER; to->ContextFlags = CONTEXT_AMD64 | (to->ContextFlags & 0x40); diff --git a/server/thread.c b/server/thread.c index d544970f3c1..281ad93a849 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1890,8 +1890,7 @@ DECL_HANDLER(set_thread_context) reply->self = (thread == current); if (thread->state == TERMINATED) set_error( STATUS_UNSUCCESSFUL ); - else if (context->cpu != thread->process->cpu) set_error( STATUS_INVALID_PARAMETER ); - else + else if (context->cpu == thread->process->cpu) { unsigned int system_flags = get_context_system_regs(context->cpu) & context->flags; @@ -1903,6 +1902,27 @@ DECL_HANDLER(set_thread_context) thread->context->regs.flags |= context->flags; } } + else if (context->cpu == CPU_x86_64 && thread->process->cpu == CPU_x86) + { + // WoW64 process has two separate contexts: one 32 bit used when executing normal user code and one 64 bit + // used by WoW64 internals for talking with the kernel. Debug registers are shared between those contexts + // and some debuggers make use of that fact so handle setting them here. + unsigned int system_flags = get_context_system_regs( context->cpu ) & context->flags; + if (system_flags) + { + set_thread_context( thread, context, system_flags ); + if (thread->context && !get_error()) + { + thread->context->regs.debug.i386_regs.dr0 = context->debug.x86_64_regs.dr0; + thread->context->regs.debug.i386_regs.dr1 = context->debug.x86_64_regs.dr1; + thread->context->regs.debug.i386_regs.dr2 = context->debug.x86_64_regs.dr2; + thread->context->regs.debug.i386_regs.dr3 = context->debug.x86_64_regs.dr3; + thread->context->regs.debug.i386_regs.dr6 = context->debug.x86_64_regs.dr6; + thread->context->regs.debug.i386_regs.dr7 = context->debug.x86_64_regs.dr7; + } + } + } + else set_error( STATUS_INVALID_PARAMETER ); release_object( thread ); } -- 2.25.1 [View Less]

1 0

[PATCH v2 1/2] ntdll/tests: test getting/setting x86_64 context of x86 processes in wine64
by Rafał Harabień 28 Feb '21

28 Feb '21

Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/ntdll/tests/exception.c | 115 +++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 397de7dad98..8f83a14f856 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -5816,6 +5816,120 @@ static void test_debug_registers(void) CloseHandle(thread); } +#if defined(__x86_64__) + +static void … [View More]test_debug_registers_wow64(void) +{ + char cmdline[] = "C:\\windows\\syswow64\\notepad.exe"; + PROCESS_INFORMATION pi; + STARTUPINFOA si = {0}; + WOW64_CONTEXT wow64_ctx; + CONTEXT ctx; + BOOL is_wow64; + NTSTATUS ret; + BOOL bret; + + si.cb = sizeof(si); + bret = CreateProcessA(cmdline, NULL, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(bret, "CreateProcessA failed\n"); + + bret = pIsWow64Process(pi.hProcess, &is_wow64); + ok(bret && is_wow64, "expected Wow64 process\n"); + + SuspendThread(pi.hThread); + + ZeroMemory(&ctx, sizeof(ctx)); + ctx.ContextFlags = CONTEXT_ALL; + bret = GetThreadContext(pi.hThread, &ctx); + todo_wine + ok(bret, "GetThreadContext failed\n"); + + ctx.Dr0 = 0x12340000; + ctx.Dr1 = 0x12340001; + ctx.Dr2 = 0x12340002; + ctx.Dr3 = 0x12340003; + ctx.Dr7 = 0x155; // enable all breakpoints (local) + bret = SetThreadContext(pi.hThread, &ctx); + todo_wine + ok(bret, "SetThreadContext failed\n"); + + if (bret) { + ZeroMemory(&ctx, sizeof(ctx)); + ctx.ContextFlags = CONTEXT_ALL; + bret = GetThreadContext(pi.hThread, &ctx); + todo_wine + ok(bret, "GetThreadContext failed\n"); + if (bret) + { + ok(ctx.Dr0 == 0x12340000, "expected 0x12340000, got %lx\n", ctx.Dr0); + ok(ctx.Dr1 == 0x12340001, "expected 0x12340001, got %lx\n", ctx.Dr1); + ok(ctx.Dr2 == 0x12340002, "expected 0x12340002, got %lx\n", ctx.Dr2); + ok(ctx.Dr3 == 0x12340003, "expected 0x12340003, got %lx\n", ctx.Dr3); + ok(ctx.Dr7 == 0x155, "expected 0x155, got %lx\n", ctx.Dr7); + } + + ZeroMemory(&wow64_ctx, sizeof(wow64_ctx)); + wow64_ctx.ContextFlags = WOW64_CONTEXT_ALL; + ret = pRtlWow64GetThreadContext(pi.hThread, &wow64_ctx); + ok(ret == STATUS_SUCCESS, "Wow64GetThreadContext failed with %lx\n", ret); + if (ret == STATUS_SUCCESS) + { + ok(wow64_ctx.Dr0 == 0x12340000, "expected 0x12340000, got %lx\n", wow64_ctx.Dr0); + ok(wow64_ctx.Dr1 == 0x12340001, "expected 0x12340001, got %lx\n", wow64_ctx.Dr1); + ok(wow64_ctx.Dr2 == 0x12340002, "expected 0x12340002, got %lx\n", wow64_ctx.Dr2); + ok(wow64_ctx.Dr3 == 0x12340003, "expected 0x12340003, got %lx\n", wow64_ctx.Dr3); + ok(wow64_ctx.Dr7 == 0x155, "expected 0x155, got %lx\n", wow64_ctx.Dr7); + } + } + + wow64_ctx.Dr0 = 0x56780000; + wow64_ctx.Dr1 = 0x56780001; + wow64_ctx.Dr2 = 0x56780002; + wow64_ctx.Dr3 = 0x56780003; + wow64_ctx.Dr7 = 0x101; // enable only the first breakpoint + ret = pRtlWow64SetThreadContext(pi.hThread, &wow64_ctx); + ok(ret == STATUS_SUCCESS, "Wow64SetThreadContext failed with %lx\n", ret); + + ZeroMemory(&wow64_ctx, sizeof(wow64_ctx)); + wow64_ctx.ContextFlags = WOW64_CONTEXT_ALL; + ret = pRtlWow64GetThreadContext(pi.hThread, &wow64_ctx); + ok(ret == STATUS_SUCCESS, "Wow64GetThreadContext failed with %lx\n", ret); + if (ret == STATUS_SUCCESS) + { + todo_wine + ok(wow64_ctx.Dr0 == 0x56780000, "expected 0x56780000, got %lx\n", wow64_ctx.Dr0); + todo_wine + ok(wow64_ctx.Dr1 == 0x56780001, "expected 0x56780001, got %lx\n", wow64_ctx.Dr1); + todo_wine + ok(wow64_ctx.Dr2 == 0x56780002, "expected 0x56780002, got %lx\n", wow64_ctx.Dr2); + todo_wine + ok(wow64_ctx.Dr3 == 0x56780003, "expected 0x56780003, got %lx\n", wow64_ctx.Dr3); + todo_wine + ok(wow64_ctx.Dr7 == 0x101, "expected 0x101, got %lx\n", wow64_ctx.Dr7); + } + + ZeroMemory(&ctx, sizeof(ctx)); + ctx.ContextFlags = CONTEXT_ALL; + bret = GetThreadContext(pi.hThread, &ctx); + todo_wine + ok(bret, "GetThreadContext failed\n"); + if (bret) + { + ok(ctx.Dr0 == 0x56780000, "expected 0x56780000, got %lx\n", ctx.Dr0); + ok(ctx.Dr1 == 0x56780001, "expected 0x56780001, got %lx\n", ctx.Dr1); + ok(ctx.Dr2 == 0x56780002, "expected 0x56780002, got %lx\n", ctx.Dr2); + ok(ctx.Dr3 == 0x56780003, "expected 0x56780003, got %lx\n", ctx.Dr3); + ok(ctx.Dr7 == 0x101, "expected 0x101, got %lx\n", ctx.Dr7); + } + + ResumeThread(pi.hThread); + TerminateProcess(pi.hProcess, 0); + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); +} + +#endif + static DWORD debug_service_exceptions; static LONG CALLBACK debug_service_handler(EXCEPTION_POINTERS *ExceptionInfo) @@ -8314,6 +8428,7 @@ START_TEST(exception) test_rtlraiseexception(); test_debug_registers(); + test_debug_registers_wow64(); test_debug_service(1); test_virtual_unwind(); test___C_specific_handler(); -- 2.25.1 [View Less]

1 0

[PATCH v2] po: Update Dutch translation
by Floris Renaud 28 Feb '21

28 Feb '21

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- po/nl.po | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/po/nl.po b/po/nl.po index d727b541ffa..431693164ce 100644 --- a/po/nl.po +++ b/po/nl.po @@ -13112,11 +13112,11 @@ msgstr "Wine Verkenner" #: programs/explorer/explorer.rc:33 msgid "Start" -msgstr "Opstarten" +msgstr "Start" #: programs/explorer/explorer.rc:34 programs/winefile/winefile.rc:36 msgid "&Run..." -msgstr "… [View More]&Starten..." +msgstr "&Uitvoeren..." #: programs/fsutil/fsutil.mc:28 msgid "" @@ -16145,10 +16145,10 @@ msgid "" "linked to the Libraries and Graphics tabs to allow you to change system-wide " "or per-application settings in those tabs as well." msgstr "" -"Wine geeft de mogelijkheid om per toepassing de Windows versie in te " -"stellen. Dit tabblad is gekoppeld aan de tabbladen 'Bibliotheken' en " -"'Grafisch' om zowel systeembreed als programmaspecifiek instellingen in deze " -"tabbladen mogelijk te maken." +"Voor elk programma kan Wine apart de Windows versie instellen. Dit tabblad is" +"gekoppeld aan de tabbladen 'Bibliotheken' en 'Grafisch'. Hierdoor kan per " +"programma de standaardinstellingen of programmaspecifieke instellingen " +"gebruikt worden." #: programs/winecfg/winecfg.rc:158 msgid "Add appli&cation..." @@ -16180,7 +16180,7 @@ msgstr "Laat de vensterbeheerder de vensters &beheren" #: programs/winecfg/winecfg.rc:172 msgid "&Emulate a virtual desktop" -msgstr "&Emuleer een virtueel bureaublad" +msgstr "Maak een &virtueel bureaublad" #: programs/winecfg/winecfg.rc:174 msgid "Desktop &size:" @@ -16514,7 +16514,7 @@ msgstr "Automatisch" #: programs/winecfg/winecfg.rc:69 msgid "Local hard disk" -msgstr "Hardeschijf" +msgstr "Harde schijf" #: programs/winecfg/winecfg.rc:70 msgid "Network share" @@ -16526,7 +16526,7 @@ msgstr "Diskettestation" #: programs/winecfg/winecfg.rc:72 msgid "CD-ROM" -msgstr "Cd-rom" +msgstr "CD-ROM" #: programs/winecfg/winecfg.rc:73 msgid "" @@ -16536,7 +16536,7 @@ msgid "" msgstr "" "U kunt geen schijven meer toevoegen.\n" "\n" -"Elke schijf moet een letter van A tot Z hebben dus het kunnen er niet meer " +"Elke schijf moet een letter van A tot Z hebben. Het kunnen er dus niet meer " "dan 26 zijn." #: programs/winecfg/winecfg.rc:74 @@ -16727,8 +16727,8 @@ msgid "" "Database</a> for tips about running this application." msgstr "" "Dit kan veroorzaakt worden door een probleem in het programma of een fout in " -"Wine. U kunt zoeken op <a href=\"https://appdb.winehq.org\">Application " -"Database</a> naar tips voor dit programma." +"Wine. Zoek in de <a href=\"https://appdb.winehq.org\">Programma Database</a> " +"naar tips voor dit programma." #: programs/winedbg/winedbg.rc:62 msgid "Show &Details" @@ -16745,9 +16745,9 @@ msgid "" "button, then <a href=\"https://wiki.winehq.org/Bugs\">file a bug report</a> " "and attach that file to the report." msgstr "" -"Indien dit probleem zich niet voordoet onder Windows en het probleem is nog " -"niet gerapporteerd, dan kunt U gedetailleerde informatie in een bestand " -"opslaan met de \"Opslaan als\" knop. Dit bestand kunt U via <a href=" +"Indien dit probleem zich niet voordoet onder Windows en het probleem nog " +"niet is gerapporteerd, dan kunt u gedetailleerde informatie in een bestand " +"opslaan met de \"Opslaan als\" knop. Dit bestand kunt u via <a href=" "\"https://wiki.winehq.org/Bugs\">file a bug report</a> versturen." #: programs/winedbg/winedbg.rc:40 -- 2.30.1 [View Less]

1 0

[PATCH] shell32: Resize Run program window
by Floris Renaud 28 Feb '21

28 Feb '21

Three lines of text will now fit in the window. More translations will fit. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- dlls/shell32/shell32.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index f19b09f8c21..ff859381593 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -334,7 +334,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" { ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT … [View More]

1 0

[PATCH] mscoree: Add an option to enable the interpreter.
by Esme Povirk 28 Feb '21

28 Feb '21

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/mscoree/metahost.c | 28 ++++++++++++++++++++++++++++ dlls/mscoree/mscoree_private.h | 12 ++++++++++++ 2 files changed, 40 insertions(+) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index d9b599fadc7..907d8af9791 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -106,6 +106,7 @@ MonoImage* (CDECL *mono_image_open_from_module_handle)(HMODULE module_handle, ch static void (CDECL *… [View More]mono_install_assembly_preload_hook)(MonoAssemblyPreLoadFunc func, void *user_data); int (CDECL *mono_jit_exec)(MonoDomain *domain, MonoAssembly *assembly, int argc, char *argv[]); MonoDomain* (CDECL *mono_jit_init_version)(const char *domain_name, const char *runtime_version); +static void (CDECL *mono_jit_set_aot_mode)(MonoAotMode mode); static int (CDECL *mono_jit_set_trace_options)(const char* options); void* (CDECL *mono_marshal_get_vtfixup_ftnptr)(MonoImage *image, DWORD token, WORD type); MonoDomain* (CDECL *mono_object_get_domain)(MonoObject *obj); @@ -158,6 +159,8 @@ static HRESULT load_mono(LPCWSTR mono_path) WCHAR mono_dll_path[MAX_PATH+16]; WCHAR mono_lib_path[MAX_PATH+4], mono_etc_path[MAX_PATH+4]; char mono_lib_path_a[MAX_PATH], mono_etc_path_a[MAX_PATH]; + int aot_size; + char aot_setting[256]; int trace_size; char trace_setting[256]; int verbose_size; @@ -239,6 +242,7 @@ static HRESULT load_mono(LPCWSTR mono_path) LOAD_OPT_MONO_FUNCTION(mono_callspec_set_assembly, NULL); LOAD_OPT_MONO_FUNCTION(mono_image_open_from_module_handle, image_open_module_handle_dummy); + LOAD_OPT_MONO_FUNCTION(mono_jit_set_aot_mode, NULL); LOAD_OPT_MONO_FUNCTION(mono_profiler_create, NULL); LOAD_OPT_MONO_FUNCTION(mono_profiler_install, NULL); LOAD_OPT_MONO_FUNCTION(mono_profiler_set_runtime_shutdown_begin_callback, NULL); @@ -277,6 +281,30 @@ static HRESULT load_mono(LPCWSTR mono_path) mono_install_assembly_preload_hook(mono_assembly_preload_hook_fn, NULL); + aot_size = GetEnvironmentVariableA("WINE_MONO_AOT", aot_setting, sizeof(aot_setting)); + + if (aot_size) + { + MonoAotMode mode; + if (strcmp(aot_setting, "interp") == 0) + mode = MONO_AOT_MODE_INTERP_ONLY; + else if (strcmp(aot_setting, "none") == 0) + mode = MONO_AOT_MODE_NONE; + else + { + ERR("unknown WINE_MONO_AOT setting, valid settings are interp and none\n"); + mode = MONO_AOT_MODE_NONE; + } + if (mono_jit_set_aot_mode != NULL) + { + mono_jit_set_aot_mode(mode); + } + else + { + ERR("mono_jit_set_aot_mode export not found\n"); + } + } + trace_size = GetEnvironmentVariableA("WINE_MONO_TRACE", trace_setting, sizeof(trace_setting)); if (trace_size) diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index da587285cfe..69c30e5e3e0 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -147,6 +147,18 @@ typedef void (CDECL *MonoProfileFunc)(MonoProfiler *prof); typedef void (CDECL *MonoPrintCallback) (const char *string, INT is_stdout); +typedef enum { + MONO_AOT_MODE_NONE, + MONO_AOT_MODE_NORMAL, + MONO_AOT_MODE_HYBRID, + MONO_AOT_MODE_FULL, + MONO_AOT_MODE_LLVMONLY, + MONO_AOT_MODE_INTERP, + MONO_AOT_MODE_INTERP_LLVMONLY, + MONO_AOT_MODE_LLVMONLY_INTERP, + MONO_AOT_MODE_INTERP_ONLY +} MonoAotMode; + extern BOOL is_mono_started DECLSPEC_HIDDEN; extern MonoImage* (CDECL *mono_assembly_get_image)(MonoAssembly *assembly) DECLSPEC_HIDDEN; -- 2.25.1 [View Less]

1 0

[PATCH v2 1/5] aclui: Add an empty ACE editor dialog.
by Zebediah Figura 28 Feb '21

28 Feb '21

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/aclui/Makefile.in | 3 ++ dlls/aclui/aclui.rc | 38 ++++++++++++++ dlls/aclui/aclui_main.c | 106 ++++++++++++++++++++++++++++++++++++++-- dlls/aclui/resource.h | 36 ++++++++++++++ 4 files changed, 179 insertions(+), 4 deletions(-) create mode 100644 dlls/aclui/aclui.rc create mode 100644 dlls/aclui/resource.h diff --git a/dlls/aclui/Makefile.in b/dlls/aclui/… [View More]Makefile.in index e79b3fe9e33..da3aa00084e 100644 --- a/dlls/aclui/Makefile.in +++ b/dlls/aclui/Makefile.in @@ -1,6 +1,9 @@ MODULE = aclui.dll IMPORTLIB = aclui +IMPORTS = comctl32 user32 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = aclui_main.c + +RC_SRCS = aclui.rc diff --git a/dlls/aclui/aclui.rc b/dlls/aclui/aclui.rc new file mode 100644 index 00000000000..3a03b0550e9 --- /dev/null +++ b/dlls/aclui/aclui.rc @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2017 Michael Müller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" +#include "winresrc.h" + +#pragma makedep po + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +IDD_SECURITY_PROPERTIES DIALOGEX 0, 0, 240, 215 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "Security" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Group or user names:", -1, 5, 5, 230, 10 + CONTROL "", IDC_USERS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | LVS_SORTASCENDING | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 5, 17, 230, 63, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + + LTEXT "", IDC_ACE_USER, 5, 105, 110, 10 + LTEXT "Allow", -1, 120, 105, 55, 10, SS_CENTER + LTEXT "Deny", -1, 180, 105, 55, 10, SS_CENTER + CONTROL "", IDC_ACE, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | LVS_SINGLESEL | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 5, 115, 230, 95, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE +END diff --git a/dlls/aclui/aclui_main.c b/dlls/aclui/aclui_main.c index 1a03f30df24..3989c3017aa 100644 --- a/dlls/aclui/aclui_main.c +++ b/dlls/aclui/aclui_main.c @@ -19,22 +19,110 @@ */ #include <stdarg.h> - +#define COBJMACROS #include "initguid.h" #include "windef.h" #include "winbase.h" #include "winuser.h" #include "winnt.h" #include "aclui.h" +#include "resource.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(aclui); -HPROPSHEETPAGE WINAPI CreateSecurityPage(LPSECURITYINFO psi) +/* the aclui.h files does not contain the necessary COBJMACROS */ +#define ISecurityInformation_AddRef(This) (This)->lpVtbl->AddRef(This) +#define ISecurityInformation_Release(This) (This)->lpVtbl->Release(This) +#define ISecurityInformation_GetObjectInformation(This, obj) (This)->lpVtbl->GetObjectInformation(This, obj) +#define ISecurityInformation_GetSecurity(This, info, sd, def) (This)->lpVtbl->GetSecurity(This, info, sd, def) +#define ISecurityInformation_GetAccessRights(This, type, flags, access, count, def) (This)->lpVtbl->GetAccessRights(This, type, flags, access, count, def) + +struct security_page +{ + SI_OBJECT_INFO info; + + HWND dialog; +}; + +static HINSTANCE aclui_instance; + +static void security_page_free(struct security_page *page) +{ + free(page); +} + +static void security_page_init_dlg(HWND hwnd, struct security_page *page) +{ + page->dialog = hwnd; +} + +static INT_PTR CALLBACK security_page_proc(HWND dialog, UINT msg, WPARAM wparam, LPARAM lparam) { - FIXME("(%p): stub\n", psi); - return NULL; + switch (msg) + { + case WM_INITDIALOG: + { + PROPSHEETPAGEW *propsheet = (PROPSHEETPAGEW *)lparam; + security_page_init_dlg(dialog, (struct security_page *)propsheet->lParam); + break; + } + } + return FALSE; +} + +static UINT CALLBACK security_page_callback(HWND hwnd, UINT msg, PROPSHEETPAGEW *ppsp) +{ + struct security_page *page = (struct security_page *)ppsp->lParam; + + if (msg == PSPCB_RELEASE) + security_page_free(page); + + return 1; +} + +HPROPSHEETPAGE WINAPI CreateSecurityPage(ISecurityInformation *security) +{ + struct security_page *page; + PROPSHEETPAGEW propsheet; + HPROPSHEETPAGE ret; + + TRACE("%p\n", security); + + InitCommonControls(); + + if (!(page = calloc(1, sizeof(*page)))) + return NULL; + + if (FAILED(ISecurityInformation_GetObjectInformation(security, &page->info))) + { + free(page); + return NULL; + } + + memset(&propsheet, 0, sizeof(propsheet)); + propsheet.dwSize = sizeof(propsheet); + propsheet.dwFlags = PSP_DEFAULT | PSP_USECALLBACK; + propsheet.hInstance = aclui_instance; + propsheet.pszTemplate = (WCHAR *)MAKEINTRESOURCE(IDD_SECURITY_PROPERTIES); + propsheet.pfnDlgProc = security_page_proc; + propsheet.pfnCallback = security_page_callback; + propsheet.lParam = (LPARAM)page; + + if (page->info.dwFlags & SI_PAGE_TITLE) + { + propsheet.pszTitle = page->info.pszPageTitle; + propsheet.dwFlags |= PSP_USETITLE; + } + + if (!(ret = CreatePropertySheetPageW(&propsheet))) + { + ERR("Failed to create property sheet page.\n"); + free(page); + return NULL; + } + return ret; } BOOL WINAPI EditSecurity(HWND owner, LPSECURITYINFO psi) @@ -42,3 +130,13 @@ BOOL WINAPI EditSecurity(HWND owner, LPSECURITYINFO psi) FIXME("(%p, %p): stub\n", owner, psi); return FALSE; } + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + if (reason == DLL_PROCESS_ATTACH) + { + aclui_instance = instance; + DisableThreadLibraryCalls(instance); + } + return TRUE; +} diff --git a/dlls/aclui/resource.h b/dlls/aclui/resource.h new file mode 100644 index 00000000000..f92d99692c7 --- /dev/null +++ b/dlls/aclui/resource.h @@ -0,0 +1,36 @@ +/* + * Definitions for aclui dialog controls + * + * Copyright (c) 2017 Michael Müller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_ACLUI__ +#define __WINE_ACLUI__ + +#define IDD_SECURITY_PROPERTIES 100 + +#define IDC_USERS 101 + +#define IDC_ACE_USER 110 +#define IDC_ACE 111 + +#define IDS_PERMISSION_FOR 1000 + +#define IDB_USER_ICONS 2000 +#define IDB_CHECKBOX 2001 + +#endif /* __WINE_ACLUI__ */ -- 2.30.1 [View Less]

1 4

[PATCH 1/5] aclui: Add an empty ACE editor dialog.
by Zebediah Figura 28 Feb '21

28 Feb '21

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/aclui/Makefile.in | 3 ++ dlls/aclui/aclui.rc | 38 ++++++++++++++ dlls/aclui/aclui_main.c | 106 ++++++++++++++++++++++++++++++++++++++-- dlls/aclui/resource.h | 36 ++++++++++++++ 4 files changed, 179 insertions(+), 4 deletions(-) create mode 100644 dlls/aclui/aclui.rc create mode 100644 dlls/aclui/resource.h diff --git a/dlls/aclui/Makefile.in b/dlls/aclui/… [View More]Makefile.in index e79b3fe9e33..da3aa00084e 100644 --- a/dlls/aclui/Makefile.in +++ b/dlls/aclui/Makefile.in @@ -1,6 +1,9 @@ MODULE = aclui.dll IMPORTLIB = aclui +IMPORTS = comctl32 user32 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = aclui_main.c + +RC_SRCS = aclui.rc diff --git a/dlls/aclui/aclui.rc b/dlls/aclui/aclui.rc new file mode 100644 index 00000000000..3a03b0550e9 --- /dev/null +++ b/dlls/aclui/aclui.rc @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2017 Michael Müller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" +#include "winresrc.h" + +#pragma makedep po + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +IDD_SECURITY_PROPERTIES DIALOGEX 0, 0, 240, 215 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "Security" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Group or user names:", -1, 5, 5, 230, 10 + CONTROL "", IDC_USERS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | LVS_SORTASCENDING | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 5, 17, 230, 63, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + + LTEXT "", IDC_ACE_USER, 5, 105, 110, 10 + LTEXT "Allow", -1, 120, 105, 55, 10, SS_CENTER + LTEXT "Deny", -1, 180, 105, 55, 10, SS_CENTER + CONTROL "", IDC_ACE, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | LVS_SINGLESEL | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 5, 115, 230, 95, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE +END diff --git a/dlls/aclui/aclui_main.c b/dlls/aclui/aclui_main.c index 1a03f30df24..3989c3017aa 100644 --- a/dlls/aclui/aclui_main.c +++ b/dlls/aclui/aclui_main.c @@ -19,22 +19,110 @@ */ #include <stdarg.h> - +#define COBJMACROS #include "initguid.h" #include "windef.h" #include "winbase.h" #include "winuser.h" #include "winnt.h" #include "aclui.h" +#include "resource.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(aclui); -HPROPSHEETPAGE WINAPI CreateSecurityPage(LPSECURITYINFO psi) +/* the aclui.h files does not contain the necessary COBJMACROS */ +#define ISecurityInformation_AddRef(This) (This)->lpVtbl->AddRef(This) +#define ISecurityInformation_Release(This) (This)->lpVtbl->Release(This) +#define ISecurityInformation_GetObjectInformation(This, obj) (This)->lpVtbl->GetObjectInformation(This, obj) +#define ISecurityInformation_GetSecurity(This, info, sd, def) (This)->lpVtbl->GetSecurity(This, info, sd, def) +#define ISecurityInformation_GetAccessRights(This, type, flags, access, count, def) (This)->lpVtbl->GetAccessRights(This, type, flags, access, count, def) + +struct security_page +{ + SI_OBJECT_INFO info; + + HWND dialog; +}; + +static HINSTANCE aclui_instance; + +static void security_page_free(struct security_page *page) +{ + free(page); +} + +static void security_page_init_dlg(HWND hwnd, struct security_page *page) +{ + page->dialog = hwnd; +} + +static INT_PTR CALLBACK security_page_proc(HWND dialog, UINT msg, WPARAM wparam, LPARAM lparam) { - FIXME("(%p): stub\n", psi); - return NULL; + switch (msg) + { + case WM_INITDIALOG: + { + PROPSHEETPAGEW *propsheet = (PROPSHEETPAGEW *)lparam; + security_page_init_dlg(dialog, (struct security_page *)propsheet->lParam); + break; + } + } + return FALSE; +} + +static UINT CALLBACK security_page_callback(HWND hwnd, UINT msg, PROPSHEETPAGEW *ppsp) +{ + struct security_page *page = (struct security_page *)ppsp->lParam; + + if (msg == PSPCB_RELEASE) + security_page_free(page); + + return 1; +} + +HPROPSHEETPAGE WINAPI CreateSecurityPage(ISecurityInformation *security) +{ + struct security_page *page; + PROPSHEETPAGEW propsheet; + HPROPSHEETPAGE ret; + + TRACE("%p\n", security); + + InitCommonControls(); + + if (!(page = calloc(1, sizeof(*page)))) + return NULL; + + if (FAILED(ISecurityInformation_GetObjectInformation(security, &page->info))) + { + free(page); + return NULL; + } + + memset(&propsheet, 0, sizeof(propsheet)); + propsheet.dwSize = sizeof(propsheet); + propsheet.dwFlags = PSP_DEFAULT | PSP_USECALLBACK; + propsheet.hInstance = aclui_instance; + propsheet.pszTemplate = (WCHAR *)MAKEINTRESOURCE(IDD_SECURITY_PROPERTIES); + propsheet.pfnDlgProc = security_page_proc; + propsheet.pfnCallback = security_page_callback; + propsheet.lParam = (LPARAM)page; + + if (page->info.dwFlags & SI_PAGE_TITLE) + { + propsheet.pszTitle = page->info.pszPageTitle; + propsheet.dwFlags |= PSP_USETITLE; + } + + if (!(ret = CreatePropertySheetPageW(&propsheet))) + { + ERR("Failed to create property sheet page.\n"); + free(page); + return NULL; + } + return ret; } BOOL WINAPI EditSecurity(HWND owner, LPSECURITYINFO psi) @@ -42,3 +130,13 @@ BOOL WINAPI EditSecurity(HWND owner, LPSECURITYINFO psi) FIXME("(%p, %p): stub\n", owner, psi); return FALSE; } + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + if (reason == DLL_PROCESS_ATTACH) + { + aclui_instance = instance; + DisableThreadLibraryCalls(instance); + } + return TRUE; +} diff --git a/dlls/aclui/resource.h b/dlls/aclui/resource.h new file mode 100644 index 00000000000..f92d99692c7 --- /dev/null +++ b/dlls/aclui/resource.h @@ -0,0 +1,36 @@ +/* + * Definitions for aclui dialog controls + * + * Copyright (c) 2017 Michael Müller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_ACLUI__ +#define __WINE_ACLUI__ + +#define IDD_SECURITY_PROPERTIES 100 + +#define IDC_USERS 101 + +#define IDC_ACE_USER 110 +#define IDC_ACE 111 + +#define IDS_PERMISSION_FOR 1000 + +#define IDB_USER_ICONS 2000 +#define IDB_CHECKBOX 2001 + +#endif /* __WINE_ACLUI__ */ -- 2.30.1 [View Less]

3 6

[PATCH] po: Update Dutch translation
by Floris Renaud 28 Feb '21

28 Feb '21

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- po/nl.po | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/po/nl.po b/po/nl.po index d727b541ffa..1c0f94c1515 100644 --- a/po/nl.po +++ b/po/nl.po @@ -13112,7 +13112,7 @@ msgstr "Wine Verkenner" #: programs/explorer/explorer.rc:33 msgid "Start" -msgstr "Opstarten" +msgstr "Wine" #: programs/explorer/explorer.rc:34 programs/winefile/winefile.rc:36 msgid "&Run..." @@ -16145,10 +… [View More]16145,10 @@ msgid "" "linked to the Libraries and Graphics tabs to allow you to change system-wide " "or per-application settings in those tabs as well." msgstr "" -"Wine geeft de mogelijkheid om per toepassing de Windows versie in te " -"stellen. Dit tabblad is gekoppeld aan de tabbladen 'Bibliotheken' en " -"'Grafisch' om zowel systeembreed als programmaspecifiek instellingen in deze " -"tabbladen mogelijk te maken." +"Voor elk programma kan Wine apart de Windows versie instellen. Dit tabblad is" +"gekoppeld aan de tabbladen 'Bibliotheken' en 'Grafisch'. Hierdoor kan per " +"programma de standaardinstellingen of programmaspecifieke instellingen " +"gebruikt worden." #: programs/winecfg/winecfg.rc:158 msgid "Add appli&cation..." @@ -16180,7 +16180,7 @@ msgstr "Laat de vensterbeheerder de vensters &beheren" #: programs/winecfg/winecfg.rc:172 msgid "&Emulate a virtual desktop" -msgstr "&Emuleer een virtueel bureaublad" +msgstr "Maak een &virtueel bureaublad" #: programs/winecfg/winecfg.rc:174 msgid "Desktop &size:" @@ -16514,7 +16514,7 @@ msgstr "Automatisch" #: programs/winecfg/winecfg.rc:69 msgid "Local hard disk" -msgstr "Hardeschijf" +msgstr "Harde schijf" #: programs/winecfg/winecfg.rc:70 msgid "Network share" @@ -16526,7 +16526,7 @@ msgstr "Diskettestation" #: programs/winecfg/winecfg.rc:72 msgid "CD-ROM" -msgstr "Cd-rom" +msgstr "CD-ROM" #: programs/winecfg/winecfg.rc:73 msgid "" @@ -16536,7 +16536,7 @@ msgid "" msgstr "" "U kunt geen schijven meer toevoegen.\n" "\n" -"Elke schijf moet een letter van A tot Z hebben dus het kunnen er niet meer " +"Elke schijf moet een letter van A tot Z hebben. Het kunnen er dus niet meer " "dan 26 zijn." #: programs/winecfg/winecfg.rc:74 @@ -16727,8 +16727,8 @@ msgid "" "Database</a> for tips about running this application." msgstr "" "Dit kan veroorzaakt worden door een probleem in het programma of een fout in " -"Wine. U kunt zoeken op <a href=\"https://appdb.winehq.org\">Application " -"Database</a> naar tips voor dit programma." +"Wine. Zoek in de <a href=\"https://appdb.winehq.org\">Programma Database</a> " +"naar tips voor dit programma." #: programs/winedbg/winedbg.rc:62 msgid "Show &Details" @@ -16745,9 +16745,9 @@ msgid "" "button, then <a href=\"https://wiki.winehq.org/Bugs\">file a bug report</a> " "and attach that file to the report." msgstr "" -"Indien dit probleem zich niet voordoet onder Windows en het probleem is nog " -"niet gerapporteerd, dan kunt U gedetailleerde informatie in een bestand " -"opslaan met de \"Opslaan als\" knop. Dit bestand kunt U via <a href=" +"Indien dit probleem zich niet voordoet onder Windows en het probleem nog " +"niet is gerapporteerd, dan kunt u gedetailleerde informatie in een bestand " +"opslaan met de \"Opslaan als\" knop. Dit bestand kunt u via <a href=" "\"https://wiki.winehq.org/Bugs\">file a bug report</a> versturen." #: programs/winedbg/winedbg.rc:40 -- 2.30.1 [View Less]

2 2

[PATCH vkd3d v2 1/6] vkd3d-shader: Return a vkd3d_string_buffer from hlsl_type_to_string().
by Zebediah Figura 28 Feb '21

28 Feb '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 62 +++++++++++++----------- libs/vkd3d-shader/hlsl.h | 4 +- libs/vkd3d-shader/hlsl.y | 20 +++++--- libs/vkd3d-shader/vkd3d_shader_main.c | 60 +++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 11 +++++ 5 files changed, 120 insertions(+), 37 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index … [View More]52b3dd10..e2a77707 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -648,10 +648,10 @@ static int compare_function_decl_rb(const void *key, const struct rb_entry *entr return 0; } -char *hlsl_type_to_string(const struct hlsl_type *type) +struct vkd3d_string_buffer *hlsl_type_to_string(struct vkd3d_string_buffer_cache *string_buffers, + const struct hlsl_type *type) { - const char *name; - char *string; + struct vkd3d_string_buffer *string; static const char base_types[HLSL_TYPE_LAST_SCALAR + 1][7] = { @@ -663,66 +663,70 @@ char *hlsl_type_to_string(const struct hlsl_type *type) "bool", }; + if (!(string = vkd3d_string_buffer_get(string_buffers))) + return NULL; + if (type->name) - return vkd3d_strdup(type->name); + { + vkd3d_string_buffer_printf(string, "%s", type->name); + return string; + } switch (type->type) { case HLSL_CLASS_SCALAR: - return vkd3d_strdup(base_types[type->base_type]); + vkd3d_string_buffer_printf(string, "%s", base_types[type->base_type]); + return string; case HLSL_CLASS_VECTOR: - name = base_types[type->base_type]; - if ((string = malloc(strlen(name) + 2))) - sprintf(string, "%s%u", name, type->dimx); + vkd3d_string_buffer_printf(string, "%s%u", base_types[type->base_type], type->dimx); return string; case HLSL_CLASS_MATRIX: - name = base_types[type->base_type]; - if ((string = malloc(strlen(name) + 4))) - sprintf(string, "%s%ux%u", name, type->dimx, type->dimy); + vkd3d_string_buffer_printf(string, "%s%ux%u", base_types[type->base_type], type->dimx, type->dimy); return string; case HLSL_CLASS_ARRAY: { + struct vkd3d_string_buffer *inner_string; const struct hlsl_type *t; - char *inner_string; - size_t len = 1; for (t = type; t->type == HLSL_CLASS_ARRAY; t = t->e.array.type) - len += 14; - if (!(inner_string = hlsl_type_to_string(t))) - return NULL; - len += strlen(inner_string); + ; - if ((string = malloc(len))) + if ((inner_string = hlsl_type_to_string(string_buffers, t))) { - strcpy(string, inner_string); - for (t = type; t->type == HLSL_CLASS_ARRAY; t = t->e.array.type) - sprintf(string + strlen(string), "[%u]", t->e.array.elements_count); + vkd3d_string_buffer_printf(string, "%s", inner_string->buffer); + vkd3d_string_buffer_release(string_buffers, inner_string); } - vkd3d_free(inner_string); + for (t = type; t->type == HLSL_CLASS_ARRAY; t = t->e.array.type) + vkd3d_string_buffer_printf(string, "[%u]", t->e.array.elements_count); return string; } case HLSL_CLASS_STRUCT: - return vkd3d_strdup("<anonymous struct>"); + vkd3d_string_buffer_printf(string, "<anonymous struct>"); + return string; default: - return vkd3d_strdup("<unexpected type>"); + vkd3d_string_buffer_printf(string, "<unexpected type>"); + return string; } } const char *debug_hlsl_type(const struct hlsl_type *type) { + struct vkd3d_string_buffer_cache string_buffers; + struct vkd3d_string_buffer *string; const char *ret; - char *string; - if (!(string = hlsl_type_to_string(type))) + vkd3d_string_buffer_cache_init(&string_buffers); + if (!(string = hlsl_type_to_string(&string_buffers, type))) return NULL; - ret = vkd3d_dbg_sprintf("%s", string); - vkd3d_free(string); + ret = vkd3d_dbg_sprintf("%s", string->buffer); + vkd3d_string_buffer_release(&string_buffers, string); + vkd3d_string_buffer_cache_cleanup(&string_buffers); return ret; } @@ -1526,6 +1530,7 @@ static bool hlsl_ctx_init(struct hlsl_ctx *ctx, struct vkd3d_shader_message_cont ctx->source_files_count = 1; ctx->location.source_name = ctx->source_files[0]; ctx->location.line = ctx->location.column = 1; + vkd3d_string_buffer_cache_init(&ctx->string_buffers); ctx->matrix_majority = HLSL_COLUMN_MAJOR; @@ -1553,6 +1558,7 @@ static void hlsl_ctx_cleanup(struct hlsl_ctx *ctx) for (i = 0; i < ctx->source_files_count; ++i) vkd3d_free((void *)ctx->source_files[i]); vkd3d_free(ctx->source_files); + vkd3d_string_buffer_cache_cleanup(&ctx->string_buffers); rb_destroy(&ctx->functions, free_function_rb, NULL); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index a374f54a..5a0470b9 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -390,6 +390,7 @@ struct hlsl_ctx unsigned int source_files_count; struct vkd3d_shader_location location; struct vkd3d_shader_message_context *message_context; + struct vkd3d_string_buffer_cache string_buffers; bool failed; void *scanner; @@ -496,7 +497,8 @@ static inline void hlsl_src_remove(struct hlsl_src *src) const char *debug_hlsl_type(const struct hlsl_type *type) DECLSPEC_HIDDEN; -char *hlsl_type_to_string(const struct hlsl_type *type) DECLSPEC_HIDDEN; +struct vkd3d_string_buffer *hlsl_type_to_string(struct vkd3d_string_buffer_cache *string_buffers, + const struct hlsl_type *type) DECLSPEC_HIDDEN; char *hlsl_modifiers_to_string(unsigned int modifiers) DECLSPEC_HIDDEN; const char *hlsl_node_type_to_string(enum hlsl_ir_node_type type) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index ea640b94..1fb1b7f3 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -255,13 +255,15 @@ static struct hlsl_ir_node *add_implicit_conversion(struct hlsl_ctx *ctx, struct if (!implicit_compatible_data_types(src_type, dst_type)) { - char *src_string = hlsl_type_to_string(src_type), *dst_string = hlsl_type_to_string(dst_type); + struct vkd3d_string_buffer *src_string, *dst_string; + src_string = hlsl_type_to_string(&ctx->string_buffers, src_type); + dst_string = hlsl_type_to_string(&ctx->string_buffers, dst_type); if (src_string && dst_string) hlsl_error(ctx, *loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "Can't implicitly convert from %s to %s.", src_string, dst_string); - vkd3d_free(src_string); - vkd3d_free(dst_string); + "Can't implicitly convert from %s to %s.", src_string->buffer, dst_string->buffer); + vkd3d_string_buffer_release(&ctx->string_buffers, src_string); + vkd3d_string_buffer_release(&ctx->string_buffers, dst_string); return NULL; } @@ -2744,13 +2746,15 @@ unary_expr: if (!compatible_data_types(src_type, dst_type)) { - char *src_string = hlsl_type_to_string(src_type), *dst_string = hlsl_type_to_string(dst_type); + struct vkd3d_string_buffer *src_string, *dst_string; + src_string = hlsl_type_to_string(&ctx->string_buffers, src_type); + dst_string = hlsl_type_to_string(&ctx->string_buffers, dst_type); if (src_string && dst_string) hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, "Can't cast from %s to %s.", - src_string, dst_string); - vkd3d_free(src_string); - vkd3d_free(dst_string); + src_string->buffer, dst_string->buffer); + vkd3d_string_buffer_release(&ctx->string_buffers, src_string); + vkd3d_string_buffer_release(&ctx->string_buffers, dst_string); YYABORT; } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index bae2852a..51136243 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -33,6 +33,12 @@ void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) vkd3d_free(buffer->buffer); } +static void vkd3d_string_buffer_clear(struct vkd3d_string_buffer *buffer) +{ + buffer->buffer[0] = '\0'; + buffer->content_size = 0; +} + static bool vkd3d_string_buffer_resize(struct vkd3d_string_buffer *buffer, int rc) { unsigned int new_buffer_size = buffer->buffer_size * 2; @@ -107,6 +113,60 @@ void vkd3d_string_buffer_trace_(const struct vkd3d_string_buffer *buffer, const } } +void vkd3d_string_buffer_cache_init(struct vkd3d_string_buffer_cache *cache) +{ + memset(cache, 0, sizeof(*cache)); +} + +void vkd3d_string_buffer_cache_cleanup(struct vkd3d_string_buffer_cache *cache) +{ + unsigned int i; + + for (i = 0; i < cache->count; ++i) + { + vkd3d_string_buffer_cleanup(cache->buffers[i]); + vkd3d_free(cache->buffers[i]); + } + vkd3d_free(cache->buffers); + vkd3d_string_buffer_cache_init(cache); +} + +struct vkd3d_string_buffer *vkd3d_string_buffer_get(struct vkd3d_string_buffer_cache *cache) +{ + struct vkd3d_string_buffer *buffer; + + if (!cache->count) + { + if (!vkd3d_array_reserve((void **)&cache->buffers, &cache->capacity, + cache->max_count + 1, sizeof(*cache->buffers))) + return NULL; + ++cache->max_count; + + if (!(buffer = vkd3d_malloc(sizeof(*buffer)))) + return NULL; + vkd3d_string_buffer_init(buffer); + if (!vkd3d_string_buffer_resize(buffer, 1)) + { + vkd3d_free(buffer); + return NULL; + } + } + else + { + buffer = cache->buffers[--cache->count]; + } + vkd3d_string_buffer_clear(buffer); + return buffer; +} + +void vkd3d_string_buffer_release(struct vkd3d_string_buffer_cache *cache, struct vkd3d_string_buffer *buffer) +{ + if (!buffer) + return; + assert(cache->count + 1 <= cache->max_count); + cache->buffers[cache->count++] = buffer; +} + void vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context, enum vkd3d_shader_log_level log_level) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index e837dbcd..cf66c67a 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -870,12 +870,23 @@ struct vkd3d_string_buffer unsigned int content_size; }; +struct vkd3d_string_buffer_cache +{ + struct vkd3d_string_buffer **buffers; + size_t count, max_count, capacity; +}; + enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out) DECLSPEC_HIDDEN; void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; +struct vkd3d_string_buffer *vkd3d_string_buffer_get(struct vkd3d_string_buffer_cache *list) DECLSPEC_HIDDEN; void vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; +void vkd3d_string_buffer_cache_cleanup(struct vkd3d_string_buffer_cache *list) DECLSPEC_HIDDEN; +void vkd3d_string_buffer_cache_init(struct vkd3d_string_buffer_cache *list) DECLSPEC_HIDDEN; int vkd3d_string_buffer_printf(struct vkd3d_string_buffer *buffer, const char *format, ...) VKD3D_PRINTF_FUNC(2, 3) DECLSPEC_HIDDEN; +void vkd3d_string_buffer_release(struct vkd3d_string_buffer_cache *list, + struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; #define vkd3d_string_buffer_trace(buffer) \ vkd3d_string_buffer_trace_(buffer, __FUNCTION__) void vkd3d_string_buffer_trace_(const struct vkd3d_string_buffer *buffer, const char *function) DECLSPEC_HIDDEN; -- 2.30.1 [View Less]

3 7

[PATCH] widl: Remove unnecessary assignment (Coverity).
by Nikolay Sivov 27 Feb '21

27 Feb '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tools/widl/header.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 16c8b57fd6e..40c1f9d008e 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1534,7 +1534,7 @@ static void write_parameterized_type_forward(FILE *header, type_t *type) static void write_parameterized_implementation(FILE *header, type_t *type, int declonly) { const statement_t *… [View More]

1 0

[PATCH] msado15: Fix copy-paste typos in IDispatch methods.
by Nikolay Sivov 27 Feb '21

27 Feb '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msado15/command.c | 2 +- dlls/msado15/stream.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c index aff12f6a108..8c8ec79a58e 100644 --- a/dlls/msado15/command.c +++ b/dlls/msado15/command.c @@ -133,7 +133,7 @@ static HRESULT WINAPI command_Invoke( _Command *iface, DISPID member, REFIID rii TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", command, … [View More]

1 0

[PATCH V3 2/2] msxml3: Implement SAXContentHandler methods for DOMDocument mxwriter output.
by Jefferson Carpenter 27 Feb '21

27 Feb '21

2 3

Wine staging 6.3 release
by Alistair Leslie-Hughes 27 Feb '21

27 Feb '21

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 6.3 (694 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * imagehlp: Implement parts of BindImageEx to make freezing Python scripts work. * widl: Support WinRT parameterized interface type. * ntdll: Implement SystemExtendedHandleInformation in NtQuerySystemInformation. * ntdll: … [View More]

1 0

[PATCH 1/2] oleaut32: Fix VariantCopy()/VariantCopyInd() prototypes.
by Nikolay Sivov 26 Feb '21

26 Feb '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/variant.c | 13 +++++++------ include/oleauto.h | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 36191b6b424..b20ddffab5f 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -689,10 +689,10 @@ HRESULT WINAPI DECLSPEC_HOTPATCH VariantClear(VARIANTARG* pVarg) /******************************************************… [View More]************************ * Copy an IRecordInfo object contained in a variant. */ -static HRESULT VARIANT_CopyIRecordInfo(VARIANT *dest, VARIANT *src) +static HRESULT VARIANT_CopyIRecordInfo(VARIANT *dest, const VARIANT *src) { struct __tagBRECORD *dest_rec = &V_UNION(dest, brecVal); - struct __tagBRECORD *src_rec = &V_UNION(src, brecVal); + const struct __tagBRECORD *src_rec = &V_UNION(src, brecVal); HRESULT hr = S_OK; ULONG size; @@ -745,7 +745,7 @@ static HRESULT VARIANT_CopyIRecordInfo(VARIANT *dest, VARIANT *src) * reference count increased using IUnknown_AddRef(). * - For all by-reference types, only the referencing pointer is copied. */ -HRESULT WINAPI VariantCopy(VARIANTARG* pvargDest, VARIANTARG* pvargSrc) +HRESULT WINAPI VariantCopy(VARIANTARG* pvargDest, const VARIANTARG* pvargSrc) { HRESULT hres = S_OK; @@ -844,9 +844,10 @@ static inline size_t VARIANT_DataSize(const VARIANT* pv) * pvargDest is always cleared using VariantClear() before pvargSrc is copied * to it. If clearing pvargDest fails, so does this function. */ -HRESULT WINAPI VariantCopyInd(VARIANT* pvargDest, VARIANTARG* pvargSrc) +HRESULT WINAPI VariantCopyInd(VARIANT* pvargDest, const VARIANTARG* pvargSrc) { - VARIANTARG vTmp, *pSrc = pvargSrc; + const VARIANTARG *pSrc = pvargSrc; + VARIANTARG vTmp; VARTYPE vt; HRESULT hres = S_OK; @@ -934,7 +935,7 @@ HRESULT WINAPI VariantCopyInd(VARIANT* pvargDest, VARIANTARG* pvargSrc) VariantCopyInd_Return: if (pSrc != pvargSrc) - VariantClear(pSrc); + VariantClear(&vTmp); TRACE("returning 0x%08x, %s\n", hres, debugstr_variant(pvargDest)); return hres; diff --git a/include/oleauto.h b/include/oleauto.h index cc50f189475..8528b74c02f 100644 --- a/include/oleauto.h +++ b/include/oleauto.h @@ -186,8 +186,8 @@ HRESULT WINAPI GetRecordInfoFromGuids(REFGUID,ULONG,ULONG,LCID,REFGUID,IRecordIn void WINAPI VariantInit(VARIANT*); HRESULT WINAPI VariantClear(VARIANT*); -HRESULT WINAPI VariantCopy(VARIANT*,VARIANT*); -HRESULT WINAPI VariantCopyInd(VARIANT*,VARIANT*); +HRESULT WINAPI VariantCopy(VARIANTARG *dst, const VARIANTARG *src); +HRESULT WINAPI VariantCopyInd(VARIANT *dst, const VARIANTARG *src); HRESULT WINAPI VariantChangeType(VARIANT*,VARIANT*,USHORT,VARTYPE); HRESULT WINAPI VariantChangeTypeEx(VARIANT*,VARIANT*,LCID,USHORT,VARTYPE); -- 2.30.0 [View Less]

1 1

[PATCH vkd3d 1/6] vkd3d-shader: Return a vkd3d_string_buffer from hlsl_type_to_string().
by Zebediah Figura 26 Feb '21

26 Feb '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 62 +++++++++++++----------- libs/vkd3d-shader/hlsl.h | 4 +- libs/vkd3d-shader/hlsl.y | 20 +++++--- libs/vkd3d-shader/vkd3d_shader_main.c | 54 +++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 11 +++++ 5 files changed, 114 insertions(+), 37 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index … [View More]52b3dd10..78eacf28 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -648,10 +648,10 @@ static int compare_function_decl_rb(const void *key, const struct rb_entry *entr return 0; } -char *hlsl_type_to_string(const struct hlsl_type *type) +struct vkd3d_string_buffer *hlsl_type_to_string(struct vkd3d_string_buffer_list *string_buffers, + const struct hlsl_type *type) { - const char *name; - char *string; + struct vkd3d_string_buffer *string; static const char base_types[HLSL_TYPE_LAST_SCALAR + 1][7] = { @@ -663,66 +663,70 @@ char *hlsl_type_to_string(const struct hlsl_type *type) "bool", }; + if (!(string = vkd3d_string_buffer_get(string_buffers))) + return NULL; + if (type->name) - return vkd3d_strdup(type->name); + { + vkd3d_string_buffer_printf(string, "%s", type->name); + return string; + } switch (type->type) { case HLSL_CLASS_SCALAR: - return vkd3d_strdup(base_types[type->base_type]); + vkd3d_string_buffer_printf(string, "%s", base_types[type->base_type]); + return string; case HLSL_CLASS_VECTOR: - name = base_types[type->base_type]; - if ((string = malloc(strlen(name) + 2))) - sprintf(string, "%s%u", name, type->dimx); + vkd3d_string_buffer_printf(string, "%s%u", base_types[type->base_type], type->dimx); return string; case HLSL_CLASS_MATRIX: - name = base_types[type->base_type]; - if ((string = malloc(strlen(name) + 4))) - sprintf(string, "%s%ux%u", name, type->dimx, type->dimy); + vkd3d_string_buffer_printf(string, "%s%ux%u", base_types[type->base_type], type->dimx, type->dimy); return string; case HLSL_CLASS_ARRAY: { + struct vkd3d_string_buffer *inner_string; const struct hlsl_type *t; - char *inner_string; - size_t len = 1; for (t = type; t->type == HLSL_CLASS_ARRAY; t = t->e.array.type) - len += 14; - if (!(inner_string = hlsl_type_to_string(t))) - return NULL; - len += strlen(inner_string); + ; - if ((string = malloc(len))) + if ((inner_string = hlsl_type_to_string(string_buffers, t))) { - strcpy(string, inner_string); - for (t = type; t->type == HLSL_CLASS_ARRAY; t = t->e.array.type) - sprintf(string + strlen(string), "[%u]", t->e.array.elements_count); + vkd3d_string_buffer_printf(string, "%s", inner_string->buffer); + vkd3d_string_buffer_release(string_buffers, inner_string); } - vkd3d_free(inner_string); + for (t = type; t->type == HLSL_CLASS_ARRAY; t = t->e.array.type) + vkd3d_string_buffer_printf(string, "[%u]", t->e.array.elements_count); return string; } case HLSL_CLASS_STRUCT: - return vkd3d_strdup("<anonymous struct>"); + vkd3d_string_buffer_printf(string, "<anonymous struct>"); + return string; default: - return vkd3d_strdup("<unexpected type>"); + vkd3d_string_buffer_printf(string, "<unexpected type>"); + return string; } } const char *debug_hlsl_type(const struct hlsl_type *type) { + struct vkd3d_string_buffer_list string_buffers; + struct vkd3d_string_buffer *string; const char *ret; - char *string; - if (!(string = hlsl_type_to_string(type))) + vkd3d_string_buffer_list_init(&string_buffers); + if (!(string = hlsl_type_to_string(&string_buffers, type))) return NULL; - ret = vkd3d_dbg_sprintf("%s", string); - vkd3d_free(string); + ret = vkd3d_dbg_sprintf("%s", string->buffer); + vkd3d_string_buffer_release(&string_buffers, string); + vkd3d_string_buffer_list_cleanup(&string_buffers); return ret; } @@ -1526,6 +1530,7 @@ static bool hlsl_ctx_init(struct hlsl_ctx *ctx, struct vkd3d_shader_message_cont ctx->source_files_count = 1; ctx->location.source_name = ctx->source_files[0]; ctx->location.line = ctx->location.column = 1; + vkd3d_string_buffer_list_init(&ctx->string_buffers); ctx->matrix_majority = HLSL_COLUMN_MAJOR; @@ -1553,6 +1558,7 @@ static void hlsl_ctx_cleanup(struct hlsl_ctx *ctx) for (i = 0; i < ctx->source_files_count; ++i) vkd3d_free((void *)ctx->source_files[i]); vkd3d_free(ctx->source_files); + vkd3d_string_buffer_list_cleanup(&ctx->string_buffers); rb_destroy(&ctx->functions, free_function_rb, NULL); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index a374f54a..62f7d88b 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -390,6 +390,7 @@ struct hlsl_ctx unsigned int source_files_count; struct vkd3d_shader_location location; struct vkd3d_shader_message_context *message_context; + struct vkd3d_string_buffer_list string_buffers; bool failed; void *scanner; @@ -496,7 +497,8 @@ static inline void hlsl_src_remove(struct hlsl_src *src) const char *debug_hlsl_type(const struct hlsl_type *type) DECLSPEC_HIDDEN; -char *hlsl_type_to_string(const struct hlsl_type *type) DECLSPEC_HIDDEN; +struct vkd3d_string_buffer *hlsl_type_to_string(struct vkd3d_string_buffer_list *string_buffers, + const struct hlsl_type *type) DECLSPEC_HIDDEN; char *hlsl_modifiers_to_string(unsigned int modifiers) DECLSPEC_HIDDEN; const char *hlsl_node_type_to_string(enum hlsl_ir_node_type type) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index ea640b94..1fb1b7f3 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -255,13 +255,15 @@ static struct hlsl_ir_node *add_implicit_conversion(struct hlsl_ctx *ctx, struct if (!implicit_compatible_data_types(src_type, dst_type)) { - char *src_string = hlsl_type_to_string(src_type), *dst_string = hlsl_type_to_string(dst_type); + struct vkd3d_string_buffer *src_string, *dst_string; + src_string = hlsl_type_to_string(&ctx->string_buffers, src_type); + dst_string = hlsl_type_to_string(&ctx->string_buffers, dst_type); if (src_string && dst_string) hlsl_error(ctx, *loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "Can't implicitly convert from %s to %s.", src_string, dst_string); - vkd3d_free(src_string); - vkd3d_free(dst_string); + "Can't implicitly convert from %s to %s.", src_string->buffer, dst_string->buffer); + vkd3d_string_buffer_release(&ctx->string_buffers, src_string); + vkd3d_string_buffer_release(&ctx->string_buffers, dst_string); return NULL; } @@ -2744,13 +2746,15 @@ unary_expr: if (!compatible_data_types(src_type, dst_type)) { - char *src_string = hlsl_type_to_string(src_type), *dst_string = hlsl_type_to_string(dst_type); + struct vkd3d_string_buffer *src_string, *dst_string; + src_string = hlsl_type_to_string(&ctx->string_buffers, src_type); + dst_string = hlsl_type_to_string(&ctx->string_buffers, dst_type); if (src_string && dst_string) hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, "Can't cast from %s to %s.", - src_string, dst_string); - vkd3d_free(src_string); - vkd3d_free(dst_string); + src_string->buffer, dst_string->buffer); + vkd3d_string_buffer_release(&ctx->string_buffers, src_string); + vkd3d_string_buffer_release(&ctx->string_buffers, dst_string); YYABORT; } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index bae2852a..681dd4f2 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -33,6 +33,12 @@ void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) vkd3d_free(buffer->buffer); } +static void vkd3d_string_buffer_clear(struct vkd3d_string_buffer *buffer) +{ + buffer->buffer[0] = '\0'; + buffer->content_size = 0; +} + static bool vkd3d_string_buffer_resize(struct vkd3d_string_buffer *buffer, int rc) { unsigned int new_buffer_size = buffer->buffer_size * 2; @@ -107,6 +113,54 @@ void vkd3d_string_buffer_trace_(const struct vkd3d_string_buffer *buffer, const } } +void vkd3d_string_buffer_list_init(struct vkd3d_string_buffer_list *list) +{ + list_init(&list->list); +} + +void vkd3d_string_buffer_list_cleanup(struct vkd3d_string_buffer_list *list) +{ + struct vkd3d_string_buffer *buffer, *buffer_next; + + LIST_FOR_EACH_ENTRY_SAFE(buffer, buffer_next, &list->list, struct vkd3d_string_buffer, entry) + { + vkd3d_string_buffer_cleanup(buffer); + vkd3d_free(buffer); + } + list_init(&list->list); +} + +struct vkd3d_string_buffer *vkd3d_string_buffer_get(struct vkd3d_string_buffer_list *list) +{ + struct vkd3d_string_buffer *buffer; + + if (list_empty(&list->list)) + { + if (!(buffer = vkd3d_malloc(sizeof(*buffer)))) + return NULL; + vkd3d_string_buffer_init(buffer); + if (!vkd3d_string_buffer_resize(buffer, 1)) + { + vkd3d_free(buffer); + return NULL; + } + } + else + { + buffer = LIST_ENTRY(list_head(&list->list), struct vkd3d_string_buffer, entry); + list_remove(&buffer->entry); + } + vkd3d_string_buffer_clear(buffer); + return buffer; +} + +void vkd3d_string_buffer_release(struct vkd3d_string_buffer_list *list, struct vkd3d_string_buffer *buffer) +{ + if (!buffer) + return; + list_add_head(&list->list, &buffer->entry); +} + void vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context, enum vkd3d_shader_log_level log_level) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index e837dbcd..2ef3d5da 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -865,17 +865,28 @@ bool shader_sm4_is_end(void *data, const DWORD **ptr) DECLSPEC_HIDDEN; struct vkd3d_string_buffer { + struct list entry; char *buffer; unsigned int buffer_size; unsigned int content_size; }; +struct vkd3d_string_buffer_list +{ + struct list list; +}; + enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out) DECLSPEC_HIDDEN; void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; +struct vkd3d_string_buffer *vkd3d_string_buffer_get(struct vkd3d_string_buffer_list *list) DECLSPEC_HIDDEN; void vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; +void vkd3d_string_buffer_list_cleanup(struct vkd3d_string_buffer_list *list) DECLSPEC_HIDDEN; +void vkd3d_string_buffer_list_init(struct vkd3d_string_buffer_list *list) DECLSPEC_HIDDEN; int vkd3d_string_buffer_printf(struct vkd3d_string_buffer *buffer, const char *format, ...) VKD3D_PRINTF_FUNC(2, 3) DECLSPEC_HIDDEN; +void vkd3d_string_buffer_release(struct vkd3d_string_buffer_list *list, + struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; #define vkd3d_string_buffer_trace(buffer) \ vkd3d_string_buffer_trace_(buffer, __FUNCTION__) void vkd3d_string_buffer_trace_(const struct vkd3d_string_buffer *buffer, const char *function) DECLSPEC_HIDDEN; -- 2.30.1 [View Less]

3 8

[PATCH] ntdll: Use cpu_info to check for AVX availability.
by Jacek Caban 26 Feb '21

26 Feb '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/signal_i386.c | 6 +++--- dlls/ntdll/unix/signal_x86_64.c | 12 ++++-------- dlls/ntdll/unix/system.c | 2 +- dlls/ntdll/unix/unix_private.h | 1 + 4 files changed, 9 insertions(+), 12 deletions(-)

1 0

[PATCH] winhttp/tests: Add tests for client certificate authentication.
by Hans Leidekker 26 Feb '21

26 Feb '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/tests/winhttp.c | 303 +++++++++++++++++++++++++++++++++++ 1 file changed, 303 insertions(+) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 5379640d5fc..6a61a23ec02 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -5127,6 +5127,308 @@ static void test_max_http_automatic_redirects (void) ok(ret == TRUE, "WinHttpCloseHandle failed on closing session, … [View More]got %d.\n", ret); } +static const BYTE pfxdata[] = +{ + 0x30, 0x82, 0x0b, 0x1d, 0x02, 0x01, 0x03, 0x30, 0x82, 0x0a, 0xe3, 0x06, + 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x01, 0xa0, 0x82, + 0x0a, 0xd4, 0x04, 0x82, 0x0a, 0xd0, 0x30, 0x82, 0x0a, 0xcc, 0x30, 0x82, + 0x05, 0x07, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, + 0x06, 0xa0, 0x82, 0x04, 0xf8, 0x30, 0x82, 0x04, 0xf4, 0x02, 0x01, 0x00, + 0x30, 0x82, 0x04, 0xed, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, + 0x01, 0x07, 0x01, 0x30, 0x1c, 0x06, 0x0a, 0x2a, 0x86, 0x48, 0x86, 0xf7, + 0x0d, 0x01, 0x0c, 0x01, 0x06, 0x30, 0x0e, 0x04, 0x08, 0xac, 0x3e, 0x35, + 0xa8, 0xed, 0x0d, 0x50, 0x07, 0x02, 0x02, 0x08, 0x00, 0x80, 0x82, 0x04, + 0xc0, 0x5a, 0x62, 0x55, 0x25, 0xf6, 0x2c, 0xf1, 0x78, 0x6c, 0x63, 0x96, + 0x8a, 0xea, 0x04, 0x64, 0xb3, 0x99, 0x3b, 0x80, 0x50, 0x05, 0x37, 0x55, + 0xa3, 0x5e, 0x9f, 0x35, 0xc3, 0x3c, 0xdc, 0xf6, 0xc4, 0xc1, 0x39, 0xa2, + 0xd7, 0x50, 0xad, 0xf9, 0x29, 0x3c, 0x51, 0xea, 0x15, 0x20, 0x25, 0xd3, + 0x4d, 0x69, 0xdf, 0x10, 0xd8, 0x9d, 0x60, 0x78, 0x8a, 0x70, 0x44, 0x7f, + 0x01, 0x4f, 0x4a, 0xfa, 0xab, 0xfd, 0x46, 0x48, 0x96, 0x2b, 0x69, 0xfc, + 0x11, 0xf8, 0x3f, 0xd3, 0x79, 0x09, 0x75, 0x81, 0x47, 0xdf, 0xce, 0xfe, + 0x07, 0x2f, 0x0a, 0xd8, 0xac, 0x87, 0x14, 0x1f, 0x7b, 0x95, 0x70, 0xee, + 0x7e, 0x52, 0x90, 0x11, 0xd6, 0x69, 0xf4, 0xd5, 0x38, 0x85, 0xc9, 0xc1, + 0x07, 0x01, 0xe8, 0xbb, 0xfb, 0xe2, 0x08, 0xa8, 0xfa, 0xbf, 0xf0, 0x92, + 0x63, 0x1d, 0xbb, 0x2b, 0x45, 0x6f, 0xce, 0x97, 0x01, 0xd7, 0x95, 0xf0, + 0x9c, 0x9a, 0x6b, 0x73, 0x01, 0xbf, 0xf9, 0x3d, 0xc8, 0x2b, 0x86, 0x7a, + 0xd5, 0x65, 0x84, 0xd7, 0xff, 0xb2, 0xf9, 0x20, 0x52, 0x35, 0xc5, 0x60, + 0x33, 0x70, 0x1d, 0x2f, 0x26, 0x09, 0x1c, 0x22, 0x17, 0xd8, 0x08, 0x4e, + 0x69, 0x20, 0xe2, 0x71, 0xe4, 0x07, 0xb1, 0x48, 0x5f, 0x20, 0x08, 0x7a, + 0xbf, 0x65, 0x53, 0x23, 0x07, 0xf9, 0x6c, 0xde, 0x3e, 0x29, 0xbf, 0x6b, + 0xef, 0xbb, 0x6a, 0x5f, 0x79, 0xa1, 0x72, 0xa1, 0x10, 0x24, 0x80, 0xb4, + 0x44, 0xb8, 0xc9, 0xfc, 0xa3, 0x36, 0x7e, 0x23, 0x37, 0x58, 0xc6, 0x1e, + 0xe8, 0x42, 0x4d, 0xb5, 0xf5, 0x58, 0x93, 0x21, 0x38, 0xa2, 0xc4, 0xa9, + 0x01, 0x96, 0xf9, 0x61, 0xac, 0x55, 0xb3, 0x3d, 0xe4, 0x54, 0x8b, 0x6c, + 0xc3, 0x83, 0xff, 0x50, 0x87, 0x94, 0xe8, 0x35, 0x3c, 0x26, 0x0d, 0x20, + 0x8a, 0x25, 0x0e, 0xb6, 0x67, 0x78, 0x29, 0xc7, 0xbf, 0x76, 0x8e, 0x62, + 0x62, 0xc4, 0x50, 0xd6, 0xc5, 0x3c, 0xb4, 0x7a, 0x35, 0xbe, 0x53, 0x52, + 0xc4, 0xe4, 0x10, 0xb3, 0xe0, 0x73, 0xb0, 0xd1, 0xc1, 0x5a, 0x4f, 0x4e, + 0x64, 0x0d, 0x92, 0x51, 0x2d, 0x4d, 0xec, 0xb0, 0xc6, 0x40, 0x1b, 0x03, + 0x89, 0x7f, 0xc2, 0x2c, 0xe3, 0x2c, 0xbd, 0x8c, 0x9c, 0xd9, 0xe0, 0x08, + 0x59, 0xd3, 0xaf, 0x48, 0x56, 0x89, 0x60, 0x85, 0x76, 0xe0, 0xd8, 0x7c, + 0xcf, 0x02, 0x8f, 0xfd, 0xb2, 0x8f, 0x2b, 0x61, 0xcf, 0x28, 0x56, 0x8b, + 0x6b, 0x03, 0x2b, 0x2f, 0x83, 0x31, 0xa0, 0x1c, 0xd1, 0x6c, 0x87, 0x49, + 0xc4, 0x77, 0x55, 0x1f, 0x61, 0x45, 0x58, 0x88, 0x9f, 0x01, 0xc3, 0x63, + 0x62, 0x30, 0x35, 0xdf, 0x61, 0x74, 0x55, 0x63, 0x3f, 0xae, 0x41, 0xc1, + 0xb8, 0xf0, 0x9f, 0xab, 0x25, 0xad, 0x41, 0x5c, 0x1f, 0x00, 0x0d, 0xef, + 0xf0, 0xcf, 0xaf, 0x41, 0x23, 0xca, 0x8c, 0x38, 0xea, 0x5a, 0xe4, 0x8b, + 0xb4, 0x89, 0xd0, 0x76, 0x7f, 0x2b, 0x77, 0x8f, 0xe4, 0x44, 0xd5, 0x37, + 0xac, 0xc2, 0x09, 0x7e, 0x7e, 0x7e, 0x02, 0x5c, 0x27, 0x01, 0xcb, 0x4d, + 0xea, 0xb3, 0x97, 0x36, 0x35, 0xd2, 0x05, 0x3c, 0x4e, 0xb8, 0x04, 0x5c, + 0xb8, 0x95, 0x3f, 0xc6, 0xbf, 0xd4, 0x20, 0x01, 0xfb, 0xed, 0x37, 0x5a, + 0xad, 0x4c, 0x61, 0x93, 0xfe, 0x95, 0x7c, 0x34, 0x11, 0x15, 0x9d, 0x00, + 0x0b, 0x99, 0x69, 0xcb, 0x7e, 0xb9, 0x53, 0x46, 0x57, 0x39, 0x3f, 0x59, + 0x4b, 0x30, 0x8d, 0xfb, 0x84, 0x66, 0x2d, 0x06, 0xc9, 0x88, 0xa6, 0x18, + 0xd7, 0x36, 0xc6, 0xf6, 0xf7, 0x47, 0x85, 0x38, 0xc8, 0x3d, 0x37, 0xea, + 0x57, 0x4c, 0xb0, 0x7c, 0x95, 0x29, 0x84, 0xab, 0xbb, 0x19, 0x86, 0xc2, + 0xc5, 0x99, 0x01, 0x38, 0x6b, 0xf1, 0xd3, 0x1d, 0xa8, 0x02, 0xf9, 0x6f, + 0xaa, 0xf1, 0x57, 0xd0, 0x88, 0x68, 0x62, 0x5f, 0x9f, 0x7a, 0x63, 0xba, + 0x3a, 0xc9, 0x95, 0x11, 0x3c, 0xf9, 0xa1, 0xc1, 0x35, 0xfe, 0xd5, 0x12, + 0x49, 0x88, 0x0d, 0x5c, 0xe2, 0xd1, 0x15, 0x18, 0xfb, 0xd5, 0x7f, 0x19, + 0x3f, 0xaf, 0xa0, 0xcb, 0x31, 0x20, 0x9e, 0x03, 0x93, 0xa4, 0x66, 0xbd, + 0x83, 0xe8, 0x60, 0x34, 0x55, 0x0d, 0x97, 0x10, 0x23, 0x24, 0x7a, 0x45, + 0x36, 0xb4, 0xc4, 0xee, 0x60, 0x6f, 0xd8, 0x46, 0xc5, 0xac, 0x2b, 0xa9, + 0x18, 0x74, 0x83, 0x1e, 0xdf, 0x7c, 0x1a, 0x5a, 0xe8, 0x5f, 0x8b, 0x4f, + 0x9f, 0x40, 0x3e, 0x5e, 0xfb, 0xd3, 0x68, 0xac, 0x34, 0x62, 0x30, 0x23, + 0xb6, 0xbc, 0xdf, 0xbc, 0xc7, 0x25, 0xd2, 0x1b, 0x57, 0x33, 0xfb, 0x78, + 0x22, 0x21, 0x1e, 0x3a, 0xf6, 0x44, 0x18, 0x7e, 0x12, 0x36, 0x47, 0x58, + 0xd0, 0x59, 0x26, 0x98, 0x98, 0x95, 0xf4, 0xd1, 0xaa, 0x45, 0xaa, 0xe7, + 0xd1, 0xe6, 0x2d, 0x78, 0xf0, 0x8b, 0x1c, 0xfd, 0xf8, 0x50, 0x60, 0xa2, + 0x1e, 0x7f, 0xe3, 0x31, 0x77, 0x31, 0x58, 0x99, 0x0f, 0xda, 0x0e, 0xa3, + 0xc6, 0x7a, 0x30, 0x45, 0x55, 0x11, 0x91, 0x77, 0x41, 0x79, 0xd3, 0x56, + 0xb2, 0x07, 0x00, 0x61, 0xab, 0xec, 0x27, 0xc7, 0x9f, 0xfa, 0x89, 0x08, + 0xc2, 0x87, 0xcf, 0xe9, 0xdc, 0x9e, 0x29, 0x22, 0xfb, 0x23, 0x7f, 0x9d, + 0x89, 0xd5, 0x6e, 0x75, 0x20, 0xd8, 0x00, 0x5b, 0xc4, 0x94, 0xbb, 0xc5, + 0xb2, 0xba, 0x77, 0x2b, 0xf6, 0x3c, 0x88, 0xb0, 0x4c, 0x38, 0x46, 0x55, + 0xee, 0x8b, 0x03, 0x15, 0xbc, 0x0a, 0x1d, 0x47, 0x87, 0x44, 0xaf, 0xb1, + 0x2a, 0xa7, 0x4d, 0x08, 0xdf, 0x3b, 0x2d, 0x70, 0xa1, 0x67, 0x31, 0x76, + 0x6e, 0x6f, 0x40, 0x3b, 0x3b, 0xe8, 0xf9, 0xdf, 0x90, 0xa4, 0xce, 0x7f, + 0xb8, 0x2d, 0x69, 0xcb, 0x1c, 0x1e, 0x94, 0xcd, 0xb1, 0xd8, 0x43, 0x22, + 0xb8, 0x4f, 0x98, 0x92, 0x74, 0xb3, 0xde, 0xeb, 0x7a, 0xcb, 0xfa, 0xd0, + 0x36, 0xe4, 0x5d, 0xfa, 0xd3, 0xce, 0xf9, 0xba, 0x3e, 0x0f, 0x6c, 0xc3, + 0x5b, 0xb3, 0x81, 0x84, 0x6e, 0x5d, 0xc1, 0x21, 0x89, 0xec, 0x67, 0x9a, + 0xfd, 0x55, 0x20, 0xb0, 0x71, 0x53, 0xae, 0xf8, 0xa4, 0x8d, 0xd5, 0xe5, + 0x2d, 0x3a, 0xce, 0x89, 0x55, 0x8c, 0x4f, 0x3b, 0x37, 0x95, 0x4e, 0x15, + 0xbe, 0xe7, 0xd1, 0x7a, 0x36, 0x82, 0x45, 0x69, 0x7c, 0x27, 0x4f, 0xb9, + 0x4b, 0x7d, 0xcd, 0x59, 0xc8, 0xf4, 0x8b, 0x0f, 0x4f, 0x75, 0x23, 0xd3, + 0xd0, 0xc7, 0x10, 0x79, 0xc0, 0xf1, 0xac, 0x14, 0xf7, 0x0d, 0xc8, 0x5e, + 0xfc, 0xff, 0x1a, 0x2b, 0x10, 0x88, 0x7e, 0x7e, 0x2f, 0xfa, 0x7b, 0x9f, + 0x47, 0x23, 0x34, 0xfc, 0xf5, 0xde, 0xd9, 0xa3, 0x05, 0x99, 0x2a, 0x96, + 0x83, 0x3d, 0xa4, 0x7f, 0x6a, 0x66, 0x9b, 0xe7, 0xf1, 0x00, 0x4e, 0x9a, + 0xfc, 0x68, 0xd2, 0x74, 0x17, 0xba, 0xc9, 0xc8, 0x20, 0x39, 0xa1, 0xa8, + 0x85, 0xc6, 0x10, 0x2b, 0xab, 0x97, 0x34, 0x2d, 0x49, 0x68, 0x57, 0xb0, + 0x43, 0xee, 0x25, 0xbb, 0x35, 0x1b, 0x03, 0x99, 0xa3, 0x21, 0x68, 0x66, + 0x86, 0x3f, 0xc6, 0xfc, 0x49, 0xf0, 0xba, 0x5f, 0x00, 0xc6, 0xe3, 0x1c, + 0xb2, 0x9f, 0x16, 0x7f, 0xc7, 0x40, 0x4a, 0x9a, 0x39, 0xc1, 0x95, 0x69, + 0xa2, 0x87, 0xba, 0x58, 0xc6, 0xf2, 0xd6, 0x66, 0xa6, 0x4c, 0x6d, 0x29, + 0x9c, 0xa8, 0x6e, 0xa9, 0xd2, 0xe4, 0x54, 0x17, 0x89, 0xe2, 0x43, 0xf0, + 0xe1, 0x8b, 0x57, 0x84, 0x6c, 0x87, 0x63, 0x17, 0xbb, 0xf6, 0x33, 0x1b, + 0xe4, 0x34, 0x6a, 0x80, 0x70, 0x7b, 0x1b, 0xfd, 0xf8, 0x79, 0x28, 0xc8, + 0x3c, 0x8e, 0xa4, 0xd5, 0xb8, 0x96, 0x54, 0xd4, 0xec, 0x72, 0xe5, 0x40, + 0x8f, 0x56, 0xde, 0x82, 0x15, 0x72, 0x4d, 0xd8, 0x0c, 0x07, 0xea, 0xe6, + 0x44, 0xcd, 0x94, 0x73, 0x5c, 0x04, 0xe8, 0x8e, 0xb7, 0xc7, 0xc9, 0x29, + 0xdc, 0x04, 0xef, 0x7c, 0x31, 0x9b, 0x50, 0xbc, 0xea, 0x71, 0x1f, 0x28, + 0x22, 0xb6, 0x04, 0x53, 0x2e, 0x71, 0xc4, 0xf6, 0xbb, 0x88, 0x51, 0xee, + 0x3e, 0x76, 0x65, 0xb4, 0x4b, 0x1b, 0xa3, 0xec, 0x7b, 0xa7, 0x9d, 0x31, + 0x5d, 0xb8, 0x9f, 0xab, 0x6b, 0x54, 0x7d, 0xbd, 0xc1, 0x2c, 0x55, 0xb0, + 0x23, 0x8c, 0x06, 0x60, 0x01, 0x4f, 0x60, 0x85, 0x56, 0x7f, 0xfb, 0x99, + 0x0c, 0xdc, 0x8c, 0x09, 0x37, 0x46, 0x5b, 0x97, 0x5d, 0xe8, 0x31, 0x00, + 0x1b, 0x30, 0x9b, 0x02, 0x92, 0x29, 0xb5, 0x20, 0xce, 0x4b, 0x90, 0xfb, + 0x91, 0x07, 0x5a, 0xd3, 0xf5, 0xa0, 0xe6, 0x8f, 0xf8, 0x73, 0xc5, 0x4b, + 0xbb, 0xad, 0x2a, 0xeb, 0xa8, 0xb7, 0x68, 0x34, 0x36, 0x47, 0xd5, 0x4b, + 0x61, 0x89, 0x53, 0xe6, 0xb6, 0xb1, 0x07, 0xe4, 0x08, 0x2e, 0xed, 0x50, + 0xd4, 0x1e, 0xed, 0x7f, 0xbf, 0x35, 0x68, 0x04, 0x45, 0x72, 0x86, 0x71, + 0x15, 0x55, 0xdf, 0xe6, 0x30, 0xc0, 0x8b, 0x8a, 0xb0, 0x6c, 0xd0, 0x35, + 0x57, 0x8f, 0x04, 0x37, 0xbc, 0xe1, 0xb8, 0xbf, 0x27, 0x37, 0x3d, 0xd0, + 0xc8, 0x46, 0x67, 0x42, 0x51, 0x30, 0x82, 0x05, 0xbd, 0x06, 0x09, 0x2a, + 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x01, 0xa0, 0x82, 0x05, 0xae, + 0x04, 0x82, 0x05, 0xaa, 0x30, 0x82, 0x05, 0xa6, 0x30, 0x82, 0x05, 0xa2, + 0x06, 0x0b, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x0c, 0x0a, 0x01, + 0x02, 0xa0, 0x82, 0x04, 0xee, 0x30, 0x82, 0x04, 0xea, 0x30, 0x1c, 0x06, + 0x0a, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x0c, 0x01, 0x03, 0x30, + 0x0e, 0x04, 0x08, 0x9f, 0xa4, 0x72, 0x2b, 0x6b, 0x0e, 0xcb, 0x9f, 0x02, + 0x02, 0x08, 0x00, 0x04, 0x82, 0x04, 0xc8, 0xe5, 0x35, 0xb9, 0x72, 0x28, + 0x20, 0x28, 0xad, 0xe3, 0x01, 0xd7, 0x0b, 0xe0, 0x4e, 0x36, 0xc3, 0x73, + 0x06, 0xd5, 0xf6, 0x75, 0x1a, 0x78, 0xb2, 0xd8, 0xf6, 0x5a, 0x85, 0x8e, + 0x50, 0xa3, 0x05, 0x49, 0x02, 0x2d, 0xf8, 0xa3, 0x2f, 0xe6, 0x02, 0x7a, + 0xd5, 0x0b, 0x1d, 0xf1, 0xd1, 0xe4, 0x16, 0xaa, 0x70, 0x2e, 0x34, 0xdb, + 0x56, 0xd9, 0x33, 0x94, 0x11, 0xaa, 0x60, 0xd4, 0xfa, 0x5b, 0xd1, 0xb3, + 0x2e, 0x86, 0x6a, 0x5a, 0x69, 0xdf, 0x11, 0x91, 0xb0, 0xca, 0x82, 0xff, + 0x63, 0xad, 0x6a, 0x0b, 0x90, 0xa6, 0xc7, 0x9b, 0xef, 0x9a, 0xf8, 0x96, + 0xec, 0xe4, 0xc4, 0xdf, 0x55, 0x4c, 0x12, 0x07, 0xab, 0x7c, 0x5c, 0x68, + 0x47, 0xf2, 0x92, 0xfb, 0x94, 0xab, 0xc3, 0x64, 0xd3, 0xfe, 0xb2, 0x16, + 0xb4, 0x78, 0x80, 0x52, 0xe9, 0x32, 0x39, 0x3b, 0x8d, 0x12, 0x91, 0x36, + 0xfd, 0xa1, 0x97, 0xc2, 0x0a, 0x4a, 0xf1, 0xb3, 0x8a, 0xe4, 0x01, 0xed, + 0x0a, 0xda, 0x2e, 0xa0, 0x38, 0xa9, 0x47, 0x3d, 0x3a, 0x64, 0x87, 0x06, + 0xc3, 0x83, 0x60, 0xaf, 0x84, 0xdb, 0x87, 0xff, 0x70, 0x61, 0x43, 0x7d, + 0x2d, 0x61, 0x9a, 0xf7, 0x0d, 0xca, 0x0c, 0x0f, 0xbe, 0x43, 0x5b, 0x99, + 0xe1, 0x90, 0x64, 0x1f, 0xa7, 0x1b, 0xa6, 0xa6, 0x5c, 0x13, 0x70, 0xa3, + 0xdb, 0xd7, 0xf0, 0xe8, 0x7a, 0xb0, 0xd1, 0x9b, 0x52, 0xa6, 0x4f, 0xd6, + 0xff, 0x54, 0x4d, 0xa6, 0x15, 0x05, 0x5c, 0xe9, 0x04, 0x6a, 0xc3, 0x49, + 0x12, 0x2f, 0x24, 0x03, 0xc3, 0x80, 0x06, 0xa6, 0x07, 0x8b, 0x96, 0xe7, + 0x39, 0x31, 0x6d, 0xd3, 0x1b, 0xa5, 0x45, 0x58, 0x04, 0xe7, 0x87, 0xdf, + 0x26, 0xfb, 0x1b, 0x9f, 0x92, 0x93, 0x32, 0x12, 0x9a, 0xc9, 0xe6, 0xcb, + 0x88, 0x14, 0x9f, 0x23, 0x0b, 0x52, 0xa2, 0xb8, 0x32, 0x6c, 0xa9, 0x33, + 0xa1, 0x17, 0xe8, 0x4a, 0xd4, 0x5c, 0x7d, 0xb3, 0xa3, 0x64, 0x86, 0x03, + 0x7c, 0x7c, 0x3f, 0x99, 0xdc, 0x21, 0x9f, 0x93, 0xc6, 0xb9, 0x1d, 0xe0, + 0x21, 0x79, 0x78, 0x35, 0xdc, 0x1e, 0x27, 0x3c, 0x73, 0x7f, 0x0f, 0xd6, + 0x4f, 0xde, 0xe9, 0xb4, 0xb7, 0xe3, 0xf5, 0x72, 0xce, 0x42, 0xf3, 0x91, + 0x5b, 0x84, 0xba, 0xbb, 0xae, 0xf0, 0x87, 0x0f, 0x50, 0xa4, 0x5e, 0x80, + 0x23, 0x57, 0x2b, 0xa0, 0xa3, 0xc3, 0x8a, 0x2f, 0xa8, 0x7a, 0x1a, 0x65, + 0x8f, 0x62, 0xf8, 0x3e, 0xe2, 0xcd, 0xbc, 0x63, 0x56, 0x8e, 0x77, 0xf3, + 0xf9, 0x69, 0x10, 0x57, 0xa8, 0xaf, 0x67, 0x2a, 0x9f, 0x7f, 0x7e, 0xeb, + 0x1d, 0x99, 0xa6, 0x67, 0xcd, 0x9e, 0x42, 0x2e, 0x5e, 0x4e, 0x61, 0x24, + 0xfa, 0xca, 0x2a, 0xeb, 0x62, 0x1f, 0xa3, 0x14, 0x0a, 0x06, 0x4b, 0x77, + 0x78, 0x77, 0x9b, 0xf1, 0x03, 0xcc, 0xb5, 0xfe, 0xfb, 0x7a, 0x77, 0xa6, + 0x82, 0x9f, 0xe5, 0xde, 0x9d, 0x0d, 0x4d, 0x37, 0xc6, 0x12, 0x73, 0x6d, + 0xea, 0xbb, 0x48, 0xf0, 0xd2, 0x81, 0xcc, 0x1a, 0x47, 0xfa, 0xa4, 0xd2, + 0xb2, 0x27, 0xa0, 0xfc, 0x30, 0x04, 0xdb, 0x05, 0xd3, 0x0b, 0xbc, 0x4d, + 0x7a, 0x99, 0xef, 0x7f, 0x26, 0x01, 0xd4, 0x07, 0x0b, 0x1e, 0x99, 0x06, + 0x3c, 0xde, 0x3d, 0x1c, 0x21, 0x82, 0x68, 0x46, 0x35, 0x38, 0x61, 0xea, + 0xd4, 0xc2, 0x65, 0x09, 0x39, 0x87, 0xb4, 0xd3, 0x5d, 0x3c, 0xa3, 0x79, + 0xe4, 0x01, 0x4e, 0xbf, 0x18, 0xba, 0x57, 0x3f, 0xdd, 0xea, 0x0a, 0x6b, + 0x99, 0xfb, 0x93, 0xfa, 0xab, 0xee, 0x08, 0xdf, 0x38, 0x23, 0xae, 0x8d, + 0xa8, 0x03, 0x13, 0xfe, 0x83, 0x88, 0xb0, 0xc2, 0xf9, 0x90, 0xa5, 0x1c, + 0x01, 0x6f, 0x71, 0x91, 0x42, 0x35, 0x81, 0x74, 0x71, 0x6c, 0xba, 0x86, + 0x48, 0xfe, 0x96, 0xd2, 0x88, 0x12, 0x36, 0x4e, 0xa6, 0x2f, 0xd1, 0xdb, + 0xfa, 0xbf, 0xdb, 0x84, 0x01, 0xfc, 0x7d, 0x7a, 0xac, 0x20, 0xae, 0xf5, + 0x95, 0xc9, 0xdc, 0x10, 0x5f, 0x4c, 0xae, 0x85, 0x01, 0x8b, 0xfe, 0x77, + 0x13, 0x01, 0xae, 0x39, 0x59, 0x7e, 0xbc, 0xfd, 0xc9, 0x42, 0xe4, 0x13, + 0x07, 0x3f, 0xa9, 0x74, 0xd9, 0xd5, 0xfc, 0xb9, 0x78, 0xbe, 0x97, 0xf5, + 0xe7, 0x36, 0x7f, 0xfa, 0x23, 0x30, 0xeb, 0xab, 0x92, 0xd3, 0xdc, 0x3f, + 0x7f, 0xc0, 0x77, 0x93, 0xf9, 0x88, 0xe3, 0x4e, 0x13, 0x53, 0x6d, 0x71, + 0x87, 0xe9, 0x24, 0x2b, 0xae, 0x26, 0xbf, 0x62, 0x51, 0x04, 0x42, 0xe1, + 0x13, 0x9d, 0xd8, 0x9f, 0x59, 0x87, 0x3f, 0xfc, 0x94, 0xff, 0xcf, 0x88, + 0x88, 0xe6, 0xeb, 0x6e, 0xc1, 0x96, 0x04, 0x27, 0xc8, 0xda, 0xfa, 0xe8, + 0x2e, 0xbb, 0x2c, 0x6e, 0xf4, 0xb4, 0x00, 0x7d, 0x8d, 0x3b, 0xef, 0x8b, + 0x18, 0xa9, 0x5f, 0x32, 0xa9, 0xf2, 0x3a, 0x7e, 0x65, 0x2d, 0x6e, 0x8d, + 0x75, 0x77, 0xf6, 0xa6, 0xd8, 0xf9, 0x6b, 0x51, 0xe6, 0x66, 0x52, 0x59, + 0x39, 0x97, 0x22, 0xda, 0xb2, 0xd6, 0x82, 0x5a, 0x6e, 0x61, 0x60, 0x16, + 0x48, 0x7b, 0xf1, 0xc3, 0x4d, 0x7f, 0x50, 0xfa, 0x4d, 0x58, 0x27, 0x30, + 0xc8, 0x96, 0xe0, 0x41, 0x4f, 0x6b, 0xeb, 0x88, 0xa2, 0x7a, 0xef, 0x8a, + 0x88, 0xc8, 0x50, 0x4b, 0x55, 0x66, 0xee, 0xbf, 0xc4, 0x01, 0x82, 0x4c, + 0xec, 0xde, 0x37, 0x64, 0xd6, 0x1e, 0xcf, 0x3e, 0x2e, 0xfe, 0x84, 0x68, + 0xbf, 0xa3, 0x68, 0x77, 0xa9, 0x03, 0xe4, 0xf8, 0xd7, 0xb2, 0x6e, 0xa3, + 0xc4, 0xc3, 0x36, 0x53, 0xf3, 0xdd, 0x7e, 0x4c, 0xf0, 0xe9, 0xb2, 0x44, + 0xe6, 0x60, 0x3d, 0x00, 0x9a, 0x08, 0xc3, 0x21, 0x17, 0x49, 0xda, 0x49, + 0xfb, 0x4c, 0x8b, 0xe9, 0x10, 0x66, 0xfe, 0xb7, 0xe0, 0xf9, 0xdd, 0xbf, + 0x41, 0xfe, 0x04, 0x9b, 0x7f, 0xe8, 0xd6, 0x2e, 0x4d, 0x0f, 0x7b, 0x10, + 0x73, 0x4c, 0xa1, 0x3e, 0x43, 0xb7, 0xcf, 0x94, 0x97, 0x7e, 0x24, 0xbb, + 0x87, 0xbf, 0x22, 0xb8, 0x3e, 0xeb, 0x9a, 0x3f, 0xe3, 0x86, 0xee, 0x21, + 0xbc, 0xf5, 0x44, 0xeb, 0x60, 0x2e, 0xe7, 0x8f, 0x89, 0xa4, 0x91, 0x61, + 0x28, 0x90, 0x85, 0x68, 0xe0, 0xa9, 0x62, 0x93, 0x86, 0x5a, 0x15, 0xbe, + 0xb2, 0x76, 0x83, 0xf2, 0x0f, 0x00, 0xc7, 0xb6, 0x57, 0xe9, 0x1f, 0x92, + 0x49, 0xfe, 0x50, 0x85, 0xbf, 0x39, 0x3d, 0xe4, 0x8b, 0x72, 0x2d, 0x49, + 0xbe, 0x05, 0x0a, 0x34, 0x56, 0x80, 0xc6, 0x1f, 0x46, 0x59, 0xc9, 0xfe, + 0x40, 0xfb, 0x78, 0x6d, 0x7a, 0xe5, 0x30, 0xe9, 0x81, 0x55, 0x75, 0x05, + 0x63, 0xd2, 0x22, 0xee, 0x2e, 0x6e, 0xb9, 0x18, 0xe5, 0x8a, 0x5a, 0x66, + 0xbd, 0x74, 0x30, 0xe3, 0x8b, 0x76, 0x22, 0x18, 0x1e, 0xef, 0x69, 0xe8, + 0x9d, 0x07, 0xa7, 0x9a, 0x87, 0x6c, 0x04, 0x4b, 0x74, 0x2b, 0xbe, 0x37, + 0x2f, 0x29, 0x9b, 0x60, 0x9d, 0x8b, 0x57, 0x55, 0x34, 0xca, 0x41, 0x25, + 0xae, 0x56, 0x92, 0x34, 0x1b, 0x9e, 0xbd, 0xfe, 0x74, 0xbd, 0x4e, 0x29, + 0xf0, 0x5e, 0x27, 0x94, 0xb0, 0x9e, 0x23, 0x9f, 0x4a, 0x0f, 0xa1, 0xdf, + 0xe7, 0xc4, 0xdb, 0xbe, 0x0f, 0x1a, 0x0b, 0x6c, 0xb0, 0xe1, 0x06, 0x7c, + 0x5a, 0x5b, 0x81, 0x1c, 0xb6, 0x12, 0xec, 0x6f, 0x3b, 0xbb, 0x84, 0x36, + 0xd5, 0x28, 0x16, 0xea, 0x51, 0xa8, 0x99, 0x24, 0x8f, 0xe7, 0xf8, 0xe9, + 0xce, 0xa1, 0x65, 0x96, 0x6f, 0x4e, 0x2f, 0xb7, 0x6f, 0x65, 0x39, 0xad, + 0xfd, 0x2e, 0xa0, 0x37, 0x32, 0x2f, 0xf3, 0x95, 0xa1, 0x3a, 0xa1, 0x9d, + 0x2c, 0x9e, 0xa1, 0x4b, 0x7e, 0xc9, 0x7e, 0x86, 0xaa, 0x16, 0x00, 0x82, + 0x1d, 0x36, 0xbf, 0x98, 0x0a, 0x82, 0x5b, 0xcc, 0xc4, 0x6a, 0xad, 0xa0, + 0x1f, 0x47, 0x98, 0xde, 0x8d, 0x68, 0x38, 0x3f, 0x33, 0xe2, 0x08, 0x3b, + 0x2a, 0x65, 0xd9, 0x2f, 0x53, 0x68, 0xb8, 0x78, 0xd0, 0x1d, 0xbb, 0x2a, + 0x73, 0x19, 0xba, 0x58, 0xea, 0xf1, 0x0a, 0xaa, 0xa6, 0xbe, 0x27, 0xd6, + 0x00, 0x6b, 0x4e, 0x43, 0x8e, 0x5b, 0x19, 0xc1, 0x37, 0x0f, 0xfb, 0x81, + 0x72, 0x10, 0xb6, 0x20, 0x32, 0xcd, 0xa2, 0x7c, 0x90, 0xd4, 0xf5, 0xcf, + 0x1c, 0xcb, 0x14, 0x24, 0x7a, 0x4d, 0xf5, 0xd5, 0xd9, 0xce, 0x6a, 0x64, + 0xc9, 0xd3, 0xa7, 0x36, 0x6f, 0x1d, 0xf1, 0xe9, 0x71, 0x6c, 0x3d, 0x02, + 0xa4, 0x62, 0xb1, 0x82, 0x5c, 0x13, 0x4b, 0x6b, 0x68, 0xe2, 0x31, 0xef, + 0xe4, 0x46, 0xfd, 0xe5, 0xa8, 0x29, 0xe9, 0x1e, 0xad, 0xff, 0x33, 0xdb, + 0x0b, 0xc0, 0x92, 0xb1, 0xef, 0xeb, 0xb3, 0x6f, 0x96, 0x7b, 0xdf, 0xcd, + 0x07, 0x19, 0x86, 0x60, 0x98, 0xcf, 0x95, 0xfe, 0x98, 0xdd, 0x29, 0xa6, + 0x35, 0x7b, 0x46, 0x13, 0x03, 0xa8, 0xd9, 0x7c, 0xb3, 0xdf, 0x9f, 0x14, + 0xb7, 0x34, 0x5a, 0xc4, 0x12, 0x81, 0xc5, 0x98, 0x25, 0x8d, 0x3e, 0xe3, + 0xd8, 0x2d, 0xe4, 0x54, 0xab, 0xb0, 0x13, 0xfd, 0xd1, 0x3f, 0x3b, 0xbf, + 0xa9, 0x45, 0x28, 0x8a, 0x2f, 0x9c, 0x1e, 0x2d, 0xe5, 0xab, 0x13, 0x95, + 0x97, 0xc3, 0x34, 0x37, 0x8d, 0x93, 0x66, 0x31, 0x81, 0xa0, 0x30, 0x23, + 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x09, 0x15, 0x31, + 0x16, 0x04, 0x14, 0xa5, 0x23, 0x9b, 0x7e, 0xe6, 0x45, 0x71, 0xbf, 0x48, + 0xc6, 0x27, 0x3c, 0x96, 0x87, 0x63, 0xbd, 0x1f, 0xde, 0x72, 0x12, 0x30, + 0x79, 0x06, 0x09, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0x37, 0x11, 0x01, + 0x31, 0x6c, 0x1e, 0x6a, 0x00, 0x4d, 0x00, 0x69, 0x00, 0x63, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x74, 0x00, 0x20, + 0x00, 0x45, 0x00, 0x6e, 0x00, 0x68, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x63, + 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, 0x00, 0x52, 0x00, 0x53, 0x00, 0x41, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x20, 0x00, 0x41, + 0x00, 0x45, 0x00, 0x53, 0x00, 0x20, 0x00, 0x43, 0x00, 0x72, 0x00, 0x79, + 0x00, 0x70, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x67, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x70, 0x00, 0x68, 0x00, 0x69, 0x00, 0x63, 0x00, 0x20, 0x00, 0x50, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x76, 0x00, 0x69, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x72, 0x30, 0x31, 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, + 0x03, 0x02, 0x1a, 0x05, 0x00, 0x04, 0x14, 0x93, 0xa8, 0xb2, 0x7e, 0xb7, + 0xab, 0xf1, 0x1c, 0x3c, 0x36, 0x58, 0xdc, 0x67, 0x6d, 0x42, 0xa6, 0xfc, + 0x53, 0x01, 0xe6, 0x04, 0x08, 0x77, 0x57, 0x22, 0xa1, 0x7d, 0xb9, 0xa2, + 0x69, 0x02, 0x02, 0x08, 0x00 +}; + +static void test_client_cert_authentication(void) +{ + HINTERNET ses, req, con; + DWORD protocols; + BOOL ret; + CRYPT_DATA_BLOB pfx; + HCERTSTORE store; + const CERT_CONTEXT *cert; + + ses = WinHttpOpen( L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); + ok( ses != NULL, "failed to open session %u\n", GetLastError() ); + + protocols = WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_1; + ret = WinHttpSetOption( ses, WINHTTP_OPTION_SECURE_PROTOCOLS, &protocols, sizeof(protocols) ); + if (!ret && GetLastError() == ERROR_INVALID_PARAMETER) /* vista */ + { + win_skip( "can't set secure protocols\n" ); + WinHttpCloseHandle( ses ); + return; + } + ok( ret, "failed to set protocols %u\n", GetLastError() ); + + con = WinHttpConnect( ses, L"test.winehq.org", 443, 0 ); + ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + + req = WinHttpOpenRequest( con, NULL, L"/tests/clientcert/", NULL, NULL, NULL, WINHTTP_FLAG_SECURE ); + ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + + ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + ok( ret, "failed to send request %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = WinHttpReceiveResponse( req, NULL ); + ok( !ret, "unexpected success\n" ); + ok( GetLastError() == ERROR_WINHTTP_CLIENT_AUTH_CERT_NEEDED, "got %u\n", GetLastError() ); + + pfx.pbData = (BYTE *)pfxdata; + pfx.cbData = sizeof(pfxdata); + store = PFXImportCertStore( &pfx, NULL, CRYPT_EXPORTABLE|CRYPT_USER_KEYSET|PKCS12_NO_PERSIST_KEY ); + ok( store != NULL, "got %u\n", GetLastError() ); + + cert = CertFindCertificateInStore( store, X509_ASN_ENCODING, 0, CERT_FIND_ANY, NULL, NULL ); + ok( cert != NULL, "got %u\n", GetLastError() ); + + ret = WinHttpSetOption( req, WINHTTP_OPTION_CLIENT_CERT_CONTEXT, (void *)cert, sizeof(*cert) ); + ok( ret, "failed to set client cert %u\n", GetLastError() ); + + ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + ok( ret, "failed to send request %u\n", GetLastError() ); + + ret = WinHttpReceiveResponse( req, NULL ); + ok( ret, "failed to receive response %u\n", GetLastError() ); + + CertFreeCertificateContext( cert ); + CertCloseStore( store, 0 ); + WinHttpCloseHandle( req ); + WinHttpCloseHandle( con ); + WinHttpCloseHandle( ses ); +} + START_TEST (winhttp) { struct server_info si; @@ -5147,6 +5449,7 @@ START_TEST (winhttp) test_WinHttpTimeToSystemTime(); test_WinHttpAddHeaders(); test_secure_connection(); + test_client_cert_authentication(); test_request_parameter_defaults(); test_WinHttpQueryOption(); test_set_default_proxy_config(); -- 2.30.0 [View Less]

2 1

[PATCH v2] d3d12: Check for VK_KHR_external_memory_capabilities before using VkPhysicalDeviceIDProperties.
by Zebediah Figura 26 Feb '21

26 Feb '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This doesn't fix a validation layer warning, but the validation layers are broken: <https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/2457> dlls/d3d12/d3d12_main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index 3dd4ec796b0..388de0b56c2 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -265,7 +265,9 @@ static … [View More]

3 2

[PATCH v3] widl: Fix C++ RuntimeClass string constants declaration.
by Rémi Bernon 26 Feb '21

26 Feb '21

MinGW g++ requires initialized selectany to have extern linkage. Also, because of the various ways WCHAR may be defined, using an array initializer is the simplest way to support all cases. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- As suggested, reduce the number of cases here and use array initializer in C++. tools/widl/header.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index bea5da124a4..… [View More]

2 1

[PATCH 4/4] include: Use GCC-style InterlockedCompareExchange128 implementation on clang in MSVC mode.
by Jacek Caban 26 Feb '21

26 Feb '21

It's not yet supported on aarch64. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Fixes building for aarch64 in msvc mode. include/winnt.h | 60 ++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 30 deletions(-)

1 0

[PATCH 3/4] include: Add MSVC ARM version of NtCurrentTeb.
by Jacek Caban 26 Feb '21

26 Feb '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- With that headers seem good enough for ARM MSVC builds, but many modules will not link due to missing 64-bit integer support functions. include/winnt.h | 6 ++++++ 1 file changed, 6 insertions(+)

1 0

[PATCH 2/4] include: Fix __dmb declaration.
by Jacek Caban 26 Feb '21

26 Feb '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/intrin.h | 40 ++++++++++++++++++++++++++++++++++++++++ include/winnt.h | 13 +++++-------- 2 files changed, 45 insertions(+), 8 deletions(-)

1 0

[PATCH 1/4] include/winnt.h: Fix arguments order for _InterlockedCompareExchange64() MSVC intrinsic.
by Jacek Caban 26 Feb '21

26 Feb '21

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- I'm resending it unmodified as part of a series to avoid conflicts with my patcher. include/winnt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 1/4] widl: Fix C++ RuntimeClass string constants declaration.
by Rémi Bernon 26 Feb '21

26 Feb '21

MinGW g++ requires initialized selectany to have extern linkage. When supported, we define WCHAR as char16_t, which requires u"" string literal. When not supported, and when WCHAR is unsigned short, it then requires to use an array initializer instead of a L"" string literal. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- tools/widl/header.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/widl/header.c b/tools/widl/header.c index a472af49066..… [View More]

2 11

[PATCH vkd3d] vkd3d-shader: Keep track of declared SPIR-V output components.
by Henri Verbeet 26 Feb '21

26 Feb '21

Much like we do for input components, for much of the same reasons. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 93 +++++++++++++++++++---------------------------- 1 file changed, 37 insertions(+), 56 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 1448d3b4..a7361aa5 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4657,6 +4657,7 @@ static void vkd3d_dxbc_compiler_emit_output(… [View More]struct vkd3d_dxbc_compiler *compiler enum vkd3d_shader_component_type component_type; const struct vkd3d_spirv_builtin *builtin; const struct vkd3d_shader_phase *phase; + struct vkd3d_symbol *symbol = NULL; struct vkd3d_symbol reg_symbol; SpvStorageClass storage_class; struct rb_entry *entry = NULL; @@ -4692,6 +4693,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler component_type = builtin->component_type; if (!builtin->spirv_array_size) output_component_count = builtin->component_count; + component_idx = 0; } else { @@ -4717,23 +4719,24 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler vkd3d_symbol_make_register(&reg_symbol, reg); - if (compiler->output_info[signature_idx].id) - { - id = compiler->output_info[signature_idx].id; - if (compiler->output_info[signature_idx].array_element_mask) - { - use_private_variable = true; - write_mask = VKD3DSP_WRITEMASK_ALL; - entry = rb_get(&compiler->symbol_table, &reg_symbol); - } - } - else if (!use_private_variable && (entry = rb_get(&compiler->symbol_table, &reg_symbol))) + if ((entry = rb_get(&compiler->symbol_table, &reg_symbol))) { - id = RB_ENTRY_VALUE(entry, const struct vkd3d_symbol, entry)->id; + symbol = RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry); + id = symbol->id; } - else + + if (!symbol || ~symbol->info.reg.dcl_mask & signature_element->mask) { - if (builtin) + if (compiler->output_info[signature_idx].id) + { + id = compiler->output_info[signature_idx].id; + if (compiler->output_info[signature_idx].array_element_mask) + { + use_private_variable = true; + write_mask = VKD3DSP_WRITEMASK_ALL; + } + } + else if (builtin) { if (phase) id = vkd3d_dxbc_compiler_emit_shader_phase_builtin_variable(compiler, phase, builtin); @@ -4745,9 +4748,6 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler calculate_sysval_array_mask(compiler, shader_signature, sysval); vkd3d_dxbc_compiler_emit_register_execution_mode(compiler, &dst->reg); - - if (component_idx) - FIXME("Unhandled component index %u.\n", component_idx); } else { @@ -4778,25 +4778,22 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationPatch, NULL, 0); vkd3d_dxbc_compiler_decorate_xfb_output(compiler, id, output_component_count, signature_element); - } - - compiler->output_info[signature_idx].id = id; - compiler->output_info[signature_idx].component_type = component_type; - if (use_private_variable) - storage_class = SpvStorageClassPrivate; + compiler->output_info[signature_idx].id = id; + compiler->output_info[signature_idx].component_type = component_type; + } - if (entry) - var_id = RB_ENTRY_VALUE(entry, const struct vkd3d_symbol, entry)->id; - else if (!use_private_variable) - var_id = id; - else if (is_patch_constant) - var_id = compiler->hs.patch_constants_id; - else - var_id = vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, - storage_class, VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_VEC4_SIZE); - if (!entry) + if (!symbol) { + var_id = id; + if (use_private_variable) + storage_class = SpvStorageClassPrivate; + if (is_patch_constant) + var_id = compiler->hs.patch_constants_id; + else if (use_private_variable) + var_id = vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, + storage_class, VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_VEC4_SIZE); + vkd3d_symbol_set_register_info(&reg_symbol, var_id, storage_class, use_private_variable ? VKD3D_SHADER_COMPONENT_FLOAT : component_type, write_mask); reg_symbol.info.reg.is_aggregate = use_private_variable ? is_patch_constant : array_size; @@ -4816,6 +4813,11 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler if (!is_patch_constant) vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); } + else + { + symbol->info.reg.dcl_mask |= signature_element->mask; + var_id = symbol->id; + } if (use_private_variable) { @@ -6100,33 +6102,12 @@ static void vkd3d_dxbc_compiler_leave_shader_phase(struct vkd3d_dxbc_compiler *c } } - if (phase->type == VKD3DSIH_HS_FORK_PHASE || phase->type == VKD3DSIH_HS_JOIN_PHASE) - { - signature = compiler->patch_constant_signature; - - memset(&reg, 0, sizeof(reg)); - reg.idx[1].offset = ~0u; - - for (i = 0; i < signature->element_count; ++i) - { - const struct vkd3d_shader_signature_element *e = &signature->elements[i]; - - reg.type = VKD3DSPR_OUTPUT; - reg.idx[0].offset = e->register_index; - vkd3d_symbol_make_register(&reg_symbol, &reg); - - if ((entry = rb_get(&compiler->symbol_table, &reg_symbol))) - { - rb_remove(&compiler->symbol_table, entry); - vkd3d_symbol_free(entry, NULL); - } - } - } - if (phase->instance_count) { + memset(&reg, 0, sizeof(reg)); reg.type = phase->type == VKD3DSIH_HS_FORK_PHASE ? VKD3DSPR_FORKINSTID : VKD3DSPR_JOININSTID; reg.idx[0].offset = ~0u; + reg.idx[1].offset = ~0u; vkd3d_symbol_make_register(&reg_symbol, &reg); if ((entry = rb_get(&compiler->symbol_table, &reg_symbol))) { -- 2.11.0 [View Less]

1 0

[PATCH] kernelbase: Fix GetFileVersionInfo*() crashes with malformed resources.
by Arkadiusz Hiler 26 Feb '21

26 Feb '21

Some Unity games ship with an encrypted Assembly-CSharp.dll, including the resources directory, yet the engine still calls GetFileVersionInfoSizeW() on those files. This may results in a page fault when trying to find the version resource and takes the whole process down. The change fixes crashes when launching Home Behind 2 and Crown Trick. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50075 Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/kernelbase/version.c | … [View More]

1 0

[PATCH] include/winnt.h: Fix arguments order for _InterlockedCompareExchange64() MSVC intrinsic.
by Dmitry Timoshkov 26 Feb '21

26 Feb '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- include/winnt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winnt.h b/include/winnt.h index 48f1715c3b6..3a9d13b055c 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6944,7 +6944,7 @@ static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volatile *dest, LONGLONG xchg, LONGLONG compare ) { - … [View More]

1 0

[PATCH 7/7] msado15: Implement Dispatch functions in ADORecordsetConstruction
by Alistair Leslie-Hughes 26 Feb '21

26 Feb '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/main.c | 1 + dlls/msado15/msado15_private.h | 1 + dlls/msado15/recordset.c | 35 ++++++++++++++++++++++++++++------ 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index 0915a44c64b..197a21dc475 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -179,6 +179,7 @@ static ITypeLib *typelib; static ITypeInfo *… [View More]typeinfos[LAST_tid]; static REFIID tid_ids[] = { + &IID_ADORecordsetConstruction, &IID__Command, &IID__Connection, &IID_Field, diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index d1e177e1a3c..55afac3f389 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -43,6 +43,7 @@ static inline WCHAR *strdupW( const WCHAR *src ) } typedef enum tid_t { + ADORecordsetConstruction_tid, Command_tid, Connection_tid, Field_tid, diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index a4fe5b53736..0b91358f83d 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -1768,16 +1768,27 @@ static HRESULT WINAPI rsconstruction_GetTypeInfo(ADORecordsetConstruction *iface LCID lcid, ITypeInfo **ppTInfo) { struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); - FIXME( "%p %u %u %p\n", recordset, iTInfo, lcid, ppTInfo ); - return E_NOTIMPL; + TRACE( "%p %u %u %p\n", recordset, iTInfo, lcid, ppTInfo ); + return get_typeinfo(ADORecordsetConstruction_tid, ppTInfo); } static HRESULT WINAPI rsconstruction_GetIDsOfNames(ADORecordsetConstruction *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); - FIXME( "%p %s %p %u %u %p\n", recordset, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId ); - return E_NOTIMPL; + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p %s %p %u %u %p\n", recordset, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId ); + + hr = get_typeinfo(ADORecordsetConstruction_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI rsconstruction_Invoke(ADORecordsetConstruction *iface, DISPID dispIdMember, @@ -1785,9 +1796,21 @@ static HRESULT WINAPI rsconstruction_Invoke(ADORecordsetConstruction *iface, DIS EXCEPINFO *pExcepInfo, UINT *puArgErr) { struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); - FIXME( "%p %d %s %d %d %p %p %p %p\n", recordset, dispIdMember, debugstr_guid(riid), + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p %d %s %d %d %p %p %p %p\n", recordset, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr ); - return E_NOTIMPL; + + hr = get_typeinfo(ADORecordsetConstruction_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &recordset->ADORecordsetConstruction_iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI rsconstruction_get_Rowset(ADORecordsetConstruction *iface, IUnknown **row_set) -- 2.30.0 [View Less]

2 1

[PATCH 6/7] msado15: Implement Dispatch functions in _Recordset
by Alistair Leslie-Hughes 26 Feb '21

26 Feb '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/main.c | 1 + dlls/msado15/msado15_private.h | 1 + dlls/msado15/recordset.c | 44 +++++++++++++++++++++++++++------- 3 files changed, 38 insertions(+), 8 deletions(-) diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index c33d269504b..0915a44c64b 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -183,6 +183,7 @@ static REFIID tid_ids[] = { &… [View More]IID__Connection, &IID_Field, &IID_Fields, + &IID__Recordset, &IID__Stream, }; diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index 6bfe0fc91fd..d1e177e1a3c 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -47,6 +47,7 @@ typedef enum tid_t { Connection_tid, Field_tid, Fields_tid, + Recordset_tid, Stream_tid, LAST_tid } tid_t; diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 1c550680e0d..a4fe5b53736 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -928,29 +928,57 @@ static HRESULT WINAPI recordset_QueryInterface( _Recordset *iface, REFIID riid, static HRESULT WINAPI recordset_GetTypeInfoCount( _Recordset *iface, UINT *count ) { - FIXME( "%p, %p\n", iface, count ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + TRACE( "%p, %p\n", recordset, count ); + *count = 1; + return S_OK; } static HRESULT WINAPI recordset_GetTypeInfo( _Recordset *iface, UINT index, LCID lcid, ITypeInfo **info ) { - FIXME( "%p, %u, %u, %p\n", iface, index, lcid, info ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + TRACE( "%p, %u, %u, %p\n", recordset, index, lcid, info ); + return get_typeinfo(Recordset_tid, info); } static HRESULT WINAPI recordset_GetIDsOfNames( _Recordset *iface, REFIID riid, LPOLESTR *names, UINT count, LCID lcid, DISPID *dispid ) { - FIXME( "%p, %s, %p, %u, %u, %p\n", iface, debugstr_guid(riid), names, count, lcid, dispid ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p, %s, %p, %u, %u, %p\n", recordset, debugstr_guid(riid), names, count, lcid, dispid ); + + hr = get_typeinfo(Recordset_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, dispid); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI recordset_Invoke( _Recordset *iface, DISPID member, REFIID riid, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excep_info, UINT *arg_err ) { - FIXME( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", iface, member, debugstr_guid(riid), lcid, flags, params, + struct recordset *recordset = impl_from_Recordset( iface ); + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", recordset, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); - return E_NOTIMPL; + + hr = get_typeinfo(Recordset_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &recordset->Recordset_iface, member, flags, params, + result, excep_info, arg_err); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI recordset_get_Properties( _Recordset *iface, Properties **obj ) -- 2.30.0 [View Less]

2 1

[PATCH 5/7] msado15: Implement Dispatch functions in Fields
by Alistair Leslie-Hughes 26 Feb '21

26 Feb '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/main.c | 1 + dlls/msado15/msado15_private.h | 1 + dlls/msado15/recordset.c | 44 +++++++++++++++++++++++++++------- 3 files changed, 38 insertions(+), 8 deletions(-) diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index 002dd32424e..c33d269504b 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -182,6 +182,7 @@ static REFIID tid_ids[] = { &IID__Command, … [View More] &IID__Connection, &IID_Field, + &IID_Fields, &IID__Stream, }; diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index 9db82c8bd9a..6bfe0fc91fd 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -46,6 +46,7 @@ typedef enum tid_t { Command_tid, Connection_tid, Field_tid, + Fields_tid, Stream_tid, LAST_tid } tid_t; diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index b79fca16705..1c550680e0d 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -519,29 +519,57 @@ static HRESULT WINAPI fields_QueryInterface( Fields *iface, REFIID riid, void ** static HRESULT WINAPI fields_GetTypeInfoCount( Fields *iface, UINT *count ) { - FIXME( "%p, %p\n", iface, count ); - return E_NOTIMPL; + struct fields *fields = impl_from_Fields( iface ); + TRACE( "%p, %p\n", fields, count ); + *count = 1; + return S_OK; } static HRESULT WINAPI fields_GetTypeInfo( Fields *iface, UINT index, LCID lcid, ITypeInfo **info ) { - FIXME( "%p, %u, %u, %p\n", iface, index, lcid, info ); - return E_NOTIMPL; + struct fields *fields = impl_from_Fields( iface ); + TRACE( "%p, %u, %u, %p\n", fields, index, lcid, info ); + return get_typeinfo(Fields_tid, info); } static HRESULT WINAPI fields_GetIDsOfNames( Fields *iface, REFIID riid, LPOLESTR *names, UINT count, LCID lcid, DISPID *dispid ) { - FIXME( "%p, %s, %p, %u, %u, %p\n", iface, debugstr_guid(riid), names, count, lcid, dispid ); - return E_NOTIMPL; + struct fields *fields = impl_from_Fields( iface ); + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p, %s, %p, %u, %u, %p\n", fields, debugstr_guid(riid), names, count, lcid, dispid ); + + hr = get_typeinfo(Fields_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, dispid); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI fields_Invoke( Fields *iface, DISPID member, REFIID riid, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excep_info, UINT *arg_err ) { - FIXME( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", iface, member, debugstr_guid(riid), lcid, flags, params, + struct fields *fields = impl_from_Fields( iface ); + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", fields, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); - return E_NOTIMPL; + + hr = get_typeinfo(Fields_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &fields->Fields_iface, member, flags, params, + result, excep_info, arg_err); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI fields_get_Count( Fields *iface, LONG *count ) -- 2.30.0 [View Less]

2 1

[PATCH 4/7] msado15: Implement Dispatch functions in Field
by Alistair Leslie-Hughes 26 Feb '21

26 Feb '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/main.c | 1 + dlls/msado15/msado15_private.h | 1 + dlls/msado15/recordset.c | 44 +++++++++++++++++++++++++++------- 3 files changed, 38 insertions(+), 8 deletions(-) diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index 33657b26217..002dd32424e 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -181,6 +181,7 @@ static ITypeInfo *typeinfos[LAST_tid]; static … [View More]REFIID tid_ids[] = { &IID__Command, &IID__Connection, + &IID_Field, &IID__Stream, }; diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index b9fa01ef90d..9db82c8bd9a 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -45,6 +45,7 @@ static inline WCHAR *strdupW( const WCHAR *src ) typedef enum tid_t { Command_tid, Connection_tid, + Field_tid, Stream_tid, LAST_tid } tid_t; diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 71df553ebb6..b79fca16705 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -126,29 +126,57 @@ static HRESULT WINAPI field_QueryInterface( Field *iface, REFIID riid, void **ob static HRESULT WINAPI field_GetTypeInfoCount( Field *iface, UINT *count ) { - FIXME( "%p, %p\n", iface, count ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + TRACE( "%p, %p\n", field, count ); + *count = 1; + return S_OK; } static HRESULT WINAPI field_GetTypeInfo( Field *iface, UINT index, LCID lcid, ITypeInfo **info ) { - FIXME( "%p, %u, %u, %p\n", iface, index, lcid, info ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + TRACE( "%p, %u, %u, %p\n", field, index, lcid, info ); + return get_typeinfo(Field_tid, info); } static HRESULT WINAPI field_GetIDsOfNames( Field *iface, REFIID riid, LPOLESTR *names, UINT count, LCID lcid, DISPID *dispid ) { - FIXME( "%p, %s, %p, %u, %u, %p\n", iface, debugstr_guid(riid), names, count, lcid, dispid ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p, %s, %p, %u, %u, %p\n", field, debugstr_guid(riid), names, count, lcid, dispid ); + + hr = get_typeinfo(Field_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, dispid); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI field_Invoke( Field *iface, DISPID member, REFIID riid, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excep_info, UINT *arg_err ) { - FIXME( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", iface, member, debugstr_guid(riid), lcid, flags, params, + struct field *field = impl_from_Field( iface ); + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", field, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); - return E_NOTIMPL; + + hr = get_typeinfo(Field_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &field->Field_iface, member, flags, params, + result, excep_info, arg_err); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI field_get_Properties( Field *iface, Properties **obj ) -- 2.30.0 [View Less]

2 1

[PATCH 3/7] msado15: Implement Dispatch functions in _Stream
by Alistair Leslie-Hughes 26 Feb '21

26 Feb '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/main.c | 1 + dlls/msado15/msado15_private.h | 1 + dlls/msado15/stream.c | 44 +++++++++++++++++++++++++++------- 3 files changed, 38 insertions(+), 8 deletions(-) diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index f4ecf3247f1..33657b26217 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -181,6 +181,7 @@ static ITypeInfo *typeinfos[LAST_tid]; static … [View More]REFIID tid_ids[] = { &IID__Command, &IID__Connection, + &IID__Stream, }; static HRESULT load_typelib(void) diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index a95a24b6dfa..b9fa01ef90d 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -45,6 +45,7 @@ static inline WCHAR *strdupW( const WCHAR *src ) typedef enum tid_t { Command_tid, Connection_tid, + Stream_tid, LAST_tid } tid_t; diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index b40f664dcf1..961aed6a739 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -91,29 +91,57 @@ static HRESULT WINAPI stream_QueryInterface( _Stream *iface, REFIID riid, void * static HRESULT WINAPI stream_GetTypeInfoCount( _Stream *iface, UINT *count ) { - FIXME( "%p, %p\n", iface, count ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + TRACE( "%p, %p\n", stream, count ); + *count = 1; + return S_OK; } static HRESULT WINAPI stream_GetTypeInfo( _Stream *iface, UINT index, LCID lcid, ITypeInfo **info ) { - FIXME( "%p, %u, %u, %p\n", iface, index, lcid, info ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + TRACE( "%p, %u, %u, %p\n", stream, index, lcid, info ); + return get_typeinfo(Stream_tid, info); } static HRESULT WINAPI stream_GetIDsOfNames( _Stream *iface, REFIID riid, LPOLESTR *names, UINT count, LCID lcid, DISPID *dispid ) { - FIXME( "%p, %s, %p, %u, %u, %p\n", iface, debugstr_guid(riid), names, count, lcid, dispid ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p, %s, %p, %u, %u, %p\n", stream, debugstr_guid(riid), names, count, lcid, dispid ); + + hr = get_typeinfo(Connection_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, dispid); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI stream_Invoke( _Stream *iface, DISPID member, REFIID riid, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excep_info, UINT *arg_err ) { - FIXME( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", iface, member, debugstr_guid(riid), lcid, flags, params, + struct stream *stream = impl_from_Stream( iface ); + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", stream, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); - return E_NOTIMPL; + + hr = get_typeinfo(Connection_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &stream->Stream_iface, member, flags, params, + result, excep_info, arg_err); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI stream_get_Size( _Stream *iface, LONG *size ) -- 2.30.0 [View Less]

2 1

[PATCH 2/7] msado15: Implement Dispatch functions in _Command
by Alistair Leslie-Hughes 26 Feb '21

26 Feb '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/command.c | 44 +++++++++++++++++++++++++++------- dlls/msado15/main.c | 1 + dlls/msado15/msado15_private.h | 1 + 3 files changed, 38 insertions(+), 8 deletions(-) diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c index 9a56ced25ac..aff12f6a108 100644 --- a/dlls/msado15/command.c +++ b/dlls/msado15/command.c @@ -91,29 +91,57 @@ static ULONG WINAPI command_Release( … [View More]_Command *iface ) static HRESULT WINAPI command_GetTypeInfoCount( _Command *iface, UINT *count ) { - FIXME( "%p, %p\n", iface, count ); - return E_NOTIMPL; + struct command *command = impl_from_Command( iface ); + TRACE( "%p, %p\n", command, count ); + *count = 1; + return S_OK; } static HRESULT WINAPI command_GetTypeInfo( _Command *iface, UINT index, LCID lcid, ITypeInfo **info ) { - FIXME( "%p, %u, %u, %p\n", iface, index, lcid, info ); - return E_NOTIMPL; + struct command *command = impl_from_Command( iface ); + TRACE( "%p, %u, %u, %p\n", command, index, lcid, info ); + return get_typeinfo(Command_tid, info); } static HRESULT WINAPI command_GetIDsOfNames( _Command *iface, REFIID riid, LPOLESTR *names, UINT count, LCID lcid, DISPID *dispid ) { - FIXME( "%p, %s, %p, %u, %u, %p\n", iface, debugstr_guid(riid), names, count, lcid, dispid ); - return E_NOTIMPL; + struct command *command = impl_from_Command( iface ); + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p, %s, %p, %u, %u, %p\n", command, debugstr_guid(riid), names, count, lcid, dispid ); + + hr = get_typeinfo(Command_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, dispid); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI command_Invoke( _Command *iface, DISPID member, REFIID riid, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excep_info, UINT *arg_err ) { - FIXME( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", iface, member, debugstr_guid(riid), lcid, flags, params, + struct command *command = impl_from_Command( iface ); + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", command, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); - return E_NOTIMPL; + + hr = get_typeinfo(Connection_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &command->Command_iface, member, flags, params, + result, excep_info, arg_err); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI command_get_Properties( _Command *iface, Properties **props ) diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index 0f75c160b24..f4ecf3247f1 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -179,6 +179,7 @@ static ITypeLib *typelib; static ITypeInfo *typeinfos[LAST_tid]; static REFIID tid_ids[] = { + &IID__Command, &IID__Connection, }; diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index a5b22f29446..a95a24b6dfa 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -43,6 +43,7 @@ static inline WCHAR *strdupW( const WCHAR *src ) } typedef enum tid_t { + Command_tid, Connection_tid, LAST_tid } tid_t; -- 2.30.0 [View Less]

2 1

[PATCH 1/7] msado15: Implement Dispatch functions in _Connection
by Alistair Leslie-Hughes 26 Feb '21

26 Feb '21

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=16676 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/connection.c | 46 ++++++++++++++++++++++++------ dlls/msado15/main.c | 51 ++++++++++++++++++++++++++++++++++ dlls/msado15/msado15_private.h | 7 +++++ 3 files changed, 95 insertions(+), 9 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index d55c0d18a35..80297dcdc16 100644 --- a/dlls/msado15/… [View More]connection.c +++ b/dlls/msado15/connection.c @@ -156,29 +156,57 @@ static HRESULT WINAPI connection_QueryInterface( _Connection *iface, REFIID riid static HRESULT WINAPI connection_GetTypeInfoCount( _Connection *iface, UINT *count ) { - FIXME( "%p, %p\n", iface, count ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + TRACE( "%p, %p\n", connection, count ); + *count = 1; + return S_OK; } static HRESULT WINAPI connection_GetTypeInfo( _Connection *iface, UINT index, LCID lcid, ITypeInfo **info ) { - FIXME( "%p, %u, %u, %p\n", iface, index, lcid, info ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + TRACE( "%p, %u, %u, %p\n", connection, index, lcid, info ); + return get_typeinfo(Connection_tid, info); } static HRESULT WINAPI connection_GetIDsOfNames( _Connection *iface, REFIID riid, LPOLESTR *names, UINT count, LCID lcid, DISPID *dispid ) { - FIXME( "%p, %s, %p, %u, %u, %p\n", iface, debugstr_guid(riid), names, count, lcid, dispid ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p, %s, %p, %u, %u, %p\n", connection, debugstr_guid(riid), names, count, lcid, dispid ); + + hr = get_typeinfo(Connection_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, dispid); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI connection_Invoke( _Connection *iface, DISPID member, REFIID riid, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excep_info, UINT *arg_err ) { - FIXME( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", iface, member, debugstr_guid(riid), lcid, flags, params, - result, excep_info, arg_err ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", connection, member, debugstr_guid(riid), lcid, flags, + params, result, excep_info, arg_err ); + + hr = get_typeinfo(Connection_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &connection->Connection_iface, member, flags, params, + result, excep_info, arg_err); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI connection_get_Properties( _Connection *iface, Properties **obj ) diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index 0b8de1f9117..0f75c160b24 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -174,3 +174,54 @@ HRESULT WINAPI DllUnregisterServer( void ) { return __wine_unregister_resources( hinstance ); } + +static ITypeLib *typelib; +static ITypeInfo *typeinfos[LAST_tid]; + +static REFIID tid_ids[] = { + &IID__Connection, +}; + +static HRESULT load_typelib(void) +{ + HRESULT hres; + ITypeLib *tl; + + if(typelib) + return S_OK; + + hres = LoadRegTypeLib(&LIBID_ADODB, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); + if(FAILED(hres)) { + ERR("LoadRegTypeLib failed: %08x\n", hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)&typelib, tl, NULL)) + ITypeLib_Release(tl); + return hres; +} + +HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) +{ + HRESULT hres; + + if (FAILED(hres = load_typelib())) + return hres; + + if(!typeinfos[tid]) { + ITypeInfo *ti; + + hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); + if(FAILED(hres)) { + ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)(typeinfos+tid), ti, NULL)) + ITypeInfo_Release(ti); + } + + *typeinfo = typeinfos[tid]; + ITypeInfo_AddRef(*typeinfo); + return S_OK; +} \ No newline at end of file diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index dd98c382e2b..a5b22f29446 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -42,4 +42,11 @@ static inline WCHAR *strdupW( const WCHAR *src ) return dst; } +typedef enum tid_t { + Connection_tid, + LAST_tid +} tid_t; + +HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) DECLSPEC_HIDDEN; + #endif /* _WINE_MSADO15_PRIVATE_H_ */ -- 2.30.0 [View Less]

2 1

[PATCH 1/5] wbemdisp: Add Methods() collection stub.
by Nikolay Sivov 26 Feb '21

26 Feb '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wbemdisp/locator.c | 194 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 191 insertions(+), 3 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 1d61c423a91..9cea78cdf71 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -49,6 +49,7 @@ enum type_id ISWbemSecurity_tid, ISWbemNamedValueSet_tid, ISWbemNamedValue_tid, + ISWbemMethodSet_tid, … [View More]last_tid }; @@ -66,6 +67,7 @@ static REFIID wbemdisp_tid_id[] = &IID_ISWbemSecurity, &IID_ISWbemNamedValueSet, &IID_ISWbemNamedValue, + &IID_ISWbemMethodSet, }; static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) @@ -500,6 +502,190 @@ static HRESULT SWbemPropertySet_create( IWbemClassObject *wbem_object, ISWbemPro return S_OK; } +struct methodset +{ + ISWbemMethodSet ISWbemMethodSet_iface; + LONG refs; +}; + +static struct methodset *impl_from_ISWbemMethodSet( ISWbemMethodSet *iface ) +{ + return CONTAINING_RECORD( iface, struct methodset, ISWbemMethodSet_iface ); +} + +static HRESULT WINAPI methodset_QueryInterface( ISWbemMethodSet *iface, REFIID riid, void **ppvObject ) +{ + struct methodset *set = impl_from_ISWbemMethodSet( iface ); + + TRACE( "%p %s %p\n", set, debugstr_guid(riid), ppvObject ); + + if (IsEqualGUID( riid, &IID_ISWbemMethodSet ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppvObject = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + ISWbemMethodSet_AddRef( iface ); + return S_OK; +} + +static ULONG WINAPI methodset_AddRef( ISWbemMethodSet *iface ) +{ + struct methodset *set = impl_from_ISWbemMethodSet( iface ); + return InterlockedIncrement( &set->refs ); +} + +static ULONG WINAPI methodset_Release( ISWbemMethodSet *iface ) +{ + struct methodset *set = impl_from_ISWbemMethodSet( iface ); + LONG refs = InterlockedDecrement( &set->refs ); + if (!refs) + { + TRACE( "destroying %p\n", set ); + heap_free( set ); + } + return refs; +} + +static HRESULT WINAPI methodset_GetTypeInfoCount( + ISWbemMethodSet *iface, + UINT *count ) +{ + struct methodset *set = impl_from_ISWbemMethodSet( iface ); + + TRACE( "%p, %p\n", set, count ); + *count = 1; + return S_OK; +} + +static HRESULT WINAPI methodset_GetTypeInfo( ISWbemMethodSet *iface, + UINT index, + LCID lcid, + ITypeInfo **info ) +{ + struct methodset *set = impl_from_ISWbemMethodSet( iface ); + + TRACE( "%p, %u, %u, %p\n", set, index, lcid, info ); + + return get_typeinfo( ISWbemMethodSet_tid, info ); +} + +static HRESULT WINAPI methodset_GetIDsOfNames( + ISWbemMethodSet *iface, + REFIID riid, + LPOLESTR *names, + UINT count, + LCID lcid, + DISPID *dispid ) +{ + struct methodset *set = impl_from_ISWbemMethodSet( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %s, %p, %u, %u, %p\n", set, debugstr_guid(riid), names, count, lcid, dispid ); + + if (!names || !count || !dispid) return E_INVALIDARG; + + hr = get_typeinfo( ISWbemMethodSet_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, names, count, dispid ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI methodset_Invoke( + ISWbemMethodSet *iface, + DISPID member, + REFIID riid, + LCID lcid, + WORD flags, + DISPPARAMS *params, + VARIANT *result, + EXCEPINFO *excep_info, + UINT *arg_err ) +{ + struct methodset *set = impl_from_ISWbemMethodSet( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", set, member, debugstr_guid(riid), + lcid, flags, params, result, excep_info, arg_err ); + + hr = get_typeinfo( ISWbemMethodSet_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &set->ISWbemMethodSet_iface, member, flags, + params, result, excep_info, arg_err ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI methodset_get__NewEnum( + ISWbemMethodSet *iface, + IUnknown **unk ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static HRESULT WINAPI methodset_Item( + ISWbemMethodSet *iface, + BSTR name, + LONG flags, + ISWbemMethod **method ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static HRESULT WINAPI methodset_get_Count( + ISWbemMethodSet *iface, + LONG *count ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static const ISWbemMethodSetVtbl methodsetvtbl = +{ + methodset_QueryInterface, + methodset_AddRef, + methodset_Release, + methodset_GetTypeInfoCount, + methodset_GetTypeInfo, + methodset_GetIDsOfNames, + methodset_Invoke, + methodset_get__NewEnum, + methodset_Item, + methodset_get_Count, +}; + +static HRESULT SWbemMethodSet_create( ISWbemMethodSet **obj ) +{ + struct methodset *set; + + if (!(set = heap_alloc(sizeof(*set)))) + return E_OUTOFMEMORY; + + set->ISWbemMethodSet_iface.lpVtbl = &methodsetvtbl; + set->refs = 1; + + *obj = &set->ISWbemMethodSet_iface; + + return S_OK; +} + #define DISPID_BASE 0x1800000 #define DISPID_BASE_METHOD 0x1000000 @@ -1027,10 +1213,12 @@ static HRESULT WINAPI object_get_Properties_( ISWbemObject *iface, ISWbemPropert static HRESULT WINAPI object_get_Methods_( ISWbemObject *iface, - ISWbemMethodSet **objWbemMethodSet ) + ISWbemMethodSet **set ) { - FIXME( "\n" ); - return E_NOTIMPL; + struct object *object = impl_from_ISWbemObject( iface ); + + TRACE( "%p, %p\n", object, set ); + return SWbemMethodSet_create( set ); } static HRESULT WINAPI object_get_Derivation_( -- 2.30.0 [View Less]

2 9

Re: TestBot job 86132 results: [PATCH v2 6/6] ddraw/tests: Run test_ck_rgba() for each device type.
by Paul Gofman 26 Feb '21

26 Feb '21

On 2/26/21 05:04, Marvin wrote: > > === w8 (32 bit report) === > > ddraw: > ddraw1.c:4615: Test failed: Got unexpected caps 0x10026000, test 16, software_device 1. > ddraw1.c:4615: Test failed: Got unexpected caps 0x10024000, test 17, software_device 1. > > ddraw2.c:5111: Test succeeded inside todo block: Got unexpected caps 0x10026000, test 16, software_device 1. > > === debiant2 (32 bit French report) === These failures definitely need fixing, but (unless … [View More]

1 0

[PATCH 1/7] widl: Generate helper macros for WinRT implementation.
by Rémi Bernon 26 Feb '21

26 Feb '21

This generates additional macros to help keeping implementation simple, guarded with WIDL_USING ifdefs, like this: #ifdef WIDL_USING_WINDOWS_FOO #define IFooVtbl __x_ABI_CWindows_CFoo_CIFooVtbl #define IFoo __x_ABI_CWindows_CFoo_CIFoo #define IFoo_DoFoo __x_ABI_CWindows_CFoo_CIFoo_DoFoo #endif /* WIDL_USING_WINDOWS_FOO */ Implementation files can define the desired WIDL_USING preprocessor macros before including the header, and then implement or use the interface methods … [View More]with the simple non-prefixed names instead. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- I updated this patch with WIDL_USING macros for namespaces instead, and to use format_namespace to make them. Then I'm adding the C++ compatibility patches too, that should fix C++ compilation errors and make the C++ interfaces code generation closer to MIDL. tools/widl/header.c | 54 ++++++++++++++++++++++++++++++++++++++++++ tools/widl/typetree.c | 19 +++++++++++++++ tools/widl/widltypes.h | 1 + 3 files changed, 74 insertions(+) diff --git a/tools/widl/header.c b/tools/widl/header.c index 82aad0f11ca..95bdb8cacb8 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -48,6 +48,8 @@ static void write_type_v(FILE *f, const decl_spec_t *t, int is_field, int declon static void write_apicontract_guard_start(FILE *header, const expr_t *expr); static void write_apicontract_guard_end(FILE *header, const expr_t *expr); +static void write_widl_using_macros(FILE *header, type_t *iface); + static void indent(FILE *h, int delta) { int c; @@ -604,6 +606,7 @@ static void write_type_definition(FILE *f, type_t *t, int declonly) fprintf(f, "#else\n"); write_type_left(f, &ds, NAME_C, declonly, TRUE); fprintf(f, ";\n"); + if (winrt_mode) write_widl_using_macros(f, t); fprintf(f, "#endif\n\n"); } if (contract) write_apicontract_guard_end(f, contract); @@ -1536,6 +1539,56 @@ static void write_com_interface_start(FILE *header, const type_t *iface) fprintf(header,"#define __%s_%sINTERFACE_DEFINED__\n\n", iface->c_name, dispinterface ? "DISP" : ""); } +static void write_widl_using_method_macros(FILE *header, const type_t *iface, const type_t *top_iface) +{ + const statement_t *stmt; + const char *name = top_iface->short_name ? top_iface->short_name : top_iface->name; + + if (type_iface_get_inherit(iface)) write_widl_using_method_macros(header, type_iface_get_inherit(iface), top_iface); + + STATEMENTS_FOR_EACH_FUNC(stmt, type_iface_get_stmts(iface)) + { + const var_t *func = stmt->u.var; + const char *func_name; + + if (is_override_method(iface, top_iface, func)) continue; + if (is_callas(func->attrs)) continue; + + func_name = get_name(func); + fprintf(header, "#define %s_%s %s_%s\n", name, func_name, top_iface->c_name, func_name); + } +} + +static char *format_widl_using_macro(const type_t *type) +{ + char *name = format_namespace(type->namespace, "WIDL_USING_", "_", "", NULL); + int i = strlen(name); + if (i) name[i - 1] = 0; /* remove trailing underscore */ + for (; i > 0; --i) name[i - 1] = toupper(name[i - 1]); + return name; +} + +static void write_widl_using_macros(FILE *header, type_t *iface) +{ + const UUID *uuid = get_attrp(iface->attrs, ATTR_UUID); + const char *name = iface->short_name ? iface->short_name : iface->name; + char *macro; + + if (!strcmp(iface->name, iface->c_name)) return; + + macro = format_widl_using_macro(iface); + fprintf(header, "#ifdef %s\n", macro); + + if (uuid) fprintf(header, "#define IID_%s IID_%s\n", name, iface->c_name); + if (iface->type_type == TYPE_INTERFACE) fprintf(header, "#define %sVtbl %sVtbl\n", name, iface->c_name); + fprintf(header, "#define %s %s\n", name, iface->c_name); + + if (iface->type_type == TYPE_INTERFACE) write_widl_using_method_macros(header, iface, iface); + + fprintf(header, "#endif /* WIDL_USING_%s */\n", macro); + free(macro); +} + static void write_com_interface_end(FILE *header, type_t *iface) { int dispinterface = is_attr(iface->attrs, ATTR_DISPINTERFACE); @@ -1608,6 +1661,7 @@ static void write_com_interface_end(FILE *header, type_t *iface) fprintf(header, "#else\n"); write_inline_wrappers(header, type, type, iface->c_name); fprintf(header, "#endif\n"); + if (winrt_mode) write_widl_using_macros(header, iface); fprintf(header, "#endif\n"); fprintf(header, "\n"); fprintf(header, "#endif\n"); diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 319dd4ae65a..8bce314018a 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -52,6 +52,7 @@ type_t *make_type(enum type_type type) t->c_name = NULL; t->signature = NULL; t->qualified_name = NULL; + t->short_name = NULL; memset(&t->details, 0, sizeof(t->details)); t->typestring_offset = 0; t->ptrdesc = 0; @@ -334,6 +335,22 @@ static char *format_parameterized_type_signature(type_t *type, typeref_list_t *p return buf; } +static char *format_parameterized_type_short_name(type_t *type, typeref_list_t *params, const char *prefix) +{ + size_t len = 0, pos = 0; + char *buf = NULL; + typeref_t *ref; + + pos += strappend(&buf, &len, pos, "%s%s", prefix, type->name); + if (params) LIST_FOR_EACH_ENTRY(ref, params, typeref_t, entry) + { + for (type = ref->type; type->type_type == TYPE_POINTER; type = type_pointer_get_ref_type(type)) {} + pos += strappend(&buf, &len, pos, "_%s", type->name); + } + + return buf; +} + type_t *type_new_function(var_list_t *args) { var_t *arg; @@ -1151,11 +1168,13 @@ type_t *type_parameterized_type_specialize_declare(type_t *type, typeref_list_t new_type->name = format_parameterized_type_name(type, params); reg_type(new_type, new_type->name, new_type->namespace, 0); new_type->c_name = format_parameterized_type_c_name(type, params, ""); + new_type->short_name = format_parameterized_type_short_name(type, params, ""); if (new_type->type_type == TYPE_DELEGATE) { new_type->details.delegate.iface = duptype(tmpl->details.delegate.iface, 0); compute_delegate_iface_names(new_type, type, params); + new_type->details.delegate.iface->short_name = format_parameterized_type_short_name(type, params, "I"); } return new_type; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 81646cae1d1..bedba40d903 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -504,6 +504,7 @@ struct _type_t { const char *c_name; const char *signature; const char *qualified_name; + const char *short_name; unsigned int typestring_offset; unsigned int ptrdesc; /* used for complex structs */ int typelib_idx; -- 2.30.0 [View Less]

2 9

[PATCH 1/2] include/d3d12: add missing enum/structures/defines needed to use d3d12x.h
by Steve Lhomme 26 Feb '21

26 Feb '21

d3dx12.h is a useful MIT licensed header from Microsoft to help do regular things with D3D12 (in C++). It's usable with mingw (and thus wine) with these additions. --- include/d3d12.idl | 77 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/include/d3d12.idl b/include/d3d12.idl index 42f33a06e40..056e078ab9d 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -75,6 +75,9 @@ const UINT D3D12_UAV_COUNTER_PLACEMENT_ALIGNMENT = 4096; const UINT … [View More]D3D12_VS_INPUT_REGISTER_COUNT = 32; const UINT D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE = 16; +cpp_quote("#define D3D12_MIN_DEPTH ( 0.0f )") +cpp_quote("#define D3D12_MAX_DEPTH ( 1.0f )") + cpp_quote("#endif") const UINT D3D12_SHADER_COMPONENT_MAPPING_MASK = 0x7; @@ -2005,6 +2008,80 @@ typedef enum D3D12_PREDICATION_OP D3D12_PREDICATION_OP_NOT_EQUAL_ZERO = 1, } D3D12_PREDICATION_OP; +typedef enum D3D12_VIEW_INSTANCING_FLAGS +{ + D3D12_VIEW_INSTANCING_FLAG_NONE, + D3D12_VIEW_INSTANCING_FLAG_ENABLE_VIEW_INSTANCE_MASKING +} D3D12_VIEW_INSTANCING_FLAGS; + +typedef enum D3D12_PIPELINE_STATE_SUBOBJECT_TYPE +{ + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_ROOT_SIGNATURE, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_VS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_PS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_HS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_GS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_CS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_STREAM_OUTPUT, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_BLEND, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_SAMPLE_MASK, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_RASTERIZER, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DEPTH_STENCIL, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_INPUT_LAYOUT, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_IB_STRIP_CUT_VALUE, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_PRIMITIVE_TOPOLOGY, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_RENDER_TARGET_FORMATS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DEPTH_STENCIL_FORMAT, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_SAMPLE_DESC, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_NODE_MASK, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_CACHED_PSO, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_FLAGS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DEPTH_STENCIL1, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_VIEW_INSTANCING, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_AS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_MS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_MAX_VALID +} D3D12_PIPELINE_STATE_SUBOBJECT_TYPE; + +typedef struct D3D12_DEPTH_STENCIL_DESC1 +{ + BOOL DepthEnable; + D3D12_DEPTH_WRITE_MASK DepthWriteMask; + D3D12_COMPARISON_FUNC DepthFunc; + BOOL StencilEnable; + UINT8 StencilReadMask; + UINT8 StencilWriteMask; + D3D12_DEPTH_STENCILOP_DESC FrontFace; + D3D12_DEPTH_STENCILOP_DESC BackFace; + BOOL DepthBoundsTestEnable; +} D3D12_DEPTH_STENCIL_DESC1; + +typedef struct D3D12_VIEW_INSTANCE_LOCATION +{ + UINT ViewportArrayIndex; + UINT RenderTargetArrayIndex; +} D3D12_VIEW_INSTANCE_LOCATION; + +typedef struct D3D12_VIEW_INSTANCING_DESC +{ + UINT ViewInstanceCount; + const D3D12_VIEW_INSTANCE_LOCATION *pViewInstanceLocations; + D3D12_VIEW_INSTANCING_FLAGS Flags; +} D3D12_VIEW_INSTANCING_DESC; + +typedef struct D3D12_RT_FORMAT_ARRAY +{ + DXGI_FORMAT RTFormats[8]; + UINT NumRenderTargets; +} D3D12_RT_FORMAT_ARRAY; + +typedef struct D3D12_PIPELINE_STATE_STREAM_DESC +{ + SIZE_T SizeInBytes; + void *pPipelineStateSubobjectStream; +} D3D12_PIPELINE_STATE_STREAM_DESC; + [ uuid(8efb471d-616c-4f49-90f7-127bb763fa51), object, -- 2.29.2 [View Less]

1 1

[PATCH] d3d12: Check for VK_KHR_external_fence_capabilities before using VkPhysicalDeviceIDProperties.
by Zebediah Figura 26 Feb '21

26 Feb '21

This fixes a validation layer warning. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d12/d3d12_main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index 3dd4ec796b0..5ac10689323 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -265,7 +265,9 @@ static VkPhysicalDevice d3d12_get_vk_physical_device(struct vkd3d_instance *inst if ((vr = pfn_vkEnumeratePhysicalDevices(… [View More]

7 11

[PATCH 1/3] wow64cpu: Add stub dll.
by Zebediah Figura 26 Feb '21

26 Feb '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Resending this series now that MemorySectionName is implemented... configure | 1 + configure.ac | 1 + dlls/wow64cpu/Makefile.in | 7 +++++++ dlls/wow64cpu/wow64cpu.spec | 9 +++++++++ dlls/wow64cpu/wow64cpu_main.c | 27 +++++++++++++++++++++++++++ 5 files changed, 45 insertions(+) create mode 100644 dlls/wow64cpu/Makefile.in create mode 100644 dlls/wow64cpu/wow64cpu.spec … [View More]create mode 100644 dlls/wow64cpu/wow64cpu_main.c diff --git a/configure b/configure index 08936ff0ec1..b9b6a526051 100755 --- a/configure +++ b/configure @@ -21123,6 +21123,7 @@ wine_fn_config_makefile dlls/wmvcore enable_wmvcore wine_fn_config_makefile dlls/wmvcore/tests enable_tests wine_fn_config_makefile dlls/wnaspi32 enable_wnaspi32 wine_fn_config_makefile dlls/wow32 enable_win16 +wine_fn_config_makefile dlls/wow64cpu enable_win64 wine_fn_config_makefile dlls/wpc enable_wpc wine_fn_config_makefile dlls/wpc/tests enable_tests wine_fn_config_makefile dlls/wpcap enable_wpcap diff --git a/configure.ac b/configure.ac index caff5d1fe52..b579f26902a 100644 --- a/configure.ac +++ b/configure.ac @@ -3857,6 +3857,7 @@ WINE_CONFIG_MAKEFILE(dlls/wmvcore) WINE_CONFIG_MAKEFILE(dlls/wmvcore/tests) WINE_CONFIG_MAKEFILE(dlls/wnaspi32) WINE_CONFIG_MAKEFILE(dlls/wow32,enable_win16) +WINE_CONFIG_MAKEFILE(dlls/wow64cpu,enable_win64) WINE_CONFIG_MAKEFILE(dlls/wpc) WINE_CONFIG_MAKEFILE(dlls/wpc/tests) WINE_CONFIG_MAKEFILE(dlls/wpcap) diff --git a/dlls/wow64cpu/Makefile.in b/dlls/wow64cpu/Makefile.in new file mode 100644 index 00000000000..2ab1ca62c4a --- /dev/null +++ b/dlls/wow64cpu/Makefile.in @@ -0,0 +1,7 @@ +MODULE = wow64cpu.dll +IMPORTS = winecrt0 ntdll + +EXTRADLLFLAGS = -nodefaultlibs -mno-cygwin + +C_SRCS = \ + wow64cpu_main.c diff --git a/dlls/wow64cpu/wow64cpu.spec b/dlls/wow64cpu/wow64cpu.spec new file mode 100644 index 00000000000..bd156df1e79 --- /dev/null +++ b/dlls/wow64cpu/wow64cpu.spec @@ -0,0 +1,9 @@ +# @ stub BTCpuGetBopCode +# @ stub BTCpuGetContext +# @ stub BTCpuProcessInit +# @ stub BTCpuResetToConsistentState +# @ stub BTCpuSetContext +# @ stub BTCpuSimulate +# @ stub BTCpuTurboThunkControl +# @ stub TurboDispatchJumpAddressEnd +# @ stub TurboDispatchJumpAddressStart diff --git a/dlls/wow64cpu/wow64cpu_main.c b/dlls/wow64cpu/wow64cpu_main.c new file mode 100644 index 00000000000..4da9695230b --- /dev/null +++ b/dlls/wow64cpu/wow64cpu_main.c @@ -0,0 +1,27 @@ +/* + * Copyright 2018 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winternl.h" + +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, void *reserved ) +{ + if (reason == DLL_PROCESS_ATTACH) LdrDisableThreadCalloutsForDll( inst ); + return TRUE; +} -- 2.20.1 [View Less]

2 4

[PATCH] windowscodecs: Add stub implementation for DDS encoder.
by Ziqing Hui 26 Feb '21

26 Feb '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/clsfactory.c | 1 + dlls/windowscodecs/ddsformat.c | 201 ++++++++++++++++++ dlls/windowscodecs/wincodecs_private.h | 1 + dlls/windowscodecs/windowscodecs_wincodec.idl | 7 + 4 files changed, 210 insertions(+)

2 1

[PATCH] ntdll: Allow getting/setting x86_64 context of x86 processes in wine64
by Rafał Harabień 26 Feb '21

26 Feb '21

WoW64 process has two separate contexts: - 32 bit context used most of the time (e.g. by application code) - 64 bit context used by system when it quits x86 emulation and jumps to the kernel code A notable exception are debug registers - their state is shared. Some debuggers make use of that fact and sets/gets debug registers of 32 bit processes using 64 bit thread context. This change adds support for setting and getting debug registers using 64 bit thread context. Getting other registers … [View More]is allowed too and will return values from 32 bit thread context. This change fixes hardware breakpoints in IDA 7.0 disassembler (64 bit app) when debugging 32 bit applications. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/ntdll/unix/signal_x86_64.c | 62 +++++++++++++++++++++++++++++++++ server/thread.c | 24 +++++++++++-- 2 files changed, 84 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 22a5d34e06c..4c1aa1bfc74 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1709,6 +1709,68 @@ NTSTATUS context_to_server( context_t *to, const CONTEXT *from ) */ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) { + if (from->cpu == CPU_x86) + { + // WoW64 process has two separate contexts: one 32 bit used when executing normal user code and one 64 bit + // used by WoW64 internals for talking with the kernel. Debug registers are shared between those contexts + // and some debuggers make use of that fact so handle getting them here. Other registers could be set to + // anything but to keep things sane lets copy them from 32 bit context. + to->ContextFlags = CONTEXT_AMD64; + if (from->flags & SERVER_CTX_CONTROL) + { + to->ContextFlags |= CONTEXT_CONTROL; + to->Rbp = from->ctl.i386_regs.ebp; + to->Rip = from->ctl.i386_regs.eip; + to->Rsp = from->ctl.i386_regs.esp; + to->SegCs = from->ctl.i386_regs.cs; + to->SegSs = from->ctl.i386_regs.ss; + to->EFlags = from->ctl.i386_regs.eflags; + } + + if (from->flags & SERVER_CTX_INTEGER) + { + to->ContextFlags |= CONTEXT_INTEGER; + to->Rax = from->integer.i386_regs.eax; + to->Rcx = from->integer.i386_regs.ecx; + to->Rdx = from->integer.i386_regs.edx; + to->Rbx = from->integer.i386_regs.ebx; + to->Rsi = from->integer.i386_regs.esi; + to->Rdi = from->integer.i386_regs.edi; + to->R8 = 0; + to->R9 = 0; + to->R10 = 0; + to->R11 = 0; + to->R12 = 0; + to->R13 = 0; + to->R14 = 0; + to->R15 = 0; + } + if (from->flags & SERVER_CTX_SEGMENTS) + { + to->ContextFlags |= CONTEXT_SEGMENTS; + to->SegDs = from->seg.i386_regs.ds; + to->SegEs = from->seg.i386_regs.es; + to->SegFs = from->seg.i386_regs.fs; + to->SegGs = from->seg.i386_regs.gs; + } + if (from->flags & SERVER_CTX_FLOATING_POINT) + { + to->ContextFlags |= CONTEXT_FLOATING_POINT; + memset(&to->u.FltSave, 0, sizeof(to->u.FltSave)); + } + if (from->flags & SERVER_CTX_DEBUG_REGISTERS) + { + to->ContextFlags |= CONTEXT_DEBUG_REGISTERS; + to->Dr0 = from->debug.i386_regs.dr0; + to->Dr1 = from->debug.i386_regs.dr1; + to->Dr2 = from->debug.i386_regs.dr2; + to->Dr3 = from->debug.i386_regs.dr3; + to->Dr6 = from->debug.i386_regs.dr6; + to->Dr7 = from->debug.i386_regs.dr7; + } + return STATUS_SUCCESS; + } + if (from->cpu != CPU_x86_64) return STATUS_INVALID_PARAMETER; to->ContextFlags = CONTEXT_AMD64 | (to->ContextFlags & 0x40); diff --git a/server/thread.c b/server/thread.c index 3cee717e169..99e82d113fa 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1887,8 +1887,7 @@ DECL_HANDLER(set_thread_context) reply->self = (thread == current); if (thread->state == TERMINATED) set_error( STATUS_UNSUCCESSFUL ); - else if (context->cpu != thread->process->cpu) set_error( STATUS_INVALID_PARAMETER ); - else + else if (context->cpu == thread->process->cpu) { unsigned int system_flags = get_context_system_regs(context->cpu) & context->flags; @@ -1900,6 +1899,27 @@ DECL_HANDLER(set_thread_context) thread->context->regs.flags |= context->flags; } } + else if (context->cpu == CPU_x86_64 && thread->process->cpu == CPU_x86) + { + // WoW64 process has two separate contexts: one 32 bit used when executing normal user code and one 64 bit + // used by WoW64 internals for talking with the kernel. Debug registers are shared between those contexts + // and some debuggers make use of that fact so handle setting them here. + unsigned int system_flags = get_context_system_regs( context->cpu ) & context->flags; + if (system_flags) + { + set_thread_context( thread, context, system_flags ); + if (thread->context && !get_error()) + { + thread->context->regs.debug.i386_regs.dr0 = context->debug.x86_64_regs.dr0; + thread->context->regs.debug.i386_regs.dr1 = context->debug.x86_64_regs.dr1; + thread->context->regs.debug.i386_regs.dr2 = context->debug.x86_64_regs.dr2; + thread->context->regs.debug.i386_regs.dr3 = context->debug.x86_64_regs.dr3; + thread->context->regs.debug.i386_regs.dr6 = context->debug.x86_64_regs.dr6; + thread->context->regs.debug.i386_regs.dr7 = context->debug.x86_64_regs.dr7; + } + } + } + else set_error( STATUS_INVALID_PARAMETER ); release_object( thread ); } -- 2.25.1 [View Less]

3 2

[PATCH 1/6] ddraw: Store hardware_device flag in struct d3d_device.
by Paul Gofman 25 Feb '21

25 Feb '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ddraw/ddraw.c | 6 +++--- dlls/ddraw/ddraw_private.h | 3 ++- dlls/ddraw/device.c | 12 +++++++----- dlls/ddraw/surface.c | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index fde757b12ac..045d79b59c8 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4358,7 +4358,7 @@ static HRESULT WINAPI d3d7_CreateDevice(IDirect3D7 *iface, … [View More]REFCLSID riid, TRACE("iface %p, riid %s, surface %p, device %p.\n", iface, debugstr_guid(riid), surface, device); wined3d_mutex_lock(); - if (SUCCEEDED(hr = d3d_device_create(ddraw, target, (IUnknown *)surface, 7, &object, NULL))) + if (SUCCEEDED(hr = d3d_device_create(ddraw, riid, target, (IUnknown *)surface, 7, &object, NULL))) { *device = &object->IDirect3DDevice7_iface; } @@ -4387,7 +4387,7 @@ static HRESULT WINAPI d3d3_CreateDevice(IDirect3D3 *iface, REFCLSID riid, return CLASS_E_NOAGGREGATION; wined3d_mutex_lock(); - if (SUCCEEDED(hr = d3d_device_create(ddraw, surface_impl, (IUnknown *)surface, 3, &device_impl, NULL))) + if (SUCCEEDED(hr = d3d_device_create(ddraw, riid, surface_impl, (IUnknown *)surface, 3, &device_impl, NULL))) { *device = &device_impl->IDirect3DDevice3_iface; } @@ -4413,7 +4413,7 @@ static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid, iface, debugstr_guid(riid), surface, device); wined3d_mutex_lock(); - if (SUCCEEDED(hr = d3d_device_create(ddraw, surface_impl, (IUnknown *)surface, 2, &device_impl, NULL))) + if (SUCCEEDED(hr = d3d_device_create(ddraw, riid, surface_impl, (IUnknown *)surface, 2, &device_impl, NULL))) { *device = &device_impl->IDirect3DDevice2_iface; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index e4ce918b189..f01468ce614 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -317,6 +317,7 @@ struct d3d_device IUnknown IUnknown_inner; LONG ref; UINT version; + BOOL hardware_device; IUnknown *outer_unknown; struct wined3d_device *wined3d_device; @@ -369,7 +370,7 @@ struct d3d_device const struct wined3d_stateblock_state *stateblock_state; }; -HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUnknown *rt_iface, +HRESULT d3d_device_create(struct ddraw *ddraw, const GUID *guid, struct ddraw_surface *target, IUnknown *rt_iface, UINT version, struct d3d_device **device, IUnknown *outer_unknown) DECLSPEC_HIDDEN; enum wined3d_depth_buffer_type d3d_device_update_depth_stencil(struct d3d_device *device) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 8c7004bd96e..f91404c89f6 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6935,7 +6935,7 @@ static void ddraw_reset_viewport_state(struct ddraw *ddraw) wined3d_stateblock_set_scissor_rect(ddraw->state, &rect); } -static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, +static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, const GUID *guid, struct ddraw_surface *target, IUnknown *rt_iface, UINT version, IUnknown *outer_unknown) { static const struct wined3d_matrix ident = @@ -6958,6 +6958,8 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, device->IUnknown_inner.lpVtbl = &d3d_device_inner_vtbl; device->ref = 1; device->version = version; + device->hardware_device = IsEqualGUID(&IID_IDirect3DTnLHalDevice, guid) + || IsEqualGUID(&IID_IDirect3DHALDevice, guid); if (outer_unknown) device->outer_unknown = outer_unknown; @@ -7016,14 +7018,14 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, return D3D_OK; } -HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUnknown *rt_iface, +HRESULT d3d_device_create(struct ddraw *ddraw, const GUID *guid, struct ddraw_surface *target, IUnknown *rt_iface, UINT version, struct d3d_device **device, IUnknown *outer_unknown) { struct d3d_device *object; HRESULT hr; - TRACE("ddraw %p, target %p, version %u, device %p, outer_unknown %p.\n", - ddraw, target, version, device, outer_unknown); + TRACE("ddraw %p, guid %s, target %p, version %u, device %p, outer_unknown %p.\n", + ddraw, debugstr_guid(guid), target, version, device, outer_unknown); if (!(target->surface_desc.ddsCaps.dwCaps & DDSCAPS_3DDEVICE) || (target->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER)) @@ -7064,7 +7066,7 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn return DDERR_OUTOFMEMORY; } - if (FAILED(hr = d3d_device_init(object, ddraw, target, rt_iface, version, outer_unknown))) + if (FAILED(hr = d3d_device_init(object, ddraw, guid, target, rt_iface, version, outer_unknown))) { WARN("Failed to initialize device, hr %#x.\n", hr); heap_free(object); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 0ca19d4f8a5..b910fb6817e 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -256,7 +256,7 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, { HRESULT hr; - if (FAILED(hr = d3d_device_create(This->ddraw, This, (IUnknown *)&This->IDirectDrawSurface_iface, + if (FAILED(hr = d3d_device_create(This->ddraw, riid, This, (IUnknown *)&This->IDirectDrawSurface_iface, 1, &This->device1, (IUnknown *)&This->IDirectDrawSurface_iface))) { This->device1 = NULL; -- 2.29.2 [View Less]

2 11

[PATCH] winebus.sys: Remove incorrect Report ID from the bus_sdl HID report descriptor.
by Arkadiusz Hiler 25 Feb '21

25 Feb '21

According to "USB Device Class Definition for Human Interface Devices Firmware Specification Version 1.11" Report ID 0 is reserved and should not be used. On top of that if Report ID is used anywhere in the descriptor the reports are expected to be prepended with an ID and this is not the case for bus_sdl devices. It worked only because our current HID parser implementation treats the Report ID 0 as there would be none. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- … [View More]

2 1

[PATCH v2 1/3] user32: Uppercase RawInput device names.
by Arkadiusz Hiler 25 Feb '21

25 Feb '21

This is a preparation for a patch that changes setupapi to return lowercased device paths, which is the source of RawInput device names. On Windows RawInput returns mostly uppercase names. This patch tries to keep Wine's old behavior in this regards as SDL 2.0.14+ looks for uppercase IG_ to match xinput devices to their RawInput counterparts. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/user32/rawinput.c | 2 ++ dlls/user32/tests/input.c | 17 +++++++++++++++-- … [View More]2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index ba11a121bc5..823ddf6f61d 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -121,6 +121,8 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) } heap_free(detail); + wcsupr(path); /* SDL does case-sensitive search for IG_ */ + file = CreateFileW(path, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); if (file == INVALID_HANDLE_VALUE) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 9d75daa0bd5..63ea80a4625 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1802,7 +1802,7 @@ static void test_GetRawInputDeviceList(void) RAWINPUTDEVICELIST devices[32]; UINT ret, oret, devcount, odevcount, i; DWORD err; - BOOLEAN br; + BOOLEAN br, xinput_tested = FALSE; SetLastError(0xdeadbeef); ret = pGetRawInputDeviceList(NULL, NULL, 0); @@ -1835,7 +1835,7 @@ static void test_GetRawInputDeviceList(void) for(i = 0; i < devcount; ++i) { - WCHAR name[128]; + WCHAR name[128], name_cpy[128]; char nameA[128]; UINT sz, len; RID_DEVICE_INFO info; @@ -1855,6 +1855,15 @@ static void test_GetRawInputDeviceList(void) len = lstrlenW(name); ok(len + 1 == ret, "GetRawInputDeviceInfo returned wrong length (name: %u, ret: %u)\n", len + 1, ret); + /* requires xinput device to be connected, SDL 2.0.14+ looks for uppercase IG_ */ + lstrcpyW(name_cpy, name); + wcsupr(name_cpy); + if (wcsstr(name_cpy, L"IG_")) + { + xinput_tested = TRUE; + ok(wcsstr(name, L"IG_") != NULL, "Expected xinput device path to contain uppercase &IG_.\n", debugstr_w(name)); + } + /* test A variant with same size */ ret = pGetRawInputDeviceInfoA(devices[i].hDevice, RIDI_DEVICENAME, nameA, &sz); ok(ret == sz, "GetRawInputDeviceInfoA gave wrong return: %d\n", err); @@ -1927,6 +1936,10 @@ static void test_GetRawInputDeviceList(void) CloseHandle(file); } + if (!xinput_tested) + skip("No xinput device. Ignoring xinput / RawInput device path tests.\n"); + + /* check if variable changes from larger to smaller value */ devcount = odevcount = ARRAY_SIZE(devices); oret = ret = pGetRawInputDeviceList(devices, &odevcount, sizeof(devices[0])); -- 2.30.1 [View Less]

2 5

[PATCH 3/3] ntdll: Use syscall frame in x86 set_full_cpu_context implementation.
by Jacek Caban 25 Feb '21

25 Feb '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/signal_i386.c | 123 +++++++++++++++++++--------------- 1 file changed, 68 insertions(+), 55 deletions(-)

1 0

[PATCH 2/3] ntdll: Store all non-volatile i386 registers in syscall dispatcher.
by Jacek Caban 25 Feb '21

25 Feb '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/signal_i386.c | 29 ++++++++++++++--------------- tools/winebuild/import.c | 13 ++++++++++++- 2 files changed, 26 insertions(+), 16 deletions(-)

1 0

[PATCH 1/3] ntdll: Reserve space for full i386 context in syscall frame.
by Jacek Caban 25 Feb '21

25 Feb '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/signal_i386.c | 62 +++++++++++++++++++++-------------- tools/winebuild/import.c | 26 ++++++++------- 2 files changed, 51 insertions(+), 37 deletions(-)

1 0

[PATCH 1/3] RawInput: Uppercase the device names up to the GUID.
by Arkadiusz Hiler 25 Feb '21

25 Feb '21

This is a preparation for a patch that changes setupapi to return lowercased device paths, which is the source of RawInput device names. On Windows RawInput returns mostly uppercase names (except the GUID part) and we want to keep Wine's old behavior in this regards as SDL 2.0.14+ looks for uppercase IG_ to match xinput devices to their RawInput counterparts. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/user32/rawinput.c | 5 ++++- 1 file changed, 4 insertions(+), … [View More]

4 14

[PATCH] msvcrt: Improve acosf compatibility with native ucrtbase.
by Piotr Caban 25 Feb '21

25 Feb '21

It reduces number of different acosf results from 5678739 to 240905. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 57 +++++++++++++++++----------------------------- 1 file changed, 21 insertions(+), 36 deletions(-)

1 0

[PATCH 1/5] widl: Never use the namespace ABI prefix for global types.
by Rémi Bernon 25 Feb '21

25 Feb '21

From: Steve Lhomme <robux4(a)ycbcr.xyz> Otherwise we end up with types like ABI::IInspectable. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- With this last series, it should now be possible to declare WinRT interfaces in IDLs, and implement the corresponding stubs in Wine. The C interfaces should now be fully compatible with MIDL. I still have a patch from Steve Lhomme to make C++ interfaces compatible too but I have to clean it up first. tools/widl/typetree.c | 3 … [View More]

2 14

[PATCH 5/5] widl: Use C++ template implementation for parameterized types.
by Jacek Caban 25 Feb '21

25 Feb '21

From: Rémi Bernon <rbernon(a)codeweavers.com> Based on a patch from Steve Lhomme. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/header.c | 21 ++++++++++++------ tools/widl/typetree.c | 50 ++++++++++++++++++++++++++++++++++++++---- tools/widl/typetree.h | 6 +++++ tools/widl/widltypes.h | 1 + 4 files changed, 67 insertions(+), 11 deletions(-)

1 0

[PATCH 4/5] widl: Write C++ template implementations for parameterized types.
by Jacek Caban 25 Feb '21

25 Feb '21

From: Rémi Bernon <rbernon(a)codeweavers.com> Based on a patch from Steve Lhomme. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- I made a small change to make generated whitespaces slightly cleaner. tools/widl/header.c | 75 +++++++++++++++++++++++++++++++++++++++++-- tools/widl/typetree.h | 8 +++++ 2 files changed, 80 insertions(+), 3 deletions(-)

1 0

[PATCH] d2d1: Use D3D11 interfaces instead of D3D10.
by Rémi Bernon 25 Feb '21

25 Feb '21

And ID3DDeviceContextState instead of ID3D10StateBlock. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49395 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/d2d1/bitmap.c | 83 +++++---- dlls/d2d1/brush.c | 92 +++++----- dlls/d2d1/d2d1_private.h | 36 ++-- dlls/d2d1/dc_render_target.c | 2 +- dlls/d2d1/device.c | 347 +++++++++++++++++------------------ dlls/d2d1/tests/d2d1.c | 5 +- 6 files changed, 283 insertions(+), … [View More]282 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 7ed57052b98..470724e96a9 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -67,12 +67,12 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_Release(ID2D1Bitmap1 *iface) if (!refcount) { if (bitmap->srv) - ID3D10ShaderResourceView_Release(bitmap->srv); + ID3D11ShaderResourceView_Release(bitmap->srv); if (bitmap->rtv) - ID3D10RenderTargetView_Release(bitmap->rtv); + ID3D11RenderTargetView_Release(bitmap->rtv); if (bitmap->surface) IDXGISurface_Release(bitmap->surface); - ID3D10Resource_Release(bitmap->resource); + ID3D11Resource_Release(bitmap->resource); ID2D1Factory_Release(bitmap->factory); heap_free(bitmap); } @@ -150,8 +150,9 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromMemory(ID2D1Bitmap1 *iface, const D2D1_RECT_U *dst_rect, const void *src_data, UINT32 pitch) { struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap1(iface); - ID3D10Device *device; - D3D10_BOX box; + ID3D11DeviceContext *context; + ID3D11Device *device; + D3D11_BOX box; TRACE("iface %p, dst_rect %p, src_data %p, pitch %u.\n", iface, dst_rect, src_data, pitch); @@ -165,9 +166,11 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromMemory(ID2D1Bitmap1 *iface, box.back = 1; } - ID3D10Resource_GetDevice(bitmap->resource, &device); - ID3D10Device_UpdateSubresource(device, bitmap->resource, 0, dst_rect ? &box : NULL, src_data, pitch, 0); - ID3D10Device_Release(device); + ID3D11Resource_GetDevice(bitmap->resource, &device); + ID3D11Device_GetImmediateContext(device, &context); + ID3D11DeviceContext_UpdateSubresource(context, bitmap->resource, 0, dst_rect ? &box : NULL, src_data, pitch, 0); + ID3D11DeviceContext_Release(context); + ID3D11Device_Release(device); return S_OK; } @@ -270,15 +273,15 @@ static BOOL format_supported(const D2D1_PIXEL_FORMAT *format) } static void d2d_bitmap_init(struct d2d_bitmap *bitmap, struct d2d_device_context *context, - ID3D10Resource *resource, D2D1_SIZE_U size, const D2D1_BITMAP_PROPERTIES1 *desc) + ID3D11Resource *resource, D2D1_SIZE_U size, const D2D1_BITMAP_PROPERTIES1 *desc) { - ID3D10Device *d3d_device; + ID3D11Device *d3d_device; HRESULT hr; bitmap->ID2D1Bitmap1_iface.lpVtbl = &d2d_bitmap_vtbl; bitmap->refcount = 1; ID2D1Factory_AddRef(bitmap->factory = context->factory); - ID3D10Resource_AddRef(bitmap->resource = resource); + ID3D11Resource_AddRef(bitmap->resource = resource); bitmap->pixel_size = size; bitmap->format = desc->pixelFormat; bitmap->dpi_x = desc->dpiX; @@ -286,21 +289,21 @@ static void d2d_bitmap_init(struct d2d_bitmap *bitmap, struct d2d_device_context bitmap->options = desc->bitmapOptions; if (d2d_device_context_is_dxgi_target(context)) - ID3D10Resource_QueryInterface(resource, &IID_IDXGISurface, (void **)&bitmap->surface); + ID3D11Resource_QueryInterface(resource, &IID_IDXGISurface, (void **)&bitmap->surface); - ID3D10Resource_GetDevice(resource, &d3d_device); + ID3D11Resource_GetDevice(resource, &d3d_device); if (bitmap->options & D2D1_BITMAP_OPTIONS_TARGET) { - if (FAILED(hr = ID3D10Device_CreateRenderTargetView(d3d_device, resource, NULL, &bitmap->rtv))) + if (FAILED(hr = ID3D11Device_CreateRenderTargetView(d3d_device, resource, NULL, &bitmap->rtv))) WARN("Failed to create RTV, hr %#x.\n", hr); } if (!(bitmap->options & D2D1_BITMAP_OPTIONS_CANNOT_DRAW)) { - if (FAILED(hr = ID3D10Device_CreateShaderResourceView(d3d_device, resource, NULL, &bitmap->srv))) + if (FAILED(hr = ID3D11Device_CreateShaderResourceView(d3d_device, resource, NULL, &bitmap->srv))) WARN("Failed to create SRV, hr %#x.\n", hr); } - ID3D10Device_Release(d3d_device); + ID3D11Device_Release(d3d_device); if (bitmap->dpi_x == 0.0f && bitmap->dpi_y == 0.0f) { @@ -312,10 +315,10 @@ static void d2d_bitmap_init(struct d2d_bitmap *bitmap, struct d2d_device_context HRESULT d2d_bitmap_create(struct d2d_device_context *context, D2D1_SIZE_U size, const void *src_data, UINT32 pitch, const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) { - D3D10_SUBRESOURCE_DATA resource_data; + D3D11_SUBRESOURCE_DATA resource_data; D2D1_BITMAP_PROPERTIES1 bitmap_desc; - D3D10_TEXTURE2D_DESC texture_desc; - ID3D10Texture2D *texture; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11Texture2D *texture; HRESULT hr; if (!format_supported(&desc->pixelFormat)) @@ -346,21 +349,21 @@ HRESULT d2d_bitmap_create(struct d2d_device_context *context, D2D1_SIZE_U size, texture_desc.Format = desc->pixelFormat.format; texture_desc.SampleDesc.Count = 1; texture_desc.SampleDesc.Quality = 0; - texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.Usage = D3D11_USAGE_DEFAULT; texture_desc.BindFlags = 0; if (desc->bitmapOptions & D2D1_BITMAP_OPTIONS_TARGET) - texture_desc.BindFlags |= D3D10_BIND_RENDER_TARGET; + texture_desc.BindFlags |= D3D11_BIND_RENDER_TARGET; if (!(desc->bitmapOptions & D2D1_BITMAP_OPTIONS_CANNOT_DRAW)) - texture_desc.BindFlags |= D3D10_BIND_SHADER_RESOURCE; + texture_desc.BindFlags |= D3D11_BIND_SHADER_RESOURCE; texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; if (desc->bitmapOptions & D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE) - texture_desc.MiscFlags |= D3D10_RESOURCE_MISC_GDI_COMPATIBLE; + texture_desc.MiscFlags |= D3D11_RESOURCE_MISC_GDI_COMPATIBLE; resource_data.pSysMem = src_data; resource_data.SysMemPitch = pitch; - if (FAILED(hr = ID3D10Device_CreateTexture2D(context->d3d_device, &texture_desc, + if (FAILED(hr = ID3D11Device1_CreateTexture2D(context->d3d_device, &texture_desc, src_data ? &resource_data : NULL, &texture))) { ERR("Failed to create texture, hr %#x.\n", hr); @@ -369,10 +372,10 @@ HRESULT d2d_bitmap_create(struct d2d_device_context *context, D2D1_SIZE_U size, if ((*bitmap = heap_alloc_zero(sizeof(**bitmap)))) { - d2d_bitmap_init(*bitmap, context, (ID3D10Resource *)texture, size, desc); + d2d_bitmap_init(*bitmap, context, (ID3D11Resource *)texture, size, desc); TRACE("Created bitmap %p.\n", *bitmap); } - ID3D10Texture2D_Release(texture); + ID3D11Texture2D_Release(texture); return *bitmap ? S_OK : E_OUTOFMEMORY; } @@ -385,7 +388,7 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, if (IsEqualGUID(iid, &IID_ID2D1Bitmap)) { struct d2d_bitmap *src_impl = unsafe_impl_from_ID2D1Bitmap(data); - ID3D10Device *device; + ID3D11Device *device; HRESULT hr = S_OK; if (src_impl->factory != context->factory) @@ -394,9 +397,9 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, goto failed; } - ID3D10Resource_GetDevice(src_impl->resource, &device); - ID3D10Device_Release(device); - if (device != context->d3d_device) + ID3D11Resource_GetDevice(src_impl->resource, &device); + ID3D11Device_Release(device); + if (device != (ID3D11Device *)context->d3d_device) { hr = D2DERR_UNSUPPORTED_OPERATION; goto failed; @@ -437,28 +440,28 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, { DXGI_SURFACE_DESC surface_desc; IDXGISurface *surface = data; - ID3D10Resource *resource; + ID3D11Resource *resource; D2D1_SIZE_U pixel_size; - ID3D10Device *device; + ID3D11Device *device; HRESULT hr; - if (FAILED(IDXGISurface_QueryInterface(surface, &IID_ID3D10Resource, (void **)&resource))) + if (FAILED(IDXGISurface_QueryInterface(surface, &IID_ID3D11Resource, (void **)&resource))) { WARN("Failed to get d3d resource from dxgi surface.\n"); return E_FAIL; } - ID3D10Resource_GetDevice(resource, &device); - ID3D10Device_Release(device); - if (device != context->d3d_device) + ID3D11Resource_GetDevice(resource, &device); + ID3D11Device_Release(device); + if (device != (ID3D11Device *)context->d3d_device) { - ID3D10Resource_Release(resource); + ID3D11Resource_Release(resource); return D2DERR_UNSUPPORTED_OPERATION; } if (!(*bitmap = heap_alloc_zero(sizeof(**bitmap)))) { - ID3D10Resource_Release(resource); + ID3D11Resource_Release(resource); return E_OUTOFMEMORY; } @@ -466,7 +469,7 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, if (FAILED(hr = IDXGISurface_GetDesc(surface, &surface_desc))) { WARN("Failed to get surface desc, hr %#x.\n", hr); - ID3D10Resource_Release(resource); + ID3D11Resource_Release(resource); return hr; } @@ -494,7 +497,7 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, pixel_size.height = surface_desc.Height; d2d_bitmap_init(*bitmap, context, resource, pixel_size, &d); - ID3D10Resource_Release(resource); + ID3D11Resource_Release(resource); TRACE("Created bitmap %p.\n", *bitmap); return S_OK; diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 07d2e26a143..2bbb6113984 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -65,7 +65,7 @@ static ULONG STDMETHODCALLTYPE d2d_gradient_Release(ID2D1GradientStopCollection if (!refcount) { heap_free(gradient->stops); - ID3D10ShaderResourceView_Release(gradient->view); + ID3D11ShaderResourceView_Release(gradient->view); ID2D1Factory_Release(gradient->factory); heap_free(gradient); } @@ -127,15 +127,15 @@ static const struct ID2D1GradientStopCollectionVtbl d2d_gradient_vtbl = d2d_gradient_GetExtendMode, }; -HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D10Device *device, const D2D1_GRADIENT_STOP *stops, +HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D11Device1 *device, const D2D1_GRADIENT_STOP *stops, UINT32 stop_count, D2D1_GAMMA gamma, D2D1_EXTEND_MODE extend_mode, struct d2d_gradient **gradient) { - D3D10_SHADER_RESOURCE_VIEW_DESC srv_desc; - D3D10_SUBRESOURCE_DATA buffer_data; - ID3D10ShaderResourceView *view; - D3D10_BUFFER_DESC buffer_desc; + D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc; + D3D11_SUBRESOURCE_DATA buffer_data; + ID3D11ShaderResourceView *view; + D3D11_BUFFER_DESC buffer_desc; struct d2d_vec4 *data; - ID3D10Buffer *buffer; + ID3D11Buffer *buffer; unsigned int i; HRESULT hr; @@ -155,8 +155,8 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D10Device *device, const D } buffer_desc.ByteWidth = 2 * stop_count * sizeof(*data); - buffer_desc.Usage = D3D10_USAGE_DEFAULT; - buffer_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; buffer_desc.CPUAccessFlags = 0; buffer_desc.MiscFlags = 0; @@ -164,7 +164,7 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D10Device *device, const D buffer_data.SysMemPitch = 0; buffer_data.SysMemSlicePitch = 0; - hr = ID3D10Device_CreateBuffer(device, &buffer_desc, &buffer_data, &buffer); + hr = ID3D11Device1_CreateBuffer(device, &buffer_desc, &buffer_data, &buffer); heap_free(data); if (FAILED(hr)) { @@ -173,12 +173,12 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D10Device *device, const D } srv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; - srv_desc.ViewDimension = D3D10_SRV_DIMENSION_BUFFER; + srv_desc.ViewDimension = D3D11_SRV_DIMENSION_BUFFER; srv_desc.Buffer.ElementOffset = 0; srv_desc.Buffer.ElementWidth = 2 * stop_count; - hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)buffer, &srv_desc, &view); - ID3D10Buffer_Release(buffer); + hr = ID3D11Device1_CreateShaderResourceView(device, (ID3D11Resource *)buffer, &srv_desc, &view); + ID3D11Buffer_Release(buffer); if (FAILED(hr)) { ERR("Failed to create view, hr %#x.\n", hr); @@ -187,7 +187,7 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D10Device *device, const D if (!(*gradient = heap_alloc_zero(sizeof(**gradient)))) { - ID3D10ShaderResourceView_Release(view); + ID3D11ShaderResourceView_Release(view); return E_OUTOFMEMORY; } @@ -204,7 +204,7 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D10Device *device, const D (*gradient)->stop_count = stop_count; if (!((*gradient)->stops = heap_calloc(stop_count, sizeof(*stops)))) { - ID3D10ShaderResourceView_Release(view); + ID3D11ShaderResourceView_Release(view); heap_free(*gradient); return E_OUTOFMEMORY; } @@ -222,9 +222,12 @@ static struct d2d_gradient *unsafe_impl_from_ID2D1GradientStopCollection(ID2D1Gr return CONTAINING_RECORD(iface, struct d2d_gradient, ID2D1GradientStopCollection_iface); } -static void d2d_gradient_bind(struct d2d_gradient *gradient, ID3D10Device *device, unsigned int brush_idx) +static void d2d_gradient_bind(struct d2d_gradient *gradient, ID3D11Device1 *device, unsigned int brush_idx) { - ID3D10Device_PSSetShaderResources(device, 2 + brush_idx, 1, &gradient->view); + ID3D11DeviceContext *context; + ID3D11Device1_GetImmediateContext(device, &context); + ID3D11DeviceContext_PSSetShaderResources(context, 2 + brush_idx, 1, &gradient->view); + ID3D11DeviceContext_Release(context); } static void d2d_brush_destroy(struct d2d_brush *brush) @@ -860,7 +863,7 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_brush_Release(ID2D1BitmapBrush1 *iface if (!refcount) { if (brush->u.bitmap.sampler_state) - ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); + ID3D11SamplerState_Release(brush->u.bitmap.sampler_state); if (brush->u.bitmap.bitmap) ID2D1Bitmap1_Release(&brush->u.bitmap.bitmap->ID2D1Bitmap1_iface); d2d_brush_destroy(brush); @@ -926,7 +929,7 @@ static void STDMETHODCALLTYPE d2d_bitmap_brush_SetExtendModeX(ID2D1BitmapBrush1 brush->u.bitmap.extend_mode_x = mode; if (brush->u.bitmap.sampler_state) { - ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); + ID3D11SamplerState_Release(brush->u.bitmap.sampler_state); brush->u.bitmap.sampler_state = NULL; } } @@ -940,7 +943,7 @@ static void STDMETHODCALLTYPE d2d_bitmap_brush_SetExtendModeY(ID2D1BitmapBrush1 brush->u.bitmap.extend_mode_y = mode; if (brush->u.bitmap.sampler_state) { - ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); + ID3D11SamplerState_Release(brush->u.bitmap.sampler_state); brush->u.bitmap.sampler_state = NULL; } } @@ -965,7 +968,7 @@ static void STDMETHODCALLTYPE d2d_bitmap_brush_SetInterpolationMode(ID2D1BitmapB brush->u.bitmap.interpolation_mode = d2d1_1_interp_mode_from_d2d1(mode); if (brush->u.bitmap.sampler_state) { - ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); + ID3D11SamplerState_Release(brush->u.bitmap.sampler_state); brush->u.bitmap.sampler_state = NULL; } } @@ -1053,7 +1056,7 @@ static void STDMETHODCALLTYPE d2d_bitmap_brush_SetInterpolationMode1(ID2D1Bitmap brush->u.bitmap.interpolation_mode = mode; if (brush->u.bitmap.sampler_state) { - ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); + ID3D11SamplerState_Release(brush->u.bitmap.sampler_state); brush->u.bitmap.sampler_state = NULL; } } @@ -1128,19 +1131,19 @@ struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface) return CONTAINING_RECORD(iface, struct d2d_brush, ID2D1Brush_iface); } -static D3D10_TEXTURE_ADDRESS_MODE texture_address_mode_from_extend_mode(D2D1_EXTEND_MODE mode) +static D3D11_TEXTURE_ADDRESS_MODE texture_address_mode_from_extend_mode(D2D1_EXTEND_MODE mode) { switch (mode) { case D2D1_EXTEND_MODE_CLAMP: - return D3D10_TEXTURE_ADDRESS_CLAMP; + return D3D11_TEXTURE_ADDRESS_CLAMP; case D2D1_EXTEND_MODE_WRAP: - return D3D10_TEXTURE_ADDRESS_WRAP; + return D3D11_TEXTURE_ADDRESS_WRAP; case D2D1_EXTEND_MODE_MIRROR: - return D3D10_TEXTURE_ADDRESS_MIRROR; + return D3D11_TEXTURE_ADDRESS_MIRROR; default: FIXME("Unhandled extend mode %#x.\n", mode); - return D3D10_TEXTURE_ADDRESS_CLAMP; + return D3D11_TEXTURE_ADDRESS_CLAMP; } } @@ -1262,11 +1265,11 @@ static BOOL d2d_brush_fill_cb(const struct d2d_brush *brush, } HRESULT d2d_brush_get_ps_cb(struct d2d_brush *brush, struct d2d_brush *opacity_brush, - BOOL outline, BOOL is_arc, struct d2d_device_context *render_target, ID3D10Buffer **ps_cb) + BOOL outline, BOOL is_arc, struct d2d_device_context *render_target, ID3D11Buffer **ps_cb) { - D3D10_SUBRESOURCE_DATA buffer_data; + D3D11_SUBRESOURCE_DATA buffer_data; struct d2d_ps_cb cb_data = {0}; - D3D10_BUFFER_DESC buffer_desc; + D3D11_BUFFER_DESC buffer_desc; HRESULT hr; cb_data.outline = outline; @@ -1277,8 +1280,8 @@ HRESULT d2d_brush_get_ps_cb(struct d2d_brush *brush, struct d2d_brush *opacity_b return E_NOTIMPL; buffer_desc.ByteWidth = sizeof(cb_data); - buffer_desc.Usage = D3D10_USAGE_DEFAULT; - buffer_desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER; buffer_desc.CPUAccessFlags = 0; buffer_desc.MiscFlags = 0; @@ -1286,31 +1289,33 @@ HRESULT d2d_brush_get_ps_cb(struct d2d_brush *brush, struct d2d_brush *opacity_b buffer_data.SysMemPitch = 0; buffer_data.SysMemSlicePitch = 0; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, ps_cb))) + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, ps_cb))) ERR("Failed to create constant buffer, hr %#x.\n", hr); return hr; } -static void d2d_brush_bind_bitmap(struct d2d_brush *brush, ID3D10Device *device, unsigned int brush_idx) +static void d2d_brush_bind_bitmap(struct d2d_brush *brush, ID3D11Device1 *device, unsigned int brush_idx) { + ID3D11DeviceContext *context; HRESULT hr; - ID3D10Device_PSSetShaderResources(device, brush_idx, 1, &brush->u.bitmap.bitmap->srv); + ID3D11Device1_GetImmediateContext(device, &context); + ID3D11DeviceContext_PSSetShaderResources(context, brush_idx, 1, &brush->u.bitmap.bitmap->srv); if (!brush->u.bitmap.sampler_state) { - D3D10_SAMPLER_DESC sampler_desc; + D3D11_SAMPLER_DESC sampler_desc; if (brush->u.bitmap.interpolation_mode == D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR) - sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_POINT; + sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_POINT; else - sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_LINEAR; + sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR; sampler_desc.AddressU = texture_address_mode_from_extend_mode(brush->u.bitmap.extend_mode_x); sampler_desc.AddressV = texture_address_mode_from_extend_mode(brush->u.bitmap.extend_mode_y); - sampler_desc.AddressW = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressW = D3D11_TEXTURE_ADDRESS_CLAMP; sampler_desc.MipLODBias = 0.0f; sampler_desc.MaxAnisotropy = 0; - sampler_desc.ComparisonFunc = D3D10_COMPARISON_NEVER; + sampler_desc.ComparisonFunc = D3D11_COMPARISON_NEVER; sampler_desc.BorderColor[0] = 0.0f; sampler_desc.BorderColor[1] = 0.0f; sampler_desc.BorderColor[2] = 0.0f; @@ -1318,14 +1323,15 @@ static void d2d_brush_bind_bitmap(struct d2d_brush *brush, ID3D10Device *device, sampler_desc.MinLOD = 0.0f; sampler_desc.MaxLOD = 0.0f; - if (FAILED(hr = ID3D10Device_CreateSamplerState(device, + if (FAILED(hr = ID3D11Device1_CreateSamplerState(device, &sampler_desc, &brush->u.bitmap.sampler_state))) ERR("Failed to create sampler state, hr %#x.\n", hr); } - ID3D10Device_PSSetSamplers(device, brush_idx, 1, &brush->u.bitmap.sampler_state); + ID3D11DeviceContext_PSSetSamplers(context, brush_idx, 1, &brush->u.bitmap.sampler_state); + ID3D11DeviceContext_Release(context); } -void d2d_brush_bind_resources(struct d2d_brush *brush, ID3D10Device *device, unsigned int brush_idx) +void d2d_brush_bind_resources(struct d2d_brush *brush, ID3D11Device1 *device, unsigned int brush_idx) { switch (brush->type) { diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 4546d5c1e3a..9a20160d331 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -27,7 +27,7 @@ #include <math.h> #define COBJMACROS #include "d2d1_2.h" -#include "d3d11.h" +#include "d3d11_1.h" #ifdef D2D1_INIT_GUID #include "initguid.h" #endif @@ -73,8 +73,8 @@ struct d2d_error_state struct d2d_shape_resources { - ID3D10InputLayout *il; - ID3D10VertexShader *vs; + ID3D11InputLayout *il; + ID3D11VertexShader *vs; }; struct d2d_brush_cb @@ -139,16 +139,16 @@ struct d2d_device_context ID2D1Factory *factory; ID2D1Device *device; - ID3D10Device *d3d_device; + ID3D11Device1 *d3d_device; + ID3DDeviceContextState *d3d_state; struct d2d_bitmap *target; - ID3D10StateBlock *stateblock; struct d2d_shape_resources shape_resources[D2D_SHAPE_TYPE_COUNT]; - ID3D10PixelShader *ps; - ID3D10Buffer *ib; + ID3D11PixelShader *ps; + ID3D11Buffer *ib; unsigned int vb_stride; - ID3D10Buffer *vb; - ID3D10RasterizerState *rs; - ID3D10BlendState *bs; + ID3D11Buffer *vb; + ID3D11RasterizerState *rs; + ID3D11BlendState *bs; struct d2d_error_state error; D2D1_DRAWING_STATE_DESCRIPTION1 drawing_state; @@ -243,12 +243,12 @@ struct d2d_gradient LONG refcount; ID2D1Factory *factory; - ID3D10ShaderResourceView *view; + ID3D11ShaderResourceView *view; D2D1_GRADIENT_STOP *stops; UINT32 stop_count; }; -HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D10Device *device, const D2D1_GRADIENT_STOP *stops, +HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D11Device1 *device, const D2D1_GRADIENT_STOP *stops, UINT32 stop_count, D2D1_GAMMA gamma, D2D1_EXTEND_MODE extend_mode, struct d2d_gradient **gradient) DECLSPEC_HIDDEN; @@ -287,7 +287,7 @@ struct d2d_brush D2D1_EXTEND_MODE extend_mode_x; D2D1_EXTEND_MODE extend_mode_y; D2D1_INTERPOLATION_MODE interpolation_mode; - ID3D10SamplerState *sampler_state; + ID3D11SamplerState *sampler_state; } bitmap; } u; }; @@ -303,9 +303,9 @@ HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory, HRESULT d2d_bitmap_brush_create(ID2D1Factory *factory, ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES1 *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, struct d2d_brush **brush) DECLSPEC_HIDDEN; -void d2d_brush_bind_resources(struct d2d_brush *brush, ID3D10Device *device, unsigned int brush_idx) DECLSPEC_HIDDEN; +void d2d_brush_bind_resources(struct d2d_brush *brush, ID3D11Device1 *device, unsigned int brush_idx) DECLSPEC_HIDDEN; HRESULT d2d_brush_get_ps_cb(struct d2d_brush *brush, struct d2d_brush *opacity_brush, BOOL outline, BOOL is_arc, - struct d2d_device_context *render_target, ID3D10Buffer **ps_cb) DECLSPEC_HIDDEN; + struct d2d_device_context *render_target, ID3D11Buffer **ps_cb) DECLSPEC_HIDDEN; struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface) DECLSPEC_HIDDEN; struct d2d_stroke_style @@ -349,10 +349,10 @@ struct d2d_bitmap LONG refcount; ID2D1Factory *factory; - ID3D10ShaderResourceView *srv; - ID3D10RenderTargetView *rtv; + ID3D11ShaderResourceView *srv; + ID3D11RenderTargetView *rtv; IDXGISurface *surface; - ID3D10Resource *resource; + ID3D11Resource *resource; D2D1_SIZE_U pixel_size; D2D1_PIXEL_FORMAT format; float dpi_x; diff --git a/dlls/d2d1/dc_render_target.c b/dlls/d2d1/dc_render_target.c index 47aa99697d7..099e3b0a3a2 100644 --- a/dlls/d2d1/dc_render_target.c +++ b/dlls/d2d1/dc_render_target.c @@ -715,7 +715,7 @@ static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_BindDC(ID2D1DCRenderTarget } bitmap_impl = unsafe_impl_from_ID2D1Bitmap(bitmap); - ID3D10Resource_QueryInterface(bitmap_impl->resource, &IID_IDXGISurface1, (void **)&dxgi_surface); + ID3D11Resource_QueryInterface(bitmap_impl->resource, &IID_IDXGISurface1, (void **)&dxgi_surface); ID2D1DeviceContext_SetTarget(context, (ID2D1Image *)bitmap); ID2D1Bitmap_Release(bitmap); diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 23ce03dce5e..f6a6c019d9d 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -118,15 +118,16 @@ static void d2d_clip_stack_pop(struct d2d_clip_stack *stack) } static void d2d_device_context_draw(struct d2d_device_context *render_target, enum d2d_shape_type shape_type, - ID3D10Buffer *ib, unsigned int index_count, ID3D10Buffer *vb, unsigned int vb_stride, - ID3D10Buffer *vs_cb, ID3D10Buffer *ps_cb, struct d2d_brush *brush, struct d2d_brush *opacity_brush) + ID3D11Buffer *ib, unsigned int index_count, ID3D11Buffer *vb, unsigned int vb_stride, + ID3D11Buffer *vs_cb, ID3D11Buffer *ps_cb, struct d2d_brush *brush, struct d2d_brush *opacity_brush) { struct d2d_shape_resources *shape_resources = &render_target->shape_resources[shape_type]; - ID3D10Device *device = render_target->d3d_device; - D3D10_RECT scissor_rect; + ID3DDeviceContextState *prev_state; + ID3D11Device1 *device = render_target->d3d_device; + ID3D11DeviceContext1 *context; + D3D11_RECT scissor_rect; unsigned int offset; - D3D10_VIEWPORT vp; - HRESULT hr; + D3D11_VIEWPORT vp; vp.TopLeftX = 0; vp.TopLeftY = 0; @@ -135,24 +136,20 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en vp.MinDepth = 0.0f; vp.MaxDepth = 1.0f; - if (FAILED(hr = render_target->stateblock->lpVtbl->Capture(render_target->stateblock))) - { - WARN("Failed to capture stateblock, hr %#x.\n", hr); - return; - } - - ID3D10Device_ClearState(device); + ID3D11Device1_GetImmediateContext1(device, &context); + ID3D11DeviceContext1_SwapDeviceContextState(context, render_target->d3d_state, &prev_state); + ID3D11DeviceContext1_ClearState(context); - ID3D10Device_IASetInputLayout(device, shape_resources->il); - ID3D10Device_IASetPrimitiveTopology(device, D3D10_PRIMITIVE_TOPOLOGY_TRIANGLELIST); - ID3D10Device_IASetIndexBuffer(device, ib, DXGI_FORMAT_R16_UINT, 0); + ID3D11DeviceContext1_IASetInputLayout(context, shape_resources->il); + ID3D11DeviceContext1_IASetPrimitiveTopology(context, D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D11DeviceContext1_IASetIndexBuffer(context, ib, DXGI_FORMAT_R16_UINT, 0); offset = 0; - ID3D10Device_IASetVertexBuffers(device, 0, 1, &vb, &vb_stride, &offset); - ID3D10Device_VSSetConstantBuffers(device, 0, 1, &vs_cb); - ID3D10Device_VSSetShader(device, shape_resources->vs); - ID3D10Device_PSSetConstantBuffers(device, 0, 1, &ps_cb); - ID3D10Device_PSSetShader(device, render_target->ps); - ID3D10Device_RSSetViewports(device, 1, &vp); + ID3D11DeviceContext1_IASetVertexBuffers(context, 0, 1, &vb, &vb_stride, &offset); + ID3D11DeviceContext1_VSSetConstantBuffers(context, 0, 1, &vs_cb); + ID3D11DeviceContext1_VSSetShader(context, shape_resources->vs, NULL, 0); + ID3D11DeviceContext1_PSSetConstantBuffers(context, 0, 1, &ps_cb); + ID3D11DeviceContext1_PSSetShader(context, render_target->ps, NULL, 0); + ID3D11DeviceContext1_RSSetViewports(context, 1, &vp); if (render_target->clip_stack.count) { const D2D1_RECT_F *clip_rect; @@ -170,24 +167,25 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en scissor_rect.right = render_target->pixel_size.width; scissor_rect.bottom = render_target->pixel_size.height; } - ID3D10Device_RSSetScissorRects(device, 1, &scissor_rect); - ID3D10Device_RSSetState(device, render_target->rs); - ID3D10Device_OMSetRenderTargets(device, 1, &render_target->target->rtv, NULL); + ID3D11DeviceContext1_RSSetScissorRects(context, 1, &scissor_rect); + ID3D11DeviceContext1_RSSetState(context, render_target->rs); + ID3D11DeviceContext1_OMSetRenderTargets(context, 1, &render_target->target->rtv, NULL); if (brush) { - ID3D10Device_OMSetBlendState(device, render_target->bs, NULL, D3D10_DEFAULT_SAMPLE_MASK); + ID3D11DeviceContext1_OMSetBlendState(context, render_target->bs, NULL, D3D11_DEFAULT_SAMPLE_MASK); d2d_brush_bind_resources(brush, device, 0); } if (opacity_brush) d2d_brush_bind_resources(opacity_brush, device, 1); if (ib) - ID3D10Device_DrawIndexed(device, index_count, 0, 0); + ID3D11DeviceContext1_DrawIndexed(context, index_count, 0, 0); else - ID3D10Device_Draw(device, index_count, 0); + ID3D11DeviceContext1_Draw(context, index_count, 0); - if (FAILED(hr = render_target->stateblock->lpVtbl->Apply(render_target->stateblock))) - WARN("Failed to apply stateblock, hr %#x.\n", hr); + ID3D11DeviceContext1_SwapDeviceContextState(context, prev_state, NULL); + ID3D11DeviceContext1_Release(context); + ID3DDeviceContextState_Release(prev_state); } static void d2d_device_context_set_error(struct d2d_device_context *context, HRESULT code) @@ -261,20 +259,20 @@ static ULONG STDMETHODCALLTYPE d2d_device_context_inner_Release(IUnknown *iface) if (context->text_rendering_params) IDWriteRenderingParams_Release(context->text_rendering_params); if (context->bs) - ID3D10BlendState_Release(context->bs); - ID3D10RasterizerState_Release(context->rs); - ID3D10Buffer_Release(context->vb); - ID3D10Buffer_Release(context->ib); - ID3D10PixelShader_Release(context->ps); + ID3D11BlendState_Release(context->bs); + ID3D11RasterizerState_Release(context->rs); + ID3D11Buffer_Release(context->vb); + ID3D11Buffer_Release(context->ib); + ID3D11PixelShader_Release(context->ps); for (i = 0; i < D2D_SHAPE_TYPE_COUNT; ++i) { - ID3D10VertexShader_Release(context->shape_resources[i].vs); - ID3D10InputLayout_Release(context->shape_resources[i].il); + ID3D11VertexShader_Release(context->shape_resources[i].vs); + ID3D11InputLayout_Release(context->shape_resources[i].il); } - context->stateblock->lpVtbl->Release(context->stateblock); + ID3DDeviceContextState_Release(context->d3d_state); if (context->target) ID2D1Bitmap1_Release(&context->target->ID2D1Bitmap1_iface); - ID3D10Device_Release(context->d3d_device); + ID3D11Device1_Release(context->d3d_device); ID2D1Factory_Release(context->factory); ID2D1Device_Release(context->device); heap_free(context); @@ -698,9 +696,9 @@ static void STDMETHODCALLTYPE d2d_device_context_FillEllipse(ID2D1DeviceContext static void d2d_device_context_draw_geometry(struct d2d_device_context *render_target, const struct d2d_geometry *geometry, struct d2d_brush *brush, float stroke_width) { - ID3D10Buffer *ib, *vb, *vs_cb, *ps_cb_bezier, *ps_cb_arc; - D3D10_SUBRESOURCE_DATA buffer_data; - D3D10_BUFFER_DESC buffer_desc; + ID3D11Buffer *ib, *vb, *vs_cb, *ps_cb_bezier, *ps_cb_arc; + D3D11_SUBRESOURCE_DATA buffer_data; + D3D11_BUFFER_DESC buffer_desc; const D2D1_MATRIX_3X2_F *w; float tmp_x, tmp_y; HRESULT hr; @@ -739,8 +737,8 @@ static void d2d_device_context_draw_geometry(struct d2d_device_context *render_t vs_cb_data.transform_rty.w = -2.0f / render_target->pixel_size.height; buffer_desc.ByteWidth = sizeof(vs_cb_data); - buffer_desc.Usage = D3D10_USAGE_DEFAULT; - buffer_desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER; buffer_desc.CPUAccessFlags = 0; buffer_desc.MiscFlags = 0; @@ -748,7 +746,7 @@ static void d2d_device_context_draw_geometry(struct d2d_device_context *render_t buffer_data.SysMemPitch = 0; buffer_data.SysMemSlicePitch = 0; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &vs_cb))) + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &vs_cb))) { WARN("Failed to create constant buffer, hr %#x.\n", hr); return; @@ -757,68 +755,68 @@ static void d2d_device_context_draw_geometry(struct d2d_device_context *render_t if (FAILED(hr = d2d_brush_get_ps_cb(brush, NULL, TRUE, FALSE, render_target, &ps_cb_bezier))) { WARN("Failed to get ps constant buffer, hr %#x.\n", hr); - ID3D10Buffer_Release(vs_cb); + ID3D11Buffer_Release(vs_cb); return; } if (FAILED(hr = d2d_brush_get_ps_cb(brush, NULL, TRUE, TRUE, render_target, &ps_cb_arc))) { WARN("Failed to get ps constant buffer, hr %#x.\n", hr); - ID3D10Buffer_Release(vs_cb); - ID3D10Buffer_Release(ps_cb_bezier); + ID3D11Buffer_Release(vs_cb); + ID3D11Buffer_Release(ps_cb_bezier); return; } if (geometry->outline.face_count) { buffer_desc.ByteWidth = geometry->outline.face_count * sizeof(*geometry->outline.faces); - buffer_desc.BindFlags = D3D10_BIND_INDEX_BUFFER; + buffer_desc.BindFlags = D3D11_BIND_INDEX_BUFFER; buffer_data.pSysMem = geometry->outline.faces; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &ib))) + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &ib))) { WARN("Failed to create index buffer, hr %#x.\n", hr); goto done; } buffer_desc.ByteWidth = geometry->outline.vertex_count * sizeof(*geometry->outline.vertices); - buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; + buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER; buffer_data.pSysMem = geometry->outline.vertices; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &vb))) + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &vb))) { ERR("Failed to create vertex buffer, hr %#x.\n", hr); - ID3D10Buffer_Release(ib); + ID3D11Buffer_Release(ib); goto done; } d2d_device_context_draw(render_target, D2D_SHAPE_TYPE_OUTLINE, ib, 3 * geometry->outline.face_count, vb, sizeof(*geometry->outline.vertices), vs_cb, ps_cb_bezier, brush, NULL); - ID3D10Buffer_Release(vb); - ID3D10Buffer_Release(ib); + ID3D11Buffer_Release(vb); + ID3D11Buffer_Release(ib); } if (geometry->outline.bezier_face_count) { buffer_desc.ByteWidth = geometry->outline.bezier_face_count * sizeof(*geometry->outline.bezier_faces); - buffer_desc.BindFlags = D3D10_BIND_INDEX_BUFFER; + buffer_desc.BindFlags = D3D11_BIND_INDEX_BUFFER; buffer_data.pSysMem = geometry->outline.bezier_faces; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &ib))) + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &ib))) { WARN("Failed to create beziers index buffer, hr %#x.\n", hr); goto done; } buffer_desc.ByteWidth = geometry->outline.bezier_count * sizeof(*geometry->outline.beziers); - buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; + buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER; buffer_data.pSysMem = geometry->outline.beziers; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &vb))) + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &vb))) { ERR("Failed to create beziers vertex buffer, hr %#x.\n", hr); - ID3D10Buffer_Release(ib); + ID3D11Buffer_Release(ib); goto done; } @@ -826,30 +824,30 @@ static void d2d_device_context_draw_geometry(struct d2d_device_context *render_t 3 * geometry->outline.bezier_face_count, vb, sizeof(*geometry->outline.beziers), vs_cb, ps_cb_bezier, brush, NULL); - ID3D10Buffer_Release(vb); - ID3D10Buffer_Release(ib); + ID3D11Buffer_Release(vb); + ID3D11Buffer_Release(ib); } if (geometry->outline.arc_face_count) { buffer_desc.ByteWidth = geometry->outline.arc_face_count * sizeof(*geometry->outline.arc_faces); - buffer_desc.BindFlags = D3D10_BIND_INDEX_BUFFER; + buffer_desc.BindFlags = D3D11_BIND_INDEX_BUFFER; buffer_data.pSysMem = geometry->outline.arc_faces; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &ib))) + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &ib))) { WARN("Failed to create arcs index buffer, hr %#x.\n", hr); goto done; } buffer_desc.ByteWidth = geometry->outline.arc_count * sizeof(*geometry->outline.arcs); - buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; + buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER; buffer_data.pSysMem = geometry->outline.arcs; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &vb))) + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &vb))) { ERR("Failed to create arcs vertex buffer, hr %#x.\n", hr); - ID3D10Buffer_Release(ib); + ID3D11Buffer_Release(ib); goto done; } @@ -857,14 +855,14 @@ static void d2d_device_context_draw_geometry(struct d2d_device_context *render_t 3 * geometry->outline.arc_face_count, vb, sizeof(*geometry->outline.arcs), vs_cb, ps_cb_arc, brush, NULL); - ID3D10Buffer_Release(vb); - ID3D10Buffer_Release(ib); + ID3D11Buffer_Release(vb); + ID3D11Buffer_Release(ib); } done: - ID3D10Buffer_Release(ps_cb_arc); - ID3D10Buffer_Release(ps_cb_bezier); - ID3D10Buffer_Release(vs_cb); + ID3D11Buffer_Release(ps_cb_arc); + ID3D11Buffer_Release(ps_cb_bezier); + ID3D11Buffer_Release(vs_cb); } static void STDMETHODCALLTYPE d2d_device_context_DrawGeometry(ID2D1DeviceContext *iface, @@ -886,9 +884,9 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawGeometry(ID2D1DeviceContext static void d2d_device_context_fill_geometry(struct d2d_device_context *render_target, const struct d2d_geometry *geometry, struct d2d_brush *brush, struct d2d_brush *opacity_brush) { - ID3D10Buffer *ib, *vb, *vs_cb, *ps_cb_bezier, *ps_cb_arc; - D3D10_SUBRESOURCE_DATA buffer_data; - D3D10_BUFFER_DESC buffer_desc; + ID3D11Buffer *ib, *vb, *vs_cb, *ps_cb_bezier, *ps_cb_arc; + D3D11_SUBRESOURCE_DATA buffer_data; + D3D11_BUFFER_DESC buffer_desc; D2D1_MATRIX_3X2_F *w; float tmp_x, tmp_y; HRESULT hr; @@ -927,8 +925,8 @@ static void d2d_device_context_fill_geometry(struct d2d_device_context *render_t vs_cb_data.transform_rty.w = -2.0f / render_target->pixel_size.height; buffer_desc.ByteWidth = sizeof(vs_cb_data); - buffer_desc.Usage = D3D10_USAGE_DEFAULT; - buffer_desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER; buffer_desc.CPUAccessFlags = 0; buffer_desc.MiscFlags = 0; @@ -936,7 +934,7 @@ static void d2d_device_context_fill_geometry(struct d2d_device_context *render_t buffer_data.SysMemPitch = 0; buffer_data.SysMemSlicePitch = 0; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &vs_cb))) + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &vs_cb))) { WARN("Failed to create constant buffer, hr %#x.\n", hr); return; @@ -945,55 +943,55 @@ static void d2d_device_context_fill_geometry(struct d2d_device_context *render_t if (FAILED(hr = d2d_brush_get_ps_cb(brush, opacity_brush, FALSE, FALSE, render_target, &ps_cb_bezier))) { WARN("Failed to get ps constant buffer, hr %#x.\n", hr); - ID3D10Buffer_Release(vs_cb); + ID3D11Buffer_Release(vs_cb); return; } if (FAILED(hr = d2d_brush_get_ps_cb(brush, opacity_brush, FALSE, TRUE, render_target, &ps_cb_arc))) { WARN("Failed to get ps constant buffer, hr %#x.\n", hr); - ID3D10Buffer_Release(vs_cb); - ID3D10Buffer_Release(ps_cb_bezier); + ID3D11Buffer_Release(vs_cb); + ID3D11Buffer_Release(ps_cb_bezier); return; } if (geometry->fill.face_count) { buffer_desc.ByteWidth = geometry->fill.face_count * sizeof(*geometry->fill.faces); - buffer_desc.BindFlags = D3D10_BIND_INDEX_BUFFER; + buffer_desc.BindFlags = D3D11_BIND_INDEX_BUFFER; buffer_data.pSysMem = geometry->fill.faces; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &ib))) + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &ib))) { WARN("Failed to create index buffer, hr %#x.\n", hr); goto done; } buffer_desc.ByteWidth = geometry->fill.vertex_count * sizeof(*geometry->fill.vertices); - buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; + buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER; buffer_data.pSysMem = geometry->fill.vertices; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &vb))) + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &vb))) { ERR("Failed to create vertex buffer, hr %#x.\n", hr); - ID3D10Buffer_Release(ib); + ID3D11Buffer_Release(ib); goto done; } d2d_device_context_draw(render_target, D2D_SHAPE_TYPE_TRIANGLE, ib, 3 * geometry->fill.face_count, vb, sizeof(*geometry->fill.vertices), vs_cb, ps_cb_bezier, brush, opacity_brush); - ID3D10Buffer_Release(vb); - ID3D10Buffer_Release(ib); + ID3D11Buffer_Release(vb); + ID3D11Buffer_Release(ib); } if (geometry->fill.bezier_vertex_count) { buffer_desc.ByteWidth = geometry->fill.bezier_vertex_count * sizeof(*geometry->fill.bezier_vertices); - buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; + buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER; buffer_data.pSysMem = geometry->fill.bezier_vertices; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &vb))) + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &vb))) { ERR("Failed to create beziers vertex buffer, hr %#x.\n", hr); goto done; @@ -1002,16 +1000,16 @@ static void d2d_device_context_fill_geometry(struct d2d_device_context *render_t d2d_device_context_draw(render_target, D2D_SHAPE_TYPE_CURVE, NULL, geometry->fill.bezier_vertex_count, vb, sizeof(*geometry->fill.bezier_vertices), vs_cb, ps_cb_bezier, brush, opacity_brush); - ID3D10Buffer_Release(vb); + ID3D11Buffer_Release(vb); } if (geometry->fill.arc_vertex_count) { buffer_desc.ByteWidth = geometry->fill.arc_vertex_count * sizeof(*geometry->fill.arc_vertices); - buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; + buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER; buffer_data.pSysMem = geometry->fill.arc_vertices; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &vb))) + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &vb))) { ERR("Failed to create arc vertex buffer, hr %#x.\n", hr); goto done; @@ -1020,13 +1018,13 @@ static void d2d_device_context_fill_geometry(struct d2d_device_context *render_t d2d_device_context_draw(render_target, D2D_SHAPE_TYPE_CURVE, NULL, geometry->fill.arc_vertex_count, vb, sizeof(*geometry->fill.arc_vertices), vs_cb, ps_cb_arc, brush, opacity_brush); - ID3D10Buffer_Release(vb); + ID3D11Buffer_Release(vb); } done: - ID3D10Buffer_Release(ps_cb_arc); - ID3D10Buffer_Release(ps_cb_bezier); - ID3D10Buffer_Release(vs_cb); + ID3D11Buffer_Release(ps_cb_arc); + ID3D11Buffer_Release(ps_cb_bezier); + ID3D11Buffer_Release(vs_cb); } static void STDMETHODCALLTYPE d2d_device_context_FillGeometry(ID2D1DeviceContext *iface, @@ -1622,10 +1620,10 @@ static void STDMETHODCALLTYPE d2d_device_context_PopAxisAlignedClip(ID2D1DeviceC static void STDMETHODCALLTYPE d2d_device_context_Clear(ID2D1DeviceContext *iface, const D2D1_COLOR_F *colour) { struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); - D3D10_SUBRESOURCE_DATA buffer_data; + D3D11_SUBRESOURCE_DATA buffer_data; struct d2d_ps_cb ps_cb_data = {0}; - D3D10_BUFFER_DESC buffer_desc; - ID3D10Buffer *vs_cb, *ps_cb; + D3D11_BUFFER_DESC buffer_desc; + ID3D11Buffer *vs_cb, *ps_cb; D2D1_COLOR_F *c; HRESULT hr; @@ -1650,8 +1648,8 @@ static void STDMETHODCALLTYPE d2d_device_context_Clear(ID2D1DeviceContext *iface TRACE("iface %p, colour %p.\n", iface, colour); buffer_desc.ByteWidth = sizeof(vs_cb_data); - buffer_desc.Usage = D3D10_USAGE_DEFAULT; - buffer_desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER; buffer_desc.CPUAccessFlags = 0; buffer_desc.MiscFlags = 0; @@ -1659,7 +1657,7 @@ static void STDMETHODCALLTYPE d2d_device_context_Clear(ID2D1DeviceContext *iface buffer_data.SysMemPitch = 0; buffer_data.SysMemSlicePitch = 0; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &vs_cb))) + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &vs_cb))) { WARN("Failed to create constant buffer, hr %#x.\n", hr); return; @@ -1682,18 +1680,18 @@ static void STDMETHODCALLTYPE d2d_device_context_Clear(ID2D1DeviceContext *iface buffer_desc.ByteWidth = sizeof(ps_cb_data); buffer_data.pSysMem = &ps_cb_data; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &ps_cb))) + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &ps_cb))) { WARN("Failed to create constant buffer, hr %#x.\n", hr); - ID3D10Buffer_Release(vs_cb); + ID3D11Buffer_Release(vs_cb); return; } d2d_device_context_draw(render_target, D2D_SHAPE_TYPE_TRIANGLE, render_target->ib, 6, render_target->vb, render_target->vb_stride, vs_cb, ps_cb, NULL, NULL); - ID3D10Buffer_Release(ps_cb); - ID3D10Buffer_Release(vs_cb); + ID3D11Buffer_Release(ps_cb); + ID3D11Buffer_Release(vs_cb); } static void STDMETHODCALLTYPE d2d_device_context_BeginDraw(ID2D1DeviceContext *iface) @@ -2022,7 +2020,7 @@ static void d2d_device_context_reset_target(struct d2d_device_context *context) memset(&context->desc.pixelFormat, 0, sizeof(context->desc.pixelFormat)); memset(&context->pixel_size, 0, sizeof(context->pixel_size)); - ID3D10BlendState_Release(context->bs); + ID3D11BlendState_Release(context->bs); context->bs = NULL; } @@ -2030,7 +2028,7 @@ static void STDMETHODCALLTYPE d2d_device_context_SetTarget(ID2D1DeviceContext *i { struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); struct d2d_bitmap *bitmap_impl; - D3D10_BLEND_DESC blend_desc; + D3D11_BLEND_DESC blend_desc; ID2D1Bitmap *bitmap; HRESULT hr; @@ -2064,23 +2062,24 @@ static void STDMETHODCALLTYPE d2d_device_context_SetTarget(ID2D1DeviceContext *i context->target = bitmap_impl; memset(&blend_desc, 0, sizeof(blend_desc)); - blend_desc.BlendEnable[0] = TRUE; - blend_desc.SrcBlend = D3D10_BLEND_ONE; - blend_desc.DestBlend = D3D10_BLEND_INV_SRC_ALPHA; - blend_desc.BlendOp = D3D10_BLEND_OP_ADD; + blend_desc.IndependentBlendEnable = FALSE; + blend_desc.RenderTarget[0].BlendEnable = TRUE; + blend_desc.RenderTarget[0].SrcBlend = D3D11_BLEND_ONE; + blend_desc.RenderTarget[0].DestBlend = D3D11_BLEND_INV_SRC_ALPHA; + blend_desc.RenderTarget[0].BlendOp = D3D11_BLEND_OP_ADD; if (context->desc.pixelFormat.alphaMode == D2D1_ALPHA_MODE_IGNORE) { - blend_desc.SrcBlendAlpha = D3D10_BLEND_ZERO; - blend_desc.DestBlendAlpha = D3D10_BLEND_ONE; + blend_desc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_ZERO; + blend_desc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_ONE; } else { - blend_desc.SrcBlendAlpha = D3D10_BLEND_ONE; - blend_desc.DestBlendAlpha = D3D10_BLEND_INV_SRC_ALPHA; + blend_desc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_ONE; + blend_desc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_INV_SRC_ALPHA; } - blend_desc.BlendOpAlpha = D3D10_BLEND_OP_ADD; - blend_desc.RenderTargetWriteMask[0] = D3D10_COLOR_WRITE_ENABLE_ALL; - if (FAILED(hr = ID3D10Device_CreateBlendState(context->d3d_device, &blend_desc, &context->bs))) + blend_desc.RenderTarget[0].BlendOpAlpha = D3D11_BLEND_OP_ADD; + blend_desc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL; + if (FAILED(hr = ID3D11Device1_CreateBlendState(context->d3d_device, &blend_desc, &context->bs))) WARN("Failed to create blend state, hr %#x.\n", hr); } @@ -2742,12 +2741,12 @@ static ULONG STDMETHODCALLTYPE d2d_gdi_interop_render_target_Release(ID2D1GdiInt static HRESULT d2d_device_context_get_surface(struct d2d_device_context *render_target, IDXGISurface1 **surface) { - ID3D10Resource *resource; + ID3D11Resource *resource; HRESULT hr; - ID3D10RenderTargetView_GetResource(render_target->target->rtv, &resource); - hr = ID3D10Resource_QueryInterface(resource, &IID_IDXGISurface1, (void **)surface); - ID3D10Resource_Release(resource); + ID3D11RenderTargetView_GetResource(render_target->target->rtv, &resource); + hr = ID3D11Resource_QueryInterface(resource, &IID_IDXGISurface1, (void **)surface); + ID3D11Resource_Release(resource); if (FAILED(hr)) { *surface = NULL; @@ -2809,38 +2808,37 @@ static const struct ID2D1GdiInteropRenderTargetVtbl d2d_gdi_interop_render_targe static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, ID2D1Device *device, IUnknown *outer_unknown, const struct d2d_device_context_ops *ops) { - D3D10_SUBRESOURCE_DATA buffer_data; - D3D10_STATE_BLOCK_MASK state_mask; + D3D11_SUBRESOURCE_DATA buffer_data; struct d2d_device *device_impl; IDWriteFactory *dwrite_factory; - D3D10_RASTERIZER_DESC rs_desc; - D3D10_BUFFER_DESC buffer_desc; + D3D11_RASTERIZER_DESC rs_desc; + D3D11_BUFFER_DESC buffer_desc; unsigned int i; HRESULT hr; - static const D3D10_INPUT_ELEMENT_DESC il_desc_outline[] = + static const D3D11_INPUT_ELEMENT_DESC il_desc_outline[] = { - {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, - {"PREV", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 8, D3D10_INPUT_PER_VERTEX_DATA, 0}, - {"NEXT", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 16, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"PREV", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 8, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"NEXT", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 16, D3D11_INPUT_PER_VERTEX_DATA, 0}, }; - static const D3D10_INPUT_ELEMENT_DESC il_desc_curve_outline[] = + static const D3D11_INPUT_ELEMENT_DESC il_desc_curve_outline[] = { - {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, - {"P", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 8, D3D10_INPUT_PER_VERTEX_DATA, 0}, - {"P", 1, DXGI_FORMAT_R32G32_FLOAT, 0, 16, D3D10_INPUT_PER_VERTEX_DATA, 0}, - {"P", 2, DXGI_FORMAT_R32G32_FLOAT, 0, 24, D3D10_INPUT_PER_VERTEX_DATA, 0}, - {"PREV", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 32, D3D10_INPUT_PER_VERTEX_DATA, 0}, - {"NEXT", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 40, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"P", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 8, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"P", 1, DXGI_FORMAT_R32G32_FLOAT, 0, 16, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"P", 2, DXGI_FORMAT_R32G32_FLOAT, 0, 24, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"PREV", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 32, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"NEXT", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 40, D3D11_INPUT_PER_VERTEX_DATA, 0}, }; - static const D3D10_INPUT_ELEMENT_DESC il_desc_triangle[] = + static const D3D11_INPUT_ELEMENT_DESC il_desc_triangle[] = { - {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, }; - static const D3D10_INPUT_ELEMENT_DESC il_desc_curve[] = + static const D3D11_INPUT_ELEMENT_DESC il_desc_curve[] = { - {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, - {"TEXCOORD", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 8, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"TEXCOORD", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 8, D3D11_INPUT_PER_VERTEX_DATA, 0}, }; static const DWORD vs_code_outline[] = { @@ -3834,7 +3832,7 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, static const struct shape_info { enum d2d_shape_type shape_type; - const D3D10_INPUT_ELEMENT_DESC *il_desc; + const D3D11_INPUT_ELEMENT_DESC *il_desc; unsigned int il_element_count; const void *vs_code; size_t vs_code_size; @@ -3864,6 +3862,7 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, { 1.0f, -1.0f}, }; static const UINT16 indices[] = {0, 1, 2, 2, 1, 3}; + static const D3D_FEATURE_LEVEL feature_levels = D3D_FEATURE_LEVEL_11_0; render_target->ID2D1DeviceContext_iface.lpVtbl = &d2d_device_context_vtbl; render_target->ID2D1GdiInteropRenderTarget_iface.lpVtbl = &d2d_gdi_interop_render_target_vtbl; @@ -3879,22 +3878,18 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, device_impl = unsafe_impl_from_ID2D1Device(device); if (FAILED(hr = IDXGIDevice_QueryInterface(device_impl->dxgi_device, - &IID_ID3D10Device, (void **)&render_target->d3d_device))) + &IID_ID3D11Device1, (void **)&render_target->d3d_device))) { WARN("Failed to get device interface, hr %#x.\n", hr); ID2D1Factory_Release(render_target->factory); return hr; } - if (FAILED(hr = D3D10StateBlockMaskEnableAll(&state_mask))) - { - WARN("Failed to create stateblock mask, hr %#x.\n", hr); - goto err; - } - - if (FAILED(hr = D3D10CreateStateBlock(render_target->d3d_device, &state_mask, &render_target->stateblock))) + if (FAILED(hr = ID3D11Device1_CreateDeviceContextState(render_target->d3d_device, + 0, &feature_levels, 1, D3D11_SDK_VERSION, &IID_ID3D11Device1, NULL, + &render_target->d3d_state))) { - WARN("Failed to create stateblock, hr %#x.\n", hr); + WARN("Failed to create device context state, hr %#x.\n", hr); goto err; } @@ -3902,15 +3897,15 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, { const struct shape_info *si = &shape_info[i]; - if (FAILED(hr = ID3D10Device_CreateInputLayout(render_target->d3d_device, si->il_desc, si->il_element_count, + if (FAILED(hr = ID3D11Device1_CreateInputLayout(render_target->d3d_device, si->il_desc, si->il_element_count, si->vs_code, si->vs_code_size, &render_target->shape_resources[si->shape_type].il))) { WARN("Failed to create input layout for shape type %#x, hr %#x.\n", si->shape_type, hr); goto err; } - if (FAILED(hr = ID3D10Device_CreateVertexShader(render_target->d3d_device, si->vs_code, - si->vs_code_size, &render_target->shape_resources[si->shape_type].vs))) + if (FAILED(hr = ID3D11Device1_CreateVertexShader(render_target->d3d_device, si->vs_code, + si->vs_code_size, NULL, &render_target->shape_resources[si->shape_type].vs))) { WARN("Failed to create vertex shader for shape type %#x, hr %#x.\n", si->shape_type, hr); goto err; @@ -3918,16 +3913,16 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, } - if (FAILED(hr = ID3D10Device_CreatePixelShader(render_target->d3d_device, - ps_code, sizeof(ps_code), &render_target->ps))) + if (FAILED(hr = ID3D11Device1_CreatePixelShader(render_target->d3d_device, + ps_code, sizeof(ps_code), NULL, &render_target->ps))) { WARN("Failed to create pixel shader, hr %#x.\n", hr); goto err; } buffer_desc.ByteWidth = sizeof(indices); - buffer_desc.Usage = D3D10_USAGE_DEFAULT; - buffer_desc.BindFlags = D3D10_BIND_INDEX_BUFFER; + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_INDEX_BUFFER; buffer_desc.CPUAccessFlags = 0; buffer_desc.MiscFlags = 0; @@ -3935,7 +3930,7 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, buffer_data.SysMemPitch = 0; buffer_data.SysMemSlicePitch = 0; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &render_target->ib))) { WARN("Failed to create clear index buffer, hr %#x.\n", hr); @@ -3943,19 +3938,19 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, } buffer_desc.ByteWidth = sizeof(quad); - buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; + buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER; buffer_data.pSysMem = quad; render_target->vb_stride = sizeof(*quad); - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &render_target->vb))) { WARN("Failed to create clear vertex buffer, hr %#x.\n", hr); goto err; } - rs_desc.FillMode = D3D10_FILL_SOLID; - rs_desc.CullMode = D3D10_CULL_NONE; + rs_desc.FillMode = D3D11_FILL_SOLID; + rs_desc.CullMode = D3D11_CULL_NONE; rs_desc.FrontCounterClockwise = FALSE; rs_desc.DepthBias = 0; rs_desc.DepthBiasClamp = 0.0f; @@ -3964,7 +3959,7 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, rs_desc.ScissorEnable = TRUE; rs_desc.MultisampleEnable = FALSE; rs_desc.AntialiasedLineEnable = FALSE; - if (FAILED(hr = ID3D10Device_CreateRasterizerState(render_target->d3d_device, &rs_desc, &render_target->rs))) + if (FAILED(hr = ID3D11Device1_CreateRasterizerState(render_target->d3d_device, &rs_desc, &render_target->rs))) { WARN("Failed to create clear rasterizer state, hr %#x.\n", hr); goto err; @@ -4003,24 +3998,24 @@ err: if (render_target->default_text_rendering_params) IDWriteRenderingParams_Release(render_target->default_text_rendering_params); if (render_target->rs) - ID3D10RasterizerState_Release(render_target->rs); + ID3D11RasterizerState_Release(render_target->rs); if (render_target->vb) - ID3D10Buffer_Release(render_target->vb); + ID3D11Buffer_Release(render_target->vb); if (render_target->ib) - ID3D10Buffer_Release(render_target->ib); + ID3D11Buffer_Release(render_target->ib); if (render_target->ps) - ID3D10PixelShader_Release(render_target->ps); + ID3D11PixelShader_Release(render_target->ps); for (i = 0; i < D2D_SHAPE_TYPE_COUNT; ++i) { if (render_target->shape_resources[i].vs) - ID3D10VertexShader_Release(render_target->shape_resources[i].vs); + ID3D11VertexShader_Release(render_target->shape_resources[i].vs); if (render_target->shape_resources[i].il) - ID3D10InputLayout_Release(render_target->shape_resources[i].il); + ID3D11InputLayout_Release(render_target->shape_resources[i].il); } - if (render_target->stateblock) - render_target->stateblock->lpVtbl->Release(render_target->stateblock); + if (render_target->d3d_state) + ID3DDeviceContextState_Release(render_target->d3d_state); if (render_target->d3d_device) - ID3D10Device_Release(render_target->d3d_device); + ID3D11Device1_Release(render_target->d3d_device); ID2D1Device_Release(render_target->device); ID2D1Factory_Release(render_target->factory); return hr; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 8d584605819..8e0899be95d 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -921,12 +921,9 @@ static ID2D1RenderTarget *create_render_target_desc(IDXGISurface *surface, hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); hr = ID2D1Factory_CreateDxgiSurfaceRenderTarget(factory, surface, desc, &render_target); - todo_wine_if(d3d11) ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); ID2D1Factory_Release(factory); - if (FAILED(hr)) - return NULL; - return render_target; } -- 2.30.0 [View Less]

2 2

[PATCH 3/5] widl: Write C++ template declarations for parameterized types.
by Jacek Caban 25 Feb '21

25 Feb '21

From: Rémi Bernon <rbernon(a)codeweavers.com> Based on a patch from Steve Lhomme. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/header.c | 45 +++++++++++++++++++++++++++++++++++++++++++ tools/widl/typetree.c | 5 +++++ 2 files changed, 50 insertions(+)

1 0

[PATCH 2/5] include: Add AggregateType / GetAbiType / GetLogicalType WinRT templates.
by Jacek Caban 25 Feb '21

25 Feb '21

From: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/windows.foundation.collections.idl | 13 +++++++++++++ 1 file changed, 13 insertions(+)

1 0

[PATCH 1/5] include: Split Windows.Foundation.Collections parameterized types.
by Jacek Caban 25 Feb '21

25 Feb '21

From: Rémi Bernon <rbernon(a)codeweavers.com> To windows.foundation.collections.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/Makefile.in | 1 + include/windows.foundation.collections.idl | 74 ++++++++++++++++++++++ include/windows.foundation.idl | 45 +------------ 3 files changed, 76 insertions(+), 44 deletions(-) create mode 100644 include/windows.foundation.collections.idl

1 0

[PATCH 1/2] d3d11/tests: Added more multisample resolve tests.
by Jan Sikorski 25 Feb '21

25 Feb '21

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 398 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 398 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 1505b3fddbc..aa500634fe1 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -30025,6 +30025,403 @@ done: release_test_context(&test_context); } +struct resolve_test_context +{ + ID3D11Device *device; + … [View More]ID3D11DeviceContext *device_context; + ID3D11VertexShader *vertex_shader; + ID3D11InputLayout *input_layout; + ID3D11Buffer *vertex_buffer; +}; + +static void run_test_multisample_resolve(struct resolve_test_context *context, + ID3D11PixelShader *pixel_shader, DXGI_FORMAT render_target_view_format, + DXGI_FORMAT source_format, DXGI_FORMAT destination_format, DXGI_FORMAT resolve_format, + unsigned byte_count, void *bytes_out) +{ + ID3D11Texture2D *staging_texture, *resolve_target, *render_target; + D3D11_VIEWPORT viewport = { 0.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f }; + D3D11_RENDER_TARGET_VIEW_DESC render_view_desc = {}; + unsigned vertex_buffer_stride = 6 * sizeof(float); + float clear_color[4] = {0.2f, 0.2f, 0.2f, 1.0f}; + D3D11_MAPPED_SUBRESOURCE staging_mapped = {}; + ID3D11RenderTargetView *render_target_view; + D3D11_TEXTURE2D_DESC staging_desc = {}; + D3D11_TEXTURE2D_DESC resolve_desc = {}; + D3D11_TEXTURE2D_DESC render_desc = {}; + unsigned vertex_buffer_offset = 0; + unsigned vertex_count = 3; + HRESULT hr; + + staging_desc.Width = 1; + staging_desc.Height = 1; + staging_desc.MipLevels = 1; + staging_desc.ArraySize = 1; + staging_desc.Format = resolve_format; + staging_desc.SampleDesc.Count = 1; + staging_desc.SampleDesc.Quality = 0; + staging_desc.Usage = D3D11_USAGE_STAGING; + staging_desc.BindFlags = 0; + staging_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ; + staging_desc.MiscFlags = 0; + + render_desc.Width = 1; + render_desc.Height = 1; + render_desc.MipLevels = 1; + render_desc.ArraySize = 1; + render_desc.Format = source_format; + render_desc.SampleDesc.Count = 2; + render_desc.SampleDesc.Quality = 0; + render_desc.Usage = D3D11_USAGE_DEFAULT; + render_desc.BindFlags = D3D11_BIND_RENDER_TARGET; + render_desc.CPUAccessFlags = 0; + render_desc.MiscFlags = 0; + + render_view_desc.Format = render_target_view_format; + render_view_desc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2DMS; + + resolve_desc.Width = 1; + resolve_desc.Height = 1; + resolve_desc.MipLevels = 1; + resolve_desc.ArraySize = 1; + resolve_desc.Format = destination_format; + resolve_desc.SampleDesc.Count = 1; + resolve_desc.SampleDesc.Quality = 0; + resolve_desc.Usage = D3D11_USAGE_DEFAULT; + resolve_desc.BindFlags = 0; + resolve_desc.CPUAccessFlags = 0; + resolve_desc.MiscFlags = 0; + + memset(bytes_out, 0, byte_count); + + hr = ID3D11Device_CreateTexture2D(context->device, &staging_desc, NULL, &staging_texture); + if (FAILED(hr)) + { + trace("Failed to create staging texture, hr %#x.\n", hr); + return; + } + + hr = ID3D11Device_CreateTexture2D(context->device, &render_desc, NULL, &render_target); + if (FAILED(hr)) + { + trace("Failed to create render target texture, hr %#x.\n", hr); + return; + } + + hr = ID3D11Device_CreateRenderTargetView(context->device, (ID3D11Resource *)render_target, + &render_view_desc, &render_target_view); + if (FAILED(hr)) + { + trace("Failed to create render target view, hr %#x.\n", hr); + return; + } + + hr = ID3D11Device_CreateTexture2D(context->device, &resolve_desc, NULL, &resolve_target); + if (FAILED(hr)) + { + trace("Failed to create resolve texture, hr %#x.\n", hr); + return; + } + + ID3D11DeviceContext_RSSetViewports(context->device_context, 1, &viewport); + ID3D11DeviceContext_OMSetRenderTargets(context->device_context, 1, &render_target_view, NULL); + ID3D11DeviceContext_IASetPrimitiveTopology(context->device_context, D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D11DeviceContext_IASetInputLayout(context->device_context, context->input_layout); + ID3D11DeviceContext_VSSetShader(context->device_context, context->vertex_shader, NULL, 0); + ID3D11DeviceContext_PSSetShader(context->device_context, pixel_shader, NULL, 0); + ID3D11DeviceContext_IASetVertexBuffers(context->device_context, 0, 1, &context->vertex_buffer, + &vertex_buffer_stride, &vertex_buffer_offset); + ID3D11DeviceContext_ClearRenderTargetView(context->device_context, render_target_view, clear_color); + ID3D11DeviceContext_Draw(context->device_context, vertex_count, 0); + ID3D11DeviceContext_ResolveSubresource(context->device_context, (ID3D11Resource *)resolve_target, + 0, (ID3D11Resource *)render_target, 0, resolve_format); + ID3D11DeviceContext_CopyResource(context->device_context, (ID3D11Resource *)staging_texture, + (ID3D11Resource *)resolve_target); + ID3D11DeviceContext_Map(context->device_context, (ID3D11Resource *)staging_texture, 0, + D3D11_MAP_READ, 0, &staging_mapped); + memcpy(bytes_out, staging_mapped.pData, byte_count); + ID3D11DeviceContext_Unmap(context->device_context, (ID3D11Resource *)staging_texture, 0); + ID3D11RenderTargetView_Release(render_target_view); + ID3D11Texture2D_Release(render_target); + ID3D11Texture2D_Release(resolve_target); + ID3D11Texture2D_Release(staging_texture); +} + +static void test_multisample_resolve2(void) +{ + D3D_FEATURE_LEVEL feature_levels[] = { D3D_FEATURE_LEVEL_11_0 }; + UINT device_creation_flags = D3D11_CREATE_DEVICE_BGRA_SUPPORT; + ID3D11PixelShader *pixel_shader, *pixel_shader_uint; + struct resolve_test_context context; + unsigned int i, quality_levels; + unsigned char result[4]; + HRESULT hr; + + const BYTE vs_code[] = + { +#if 0 + struct VS_Input + { + float2 pos : POS; + float4 color : COL; + }; + + struct VS_Output + { + float4 position : SV_POSITION; + float4 color : COL; + }; + + VS_Output vs_main(VS_Input input) + { + VS_Output output; + output.position = float4(input.pos, 0.0f, 1.0f); + output.color = input.color; + + return output; + } +#endif + 68,88,66,67,30,184,39,220,81,141,142,55,98,251,192,170,226,59, + 159,54,1,0,0,0,104,2,0,0,5,0,0,0,52,0,0,0,160,0,0,0,232,0,0,0, + 56,1,0,0,204,1,0,0,82,68,69,70,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 60,0,0,0,0,5,254,255,0,1,0,0,60,0,0,0,82,68,49,49,60,0,0,0,24,0, + 0,0,32,0,0,0,40,0,0,0,36,0,0,0,12,0,0,0,0,0,0,0,77,105,99,114,111, + 115,111,102,116,32,40,82,41,32,72,76,83,76,32,83,104,97,100,101, + 114,32,67,111,109,112,105,108,101,114,32,49,48,46,49,0,73,83,71, + 78,64,0,0,0,2,0,0,0,8,0,0,0,56,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0, + 0,0,3,3,0,0,60,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,1,0,0,0,15,15,0,0, + 80,79,83,0,67,79,76,0,79,83,71,78,72,0,0,0,2,0,0,0,8,0,0,0,56,0, + 0,0,0,0,0,0,1,0,0,0,3,0,0,0,0,0,0,0,15,0,0,0,68,0,0,0,0,0,0,0,0, + 0,0,0,3,0,0,0,1,0,0,0,15,0,0,0,83,86,95,80,79,83,73,84,73,79,78, + 0,67,79,76,0,83,72,69,88,140,0,0,0,80,0,1,0,35,0,0,0,106,8,0,1, + 95,0,0,3,50,16,16,0,0,0,0,0,95,0,0,3,242,16,16,0,1,0,0,0,103,0,0, + 4,242,32,16,0,0,0,0,0,1,0,0,0,101,0,0,3,242,32,16,0,1,0,0,0,54, + 0,0,5,50,32,16,0,0,0,0,0,70,16,16,0,0,0,0,0,54,0,0,8,194,32,16,0, + 0,0,0,0,2,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,63,54,0,0,5,242, + 32,16,0,1,0,0,0,70,30,16,0,1,0,0,0,62,0,0,1,83,84,65,84,148,0,0,0, + 4,0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + }; + + const BYTE ps_code[] = + { +#if 0 + float4 ps_main(VS_Output input) : SV_TARGET + { + return input.color; + } +#endif + 68,88,66,67,39,85,23,171,129,58,200,222,67,215,85,143,48,99,104,37, + 1,0,0,0,4,2,0,0,5,0,0,0,52,0,0,0,160,0,0,0,240,0,0,0,36,1,0,0,104, + 1,0,0,82,68,69,70,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,0,0,0,0,5, + 255,255,0,1,0,0,60,0,0,0,82,68,49,49,60,0,0,0,24,0,0,0,32,0,0,0,40, + 0,0,0,36,0,0,0,12,0,0,0,0,0,0,0,77,105,99,114,111,115,111,102,116, + 32,40,82,41,32,72,76,83,76,32,83,104,97,100,101,114,32,67,111,109, + 112,105,108,101,114,32,49,48,46,49,0,73,83,71,78,72,0,0,0,2,0,0,0,8, + 0,0,0,56,0,0,0,0,0,0,0,1,0,0,0,3,0,0,0,0,0,0,0,15,0,0,0,68,0,0,0,0, + 0,0,0,0,0,0,0,3,0,0,0,1,0,0,0,15,15,0,0,83,86,95,80,79,83,73,84,73, + 79,78,0,67,79,76,0,79,83,71,78,44,0,0,0,1,0,0,0,8,0,0,0,32,0,0,0,0, + 0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,15,0,0,0,83,86,95,84,65,82,71,69,84,0, + 171,171,83,72,69,88,60,0,0,0,80,0,0,0,15,0,0,0,106,8,0,1,98,16,0,3, + 242,16,16,0,1,0,0,0,101,0,0,3,242,32,16,0,0,0,0,0,54,0,0,5,242,32, + 16,0,0,0,0,0,70,30,16,0,1,0,0,0,62,0,0,1,83,84,65,84,148,0,0,0,2,0, + 0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0 + }; + + const BYTE ps_uint_code[] = + { +#if 0 + uint4 ps_main_uint(VS_Output input) : SV_TARGET + { + return 255 * input.color; + } +#endif + 68,88,66,67,183,183,169,55,133,61,81,26,195,69,141,254,78,169,90,79, + 1,0,0,0,52,2,0,0,5,0,0,0,52,0,0,0,160,0,0,0,240,0,0,0,36,1,0,0,152, + 1,0,0,82,68,69,70,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,0,0,0,0,5,255, + 255,0,1,0,0,60,0,0,0,82,68,49,49,60,0,0,0,24,0,0,0,32,0,0,0,40,0,0,0, + 36,0,0,0,12,0,0,0,0,0,0,0,77,105,99,114,111,115,111,102,116,32,40,82, + 41,32,72,76,83,76,32,83,104,97,100,101,114,32,67,111,109,112,105,108, + 101,114,32,49,48,46,49,0,73,83,71,78,72,0,0,0,2,0,0,0,8,0,0,0,56,0,0,0, + 0,0,0,0,1,0,0,0,3,0,0,0,0,0,0,0,15,0,0,0,68,0,0,0,0,0,0,0,0,0,0,0,3, + 0,0,0,1,0,0,0,15,15,0,0,83,86,95,80,79,83,73,84,73,79,78,0,67,79,76,0, + 79,83,71,78,44,0,0,0,1,0,0,0,8,0,0,0,32,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0, + 0,0,0,0,15,0,0,0,83,86,95,84,65,82,71,69,84,0,171,171,83,72,69,88,108, + 0,0,0,80,0,0,0,27,0,0,0,106,8,0,1,98,16,0,3,242,16,16,0,1,0,0,0,101,0, + 0,3,242,32,16,0,0,0,0,0,104,0,0,2,1,0,0,0,56,0,0,10,242,0,16,0,0,0,0, + 0,70,30,16,0,1,0,0,0,2,64,0,0,0,0,127,67,0,0,127,67,0,0,127,67,0,0,127, + 67,28,0,0,5,242,32,16,0,0,0,0,0,70,14,16,0,0,0,0,0,62,0,0,1,83,84,65, + 84,148,0,0,0,3,0,0,0,1,0,0,0,0,0,0,0,2,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0, + 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + }; + + float vertex_data [] = + { /* x, y, r, g, b, a */ + 1.0f, 1.0f, .8f, 0.f, 0.f, 1.f, + 1.0f, -1.0f, .8f, 0.f, 0.f, 1.f, + -1.0f, -1.0f, .8f, 0.f, 0.f, 1.f, + }; + + D3D11_INPUT_ELEMENT_DESC input_elements[] = + { + { "POS", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 }, + { "COL", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, D3D11_APPEND_ALIGNED_ELEMENT, D3D11_INPUT_PER_VERTEX_DATA, 0 } + }; + + struct + { + BOOL use_uint_shader; + DXGI_FORMAT render_target_view_format; + DXGI_FORMAT source_format; + DXGI_FORMAT destination_format; + DXGI_FORMAT resolve_format; + unsigned int byte_count; + unsigned char expected[4]; + BOOL todo; + } + tests[] = + { + { FALSE, DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32_FLOAT, + DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32_FLOAT, + 4, { 0, 0, 0, 0x3f } }, + { FALSE, DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32_TYPELESS, + DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32_FLOAT, + 4, { 0, 0, 0, 0x3f }, TRUE }, + { FALSE, DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32_FLOAT, + DXGI_FORMAT_R32_TYPELESS, DXGI_FORMAT_R32_FLOAT, + 4, { 0, 0, 0, 0x3f }, TRUE }, + { FALSE, DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32_TYPELESS, + DXGI_FORMAT_R32_TYPELESS, DXGI_FORMAT_R32_FLOAT, + 4, { 0, 0, 0, 0x3f }, TRUE }, + { FALSE, DXGI_FORMAT_R16_UNORM, DXGI_FORMAT_R16_UNORM, + DXGI_FORMAT_R16_UNORM, DXGI_FORMAT_R16_UNORM, + 2, { 0, 0x80 } }, + { FALSE, DXGI_FORMAT_R16_FLOAT, DXGI_FORMAT_R16_FLOAT, + DXGI_FORMAT_R16_FLOAT, DXGI_FORMAT_R16_FLOAT, + 2, { 0xff, 0x37 } }, + { FALSE, DXGI_FORMAT_R16_FLOAT, DXGI_FORMAT_R16_TYPELESS, + DXGI_FORMAT_R16_TYPELESS, DXGI_FORMAT_R16_FLOAT, + 2, { 0xff, 0x37 } }, + { FALSE, DXGI_FORMAT_R16_FLOAT, DXGI_FORMAT_R16_TYPELESS, + DXGI_FORMAT_R16_TYPELESS, DXGI_FORMAT_R16_UNORM, + 2, { 0x66, 0x36 }, TRUE }, + { FALSE, DXGI_FORMAT_R16_UNORM, DXGI_FORMAT_R16_TYPELESS, + DXGI_FORMAT_R16_TYPELESS, DXGI_FORMAT_R16_FLOAT, + 2, { 0xbd, 0xc8 } }, + { FALSE, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, + 4, { 0x80, 0x19, 0x19, 0xff } }, + { FALSE, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + 4, { 0x99, 0x23, 0x23, 0xff }, TRUE }, + { FALSE, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + 4, { 0x99, 0x23, 0x23, 0xff }, TRUE }, + { FALSE, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_SNORM, + 4, { 0, 0x19, 0x19, 0xff }, TRUE }, + { FALSE, DXGI_FORMAT_R8G8B8A8_SNORM, DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, + 4, { 0x3f, 0xc, 0xc, 0x7f }, TRUE }, + { TRUE, DXGI_FORMAT_R8G8B8A8_SINT, DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, + 4, { 0x3f, 0, 0, 0x40 }, TRUE }, + { TRUE, DXGI_FORMAT_R8G8B8A8_SINT, DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_SNORM, + 4, { 0x40, 0, 0, 0x40 }, TRUE }, + { TRUE, DXGI_FORMAT_R8G8B8A8_UINT, DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, + 4, { 0x66, 0, 0, 0x80 }, TRUE }, + }; + + hr = D3D11CreateDevice(0, D3D_DRIVER_TYPE_HARDWARE, 0, device_creation_flags, + feature_levels, ARRAY_SIZE(feature_levels), D3D11_SDK_VERSION, &context.device, + 0, &context.device_context); + if (FAILED(hr)) + { + trace("Failed to create device, hr %#x.\n", hr); + return; + } + + hr = ID3D11Device_CreateVertexShader(context.device, vs_code, sizeof(vs_code), + NULL, &context.vertex_shader); + if (FAILED(hr)) + { + trace("Failed to create vertex shader, hr %#x.\n", hr); + goto out_1; + } + hr = ID3D11Device_CreatePixelShader(context.device, ps_code, sizeof(ps_code), + NULL, &pixel_shader); + if (FAILED(hr)) + { + trace("Failed to create pixel shader, hr %#x.\n", hr); + goto out_2; + } + hr = ID3D11Device_CreatePixelShader(context.device, ps_uint_code, sizeof(ps_uint_code), + NULL, &pixel_shader_uint); + if (FAILED(hr)) + { + trace("Failed to create uint pixel shader, hr %#x.\n", hr); + goto out_3; + } + hr = ID3D11Device_CreateInputLayout(context.device, input_elements, + ARRAY_SIZE(input_elements), vs_code, sizeof(vs_code), &context.input_layout); + if (FAILED(hr)) + { + trace("Failed to create input layout, hr %#x.\n", hr); + goto out_4; + } + context.vertex_buffer = create_buffer(context.device, D3D11_BIND_VERTEX_BUFFER, + sizeof(vertex_data), vertex_data); + if (!context.vertex_buffer) + goto out_5; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = ID3D11Device_CheckMultisampleQualityLevels(context.device, tests[i].source_format, 2, &quality_levels); + ok(hr == S_OK, "Failed to check multisample quality levels, hr %#x.\n", hr); + if (!quality_levels) + { + skip("Test %3u: 2xMSAA not supported.\n", i); + } + else + { + run_test_multisample_resolve(&context, tests[i].use_uint_shader ? pixel_shader_uint : pixel_shader, + tests[i].render_target_view_format, tests[i].source_format, tests[i].destination_format, + tests[i].resolve_format, tests[i].byte_count, result); + + todo_wine_if(tests[i].todo) + ok(!memcmp(result, tests[i].expected, tests[i].byte_count), + "Test %3u: expected: %2x %2x %2x %2x, got: %2x %2x %2x %2x\n", i, + tests[i].expected[0], tests[i].expected[1], tests[i].expected[2], tests[i].expected[3], + result[0], result[1], result[2], result[3]); + } + } + + ID3D11Buffer_Release(context.vertex_buffer); +out_5: + ID3D11InputLayout_Release(context.input_layout); +out_4: + ID3D11PixelShader_Release(pixel_shader_uint); +out_3: + ID3D11PixelShader_Release(pixel_shader); +out_2: + ID3D11VertexShader_Release(context.vertex_shader); +out_1: + ID3D11DeviceContext_Release(context.device_context); + ID3D11Device_Release(context.device); +} + static void test_multisample_resolve(void) { struct d3d11_test_context test_context; @@ -32194,6 +32591,7 @@ START_TEST(d3d11) queue_test(test_unbound_multisample_texture); queue_test(test_multiple_viewports); queue_test(test_multisample_resolve); + queue_test(test_multisample_resolve2); queue_test(test_sample_shading); queue_test(test_sample_mask); queue_test(test_depth_clip); -- 2.30.0 [View Less]

4 7

[PATCH vkd3d 1/3] vkd3d: Define CONST_VTABLE.
by Zebediah Figura 25 Feb '21

25 Feb '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d/vkd3d_private.h | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 4af970c1..022d14eb 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -20,6 +20,7 @@ #define __VKD3D_PRIVATE_H #define COBJMACROS +#define CONST_VTABLE #define NONAMELESSUNION #define VK_NO_PROTOTYPES -- 2.30.1

2 3

[PATCH 1/2] wbemprox: Implement GetValue()/SetValue() for context object.
by Nikolay Sivov 25 Feb '21

25 Feb '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wbemprox/services.c | 87 +++++++++++++++++++++++++++++++--- dlls/wbemprox/tests/services.c | 63 ++++++++++++++++++++++++ 2 files changed, 144 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 965f1b168f1..eff5148ef29 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -955,12 +955,33 @@ HRESULT WbemServices_create( const WCHAR *namespace, LPVOID … [View More]*ppObj ) return S_OK; } +struct wbem_context_value +{ + struct list entry; + WCHAR *name; + VARIANT value; +}; + struct wbem_context { IWbemContext IWbemContext_iface; LONG refs; + struct list values; }; +static void wbem_context_delete_values(struct wbem_context *context) +{ + struct wbem_context_value *value, *next; + + LIST_FOR_EACH_ENTRY_SAFE(value, next, &context->values, struct wbem_context_value, entry) + { + list_remove( &value->entry ); + VariantClear( &value->value ); + heap_free( value->name ); + heap_free( value ); + } +} + static struct wbem_context *impl_from_IWbemContext( IWbemContext *iface ) { return CONTAINING_RECORD( iface, struct wbem_context, IWbemContext_iface ); @@ -1004,6 +1025,7 @@ static ULONG WINAPI wbem_context_Release( if (!refs) { TRACE("destroying %p\n", context); + wbem_context_delete_values( context ); heap_free( context ); } return refs; @@ -1056,26 +1078,78 @@ static HRESULT WINAPI wbem_context_EndEnumeration( return E_NOTIMPL; } +static struct wbem_context_value *wbem_context_get_value( struct wbem_context *context, const WCHAR *name ) +{ + struct wbem_context_value *value; + + LIST_FOR_EACH_ENTRY( value, &context->values, struct wbem_context_value, entry ) + { + if (!lstrcmpiW( value->name, name )) return value; + } + + return NULL; +} + static HRESULT WINAPI wbem_context_SetValue( IWbemContext *iface, LPCWSTR name, LONG flags, - VARIANT *value ) + VARIANT *var ) { - FIXME("%p, %s, %#x, %p\n", iface, debugstr_w(name), flags, value); + struct wbem_context *context = impl_from_IWbemContext( iface ); + struct wbem_context_value *value; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %s, %#x, %s\n", iface, debugstr_w(name), flags, debugstr_variant(var)); + + if (!name || !var) + return WBEM_E_INVALID_PARAMETER; + + if ((value = wbem_context_get_value( context, name ))) + { + VariantClear( &value->value ); + hr = VariantCopy( &value->value, var ); + } + else + { + if (!(value = heap_alloc_zero( sizeof(*value) ))) return E_OUTOFMEMORY; + if (!(value->name = heap_strdupW( name ))) + { + heap_free( value ); + return E_OUTOFMEMORY; + } + if (FAILED(hr = VariantCopy( &value->value, var ))) + { + heap_free( value->name ); + heap_free( value ); + return hr; + } + + list_add_tail( &context->values, &value->entry ); + } + + return hr; } static HRESULT WINAPI wbem_context_GetValue( IWbemContext *iface, LPCWSTR name, LONG flags, - VARIANT *value ) + VARIANT *var ) { - FIXME("%p, %s, %#x, %p\n", iface, debugstr_w(name), flags, value); + struct wbem_context *context = impl_from_IWbemContext( iface ); + struct wbem_context_value *value; - return E_NOTIMPL; + TRACE("%p, %s, %#x, %p\n", iface, debugstr_w(name), flags, var); + + if (!name || !var) + return WBEM_E_INVALID_PARAMETER; + + if (!(value = wbem_context_get_value( context, name ))) + return WBEM_E_NOT_FOUND; + + V_VT(var) = VT_EMPTY; + return VariantCopy( var, &value->value ); } static HRESULT WINAPI wbem_context_DeleteValue( @@ -1123,6 +1197,7 @@ HRESULT WbemContext_create( void **obj ) context->IWbemContext_iface.lpVtbl = &wbem_context_vtbl; context->refs = 1; + list_init(&context->values); *obj = &context->IWbemContext_iface; diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index a60d39f1ef2..ebbc766d6c5 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -152,11 +152,74 @@ static void test_IWbemLocator(void) static void test_IWbemContext(void) { IWbemContext *context; + VARIANT var; HRESULT hr; + BSTR str; hr = CoCreateInstance( &CLSID_WbemContext, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemContext, (void **)&context ); ok(hr == S_OK, "Failed to create context object, hr %#x.\n", hr); + hr = IWbemContext_SetValue(context, L"name", 0, NULL); + ok(hr == WBEM_E_INVALID_PARAMETER, "Unexpected hr %#x.\n", hr); + + V_VT(&var) = VT_I4; + V_I4(&var) = 12; + hr = IWbemContext_SetValue(context, NULL, 0, &var); + ok(hr == WBEM_E_INVALID_PARAMETER, "Unexpected hr %#x.\n", hr); + + hr = IWbemContext_SetValue(context, L"name", 0, &var); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IWbemContext_GetValue(context, NULL, 0, &var); + ok(hr == WBEM_E_INVALID_PARAMETER, "Unexpected hr %#x.\n", hr); + + hr = IWbemContext_GetValue(context, L"name", 0, NULL); + ok(hr == WBEM_E_INVALID_PARAMETER, "Unexpected hr %#x.\n", hr); + + hr = IWbemContext_GetValue(context, L"noname", 0, &var); + ok(hr == WBEM_E_NOT_FOUND, "Unexpected hr %#x.\n", hr); + + V_VT(&var) = VT_EMPTY; + hr = IWbemContext_GetValue(context, L"NAME", 0, &var); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(V_VT(&var) == VT_I4, "Unexpected value type.\n"); + + V_VT(&var) = VT_I4; + V_I4(&var) = 13; + hr = IWbemContext_SetValue(context, L"name2", 0, &var); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IWbemContext_Next(context, 0, &str, &var); +todo_wine + ok(hr == WBEM_E_UNEXPECTED, "Unexpected hr %#x.\n", hr); + + hr = IWbemContext_BeginEnumeration(context, 0); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + str = NULL; + hr = IWbemContext_Next(context, 0, &str, &var); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!lstrcmpW(str, L"name"), "Unexpected name %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); +} + hr = IWbemContext_EndEnumeration(context); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Overwrite */ + V_VT(&var) = VT_I4; + V_I4(&var) = 14; + hr = IWbemContext_SetValue(context, L"name", 0, &var); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + V_VT(&var) = VT_EMPTY; + hr = IWbemContext_GetValue(context, L"name", 0, &var); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(V_VT(&var) == VT_I4, "Unexpected value type.\n"); + ok(V_I4(&var) == 14, "Unexpected value.\n"); + IWbemContext_Release( context ); } -- 2.30.0 [View Less]

2 3

[PATCH v3] msado15: Semi-stub _Recordset Open
by Alistair Leslie-Hughes 25 Feb '21

25 Feb '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/recordset.c | 54 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 3 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 12bb9680258..71df553ebb6 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -1182,15 +1182,63 @@ static HRESULT WINAPI recordset_Open( _Recordset *iface, VARIANT source, VARIANT … [View More] CursorTypeEnum cursor_type, LockTypeEnum lock_type, LONG options ) { struct recordset *recordset = impl_from_Recordset( iface ); + ADOConnectionConstruction15 *construct; + IUnknown *session; + ICommandText *command_text; + DBROWCOUNT affected; + IUnknown *rowset; + HRESULT hr; - FIXME( "%p, %s, %s, %d, %d, %d\n", recordset, debugstr_variant(&source), debugstr_variant(&active_connection), + FIXME( "%p, %s, %s, %d, %d, %d Semi-stub\n", recordset, debugstr_variant(&source), debugstr_variant(&active_connection), cursor_type, lock_type, options ); - if (!recordset->fields) return MAKE_ADO_HRESULT( adErrInvalidConnection ); if (recordset->state == adStateOpen) return MAKE_ADO_HRESULT( adErrObjectOpen ); + if (recordset->fields) + { + recordset->state = adStateOpen; + return S_OK; + } + + if (V_VT(&active_connection) != VT_DISPATCH) + { + FIXME("Unsupported Active connection type %d\n", V_VT(&active_connection)); + return MAKE_ADO_HRESULT( adErrInvalidConnection ); + } + + hr = IDispatch_QueryInterface(V_DISPATCH(&active_connection), &IID_ADOConnectionConstruction15, (void**)&construct); + if (FAILED(hr)) + return E_FAIL; + + hr = ADOConnectionConstruction15_get_Session(construct, &session); + ADOConnectionConstruction15_Release(construct); + if (FAILED(hr)) + return E_FAIL; + + if (V_VT(&source) != VT_BSTR) + { + FIXME("Unsupported source type!\n"); + IUnknown_Release(session); + return E_FAIL; + } + + hr = create_command_text(session, V_BSTR(&source), &command_text); + IUnknown_Release(session); + if (FAILED(hr)) + return hr; + + hr = ICommandText_Execute(command_text, NULL, &IID_IUnknown, NULL, &affected, &rowset); + ICommandText_Release(command_text); + if (FAILED(hr)) + return hr; + + ADORecordsetConstruction_put_Rowset(&recordset->ADORecordsetConstruction_iface, rowset); + recordset->cursor_type = cursor_type; recordset->state = adStateOpen; - return S_OK; + + IUnknown_Release(rowset); + + return hr; } static HRESULT WINAPI recordset_Requery( _Recordset *iface, LONG options ) -- 2.30.0 [View Less]

2 1

[PATCH resend 4/4] user32: Remove code that queries monitor information from SetupAPI device properties.
by Zhiyi Zhang 25 Feb '21

25 Feb '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/sysparams.c | 156 ++-------------------------------------- 1 file changed, 4 insertions(+), 152 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 22f3eec4e94..33d08b0aeef 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -102,25 +102,10 @@ DEFINE_DEVPROPKEY(DEVPROPKEY_MONITOR_OUTPUT_ID, 0xca085853, 0x16ce, 0x48aa, 0xb1 /* Wine specific monitor properties */ … [View More]DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); -DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); -DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCWORK, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 4); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 5); #define NULLDRV_DEFAULT_HMONITOR ((HMONITOR)(UINT_PTR)(0x10000 + 1)) -/* Cached monitor information */ -static MONITORINFOEXW *monitors; -static UINT monitor_count; -static FILETIME last_query_monitors_time; -static CRITICAL_SECTION monitors_section; -static CRITICAL_SECTION_DEBUG monitors_critsect_debug = -{ - 0, 0, &monitors_section, - { &monitors_critsect_debug.ProcessLocksList, &monitors_critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": monitors_section") } -}; -static CRITICAL_SECTION monitors_section = { &monitors_critsect_debug, -1 , 0, 0, 0, 0 }; - static HDC display_dc; static CRITICAL_SECTION display_dc_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -144,7 +129,6 @@ static DPI_AWARENESS dpi_awareness; static DPI_AWARENESS default_awareness = DPI_AWARENESS_UNAWARE; static HKEY volatile_base_key; -static HKEY video_key; union sysparam_all_entry; @@ -3776,100 +3760,8 @@ HMONITOR WINAPI MonitorFromWindow(HWND hWnd, DWORD dwFlags) return MonitorFromRect( &rect, dwFlags ); } -/* Return FALSE on failure and TRUE on success */ -static BOOL update_monitor_cache(void) -{ - SP_DEVINFO_DATA device_data = {sizeof(device_data)}; - HDEVINFO devinfo = INVALID_HANDLE_VALUE; - MONITORINFOEXW *monitor_array; - FILETIME filetime = {0}; - DWORD device_count = 0; - HANDLE mutex = NULL; - DWORD state_flags; - BOOL ret = FALSE; - BOOL is_replica; - DWORD i = 0, j; - DWORD type; - - /* Update monitor cache from SetupAPI if it's outdated */ - if (!video_key && RegOpenKeyW( HKEY_LOCAL_MACHINE, L"HARDWARE\\DEVICEMAP\\VIDEO", &video_key )) - return FALSE; - if (RegQueryInfoKeyW( video_key, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, &filetime )) - return FALSE; - if (CompareFileTime( &filetime, &last_query_monitors_time ) < 1) - return TRUE; - - mutex = get_display_device_init_mutex(); - EnterCriticalSection( &monitors_section ); - devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_MONITOR, L"DISPLAY", NULL, DIGCF_PRESENT ); - - while (SetupDiEnumDeviceInfo( devinfo, i++, &device_data )) - { - /* Inactive monitors don't get enumerated */ - if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, &type, - (BYTE *)&state_flags, sizeof(DWORD), NULL, 0 )) - goto fail; - if (state_flags & DISPLAY_DEVICE_ACTIVE) - device_count++; - } - - if (device_count && monitor_count < device_count) - { - monitor_array = heap_alloc( device_count * sizeof(*monitor_array) ); - if (!monitor_array) - goto fail; - heap_free( monitors ); - monitors = monitor_array; - } - - for (i = 0, monitor_count = 0; SetupDiEnumDeviceInfo( devinfo, i, &device_data ); i++) - { - if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, &type, - (BYTE *)&state_flags, sizeof(DWORD), NULL, 0 )) - goto fail; - if (!(state_flags & DISPLAY_DEVICE_ACTIVE)) - continue; - if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, - (BYTE *)&monitors[monitor_count].rcMonitor, sizeof(RECT), NULL, 0 )) - goto fail; - - /* Replicas in mirroring monitor sets don't get enumerated */ - is_replica = FALSE; - for (j = 0; j < monitor_count; j++) - { - if (EqualRect(&monitors[j].rcMonitor, &monitors[monitor_count].rcMonitor)) - { - is_replica = TRUE; - break; - } - } - if (is_replica) - continue; - - if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, &type, - (BYTE *)&monitors[monitor_count].rcWork, sizeof(RECT), NULL, 0 )) - goto fail; - if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, &type, - (BYTE *)monitors[monitor_count].szDevice, CCHDEVICENAME * sizeof(WCHAR), NULL, 0)) - goto fail; - monitors[monitor_count].dwFlags = - !wcscmp( L"\\\\.\\DISPLAY1", monitors[monitor_count].szDevice ) ? MONITORINFOF_PRIMARY : 0; - - monitor_count++; - } - - last_query_monitors_time = filetime; - ret = TRUE; -fail: - SetupDiDestroyDeviceInfoList( devinfo ); - LeaveCriticalSection( &monitors_section ); - release_display_device_init_mutex( mutex ); - return ret; -} - BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, MONITORINFO *info ) { - UINT index = (UINT_PTR)handle - 1; WCHAR adapter_name[CCHDEVICENAME]; TRACE("(%p, %p)\n", handle, info); @@ -3907,29 +3799,8 @@ BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, MONITORINFO *info ) return TRUE; } - if (!update_monitor_cache()) - { - SetLastError( ERROR_INVALID_MONITOR_HANDLE ); - return FALSE; - } - - EnterCriticalSection( &monitors_section ); - if (index < monitor_count) - { - info->rcMonitor = monitors[index].rcMonitor; - info->rcWork = monitors[index].rcWork; - info->dwFlags = monitors[index].dwFlags; - if (info->cbSize >= sizeof(MONITORINFOEXW)) - lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, monitors[index].szDevice ); - LeaveCriticalSection( &monitors_section ); - return TRUE; - } - else - { - LeaveCriticalSection( &monitors_section ); - SetLastError( ERROR_INVALID_MONITOR_HANDLE ); - return FALSE; - } + SetLastError( ERROR_INVALID_MONITOR_HANDLE ); + return FALSE; } /*********************************************************************** @@ -4071,27 +3942,8 @@ BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC pro if (i) return TRUE; - if (update_monitor_cache()) - { - while (TRUE) - { - EnterCriticalSection( &monitors_section ); - if (i >= monitor_count) - { - LeaveCriticalSection( &monitors_section ); - return TRUE; - } - monitor_rect = monitors[i].rcMonitor; - LeaveCriticalSection( &monitors_section ); - - if (!proc( (HMONITOR)(UINT_PTR)(i + 1), hdc, &monitor_rect, lp )) - return FALSE; - - ++i; - } - } - - /* Fallback to report one monitor if using SetupAPI failed */ + /* Fallback to report one monitor if wineserver calls failed */ + ERR("Failed to enumerate monitors, reporting a 640x480 monitor.\n"); SetRect( &monitor_rect, 0, 0, 640, 480 ); if (!proc( NULLDRV_DEFAULT_HMONITOR, hdc, &monitor_rect, lp )) return FALSE; -- 2.27.0 [View Less]

2 1

[PATCH resend 3/4] winex11.drv: Query virtual screen and primary screen rectangles from the wineserver.
by Zhiyi Zhang 25 Feb '21

25 Feb '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/display.c | 39 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index fb12b158c17..3ff9bfea531 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -47,7 +47,6 @@ DEFINE_DEVPROPKEY(DEVPROPKEY_MONITOR_OUTPUT_ID, 0xca085853, 0x16ce, 0x48aa, 0xb1 /* Wine specific properties */ … [View More]DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_GPU_VULKAN_UUID, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5c, 2); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); -DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 5); static const WCHAR driver_date_dataW[] = {'D','r','i','v','e','r','D','a','t','e','D','a','t','a',0}; @@ -146,14 +145,11 @@ void release_display_device_init_mutex(HANDLE mutex) static BOOL update_screen_cache(void) { RECT virtual_rect = {0}, primary_rect = {0}, monitor_rect; - SP_DEVINFO_DATA device_data = {sizeof(device_data)}; - HDEVINFO devinfo = INVALID_HANDLE_VALUE; FILETIME filetime = {0}; HANDLE mutex = NULL; + NTSTATUS status; DWORD i = 0; INT result; - DWORD type; - BOOL ret = FALSE; EnterCriticalSection(&screen_section); if ((!video_key && RegOpenKeyW(HKEY_LOCAL_MACHINE, video_keyW, &video_key)) @@ -169,15 +165,21 @@ static BOOL update_screen_cache(void) mutex = get_display_device_init_mutex(); - devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, displayW, NULL, DIGCF_PRESENT); - if (devinfo == INVALID_HANDLE_VALUE) - goto fail; - - while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) + while (TRUE) { - if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, - (BYTE *)&monitor_rect, sizeof(monitor_rect), NULL, 0)) - goto fail; + SERVER_START_REQ(enum_monitor) + { + req->index = i++; + if (!(status = wine_server_call(req))) + { + SetRect(&monitor_rect, reply->monitor_rect.left, reply->monitor_rect.top, + reply->monitor_rect.right, reply->monitor_rect.bottom); + } + } + SERVER_END_REQ; + + if (status) + break; UnionRect(&virtual_rect, &virtual_rect, &monitor_rect); if (i == 1) @@ -189,13 +191,8 @@ static BOOL update_screen_cache(void) primary_monitor_rect = primary_rect; last_query_screen_time = filetime; LeaveCriticalSection(&screen_section); - ret = TRUE; -fail: - SetupDiDestroyDeviceInfoList(devinfo); release_display_device_init_mutex(mutex); - if (!ret) - WARN("Update screen cache failed!\n"); - return ret; + return TRUE; } POINT virtual_screen_to_root(INT x, INT y) @@ -621,10 +618,6 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, DEVPROP_TYPE_UINT32, (const BYTE *)&monitor->state_flags, sizeof(monitor->state_flags), 0)) goto done; - /* RcMonitor */ - if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, DEVPROP_TYPE_BINARY, - (const BYTE *)&monitor->rc_monitor, sizeof(monitor->rc_monitor), 0)) - goto done; /* Adapter name */ sprintfW(bufferW, adapter_name_fmtW, video_index + 1); size = (strlenW(bufferW) + 1) * sizeof(WCHAR); -- 2.27.0 [View Less]

2 1

[PATCH resend 2/4] winemac.drv: Store monitor information in the wineserver for EnumDisplayMonitors().
by Zhiyi Zhang 25 Feb '21

25 Feb '21

Fix a regression that Office 2016/365 has a 640x480 main window. Office 2016/365 hooks NtOpenKeyEx() and prevents access to SetupAPI device properties. After querying monitor information from SetupAPI failed, EnumDisplayMonitors() reports a fallback monitor of size 640x480. As to why store the monitor information in the wineserver, it seems that EnumDisplayMonitors() reports monitors connected to current user logon session. For instance, EnumDisplayMonitors() always report one monitor when … [View More]called by services. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/display.c | 65 ++++++++++++++++++++++++++++++-------- 1 file changed, 51 insertions(+), 14 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 6706c88341c..2b672ffe74b 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -32,6 +32,7 @@ #include "setupapi.h" #define WIN32_NO_STATUS #include "winternl.h" +#include "wine/server.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(display); @@ -57,8 +58,6 @@ DEFINE_DEVPROPKEY(DEVPROPKEY_MONITOR_OUTPUT_ID, 0xca085853, 0x16ce, 0x48aa, 0xb1 /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); -DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); -DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCWORK, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 4); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 5); static const char initial_mode_key[] = "Initial Display Mode"; @@ -1628,10 +1627,11 @@ static BOOL macdrv_init_monitor(HDEVINFO devinfo, const struct macdrv_monitor *m int video_index, const LUID *gpu_luid, UINT output_id) { SP_DEVINFO_DATA device_data = {sizeof(SP_DEVINFO_DATA)}; + RECT monitor_rect, work_rect; WCHAR nameW[MAX_PATH]; WCHAR bufferW[MAX_PATH]; + DWORD size; HKEY hkey; - RECT rect; BOOL ret = FALSE; /* Create GUID_DEVCLASS_MONITOR instance */ @@ -1666,22 +1666,35 @@ static BOOL macdrv_init_monitor(HDEVINFO devinfo, const struct macdrv_monitor *m if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, DEVPROP_TYPE_UINT32, (const BYTE *)&monitor->state_flags, sizeof(monitor->state_flags), 0)) goto done; - /* RcMonitor */ - rect = rect_from_cgrect(monitor->rc_monitor); - if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, DEVPROP_TYPE_BINARY, - (const BYTE *)&rect, sizeof(rect), 0)) - goto done; - /* RcWork */ - rect = rect_from_cgrect(monitor->rc_work); - if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, DEVPROP_TYPE_BINARY, - (const BYTE *)&rect, sizeof(rect), 0)) - goto done; /* Adapter name */ sprintfW(bufferW, adapter_name_fmtW, video_index + 1); + size = (lstrlenW(bufferW) + 1) * sizeof(WCHAR); if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, DEVPROP_TYPE_STRING, - (const BYTE *)bufferW, (lstrlenW(bufferW) + 1) * sizeof(WCHAR), 0)) + (const BYTE *)bufferW, size, 0)) goto done; + /* EnumDisplayMonitors() doesn't enumerate mirrored replicas and inactive monitors */ + if (monitor_index == 0 && monitor->state_flags & DISPLAY_DEVICE_ACTIVE) + { + SERVER_START_REQ(create_monitor) + { + monitor_rect = rect_from_cgrect(monitor->rc_monitor); + req->monitor_rect.top = monitor_rect.top; + req->monitor_rect.left = monitor_rect.left; + req->monitor_rect.right = monitor_rect.right; + req->monitor_rect.bottom = monitor_rect.bottom; + work_rect = rect_from_cgrect(monitor->rc_work); + req->work_rect.top = work_rect.top; + req->work_rect.left = work_rect.left; + req->work_rect.right = work_rect.right; + req->work_rect.bottom = work_rect.bottom; + wine_server_add_data(req, bufferW, size); + if (wine_server_call(req)) + goto done; + } + SERVER_END_REQ; + } + ret = TRUE; done: if (!ret) @@ -1693,7 +1706,9 @@ static void prepare_devices(HKEY video_hkey) { static const BOOL not_present = FALSE; SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HMONITOR monitor = NULL; HDEVINFO devinfo; + NTSTATUS status; DWORD i = 0; /* Remove all monitors */ @@ -1705,6 +1720,28 @@ static void prepare_devices(HKEY video_hkey) } SetupDiDestroyDeviceInfoList(devinfo); + while (TRUE) + { + SERVER_START_REQ(enum_monitor) + { + req->index = 0; + if (!(status = wine_server_call(req))) + monitor = wine_server_ptr_handle(reply->handle); + } + SERVER_END_REQ; + + if (status) + break; + + SERVER_START_REQ(destroy_monitor) + { + req->handle = wine_server_user_handle(monitor); + if (wine_server_call(req)) + ERR("Failed to destroy monitor.\n"); + } + SERVER_END_REQ; + } + /* Clean up old adapter keys for reinitialization */ RegDeleteTreeW(video_hkey, NULL); -- 2.27.0 [View Less]

2 1

[PATCH 1/2] regedit/tests: Comprehensively check for elevated privileges before starting tests
by Hugh McMaster 25 Feb '21

25 Feb '21

Calls to regedit.exe on user accounts wit standard privileges trigger a UAC prompt. Not responding to the prompt eventually causes a test timeout, so use registry API calls to determine if the tests are running with elevated privileges. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/tests/regedit.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c … [View More]

1 1

[PATCH v2 tools] winetest/gather: Make the 'platform' table header sticky
by Hugh McMaster 25 Feb '21

25 Feb '21

The component test table is very long, which makes it difficult to remember which column holds what data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- v2: Add a z-index value in case some browsers expect it. winetest/gather | 4 ++-- winetest/summary.css | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/winetest/gather b/winetest/gather index 8948697..392e8e6 100755 --- a/winetest/gather +++ b/winetest/gather @@ -530,7 +530,7 @@ EOF … [View More]

1 0

[PATCH tools] winetest/gather: Make the 'platform' table header sticky
by Hugh McMaster 25 Feb '21

25 Feb '21

The component test table is very long, which makes it difficult to remember which column holds what data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- winetest/gather | 4 ++-- winetest/summary.css | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/winetest/gather b/winetest/gather index 8948697..392e8e6 100755 --- a/winetest/gather +++ b/winetest/gather @@ -530,7 +530,7 @@ EOF chop $msg; } $title .= <<"… [View More]

1 0

[PATCH 3/4] wined3d: Allow layered clears.
by Henri Verbeet 24 Feb '21

24 Feb '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 4 ++-- dlls/d3d11/tests/d3d11.c | 4 ++-- dlls/wined3d/device.c | 6 ------ 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index e8915aea8e79..a5b2620d98ad 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -11235,12 +11235,12 @@ static void … [View More]test_clear_render_target_view_2d(void) get_texture_readback(texture, 0, &rb); colour = get_readback_color(&rb, 8, 8); - todo_wine ok(compare_color(colour, 0x80ff0000, 1), "Got unexpected colour 0x%08x.\n", colour); + ok(compare_color(colour, 0x80ff0000, 1), "Got unexpected colour 0x%08x.\n", colour); release_resource_readback(&rb); get_texture_readback(texture, 1, &rb); colour = get_readback_color(&rb, 8, 8); - todo_wine ok(compare_color(colour, 0x8000ff00, 1), "Got unexpected colour 0x%08x.\n", colour); + ok(compare_color(colour, 0x8000ff00, 1), "Got unexpected colour 0x%08x.\n", colour); release_resource_readback(&rb); get_texture_readback(texture, 2, &rb); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index efbad45b35dc..a331baf48a00 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -15565,12 +15565,12 @@ static void test_clear_render_target_view_2d(void) get_texture_readback(texture, 0, &rb); colour = get_readback_color(&rb, 8, 8, 0); - todo_wine ok(compare_color(colour, 0x80ff0000, 1), "Got unexpected colour 0x%08x.\n", colour); + ok(compare_color(colour, 0x80ff0000, 1), "Got unexpected colour 0x%08x.\n", colour); release_resource_readback(&rb); get_texture_readback(texture, 1, &rb); colour = get_readback_color(&rb, 8, 8, 0); - todo_wine ok(compare_color(colour, 0x8000ff00, 1), "Got unexpected colour 0x%08x.\n", colour); + ok(compare_color(colour, 0x8000ff00, 1), "Got unexpected colour 0x%08x.\n", colour); release_resource_readback(&rb); get_texture_readback(texture, 2, &rb); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7405a38e13b8..aaf91a03947c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5093,12 +5093,6 @@ HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *devi return WINED3DERR_INVALIDCALL; } - if (view->layer_count != max(1, resource->depth >> view->desc.u.texture.level_idx)) - { - FIXME("Layered clears not implemented.\n"); - return WINED3DERR_INVALIDCALL; - } - if (!rect) { SetRect(&r, 0, 0, view->width, view->height); -- 2.20.1 [View Less]

2 1

[PATCH 2/4] d3d11/tests: Add a test for layered clears.
by Henri Verbeet 24 Feb '21

24 Feb '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 90 +++++++++++++++++++++++++++++++++------- 1 file changed, 75 insertions(+), 15 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 32a9dc2e5306..efbad45b35dc 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -15434,18 +15434,20 @@ static void test_clear_render_target_view_1d(void) static void test_clear_render_target_view_2d(void) { … [View More]static const DWORD expected_color = 0xbf4c7f19, expected_srgb_color = 0xbf95bc59; - static const float color[] = {0.1f, 0.5f, 0.3f, 0.75f}; + static const float clear_colour[] = {0.1f, 0.5f, 0.3f, 0.75f}; static const float green[] = {0.0f, 1.0f, 0.0f, 0.5f}; + static const float blue[] = {0.0f, 0.0f, 1.0f, 0.5f}; + ID3D11RenderTargetView *rtv[3], *srgb_rtv; ID3D11Texture2D *texture, *srgb_texture; struct d3d11_test_context test_context; - ID3D11RenderTargetView *rtv, *srgb_rtv; D3D11_RENDER_TARGET_VIEW_DESC rtv_desc; D3D11_TEXTURE2D_DESC texture_desc; ID3D11DeviceContext *context; struct resource_readback rb; ID3D11Device *device; unsigned int i, j; + DWORD colour; HRESULT hr; if (!init_test_context(&test_context, NULL)) @@ -15472,27 +15474,27 @@ static void test_clear_render_target_view_2d(void) hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &srgb_texture); ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); - hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtv); + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtv[0]); ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)srgb_texture, NULL, &srgb_rtv); ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); - ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, color); + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, clear_colour); check_texture_color(test_context.backbuffer, expected_color, 1); - ID3D11DeviceContext_ClearRenderTargetView(context, rtv, color); + ID3D11DeviceContext_ClearRenderTargetView(context, rtv[0], clear_colour); check_texture_color(texture, expected_color, 1); if (!enable_debug_layer) ID3D11DeviceContext_ClearRenderTargetView(context, NULL, green); check_texture_color(texture, expected_color, 1); - ID3D11DeviceContext_ClearRenderTargetView(context, srgb_rtv, color); + ID3D11DeviceContext_ClearRenderTargetView(context, srgb_rtv, clear_colour); check_texture_color(srgb_texture, expected_srgb_color, 1); ID3D11RenderTargetView_Release(srgb_rtv); - ID3D11RenderTargetView_Release(rtv); + ID3D11RenderTargetView_Release(rtv[0]); ID3D11Texture2D_Release(srgb_texture); ID3D11Texture2D_Release(texture); @@ -15509,30 +15511,88 @@ static void test_clear_render_target_view_2d(void) rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; rtv_desc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2D; U(rtv_desc).Texture2D.MipSlice = 0; - hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, &rtv_desc, &rtv); + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, &rtv_desc, &rtv[0]); ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); - ID3D11DeviceContext_ClearRenderTargetView(context, rtv, color); + ID3D11DeviceContext_ClearRenderTargetView(context, rtv[0], clear_colour); check_texture_color(texture, expected_color, 1); - ID3D11DeviceContext_ClearRenderTargetView(context, srgb_rtv, color); + ID3D11DeviceContext_ClearRenderTargetView(context, srgb_rtv, clear_colour); get_texture_readback(texture, 0, &rb); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j) { BOOL broken_device = is_warp_device(device) || is_nvidia_device(device); - DWORD color = get_readback_color(&rb, 80 + i * 160, 60 + j * 120, 0); - ok(compare_color(color, expected_srgb_color, 1) - || broken(compare_color(color, expected_color, 1) && broken_device), - "Got unexpected color 0x%08x.\n", color); + colour = get_readback_color(&rb, 80 + i * 160, 60 + j * 120, 0); + ok(compare_color(colour, expected_srgb_color, 1) + || broken(compare_color(colour, expected_color, 1) && broken_device), + "Got unexpected colour 0x%08x.\n", colour); } } release_resource_readback(&rb); ID3D11RenderTargetView_Release(srgb_rtv); - ID3D11RenderTargetView_Release(rtv); + ID3D11RenderTargetView_Release(rtv[0]); ID3D11Texture2D_Release(texture); + + texture_desc.Width = 16; + texture_desc.Height = 16; + texture_desc.ArraySize = 5; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + rtv_desc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2DARRAY; + U(rtv_desc).Texture2DArray.MipSlice = 0; + U(rtv_desc).Texture2DArray.FirstArraySlice = 0; + U(rtv_desc).Texture2DArray.ArraySize = 5; + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, &rtv_desc, &rtv[0]); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + U(rtv_desc).Texture2DArray.FirstArraySlice = 1; + U(rtv_desc).Texture2DArray.ArraySize = 3; + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, &rtv_desc, &rtv[1]); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + U(rtv_desc).Texture2DArray.FirstArraySlice = 2; + U(rtv_desc).Texture2DArray.ArraySize = 1; + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, &rtv_desc, &rtv[2]); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ID3D11DeviceContext_ClearRenderTargetView(context, rtv[0], blue); + ID3D11DeviceContext_ClearRenderTargetView(context, rtv[1], green); + ID3D11DeviceContext_ClearRenderTargetView(context, rtv[2], clear_colour); + + get_texture_readback(texture, 0, &rb); + colour = get_readback_color(&rb, 8, 8, 0); + todo_wine ok(compare_color(colour, 0x80ff0000, 1), "Got unexpected colour 0x%08x.\n", colour); + release_resource_readback(&rb); + + get_texture_readback(texture, 1, &rb); + colour = get_readback_color(&rb, 8, 8, 0); + todo_wine ok(compare_color(colour, 0x8000ff00, 1), "Got unexpected colour 0x%08x.\n", colour); + release_resource_readback(&rb); + + get_texture_readback(texture, 2, &rb); + colour = get_readback_color(&rb, 8, 8, 0); + ok(compare_color(colour, 0xbf4c7f19, 1), "Got unexpected colour 0x%08x.\n", colour); + release_resource_readback(&rb); + + get_texture_readback(texture, 3, &rb); + colour = get_readback_color(&rb, 8, 8, 0); + todo_wine ok(compare_color(colour, 0x8000ff00, 1), "Got unexpected colour 0x%08x.\n", colour); + release_resource_readback(&rb); + + get_texture_readback(texture, 4, &rb); + colour = get_readback_color(&rb, 8, 8, 0); + todo_wine ok(compare_color(colour, 0x80ff0000, 1), "Got unexpected colour 0x%08x.\n", colour); + release_resource_readback(&rb); + + ID3D11RenderTargetView_Release(rtv[2]); + ID3D11RenderTargetView_Release(rtv[1]); + ID3D11RenderTargetView_Release(rtv[0]); + ID3D11Texture2D_Release(texture); + release_test_context(&test_context); } -- 2.20.1 [View Less]

2 1

[PATCH 1/4] d3d10core/tests: Add a test for layered clears.
by Henri Verbeet 24 Feb '21

24 Feb '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 90 ++++++++++++++++++++++++++------ 1 file changed, 75 insertions(+), 15 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index f21431b22434..e8915aea8e79 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -11104,17 +11104,19 @@ static void test_clear_render_target_view_1d(void) static void … [View More]test_clear_render_target_view_2d(void) { static const DWORD expected_color = 0xbf4c7f19, expected_srgb_color = 0xbf95bc59; - static const float color[] = {0.1f, 0.5f, 0.3f, 0.75f}; + static const float clear_colour[] = {0.1f, 0.5f, 0.3f, 0.75f}; static const float green[] = {0.0f, 1.0f, 0.0f, 0.5f}; + static const float blue[] = {0.0f, 0.0f, 1.0f, 0.5f}; + ID3D10RenderTargetView *rtv[3], *srgb_rtv; struct d3d10core_test_context test_context; ID3D10Texture2D *texture, *srgb_texture; - ID3D10RenderTargetView *rtv, *srgb_rtv; D3D10_RENDER_TARGET_VIEW_DESC rtv_desc; D3D10_TEXTURE2D_DESC texture_desc; struct resource_readback rb; ID3D10Device *device; unsigned int i, j; + DWORD colour; HRESULT hr; if (!init_test_context(&test_context)) @@ -11140,16 +11142,16 @@ static void test_clear_render_target_view_2d(void) hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &srgb_texture); ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); - hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, NULL, &rtv); + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, NULL, &rtv[0]); ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)srgb_texture, NULL, &srgb_rtv); ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, color); + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, clear_colour); check_texture_color(test_context.backbuffer, expected_color, 1); - ID3D10Device_ClearRenderTargetView(device, rtv, color); + ID3D10Device_ClearRenderTargetView(device, rtv[0], clear_colour); check_texture_color(texture, expected_color, 1); if (is_d3d11_interface_available(device) && !enable_debug_layer) @@ -11158,11 +11160,11 @@ static void test_clear_render_target_view_2d(void) check_texture_color(texture, expected_color, 1); } - ID3D10Device_ClearRenderTargetView(device, srgb_rtv, color); + ID3D10Device_ClearRenderTargetView(device, srgb_rtv, clear_colour); check_texture_color(srgb_texture, expected_srgb_color, 1); ID3D10RenderTargetView_Release(srgb_rtv); - ID3D10RenderTargetView_Release(rtv); + ID3D10RenderTargetView_Release(rtv[0]); ID3D10Texture2D_Release(srgb_texture); ID3D10Texture2D_Release(texture); @@ -11179,30 +11181,88 @@ static void test_clear_render_target_view_2d(void) rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; rtv_desc.ViewDimension = D3D10_RTV_DIMENSION_TEXTURE2D; U(rtv_desc).Texture2D.MipSlice = 0; - hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, &rtv_desc, &rtv); + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, &rtv_desc, &rtv[0]); ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); - ID3D10Device_ClearRenderTargetView(device, rtv, color); + ID3D10Device_ClearRenderTargetView(device, rtv[0], clear_colour); check_texture_color(texture, expected_color, 1); - ID3D10Device_ClearRenderTargetView(device, srgb_rtv, color); + ID3D10Device_ClearRenderTargetView(device, srgb_rtv, clear_colour); get_texture_readback(texture, 0, &rb); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j) { BOOL broken_device = is_warp_device(device) || is_nvidia_device(device); - DWORD color = get_readback_color(&rb, 80 + i * 160, 60 + j * 120); - ok(compare_color(color, expected_srgb_color, 1) - || broken(compare_color(color, expected_color, 1) && broken_device), - "Got unexpected color 0x%08x.\n", color); + colour = get_readback_color(&rb, 80 + i * 160, 60 + j * 120); + ok(compare_color(colour, expected_srgb_color, 1) + || broken(compare_color(colour, expected_color, 1) && broken_device), + "Got unexpected colour 0x%08x.\n", colour); } } release_resource_readback(&rb); ID3D10RenderTargetView_Release(srgb_rtv); - ID3D10RenderTargetView_Release(rtv); + ID3D10RenderTargetView_Release(rtv[0]); ID3D10Texture2D_Release(texture); + + texture_desc.Width = 16; + texture_desc.Height = 16; + texture_desc.ArraySize = 5; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + rtv_desc.ViewDimension = D3D10_RTV_DIMENSION_TEXTURE2DARRAY; + U(rtv_desc).Texture2DArray.MipSlice = 0; + U(rtv_desc).Texture2DArray.FirstArraySlice = 0; + U(rtv_desc).Texture2DArray.ArraySize = 5; + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, &rtv_desc, &rtv[0]); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + U(rtv_desc).Texture2DArray.FirstArraySlice = 1; + U(rtv_desc).Texture2DArray.ArraySize = 3; + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, &rtv_desc, &rtv[1]); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + U(rtv_desc).Texture2DArray.FirstArraySlice = 2; + U(rtv_desc).Texture2DArray.ArraySize = 1; + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, &rtv_desc, &rtv[2]); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ID3D10Device_ClearRenderTargetView(device, rtv[0], blue); + ID3D10Device_ClearRenderTargetView(device, rtv[1], green); + ID3D10Device_ClearRenderTargetView(device, rtv[2], clear_colour); + + get_texture_readback(texture, 0, &rb); + colour = get_readback_color(&rb, 8, 8); + todo_wine ok(compare_color(colour, 0x80ff0000, 1), "Got unexpected colour 0x%08x.\n", colour); + release_resource_readback(&rb); + + get_texture_readback(texture, 1, &rb); + colour = get_readback_color(&rb, 8, 8); + todo_wine ok(compare_color(colour, 0x8000ff00, 1), "Got unexpected colour 0x%08x.\n", colour); + release_resource_readback(&rb); + + get_texture_readback(texture, 2, &rb); + colour = get_readback_color(&rb, 8, 8); + ok(compare_color(colour, 0xbf4c7f19, 1), "Got unexpected colour 0x%08x.\n", colour); + release_resource_readback(&rb); + + get_texture_readback(texture, 3, &rb); + colour = get_readback_color(&rb, 8, 8); + todo_wine ok(compare_color(colour, 0x8000ff00, 1), "Got unexpected colour 0x%08x.\n", colour); + release_resource_readback(&rb); + + get_texture_readback(texture, 4, &rb); + colour = get_readback_color(&rb, 8, 8); + todo_wine ok(compare_color(colour, 0x80ff0000, 1), "Got unexpected colour 0x%08x.\n", colour); + release_resource_readback(&rb); + + ID3D10RenderTargetView_Release(rtv[2]); + ID3D10RenderTargetView_Release(rtv[1]); + ID3D10RenderTargetView_Release(rtv[0]); + ID3D10Texture2D_Release(texture); + release_test_context(&test_context); } -- 2.20.1 [View Less]

2 1

[PATCH] quartz/vmr9: Don't release the default presenter object if it could not be created.
by Zebediah Figura 24 Feb '21

24 Feb '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/vmr9.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 57b219a6d26..c748e674081 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1383,19 +1383,23 @@ static HRESULT WINAPI VMR9FilterConfig_SetRenderingMode(IVMRFilterConfig9 *iface case VMR9Mode_Windowless: This->cookie = ~0; - hr = … [View More]

1 0

[PATCH 1/2] kernel32/tests: Add a test for async cancellation due to process exit.
by Zebediah Figura 24 Feb '21

24 Feb '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/tests/pipe.c | 70 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 91f6df34f81..f1feb6c53f0 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -4116,6 +4116,66 @@ static void test_GetOverlappedResultEx(void) CloseHandle(server); } +static void child_process_exit_process_async(DWORD … [View More]parent_pid, HANDLE parent_pipe) +{ + OVERLAPPED overlapped = {0}; + static char buffer[1]; + HANDLE parent, pipe; + BOOL ret; + + parent = OpenProcess(PROCESS_DUP_HANDLE, FALSE, parent_pid); + ok(!!parent, "got parent %p\n", parent); + + ret = DuplicateHandle(parent, parent_pipe, GetCurrentProcess(), &pipe, 0, + FALSE, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE); + ok(ret, "got error %u\n", GetLastError()); + + overlapped.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + + ret = ReadFile(pipe, buffer, sizeof(buffer), NULL, &overlapped); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_IO_PENDING, "got error %u\n", GetLastError()); + + /* exit without closing the pipe handle */ +} + +static void test_exit_process_async(void) +{ + HANDLE client, server, port; + OVERLAPPED *overlapped; + PROCESS_INFORMATION pi; + STARTUPINFOA si = {0}; + char cmdline[300]; + ULONG_PTR key; + char **argv; + DWORD size; + BOOL ret; + + winetest_get_mainargs(&argv); + + create_overlapped_pipe(PIPE_TYPE_BYTE, &client, &server); + port = CreateIoCompletionPort(client, NULL, 123, 0); + + sprintf(cmdline, "%s pipe exit_process_async %x %p", argv[0], GetCurrentProcessId(), client); + ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "got error %u\n", GetLastError()); + ret = WaitForSingleObject(pi.hProcess, 1000); + ok(!ret, "wait timed out\n"); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + + key = 0xdeadbeef; + size = 0xdeadbeef; + ret = GetQueuedCompletionStatus(port, &size, &key, &overlapped, 1000); + ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_OPERATION_ABORTED, "got error %u\n", GetLastError()); + todo_wine ok(!size, "got size %u\n", size); + todo_wine ok(key == 123, "got key %Iu\n", key); + + CloseHandle(port); + CloseHandle(server); +} + START_TEST(pipe) { char **argv; @@ -4158,6 +4218,15 @@ START_TEST(pipe) child_process_check_session_id(id); return; } + if (!strcmp(argv[2], "exit_process_async")) + { + HANDLE handle; + DWORD pid; + sscanf(argv[3], "%x", &pid); + sscanf(argv[4], "%p", &handle); + child_process_exit_process_async(pid, handle); + return; + } } if (test_DisconnectNamedPipe()) @@ -4186,4 +4255,5 @@ START_TEST(pipe) test_nowait(PIPE_TYPE_BYTE); test_nowait(PIPE_TYPE_MESSAGE); test_GetOverlappedResultEx(); + test_exit_process_async(); } -- 2.20.1 [View Less]

1 1

[PATCH 4/4] wined3d: Load/invalidate entire views in ffp_blitter_clear_rendertargets().
by Henri Verbeet 24 Feb '21

24 Feb '21

In particular, clearing a multi-layer view affects all layers, not just the first. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 4 ++-- dlls/d3d11/tests/d3d11.c | 4 ++-- dlls/wined3d/texture.c | 21 ++++++++------------- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index a5b2620d98ad..b2a2e2028f24 100644 --- a/dlls/d3d10core/… [View More]tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -11250,12 +11250,12 @@ static void test_clear_render_target_view_2d(void) get_texture_readback(texture, 3, &rb); colour = get_readback_color(&rb, 8, 8); - todo_wine ok(compare_color(colour, 0x8000ff00, 1), "Got unexpected colour 0x%08x.\n", colour); + ok(compare_color(colour, 0x8000ff00, 1), "Got unexpected colour 0x%08x.\n", colour); release_resource_readback(&rb); get_texture_readback(texture, 4, &rb); colour = get_readback_color(&rb, 8, 8); - todo_wine ok(compare_color(colour, 0x80ff0000, 1), "Got unexpected colour 0x%08x.\n", colour); + ok(compare_color(colour, 0x80ff0000, 1), "Got unexpected colour 0x%08x.\n", colour); release_resource_readback(&rb); ID3D10RenderTargetView_Release(rtv[2]); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index a331baf48a00..c40593d31d83 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -15580,12 +15580,12 @@ static void test_clear_render_target_view_2d(void) get_texture_readback(texture, 3, &rb); colour = get_readback_color(&rb, 8, 8, 0); - todo_wine ok(compare_color(colour, 0x8000ff00, 1), "Got unexpected colour 0x%08x.\n", colour); + ok(compare_color(colour, 0x8000ff00, 1), "Got unexpected colour 0x%08x.\n", colour); release_resource_readback(&rb); get_texture_readback(texture, 4, &rb); colour = get_readback_color(&rb, 8, 8, 0); - todo_wine ok(compare_color(colour, 0x80ff0000, 1), "Got unexpected colour 0x%08x.\n", colour); + ok(compare_color(colour, 0x80ff0000, 1), "Got unexpected colour 0x%08x.\n", colour); release_resource_readback(&rb); ID3D11RenderTargetView_Release(rtv[2]); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b53cd02d75cc..d6408fb1c7ac 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -5366,12 +5366,10 @@ static void ffp_blitter_clear_rendertargets(struct wined3d_device *device, unsig if (rtv && rtv->format->id != WINED3DFMT_NULL) { - struct wined3d_texture *rt = wined3d_texture_from_resource(rtv->resource); - if (flags & WINED3DCLEAR_TARGET && !is_full_clear(rtv, draw_rect, rect_count ? clear_rect : NULL)) - wined3d_texture_load_location(rt, rtv->sub_resource_idx, context, rtv->resource->draw_binding); + wined3d_rendertarget_view_load_location(rtv, context, rtv->resource->draw_binding); else - wined3d_texture_prepare_location(rt, rtv->sub_resource_idx, context, rtv->resource->draw_binding); + wined3d_rendertarget_view_prepare_location(rtv, context, rtv->resource->draw_binding); } } @@ -5392,18 +5390,17 @@ static void ffp_blitter_clear_rendertargets(struct wined3d_device *device, unsig if (depth_stencil) { DWORD ds_location = render_offscreen ? dsv->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; - struct wined3d_texture *ds = wined3d_texture_from_resource(dsv->resource); if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL) && !is_full_clear(dsv, draw_rect, rect_count ? clear_rect : NULL)) - wined3d_texture_load_location(ds, dsv->sub_resource_idx, context, ds_location); + wined3d_rendertarget_view_load_location(dsv, context, ds_location); else - wined3d_texture_prepare_location(ds, dsv->sub_resource_idx, context, ds_location); + wined3d_rendertarget_view_prepare_location(dsv, context, ds_location); if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) { - wined3d_texture_validate_location(ds, dsv->sub_resource_idx, ds_location); - wined3d_texture_invalidate_location(ds, dsv->sub_resource_idx, ~ds_location); + wined3d_rendertarget_view_validate_location(dsv, ds_location); + wined3d_rendertarget_view_invalidate_location(dsv, ~ds_location); } } @@ -5443,7 +5440,6 @@ static void ffp_blitter_clear_rendertargets(struct wined3d_device *device, unsig for (i = 0; i < rt_count; ++i) { struct wined3d_rendertarget_view *rtv = fb->render_targets[i]; - struct wined3d_texture *texture; if (!rtv) continue; @@ -5454,9 +5450,8 @@ static void ffp_blitter_clear_rendertargets(struct wined3d_device *device, unsig continue; } - texture = texture_from_resource(rtv->resource); - wined3d_texture_validate_location(texture, rtv->sub_resource_idx, rtv->resource->draw_binding); - wined3d_texture_invalidate_location(texture, rtv->sub_resource_idx, ~rtv->resource->draw_binding); + wined3d_rendertarget_view_validate_location(rtv, rtv->resource->draw_binding); + wined3d_rendertarget_view_invalidate_location(rtv, ~rtv->resource->draw_binding); } if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] && needs_srgb_write(context->d3d_info, state, fb)) -- 2.20.1 [View Less]

1 0

[PATCH 1/6] winegstreamer: Rename some callbacks to more closely match GStreamer terminology.
by Zebediah Figura 24 Feb '21

24 Feb '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/wg_parser.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 94f677538c7..63ba95a78cb 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -699,7 +699,8 @@ static void CDECL wg_parser_stream_notify_qos(struct wg_parser_stream *stream, gst_pad_push_event(… [View More]stream->my_sink, event); } -static GstAutoplugSelectResult autoplug_blacklist(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) +static GstAutoplugSelectResult autoplug_select_cb(GstElement *bin, GstPad *pad, + GstCaps *caps, GstElementFactory *fact, gpointer user) { const char *name = gst_element_factory_get_longname(fact); @@ -865,7 +866,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) return TRUE; } -static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *buffer) +static GstFlowReturn sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *buffer) { struct wg_parser_stream *stream = gst_pad_get_element_private(pad); struct wg_parser_event stream_event; @@ -978,7 +979,7 @@ static struct wg_parser_stream *create_stream(struct wg_parser *parser) sprintf(pad_name, "qz_sink_%u", parser->stream_count); stream->my_sink = gst_pad_new(pad_name, GST_PAD_SINK); gst_pad_set_element_private(stream->my_sink, stream); - gst_pad_set_chain_function(stream->my_sink, got_data_sink); + gst_pad_set_chain_function(stream->my_sink, sink_chain_cb); gst_pad_set_event_function(stream->my_sink, event_sink); gst_pad_set_query_function(stream->my_sink, query_sink); @@ -1114,7 +1115,7 @@ out: gst_caps_unref(caps); } -static void existing_new_pad(GstElement *element, GstPad *pad, gpointer user) +static void pad_added_cb(GstElement *element, GstPad *pad, gpointer user) { struct wg_parser *parser = user; @@ -1126,7 +1127,7 @@ static void existing_new_pad(GstElement *element, GstPad *pad, gpointer user) init_new_decoded_pad(element, pad, parser); } -static void removed_decoded_pad(GstElement *element, GstPad *pad, gpointer user) +static void pad_removed_cb(GstElement *element, GstPad *pad, gpointer user) { struct wg_parser *parser = user; unsigned int i; @@ -1155,7 +1156,8 @@ static void removed_decoded_pad(GstElement *element, GstPad *pad, gpointer user) g_free(name); } -static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 offset, guint size, GstBuffer **buffer) +static GstFlowReturn src_getrange_cb(GstPad *pad, GstObject *parent, + guint64 offset, guint size, GstBuffer **buffer) { struct wg_parser *parser = gst_pad_get_element_private(pad); GstBuffer *new_buffer = NULL; @@ -1277,7 +1279,7 @@ static void *push_data(void *arg) break; size = min(16384, max_size - parser->next_offset); - if ((ret = request_buffer_src(parser->my_src, NULL, parser->next_offset, size, &buffer)) < 0) + if ((ret = src_getrange_cb(parser->my_src, NULL, parser->next_offset, size, &buffer)) < 0) { GST_ERROR("Failed to read data, ret %s.", gst_flow_get_name(ret)); break; @@ -1347,7 +1349,7 @@ static gboolean activate_mode(GstPad *pad, GstObject *parent, GstPadMode mode, g return FALSE; } -static GstBusSyncReply watch_bus(GstBus *bus, GstMessage *msg, gpointer user) +static GstBusSyncReply bus_handler_cb(GstBus *bus, GstMessage *msg, gpointer user) { struct wg_parser *parser = user; gchar *dbg_info = NULL; @@ -1498,14 +1500,14 @@ static HRESULT CDECL wg_parser_connect(struct wg_parser *parser, uint64_t file_s if (!parser->bus) { parser->bus = gst_bus_new(); - gst_bus_set_sync_handler(parser->bus, watch_bus, parser, NULL); + gst_bus_set_sync_handler(parser->bus, bus_handler_cb, parser, NULL); } parser->container = gst_bin_new(NULL); gst_element_set_bus(parser->container, parser->bus); parser->my_src = gst_pad_new_from_static_template(&src_template, "quartz-src"); - gst_pad_set_getrange_function(parser->my_src, request_buffer_src); + gst_pad_set_getrange_function(parser->my_src, src_getrange_cb); gst_pad_set_query_function(parser->my_src, query_function); gst_pad_set_activatemode_function(parser->my_src, activate_mode); gst_pad_set_event_function(parser->my_src, event_src); @@ -1614,9 +1616,9 @@ static BOOL decodebin_parser_init_gst(struct wg_parser *parser) gst_bin_add(GST_BIN(parser->container), element); parser->decodebin = element; - g_signal_connect(element, "pad-added", G_CALLBACK(existing_new_pad), parser); - g_signal_connect(element, "pad-removed", G_CALLBACK(removed_decoded_pad), parser); - g_signal_connect(element, "autoplug-select", G_CALLBACK(autoplug_blacklist), parser); + g_signal_connect(element, "pad-added", G_CALLBACK(pad_added_cb), parser); + g_signal_connect(element, "pad-removed", G_CALLBACK(pad_removed_cb), parser); + g_signal_connect(element, "autoplug-select", G_CALLBACK(autoplug_select_cb), parser); g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads), parser); parser->their_sink = gst_element_get_static_pad(element, "sink"); @@ -1666,8 +1668,8 @@ static BOOL avi_parser_init_gst(struct wg_parser *parser) gst_bin_add(GST_BIN(parser->container), element); - g_signal_connect(element, "pad-added", G_CALLBACK(existing_new_pad), parser); - g_signal_connect(element, "pad-removed", G_CALLBACK(removed_decoded_pad), parser); + g_signal_connect(element, "pad-added", G_CALLBACK(pad_added_cb), parser); + g_signal_connect(element, "pad-removed", G_CALLBACK(pad_removed_cb), parser); g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads), parser); parser->their_sink = gst_element_get_static_pad(element, "sink"); -- 2.30.1 [View Less]

3 7

[PATCH] server: Fix page size calculation in write access check.
by Torge Matthies 24 Feb '21

24 Feb '21

Also fix a wrong comment. Ptrace and all of this code use longs. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- server/ptrace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index 49347791d8c..88c176d2d0c 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -410,10 +410,10 @@ int read_process_memory( struct process *process, client_ptr_t ptr, data_size_t } /* make sure we can write to the whole address … [View More]

1 0

[PATCH] netprofm: Fix connection_GetAdapterId return wrong GUID.
by Bernhard Kölbl 24 Feb '21

24 Feb '21

The index of a network interface is not a valid GUID. AdapterName holds the correct GUID and should be used instead. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/netprofm/Makefile.in | 2 +- dlls/netprofm/list.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/netprofm/Makefile.in b/dlls/netprofm/Makefile.in index d57d1d60c45..3d1d225d3df 100644 --- a/dlls/netprofm/Makefile.in +++ b/dlls/netprofm/Makefile.in @@ -1,5 +1,5 @@ … [View More]

3 2

[PATCH 4/4] ntdll: Fix compacted legacy xsave area handling.
by Jacek Caban 24 Feb '21

24 Feb '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/signal_x86_64.c | 36 +++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-)

1 0

[PATCH 3/4] ntdll: Use the right cpuid for XSAVEC detection.
by Jacek Caban 24 Feb '21

24 Feb '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50713 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/system.c | 50 ++++++++++------------------------------ 1 file changed, 12 insertions(+), 38 deletions(-)

1 0

[PATCH 2/4] ntdll: Don't use FeatureSet for XSAVE compaction support flag.
by Jacek Caban 24 Feb '21

24 Feb '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- FeatureSet is already overloaded and I originally assumed that CPU_FEATURE_DAZ is something related to ARM due to misleading formatting. dlls/ntdll/unix/signal_i386.c | 4 ++-- dlls/ntdll/unix/signal_x86_64.c | 9 ++++----- dlls/ntdll/unix/system.c | 4 +++- dlls/ntdll/unix/unix_private.h | 2 ++ include/winternl.h | 3 +-- 5 files changed, 12 insertions(+), 10 deletions(-)

1 0

[PATCH 1/4] ntdll: Use syscall frame in x86_64 call_raise_user_exception_dispatcher implementation.
by Jacek Caban 24 Feb '21

24 Feb '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/signal_x86_64.c | 18 ++++-------------- dlls/ntdll/unix/unix_private.h | 2 +- 2 files changed, 5 insertions(+), 15 deletions(-)

1 0

[PATCH] msvcrt: Improve asinf compatibility with native ucrtbase.
by Piotr Caban 24 Feb '21

24 Feb '21

It reduces number of different asinf results from 5413834 to 639464. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-)

1 0

[PATCH v2 1/2] winex11.drv: Factor out describe_pixel_format() function.
by Paul Gofman 24 Feb '21

24 Feb '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winex11.drv/opengl.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 3e25e485e6d..e0e5849f010 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1594,8 +1594,7 @@ void destroy_gl_drawable( HWND hwnd ) * * Get the pixel-format descriptor associated to the given id */ -static int … [View More]WINAPI glxdrv_wglDescribePixelFormat( HDC hdc, int iPixelFormat, - UINT nBytes, PIXELFORMATDESCRIPTOR *ppfd) +static int WINAPI describe_pixel_format( int iPixelFormat, PIXELFORMATDESCRIPTOR *ppfd, BOOL allow_offscreen ) { /*XVisualInfo *vis;*/ int value; @@ -1604,23 +1603,13 @@ static int WINAPI glxdrv_wglDescribePixelFormat( HDC hdc, int iPixelFormat, if (!has_opengl()) return 0; - TRACE("(%p,%d,%d,%p)\n", hdc, iPixelFormat, nBytes, ppfd); - - if (!ppfd) return nb_onscreen_formats; - /* Look for the iPixelFormat in our list of supported formats. If it is supported we get the index in the FBConfig table and the number of supported formats back */ - fmt = get_pixel_format(gdi_display, iPixelFormat, FALSE /* Offscreen */); + fmt = get_pixel_format(gdi_display, iPixelFormat, allow_offscreen); if (!fmt) { WARN("unexpected format %d\n", iPixelFormat); return 0; } - if (nBytes < sizeof(PIXELFORMATDESCRIPTOR)) { - ERR("Wrong structure size !\n"); - /* Should set error */ - return 0; - } - memset(ppfd, 0, sizeof(PIXELFORMATDESCRIPTOR)); ppfd->nSize = sizeof(PIXELFORMATDESCRIPTOR); ppfd->nVersion = 1; @@ -1723,6 +1712,28 @@ static int WINAPI glxdrv_wglDescribePixelFormat( HDC hdc, int iPixelFormat, return nb_onscreen_formats; } +/** + * glxdrv_DescribePixelFormat + * + * Get the pixel-format descriptor associated to the given id + */ +static int WINAPI glxdrv_wglDescribePixelFormat( HDC hdc, int iPixelFormat, + UINT nBytes, PIXELFORMATDESCRIPTOR *ppfd) +{ + TRACE("(%p,%d,%d,%p)\n", hdc, iPixelFormat, nBytes, ppfd); + + if (!ppfd) return nb_onscreen_formats; + + if (nBytes < sizeof(PIXELFORMATDESCRIPTOR)) + { + ERR("Wrong structure size !\n"); + /* Should set error */ + return 0; + } + + return describe_pixel_format(iPixelFormat, ppfd, FALSE); +} + /*********************************************************************** * glxdrv_wglGetPixelFormat */ -- 2.29.2 [View Less]

1 1

[PATCH v2] msado15: Semi-stub _Recordset Open
by Alistair Leslie-Hughes 24 Feb '21

24 Feb '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/recordset.c | 53 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 50 insertions(+), 3 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 12bb9680258..6064908bb28 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -1182,15 +1182,62 @@ static HRESULT WINAPI recordset_Open( _Recordset *iface, VARIANT source, VARIANT … [View More] CursorTypeEnum cursor_type, LockTypeEnum lock_type, LONG options ) { struct recordset *recordset = impl_from_Recordset( iface ); + ADOConnectionConstruction15 *construct; + IUnknown *session; + ICommandText *command_text; + DBROWCOUNT affected; + IUnknown *rowset; + HRESULT hr; - FIXME( "%p, %s, %s, %d, %d, %d\n", recordset, debugstr_variant(&source), debugstr_variant(&active_connection), + FIXME( "%p, %s, %s, %d, %d, %d Semi-stub\n", recordset, debugstr_variant(&source), debugstr_variant(&active_connection), cursor_type, lock_type, options ); - if (!recordset->fields) return MAKE_ADO_HRESULT( adErrInvalidConnection ); if (recordset->state == adStateOpen) return MAKE_ADO_HRESULT( adErrObjectOpen ); + if (recordset->fields) + { + recordset->state = adStateOpen; + return S_OK; + } + + if (V_VT(&active_connection) != VT_DISPATCH) + { + FIXME("Unsupported Active connection type %d\n", V_VT(&active_connection)); + return MAKE_ADO_HRESULT( adErrInvalidConnection ); + } + + hr = IDispatch_QueryInterface(V_DISPATCH(&active_connection), &IID_ADOConnectionConstruction15, (void**)&construct); + if (FAILED(hr)) + return E_FAIL; + + hr = ADOConnectionConstruction15_get_Session(construct, &session); + ADOConnectionConstruction15_Release(construct); + if (FAILED(hr)) + return E_FAIL; + + if (V_VT(&source) != VT_BSTR) + { + FIXME("Unsupported source type!\n"); + return E_FAIL; + } + + hr = create_command_text(session, V_BSTR(&source), &command_text); + IUnknown_Release(session); + if (FAILED(hr)) + return hr; + + hr = ICommandText_Execute(command_text, NULL, &IID_IUnknown, NULL, &affected, &rowset); + ICommandText_Release(command_text); + if (FAILED(hr)) + return hr; + + ADORecordsetConstruction_put_Rowset(&recordset->ADORecordsetConstruction_iface, rowset); + recordset->cursor_type = cursor_type; recordset->state = adStateOpen; - return S_OK; + + IUnknown_Release(rowset); + + return hr; } static HRESULT WINAPI recordset_Requery( _Recordset *iface, LONG options ) -- 2.30.0 [View Less]

2 1

[v6 PATCH] msxml3/tests: Test mxwriter domdoc output.
by Nikolay Sivov 24 Feb '21

24 Feb '21

From: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Signed-off-by: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Jefferson, note that this test appears to rely on DOMDocument60 behavior, it fails for me on Windows otherwise. It would be nice if it didn't. v6: using regular interface version; skipping earlier on Wine; formatting changes. dlls/msxml3/tests/saxreader.c | 194 ++++++++++++++++++++++++++… [View More]++++++++ 1 file changed, 194 insertions(+) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index ab814c5f764..35d0e71545b 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -4367,6 +4367,199 @@ static void test_mxwriter_stream(void) free_bstrs(); } +static void test_mxwriter_domdoc(void) +{ + ISAXContentHandler *content; + IXMLDOMDocument *domdoc; + IMXWriter *writer; + HRESULT hr; + VARIANT dest; + IXMLDOMElement *root = NULL; + IXMLDOMNodeList *node_list = NULL; + IXMLDOMNode *node = NULL; + LONG list_length = 0; + BSTR str; + + /* Create writer and attach DOMDocument output */ + hr = CoCreateInstance(&CLSID_MXXMLWriter60, NULL, CLSCTX_INPROC_SERVER, &IID_IMXWriter, (void**)&writer); + ok(hr == S_OK, "Failed to create a writer, hr %#x.\n", hr); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoCreateInstance(&CLSID_DOMDocument60, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void **)&domdoc); + ok(hr == S_OK, "Failed to create a document, hr %#x.\n", hr); + + V_VT(&dest) = VT_DISPATCH; + V_DISPATCH(&dest) = (IDispatch *)domdoc; + + hr = IMXWriter_put_output(writer, dest); +todo_wine + ok(hr == S_OK, "Failed to set writer output, hr %#x.\n", hr); + if (FAILED(hr)) + { + IXMLDOMDocument_Release(domdoc); + IMXWriter_Release(writer); + return; + } + + /* Add root element to document. */ + hr = IXMLDOMDocument_createElement(domdoc, _bstr_("TestElement"), &root); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IXMLDOMDocument_appendChild(domdoc, (IXMLDOMNode *)root, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IXMLDOMElement_Release(root); + + hr = IXMLDOMDocument_get_documentElement(domdoc, &root); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(root != NULL, "Unexpected document root.\n"); + IXMLDOMElement_Release(root); + + /* startDocument clears root element and disables methods. */ + hr = ISAXContentHandler_startDocument(content); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXMLDOMDocument_get_documentElement(domdoc, &root); +todo_wine + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + hr = IXMLDOMDocument_createElement(domdoc, _bstr_("TestElement"), &root); +todo_wine + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + /* startElement allows document root node to be accessed. */ + hr = ISAXContentHandler_startElement(content, L"", 0, L"", 0, L"BankAccount", 11, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXMLDOMDocument_get_documentElement(domdoc, &root); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(root != NULL, "Unexpected document root.\n"); + + hr = IXMLDOMElement_get_nodeName(root, &str); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(!lstrcmpW(L"BankAccount", str), "Unexpected name %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); + + /* startElement immediately updates previous node. */ + hr = ISAXContentHandler_startElement(content, L"", 0, L"", 0, L"Number", 6, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXMLDOMElement_get_childNodes(root, &node_list); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXMLDOMNodeList_get_length(node_list, &list_length); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(list_length == 1, "list length %i, expected 1\n", list_length); + + hr = IXMLDOMNodeList_get_item(node_list, 0, &node); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXMLDOMNode_get_nodeName(node, &str); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!lstrcmpW(L"Number", str), "got %s\n", wine_dbgstr_w(str)); +} + SysFreeString(str); + + /* characters not immediately visible. */ + hr = ISAXContentHandler_characters(content, L"12345", 5); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXMLDOMNode_get_text(node, &str); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!lstrcmpW(L"", str), "got %s\n", wine_dbgstr_w(str)); +} + SysFreeString(str); + + /* characters visible after endElement. */ + hr = ISAXContentHandler_endElement(content, L"", 0, L"", 0, L"Number", 6); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXMLDOMNode_get_text(node, &str); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!lstrcmpW(L"12345", str), "got %s\n", wine_dbgstr_w(str)); +} + SysFreeString(str); + + IXMLDOMNode_Release(node); + + /* second startElement updates the existing node list. */ + + hr = ISAXContentHandler_startElement(content, L"", 0, L"", 0, L"Name", 4, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = ISAXContentHandler_characters(content, L"Captain Ahab", 12); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = ISAXContentHandler_endElement(content, L"", 0, L"", 0, L"Name", 4); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = ISAXContentHandler_endElement(content, L"", 0, L"", 0, L"BankAccount", 11); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXMLDOMNodeList_get_length(node_list, &list_length); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(2 == list_length, "list length %i, expected 2\n", list_length); +} + hr = IXMLDOMNodeList_get_item(node_list, 1, &node); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXMLDOMNode_get_nodeName(node, &str); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!lstrcmpW(L"Name", str), "got %s\n", wine_dbgstr_w(str)); +} + SysFreeString(str); + + hr = IXMLDOMNode_get_text(node, &str); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!lstrcmpW(L"Captain Ahab", str), "got %s\n", wine_dbgstr_w(str)); +} + SysFreeString(str); + + IXMLDOMNode_Release(node); + IXMLDOMNodeList_Release(node_list); + IXMLDOMElement_Release(root); + + /* endDocument makes document modifiable again. */ + + hr = ISAXContentHandler_endDocument(content); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXMLDOMDocument_createElement(domdoc, _bstr_("TestElement"), &root); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IXMLDOMElement_Release(root); + + /* finally check doc output */ + hr = IXMLDOMDocument_get_xml(domdoc, &str); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!lstrcmpW( + L"<BankAccount>" + "<Number>12345</Number>" + "<Name>Captain Ahab</Name>" + "</BankAccount>\r\n", + str), + "got %s\n", wine_dbgstr_w(str)); +} + SysFreeString(str); + + IXMLDOMDocument_Release(domdoc); + ISAXContentHandler_Release(content); + IMXWriter_Release(writer); + + free_bstrs(); +} + static const char *encoding_names[] = { "iso-8859-1", "iso-8859-2", @@ -5768,6 +5961,7 @@ START_TEST(saxreader) test_mxwriter_properties(); test_mxwriter_flush(); test_mxwriter_stream(); + test_mxwriter_domdoc(); test_mxwriter_encoding(); test_mxwriter_dispex(); test_mxwriter_indent(); -- 2.30.0 [View Less]

1 0

[PATCH] include: Add more SQL_ defines
by Alistair Leslie-Hughes 24 Feb '21

24 Feb '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/sqlucode.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/sqlucode.h b/include/sqlucode.h index c87348cd8b5..1286216f902 100644 --- a/include/sqlucode.h +++ b/include/sqlucode.h @@ -27,6 +27,9 @@ extern "C" { #endif +#define SQL_WVARCHAR (-9) +#define SQL_WLONGVARCHAR (-10) + SQLRETURN WINAPI SQLConnectW(SQLHDBC ConnectionHandle, SQLWCHAR *ServerName, … [View More]

1 0

[PATCH] wbemdisp: Add SWbemNamedValueSet stub.
by Nikolay Sivov 24 Feb '21

24 Feb '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wbemdisp/locator.c | 237 ++++++++++++++++++++++++++++++- dlls/wbemdisp/main.c | 3 + dlls/wbemdisp/tests/wbemdisp.c | 12 ++ dlls/wbemdisp/wbemdisp_private.h | 1 + include/wbemdisp.idl | 11 ++ 5 files changed, 263 insertions(+), 1 deletion(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 28c8e5b4120..bbb0625f4e8 100644 --- a/dlls/wbemdisp/locator.c +++ b/… [View More]dlls/wbemdisp/locator.c @@ -47,6 +47,7 @@ enum type_id ISWbemPropertySet_tid, ISWbemServices_tid, ISWbemSecurity_tid, + ISWbemNamedValueSet_tid, last_tid }; @@ -61,7 +62,8 @@ static REFIID wbemdisp_tid_id[] = &IID_ISWbemProperty, &IID_ISWbemPropertySet, &IID_ISWbemServices, - &IID_ISWbemSecurity + &IID_ISWbemSecurity, + &IID_ISWbemNamedValueSet, }; static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) @@ -2456,3 +2458,236 @@ static HRESULT ISWbemSecurity_create( ISWbemSecurity **obj ) TRACE( "returning iface %p\n", *obj ); return S_OK; } + +struct namedvalueset +{ + ISWbemNamedValueSet ISWbemNamedValueSet_iface; + LONG refs; +}; + +static struct namedvalueset *impl_from_ISWbemNamedValueSet( ISWbemNamedValueSet *iface ) +{ + return CONTAINING_RECORD( iface, struct namedvalueset, ISWbemNamedValueSet_iface ); +} + +static HRESULT WINAPI namedvalueset_QueryInterface( + ISWbemNamedValueSet *iface, + REFIID riid, + void **ppvObject ) +{ + struct namedvalueset *set = impl_from_ISWbemNamedValueSet( iface ); + + TRACE( "%p, %s, %p\n", set, debugstr_guid( riid ), ppvObject ); + + if (IsEqualGUID( riid, &IID_ISWbemNamedValueSet ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppvObject = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + ISWbemNamedValueSet_AddRef( iface ); + return S_OK; +} + +static ULONG WINAPI namedvalueset_AddRef( + ISWbemNamedValueSet *iface ) +{ + struct namedvalueset *set = impl_from_ISWbemNamedValueSet( iface ); + return InterlockedIncrement( &set->refs ); +} + +static ULONG WINAPI namedvalueset_Release( + ISWbemNamedValueSet *iface ) +{ + struct namedvalueset *set = impl_from_ISWbemNamedValueSet( iface ); + LONG refs = InterlockedDecrement( &set->refs ); + if (!refs) + { + TRACE( "destroying %p\n", set ); + heap_free( set ); + } + return refs; +} + +static HRESULT WINAPI namedvalueset_GetTypeInfoCount( + ISWbemNamedValueSet *iface, + UINT *count ) +{ + struct namedvalueset *set = impl_from_ISWbemNamedValueSet( iface ); + TRACE( "%p, %p\n", set, count ); + + *count = 1; + return S_OK; +} + +static HRESULT WINAPI namedvalueset_GetTypeInfo( + ISWbemNamedValueSet *iface, + UINT index, + LCID lcid, + ITypeInfo **info ) +{ + struct namedvalueset *set = impl_from_ISWbemNamedValueSet( iface ); + + TRACE( "%p, %u, %u, %p\n", set, index, lcid, info ); + + return get_typeinfo( ISWbemNamedValueSet_tid, info ); +} + +static HRESULT WINAPI namedvalueset_GetIDsOfNames( + ISWbemNamedValueSet *iface, + REFIID riid, + LPOLESTR *names, + UINT count, + LCID lcid, + DISPID *dispid ) +{ + struct namedvalueset *set = impl_from_ISWbemNamedValueSet( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %s, %p, %u, %u, %p\n", set, debugstr_guid(riid), names, count, lcid, dispid ); + + if (!names || !count || !dispid) return E_INVALIDARG; + + hr = get_typeinfo( ISWbemNamedValueSet_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, names, count, dispid ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI namedvalueset_Invoke( + ISWbemNamedValueSet *iface, + DISPID member, + REFIID riid, + LCID lcid, + WORD flags, + DISPPARAMS *params, + VARIANT *result, + EXCEPINFO *excep_info, + UINT *arg_err ) +{ + struct namedvalueset *set = impl_from_ISWbemNamedValueSet( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", set, member, debugstr_guid(riid), + lcid, flags, params, result, excep_info, arg_err ); + + hr = get_typeinfo( ISWbemNamedValueSet_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &set->ISWbemNamedValueSet_iface, member, flags, + params, result, excep_info, arg_err ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI namedvalueset_get__NewEnum( + ISWbemNamedValueSet *iface, + IUnknown **unk ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static HRESULT WINAPI namedvalueset_Item( + ISWbemNamedValueSet *iface, + BSTR name, + LONG flags, + ISWbemNamedValue **value ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static HRESULT WINAPI namedvalueset_Count( + ISWbemNamedValueSet *iface, + LONG *count ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static HRESULT WINAPI namedvalueset_Add( + ISWbemNamedValueSet *iface, + BSTR name, + VARIANT *value, + LONG flags, + ISWbemNamedValue **namedvalue ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static HRESULT WINAPI namedvalueset_Remove( + ISWbemNamedValueSet *iface, + BSTR name, + LONG flags ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static HRESULT WINAPI namedvalueset_Clone( + ISWbemNamedValueSet *iface, + ISWbemNamedValueSet **valueset ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static HRESULT WINAPI namedvalueset_DeleteAll( + ISWbemNamedValueSet *iface ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static const ISWbemNamedValueSetVtbl namedvalueset_vtbl = +{ + namedvalueset_QueryInterface, + namedvalueset_AddRef, + namedvalueset_Release, + namedvalueset_GetTypeInfoCount, + namedvalueset_GetTypeInfo, + namedvalueset_GetIDsOfNames, + namedvalueset_Invoke, + namedvalueset_get__NewEnum, + namedvalueset_Item, + namedvalueset_Count, + namedvalueset_Add, + namedvalueset_Remove, + namedvalueset_Clone, + namedvalueset_DeleteAll, +}; + +HRESULT SWbemNamedValueSet_create( void **obj ) +{ + struct namedvalueset *set; + + TRACE( "%p\n", obj ); + + if (!(set = heap_alloc_zero( sizeof(*set) ))) return E_OUTOFMEMORY; + set->ISWbemNamedValueSet_iface.lpVtbl = &namedvalueset_vtbl; + set->refs = 1; + + *obj = &set->ISWbemNamedValueSet_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} diff --git a/dlls/wbemdisp/main.c b/dlls/wbemdisp/main.c index cfaf7d787eb..b0064582187 100644 --- a/dlls/wbemdisp/main.c +++ b/dlls/wbemdisp/main.c @@ -262,6 +262,7 @@ static const struct IClassFactoryVtbl factory_vtbl = }; static struct factory swbem_locator_cf = { { &factory_vtbl }, SWbemLocator_create }; +static struct factory swbem_namedvalueset_cf = { { &factory_vtbl }, SWbemNamedValueSet_create }; static struct factory winmgmts_cf = { { &factory_vtbl }, WinMGMTS_create }; BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) @@ -289,6 +290,8 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *obj ) cf = &swbem_locator_cf.IClassFactory_iface; else if (IsEqualGUID( rclsid, &CLSID_WinMGMTS )) cf = &winmgmts_cf.IClassFactory_iface; + else if (IsEqualGUID( rclsid, &CLSID_SWbemNamedValueSet )) + cf = &swbem_namedvalueset_cf.IClassFactory_iface; else return CLASS_E_CLASSNOTAVAILABLE; diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index fa51ce6d756..24225ad1ac1 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -402,12 +402,24 @@ static void test_locator(void) ISWbemLocator_Release( locator ); } +static void test_namedvalueset(void) +{ + ISWbemNamedValueSet *set; + HRESULT hr; + + hr = CoCreateInstance( &CLSID_SWbemNamedValueSet, NULL, CLSCTX_INPROC_SERVER, &IID_ISWbemNamedValueSet, (void **)&set ); + ok( hr == S_OK, "got %x\n", hr ); + + ISWbemNamedValueSet_Release(set); +} + START_TEST(wbemdisp) { CoInitialize( NULL ); test_ParseDisplayName(); test_locator(); + test_namedvalueset(); CoUninitialize(); } diff --git a/dlls/wbemdisp/wbemdisp_private.h b/dlls/wbemdisp/wbemdisp_private.h index b03a13e2ea0..1648843fcba 100644 --- a/dlls/wbemdisp/wbemdisp_private.h +++ b/dlls/wbemdisp/wbemdisp_private.h @@ -17,3 +17,4 @@ */ HRESULT SWbemLocator_create(LPVOID *) DECLSPEC_HIDDEN; +HRESULT SWbemNamedValueSet_create(void **) DECLSPEC_HIDDEN; diff --git a/include/wbemdisp.idl b/include/wbemdisp.idl index 8ccdd0ca5e2..6f09f7ee154 100644 --- a/include/wbemdisp.idl +++ b/include/wbemdisp.idl @@ -1196,4 +1196,15 @@ coclass SWbemLocator interface ISWbemLocator; } +[ + threading(apartment), + uuid(9aed384e-ce8b-11d1-8b05-00600806d9b6), + progid("WbemScripting.SWbemNamedValueSet.1"), + vi_progid("WbemScripting.SWbemNamedValueSet") +] +coclass SWbemNamedValueSet +{ + interface ISWbemNamedValueSet; +} + } /* WbemScripting */ -- 2.30.0 [View Less]

2 1

[PATCH] wbemprox: Implement WbemContext stub.
by Nikolay Sivov 24 Feb '21

24 Feb '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wbemprox/main.c | 5 + dlls/wbemprox/services.c | 175 +++++++++++++++++++++++++++++++ dlls/wbemprox/tests/services.c | 12 +++ dlls/wbemprox/wbemprox.idl | 7 ++ dlls/wbemprox/wbemprox_private.h | 1 + include/wbemcli.idl | 9 ++ 6 files changed, 209 insertions(+) diff --git a/dlls/wbemprox/main.c b/dlls/wbemprox/main.c index 09084414983..0ebbd55aba9 100644 --- a/dlls/… [View More]wbemprox/main.c +++ b/dlls/wbemprox/main.c @@ -112,6 +112,7 @@ static const struct IClassFactoryVtbl wbemprox_cf_vtbl = }; static wbemprox_cf wbem_locator_cf = { { &wbemprox_cf_vtbl }, WbemLocator_create }; +static wbemprox_cf wbem_context_cf = { { &wbemprox_cf_vtbl }, WbemContext_create }; BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -139,6 +140,10 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) { cf = &wbem_locator_cf.IClassFactory_iface; } + else if (IsEqualGUID( rclsid, &CLSID_WbemContext )) + { + cf = &wbem_context_cf.IClassFactory_iface; + } if (!cf) return CLASS_E_CLASSNOTAVAILABLE; return IClassFactory_QueryInterface( cf, iid, ppv ); } diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index ab7146db2d8..965f1b168f1 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -954,3 +954,178 @@ HRESULT WbemServices_create( const WCHAR *namespace, LPVOID *ppObj ) TRACE("returning iface %p\n", *ppObj); return S_OK; } + +struct wbem_context +{ + IWbemContext IWbemContext_iface; + LONG refs; +}; + +static struct wbem_context *impl_from_IWbemContext( IWbemContext *iface ) +{ + return CONTAINING_RECORD( iface, struct wbem_context, IWbemContext_iface ); +} + +static HRESULT WINAPI wbem_context_QueryInterface( + IWbemContext *iface, + REFIID riid, + void **obj) +{ + TRACE("%p, %s, %p\n", iface, debugstr_guid( riid ), obj ); + + if ( IsEqualGUID( riid, &IID_IWbemContext ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *obj = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IWbemContext_AddRef( iface ); + return S_OK; +} + +static ULONG WINAPI wbem_context_AddRef( + IWbemContext *iface ) +{ + struct wbem_context *context = impl_from_IWbemContext( iface ); + return InterlockedIncrement( &context->refs ); +} + +static ULONG WINAPI wbem_context_Release( + IWbemContext *iface ) +{ + struct wbem_context *context = impl_from_IWbemContext( iface ); + LONG refs = InterlockedDecrement( &context->refs ); + + if (!refs) + { + TRACE("destroying %p\n", context); + heap_free( context ); + } + return refs; +} + +static HRESULT WINAPI wbem_context_Clone( + IWbemContext *iface, + IWbemContext **newcopy ) +{ + FIXME("%p, %p\n", iface, newcopy); + + return E_NOTIMPL; +} + +static HRESULT WINAPI wbem_context_GetNames( + IWbemContext *iface, + LONG flags, + SAFEARRAY **names ) +{ + FIXME("%p, %#x, %p\n", iface, flags, names); + + return E_NOTIMPL; +} + +static HRESULT WINAPI wbem_context_BeginEnumeration( + IWbemContext *iface, + LONG flags ) +{ + FIXME("%p, %#x\n", iface, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI wbem_context_Next( + IWbemContext *iface, + LONG flags, + BSTR *name, + VARIANT *value ) +{ + FIXME("%p, %#x, %p, %p\n", iface, flags, name, value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI wbem_context_EndEnumeration( + IWbemContext *iface ) +{ + FIXME("%p\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI wbem_context_SetValue( + IWbemContext *iface, + LPCWSTR name, + LONG flags, + VARIANT *value ) +{ + FIXME("%p, %s, %#x, %p\n", iface, debugstr_w(name), flags, value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI wbem_context_GetValue( + IWbemContext *iface, + LPCWSTR name, + LONG flags, + VARIANT *value ) +{ + FIXME("%p, %s, %#x, %p\n", iface, debugstr_w(name), flags, value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI wbem_context_DeleteValue( + IWbemContext *iface, + LPCWSTR name, + LONG flags ) +{ + FIXME("%p, %s, %#x\n", iface, debugstr_w(name), flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI wbem_context_DeleteAll( + IWbemContext *iface ) +{ + FIXME("%p\n", iface); + + return E_NOTIMPL; +} + +static const IWbemContextVtbl wbem_context_vtbl = +{ + wbem_context_QueryInterface, + wbem_context_AddRef, + wbem_context_Release, + wbem_context_Clone, + wbem_context_GetNames, + wbem_context_BeginEnumeration, + wbem_context_Next, + wbem_context_EndEnumeration, + wbem_context_SetValue, + wbem_context_GetValue, + wbem_context_DeleteValue, + wbem_context_DeleteAll, +}; + +HRESULT WbemContext_create( void **obj ) +{ + struct wbem_context *context; + + TRACE("(%p)\n", obj); + + context = heap_alloc( sizeof(*context) ); + if (!context) return E_OUTOFMEMORY; + + context->IWbemContext_iface.lpVtbl = &wbem_context_vtbl; + context->refs = 1; + + *obj = &context->IWbemContext_iface; + + TRACE("returning iface %p\n", *obj); + return S_OK; +} diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index cf45ed712b6..a60d39f1ef2 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -149,10 +149,22 @@ static void test_IWbemLocator(void) IWbemLocator_Release( locator ); } +static void test_IWbemContext(void) +{ + IWbemContext *context; + HRESULT hr; + + hr = CoCreateInstance( &CLSID_WbemContext, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemContext, (void **)&context ); + ok(hr == S_OK, "Failed to create context object, hr %#x.\n", hr); + + IWbemContext_Release( context ); +} + START_TEST(services) { CoInitialize( NULL ); test_IClientSecurity(); test_IWbemLocator(); + test_IWbemContext(); CoUninitialize(); } diff --git a/dlls/wbemprox/wbemprox.idl b/dlls/wbemprox/wbemprox.idl index 5c6255a39dc..32fee800ee4 100644 --- a/dlls/wbemprox/wbemprox.idl +++ b/dlls/wbemprox/wbemprox.idl @@ -27,6 +27,13 @@ ] coclass WbemLocator { interface IWbemLocator; } +[ + helpstring("WBEM Call Context"), + threading(both), + uuid(674b6698-ee92-11d0-ad71-00c04fd8fdff) +] +coclass WbemContext { interface IWbemContext; } + [ helpstring("WBEM Administrative Locator"), threading(both), diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index ff9a7f6ff82..ac857b859e8 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -237,6 +237,7 @@ HRESULT create_signature( const WCHAR *, const WCHAR *, enum param_direction, HRESULT WbemLocator_create(LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemServices_create(const WCHAR *, LPVOID *) DECLSPEC_HIDDEN; +HRESULT WbemContext_create(void **) DECLSPEC_HIDDEN; HRESULT create_class_object(const WCHAR *, IEnumWbemClassObject *, UINT, struct record *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT EnumWbemClassObject_create(struct query *, LPVOID *) DECLSPEC_HIDDEN; diff --git a/include/wbemcli.idl b/include/wbemcli.idl index 4a2c1f785c9..f5c7f1bf44a 100644 --- a/include/wbemcli.idl +++ b/include/wbemcli.idl @@ -936,3 +936,12 @@ coclass WbemRefresher interface IWbemRefresher; interface IWbemConfigureRefresher; }; + +[ + restricted, + uuid(674b6698-ee92-11d0-ad71-00c04fd8fdff) +] +coclass WbemContext +{ + interface IWbemContext; +} -- 2.30.0 [View Less]

2 1

[PATCH] ntdll/tests: Avoid passing an uninitialized timeout to NtNotifyChangeKey().
by Zebediah Figura 24 Feb '21

24 Feb '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/reg.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index ac1dec9f2f8..7463f98aa29 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1850,7 +1850,7 @@ static void test_NtQueryKey(void) static void test_notify(void) { OBJECT_ATTRIBUTES attr; - LARGE_INTEGER timeout; + static const LARGE_INTEGER timeout; … [View More]

1 0

[PATCH 2/3] ntdll: Make cpu_info global.
by Jacek Caban 23 Feb '21

23 Feb '21

And use it in a few more places. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/signal_x86_64.c | 16 ++++++---------- dlls/ntdll/unix/system.c | 2 +- dlls/ntdll/unix/unix_private.h | 1 + 3 files changed, 8 insertions(+), 11 deletions(-)

1 1

[PATCH 5/5] d3d11: Always return the rectangle count in d3d11_immediate_context_RSGetScissorRects().
by Henri Verbeet 23 Feb '21

23 Feb '21

From: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 200186. dlls/d3d11/device.c | 9 ++------- dlls/d3d11/tests/d3d11.c | 6 +++--- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index a5d9dc1aa7be..c8ec35a59c0f 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2270,… [View More]14 +2270,9 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetScissorRects(ID3D11De wined3d_device_get_scissor_rects(device->wined3d_device, &actual_count, rects); wined3d_mutex_unlock(); - if (!rects) - { - *rect_count = actual_count; - return; - } - - if (*rect_count > actual_count) + if (rects && *rect_count > actual_count) memset(&rects[actual_count], 0, (*rect_count - actual_count) * sizeof(*rects)); + *rect_count = actual_count; } static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetShaderResources(ID3D11DeviceContext1 *iface, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2eff98fe8fcf..32a9dc2e5306 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -7235,7 +7235,7 @@ static void test_device_context_state(void) memset(tmp_rect, 0xa5, sizeof(tmp_rect)); count = 2; ID3D11DeviceContext1_RSGetScissorRects(context, &count, tmp_rect); - todo_wine ok(count == 0, "Got unexpected scissor rect count %u.\n", count); + ok(count == 0, "Got unexpected scissor rect count %u.\n", count); tmp_sob = (ID3D11Buffer *)0xdeadbeef; ID3D11DeviceContext1_SOGetTargets(context, 1, &tmp_sob); @@ -7514,7 +7514,7 @@ static void test_device_context_state(void) memset(tmp_rect, 0xa5, sizeof(tmp_rect)); count = 2; ID3D11DeviceContext1_RSGetScissorRects(context, &count, tmp_rect); - todo_wine ok(count == 1, "Got scissor rect count %u, expected 1.\n", count); + ok(count == 1, "Got scissor rect count %u, expected 1.\n", count); ok(!memcmp(tmp_rect, &rect, sizeof(rect)), "Got scissor rect %s, expected %s.\n", wine_dbgstr_rect(tmp_rect), wine_dbgstr_rect(&rect)); @@ -7962,7 +7962,7 @@ static void test_device_context_state(void) memset(tmp_rect, 0xa5, sizeof(tmp_rect)); count = 2; ID3D11DeviceContext1_RSGetScissorRects(context, &count, tmp_rect); - todo_wine ok(count == 1, "Got scissor rect count %u, expected 1.\n", count); + ok(count == 1, "Got scissor rect count %u, expected 1.\n", count); ok(!memcmp(tmp_rect, &rect, sizeof(rect)), "Got scissor rect %s, expected %s.\n", wine_dbgstr_rect(tmp_rect), wine_dbgstr_rect(&rect)); -- 2.20.1 [View Less]

2 1

[PATCH vkd3d v2 1/3] vkd3d-shader: Implement hlsl_error() and hlsl_warning().
by Zebediah Figura 23 Feb '21

23 Feb '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Makefile.am | 1 - libs/vkd3d-shader/hlsl.c | 18 +- libs/vkd3d-shader/hlsl.h | 8 +- libs/vkd3d-shader/hlsl.l | 3 +- libs/vkd3d-shader/hlsl.y | 204 ++++++++++++----------- libs/vkd3d-shader/vkd3d_shader_private.h | 18 ++ 6 files changed, 147 insertions(+), 105 deletions(-) diff --git a/Makefile.am b/Makefile.am index … [View More]065b9817..3c219e8a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -246,7 +246,6 @@ XFAIL_TESTS = \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-comma.shader_test \ - tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 9e1eb7ee..1f9a3927 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -31,16 +31,26 @@ void hlsl_note(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, /* FIXME */ } -void hlsl_error(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, const char *fmt, ...) +void hlsl_error(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, + enum vkd3d_shader_error error, const char *fmt, ...) { - /* FIXME */ + va_list args; + + va_start(args, fmt); + vkd3d_shader_verror(ctx->message_context, &loc, error, fmt, args); + va_end(args); ctx->failed = true; } -void hlsl_warning(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, const char *fmt, ...) +void hlsl_warning(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, + enum vkd3d_shader_error error, const char *fmt, ...) { - /* FIXME */ + va_list args; + + va_start(args, fmt); + vkd3d_shader_vwarning(ctx->message_context, &loc, error, fmt, args); + va_end(args); } bool hlsl_add_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, bool local_var) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 56b8e2a8..9122b097 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -546,10 +546,10 @@ struct hlsl_ir_load *hlsl_new_var_load(struct hlsl_ir_var *var, const struct vkd void hlsl_message(const char *fmt, ...) VKD3D_PRINTF_FUNC(1,2) DECLSPEC_HIDDEN; -void hlsl_error(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, - const char *fmt, ...) VKD3D_PRINTF_FUNC(3, 4) DECLSPEC_HIDDEN; -void hlsl_warning(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, - const char *fmt, ...) VKD3D_PRINTF_FUNC(3, 4) DECLSPEC_HIDDEN; +void hlsl_error(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, enum vkd3d_shader_error error, + const char *fmt, ...) VKD3D_PRINTF_FUNC(4, 5) DECLSPEC_HIDDEN; +void hlsl_warning(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, enum vkd3d_shader_error error, + const char *fmt, ...) VKD3D_PRINTF_FUNC(4, 5) DECLSPEC_HIDDEN; void hlsl_note(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, enum vkd3d_shader_log_level level, const char *fmt, ...) VKD3D_PRINTF_FUNC(4, 5) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index 933c9b88..4cc0a3ea 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -65,7 +65,8 @@ ANY (.) {RESERVED4} { struct hlsl_ctx *ctx = yyget_extra(yyscanner); - hlsl_error(ctx, *yylloc, "Reserved keyword \"%s\" used.\n", yytext); + hlsl_error(ctx, *yylloc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, + "Reserved keyword \"%s\" used.", yytext); } BlendState {return KW_BLENDSTATE; } diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index c33d97c6..b6d03243 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -113,7 +113,7 @@ int yylex(HLSL_YYSTYPE *yylval_param, HLSL_YYLTYPE *yylloc_param, void *yyscanne static void yyerror(YYLTYPE *loc, void *scanner, struct hlsl_ctx *ctx, const char *s) { - hlsl_error(ctx, *loc, "%s", s); + hlsl_error(ctx, *loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "%s", s); } static struct hlsl_ir_node *node_from_list(struct list *list) @@ -124,7 +124,8 @@ static struct hlsl_ir_node *node_from_list(struct list *list) static void check_invalid_matrix_modifiers(struct hlsl_ctx *ctx, DWORD modifiers, struct vkd3d_shader_location loc) { if (modifiers & HLSL_MODIFIERS_MAJORITY_MASK) - hlsl_error(ctx, loc, "'row_major' or 'column_major' modifiers are only allowed for matrices."); + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, + "'row_major' and 'column_major' modifiers are only allowed for matrices."); } static bool convertible_data_type(struct hlsl_type *type) @@ -257,14 +258,16 @@ static struct hlsl_ir_node *add_implicit_conversion(struct hlsl_ctx *ctx, struct char *src_string = hlsl_type_to_string(src_type), *dst_string = hlsl_type_to_string(dst_type); if (src_string && dst_string) - hlsl_error(ctx, *loc, "Can't implicitly convert from %s to %s.", src_string, dst_string); + hlsl_error(ctx, *loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Can't implicitly convert from %s to %s.", src_string, dst_string); vkd3d_free(src_string); vkd3d_free(dst_string); return NULL; } if (dst_type->dimx * dst_type->dimy < src_type->dimx * src_type->dimy) - hlsl_warning(ctx, *loc, "implicit truncation of vector type"); + hlsl_warning(ctx, *loc, VKD3D_SHADER_WARNING_HLSL_IMPLICIT_TRUNCATION, "Implicit truncation of %s type.", + src_type->type == HLSL_CLASS_VECTOR ? "vector" : "matrix"); if (!(cast = hlsl_new_cast(node, dst_type, loc))) return NULL; @@ -289,14 +292,15 @@ static bool declare_variable(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, boo char *string; if ((string = hlsl_modifiers_to_string(invalid))) - hlsl_error(ctx, decl->loc, + hlsl_error(ctx, decl->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, "Modifiers '%s' are not allowed on local variables.", string); vkd3d_free(string); } if (decl->semantic) { - hlsl_error(ctx, decl->loc, "semantics are not allowed on local variables"); + hlsl_error(ctx, decl->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SEMANTIC, + "Semantics are not allowed on local variables."); return false; } } @@ -304,7 +308,8 @@ static bool declare_variable(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, boo { if (hlsl_get_function(ctx, decl->name)) { - hlsl_error(ctx, decl->loc, "redefinition of '%s'", decl->name); + hlsl_error(ctx, decl->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, + "Variable '%s' is already defined as a function.", decl->name); return false; } } @@ -313,8 +318,9 @@ static bool declare_variable(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, boo { struct hlsl_ir_var *old = hlsl_get_var(ctx->cur_scope, decl->name); - hlsl_error(ctx, decl->loc, "\"%s\" already declared", decl->name); - hlsl_note(ctx, old->loc, VKD3D_SHADER_LOG_ERROR, "\"%s\" was previously declared here", old->name); + hlsl_error(ctx, decl->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, + "Variable \"%s\" was already declared in this scope.", decl->name); + hlsl_note(ctx, old->loc, VKD3D_SHADER_LOG_ERROR, "\"%s\" was previously declared here.", old->name); return false; } return true; @@ -327,13 +333,15 @@ static DWORD add_modifiers(struct hlsl_ctx *ctx, DWORD modifiers, DWORD mod, con char *string; if ((string = hlsl_modifiers_to_string(mod))) - hlsl_error(ctx, loc, "Modifier '%s' was already specified.", string); + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, + "Modifier '%s' was already specified.", string); vkd3d_free(string); return modifiers; } if ((mod & HLSL_MODIFIERS_MAJORITY_MASK) && (modifiers & HLSL_MODIFIERS_MAJORITY_MASK)) { - hlsl_error(ctx, loc, "more than one matrix majority keyword"); + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, + "'row_major' and 'column_major' modifiers are mutually exclusive."); return modifiers; } return modifiers | mod; @@ -541,7 +549,7 @@ static struct hlsl_ir_jump *add_return(struct hlsl_ctx *ctx, struct list *instrs } else if (!hlsl_type_is_void(return_type)) { - hlsl_error(ctx, loc, "non-void function must return a value"); + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_RETURN, "Non-void function must return a value."); return NULL; } @@ -631,9 +639,9 @@ static struct hlsl_ir_load *add_array_load(struct hlsl_ctx *ctx, struct list *in else { if (expr_type->type == HLSL_CLASS_SCALAR) - hlsl_error(ctx, loc, "array-indexed expression is scalar"); + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_INDEX, "Scalar expressions cannot be array-indexed."); else - hlsl_error(ctx, loc, "expression is not array-indexable"); + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_INDEX, "Expression cannot be array-indexed."); return NULL; } @@ -733,7 +741,7 @@ static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *ty field->semantic = v->semantic; if (v->initializer.args_count) { - hlsl_error(ctx, v->loc, "struct field with an initializer.\n"); + hlsl_error(ctx, v->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "Illegal initializer on a struct field.\n"); free_parse_initializer(&v->initializer); } list_add_tail(list, &field->entry); @@ -768,12 +776,13 @@ static bool add_typedef(struct hlsl_ctx *ctx, DWORD modifiers, struct hlsl_type if ((type->modifiers & HLSL_MODIFIER_COLUMN_MAJOR) && (type->modifiers & HLSL_MODIFIER_ROW_MAJOR)) - hlsl_error(ctx, v->loc, "more than one matrix majority keyword"); + hlsl_error(ctx, v->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, + "'row_major' and 'column_major' modifiers are mutually exclusive."); ret = hlsl_scope_add_type(ctx->cur_scope, type); if (!ret) - hlsl_error(ctx, v->loc, - "redefinition of custom type '%s'", v->name); + hlsl_error(ctx, v->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, + "Type '%s' is already defined.", v->name); vkd3d_free(v); } vkd3d_free(list); @@ -1009,7 +1018,8 @@ static struct hlsl_type *expr_common_type(struct hlsl_ctx *ctx, struct hlsl_type if (t1->type > HLSL_CLASS_LAST_NUMERIC || t2->type > HLSL_CLASS_LAST_NUMERIC) { - hlsl_error(ctx, *loc, "non scalar/vector/matrix data type in expression"); + hlsl_error(ctx, *loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Non-numeric types cannot be used in expressions."); return NULL; } @@ -1018,7 +1028,8 @@ static struct hlsl_type *expr_common_type(struct hlsl_ctx *ctx, struct hlsl_type if (!expr_compatible_data_types(t1, t2)) { - hlsl_error(ctx, *loc, "expression data types are incompatible"); + hlsl_error(ctx, *loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Expression data types are incompatible."); return NULL; } @@ -1121,9 +1132,9 @@ static struct hlsl_ir_expr *add_expr(struct hlsl_ctx *ctx, struct list *instrs, continue; if (operands[i]->data_type->dimx * operands[i]->data_type->dimy != 1 && operands[i]->data_type->dimx * operands[i]->data_type->dimy != type->dimx * type->dimy) - { - hlsl_warning(ctx, operands[i]->loc, "implicit truncation of vector/matrix type"); - } + hlsl_warning(ctx, operands[i]->loc, VKD3D_SHADER_WARNING_HLSL_IMPLICIT_TRUNCATION, + "Implicit truncation of %s type.", + operands[i]->data_type->type == HLSL_CLASS_VECTOR ? "vector" : "matrix"); if (!(cast = hlsl_new_cast(operands[i], type, &operands[i]->loc))) return NULL; @@ -1261,7 +1272,7 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in hlsl_src_from_node(&swizzle->val, rhs); if (!invert_swizzle(&swizzle->swizzle, &writemask, &width)) { - hlsl_error(ctx, lhs->loc, "invalid writemask"); + hlsl_error(ctx, lhs->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_WRITEMASK, "Invalid writemask."); vkd3d_free(assign); return NULL; } @@ -1272,7 +1283,7 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in } else { - hlsl_error(ctx, lhs->loc, "invalid lvalue"); + hlsl_error(ctx, lhs->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_LVALUE, "Invalid lvalue."); vkd3d_free(assign); return NULL; } @@ -1308,7 +1319,8 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, stru if (initializer_size(initializer) != hlsl_type_component_count(type)) { - hlsl_error(ctx, var->loc, "structure initializer mismatch"); + hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Wrong number of parameters in struct initializer."); free_parse_initializer(initializer); return; } @@ -1396,7 +1408,8 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t if (type->modifiers & HLSL_MODIFIER_CONST && !(var->modifiers & HLSL_STORAGE_UNIFORM) && !v->initializer.args_count) { - hlsl_error(ctx, v->loc, "const variable without initializer"); + hlsl_error(ctx, v->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_INITIALIZER, + "Const variable \"%s\" is missing an initializer.", var->name); hlsl_free_var(var); vkd3d_free(v); continue; @@ -1420,8 +1433,8 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t { if (size < type->dimx * type->dimy) { - hlsl_error(ctx, v->loc, - "'%s' initializer does not match", v->name); + hlsl_error(ctx, v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Wrong number of parameters in numeric initializer."); free_parse_initializer(&v->initializer); vkd3d_free(v); continue; @@ -1430,8 +1443,8 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) && hlsl_type_component_count(type) != size) { - hlsl_error(ctx, v->loc, - "'%s' initializer does not match", v->name); + hlsl_error(ctx, v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Wrong number of parameters in initializer."); free_parse_initializer(&v->initializer); vkd3d_free(v); continue; @@ -1710,14 +1723,14 @@ hlsl_prog: { if (decl->body && $2.decl->body) { - hlsl_error(ctx, $2.decl->loc, - "redefinition of function \"%s\"", $2.name); + hlsl_error(ctx, $2.decl->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, + "Function \"%s\" is already defined.", $2.name); YYABORT; } else if (!hlsl_type_compare(decl->return_type, $2.decl->return_type)) { - hlsl_error(ctx, $2.decl->loc, - "redefining function \"%s\" with a different return type", $2.name); + hlsl_error(ctx, $2.decl->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, + "Function \"%s\" was already declared with a different return type.", $2.name); hlsl_note(ctx, decl->loc, VKD3D_SHADER_LOG_ERROR, "\"%s\" previously declared here", $2.name); YYABORT; @@ -1725,10 +1738,8 @@ hlsl_prog: } if (hlsl_type_is_void($2.decl->return_type) && $2.decl->semantic) - { - hlsl_error(ctx, $2.decl->loc, - "void function with a semantic"); - } + hlsl_error(ctx, $2.decl->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SEMANTIC, + "Semantics are not allowed on void functions."); hlsl_add_function(&ctx->functions, $2.name, $2.decl, false); } @@ -1772,15 +1783,11 @@ struct_declaration: if (!$3) { if (!$2->name) - { - hlsl_error(ctx, @2, - "anonymous struct declaration with no variables"); - } + hlsl_error(ctx, @2, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, + "Anonymous struct type must declare a variable."); if (modifiers) - { - hlsl_error(ctx, @1, - "modifier not allowed on struct type declaration"); - } + hlsl_error(ctx, @1, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, + "Modifiers are not allowed on struct type declataions."); } if (!(type = apply_type_modifiers(ctx, $2, &modifiers, @1))) @@ -1801,14 +1808,14 @@ named_struct_spec: if (hlsl_get_var(ctx->cur_scope, $2)) { - hlsl_error(ctx, @2, "redefinition of '%s'", $2); + hlsl_error(ctx, @2, VKD3D_SHADER_ERROR_HLSL_REDEFINED, "\"%s\" is already declared as a variable.", $2); YYABORT; } ret = hlsl_scope_add_type(ctx->cur_scope, $$); if (!ret) { - hlsl_error(ctx, @2, "redefinition of struct '%s'", $2); + hlsl_error(ctx, @2, VKD3D_SHADER_ERROR_HLSL_REDEFINED, "Struct \"%s\" is already defined.", $2); YYABORT; } } @@ -1841,7 +1848,8 @@ fields_list: ret = add_struct_field($$, field); if (ret == false) { - hlsl_error(ctx, @2, "redefinition of '%s'", field->name); + hlsl_error(ctx, @2, VKD3D_SHADER_ERROR_HLSL_REDEFINED, + "Field \"%s\" is already defined.", field->name); vkd3d_free(field); } } @@ -1882,17 +1890,19 @@ func_prototype: { if ($1) { - hlsl_error(ctx, @1, "unexpected modifiers on a function"); + hlsl_error(ctx, @1, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, + "Modifiers are not allowed on functions."); YYABORT; } if (hlsl_get_var(ctx->globals, $3)) { - hlsl_error(ctx, @3, "redefinition of '%s'\n", $3); + hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_REDEFINED, "Function \"%s\" is already defined.", $3); YYABORT; } if (hlsl_type_is_void($2) && $7.semantic) { - hlsl_error(ctx, @7, "void function with a semantic"); + hlsl_error(ctx, @7, VKD3D_SHADER_ERROR_HLSL_INVALID_SEMANTIC, + "Semantics are not allowed on void functions."); } if ($7.reg_reservation) @@ -1995,7 +2005,8 @@ param_list: $$ = $1; if (!add_func_parameter(ctx, $$, &$3, @3)) { - hlsl_error(ctx, @3, "duplicate parameter %s", $3.name); + hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_REDEFINED, + "Parameter \"%s\" is already declared.", $3.name); YYABORT; } } @@ -2026,8 +2037,7 @@ input_mods: { if ($1 & $2) { - hlsl_error(ctx, @2, - "duplicate input-output modifiers"); + hlsl_error(ctx, @2, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, "Duplicate modifiers specified."); YYABORT; } $$ = $1 | $2; @@ -2056,14 +2066,14 @@ type: { if ($3->type != HLSL_CLASS_SCALAR) { - hlsl_error(ctx, @3, - "vectors of non-scalar types are not allowed\n"); + hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Vectors of non-scalar types are not allowed."); YYABORT; } if ($5 < 1 || $5 > 4) { - hlsl_error(ctx, @5, - "vector size must be between 1 and 4\n"); + hlsl_error(ctx, @5, VKD3D_SHADER_ERROR_HLSL_INVALID_SIZE, + "Vector size must be between 1 and 4."); YYABORT; } @@ -2073,20 +2083,20 @@ type: { if ($3->type != HLSL_CLASS_SCALAR) { - hlsl_error(ctx, @3, - "matrices of non-scalar types are not allowed\n"); + hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Matrices of non-scalar types are not allowed."); YYABORT; } if ($5 < 1 || $5 > 4) { - hlsl_error(ctx, @5, - "matrix row count must be between 1 and 4\n"); + hlsl_error(ctx, @5, VKD3D_SHADER_ERROR_HLSL_INVALID_SIZE, + "Matrix row count must be between 1 and 4."); YYABORT; } if ($7 < 1 || $7 > 4) { - hlsl_error(ctx, @7, - "matrix column count must be between 1 and 4\n"); + hlsl_error(ctx, @7, VKD3D_SHADER_ERROR_HLSL_INVALID_SIZE, + "Matrix column count must be between 1 and 4."); YYABORT; } @@ -2127,7 +2137,7 @@ base_type: { $$ = hlsl_get_type(ctx->cur_scope, $2, true); if ($$->type != HLSL_CLASS_STRUCT) - hlsl_error(ctx, @1, "'%s' redefined as a structure\n", $2); + hlsl_error(ctx, @1, VKD3D_SHADER_ERROR_HLSL_REDEFINED, "\"%s\" redefined as a structure.", $2); vkd3d_free($2); } @@ -2151,7 +2161,8 @@ typedef: if ($2 & ~HLSL_TYPE_MODIFIERS_MASK) { struct parse_variable_def *v, *v_next; - hlsl_error(ctx, @1, "modifier not allowed on typedefs"); + hlsl_error(ctx, @1, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, + "Storage modifiers are not allowed on typedefs."); LIST_FOR_EACH_ENTRY_SAFE(v, v_next, $4, struct parse_variable_def, entry) vkd3d_free(v); vkd3d_free($4); @@ -2248,15 +2259,15 @@ array: if (!size) { - hlsl_error(ctx, @2, - "array size is not a positive integer constant\n"); + hlsl_error(ctx, @2, VKD3D_SHADER_ERROR_HLSL_INVALID_SIZE, + "Array size is not a positive integer constant."); YYABORT; } if (size > 65536) { - hlsl_error(ctx, @2, - "array size must be between 1 and 65536"); + hlsl_error(ctx, @2, VKD3D_SHADER_ERROR_HLSL_INVALID_SIZE, + "Array size must be between 1 and 65536."); YYABORT; } $$ = size; @@ -2408,8 +2419,8 @@ selection_statement: vkd3d_free($5.then_instrs); vkd3d_free($5.else_instrs); if (condition->data_type->dimx > 1 || condition->data_type->dimy > 1) - hlsl_error(ctx, instr->node.loc, - "if condition requires a scalar"); + hlsl_error(ctx, instr->node.loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "if condition requires a scalar."); $$ = $3; list_add_tail($$, &instr->node.entry); } @@ -2498,7 +2509,7 @@ primary_expr: if (!(var = hlsl_get_var(ctx->cur_scope, $1))) { - hlsl_error(ctx, @1, "variable '%s' is not declared\n", $1); + hlsl_error(ctx, @1, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED, "Variable \"%s\" is not defined.", $1); YYABORT; } if ((load = hlsl_new_var_load(var, @1))) @@ -2522,7 +2533,7 @@ postfix_expr: if (node_from_list($1)->data_type->modifiers & HLSL_MODIFIER_CONST) { - hlsl_error(ctx, @2, "modifying a const expression"); + hlsl_error(ctx, @2, VKD3D_SHADER_ERROR_HLSL_MODIFIES_CONST, "Statement modifies a const expression."); YYABORT; } inc = hlsl_new_unary_expr(HLSL_IR_UNOP_POSTINC, node_from_list($1), @2); @@ -2537,7 +2548,7 @@ postfix_expr: if (node_from_list($1)->data_type->modifiers & HLSL_MODIFIER_CONST) { - hlsl_error(ctx, @2, "modifying a const expression"); + hlsl_error(ctx, @2, VKD3D_SHADER_ERROR_HLSL_MODIFIES_CONST, "Statement modifies a const expression."); YYABORT; } inc = hlsl_new_unary_expr(HLSL_IR_UNOP_POSTDEC, node_from_list($1), @2); @@ -2568,7 +2579,7 @@ postfix_expr: } if (!$$) { - hlsl_error(ctx, @3, "invalid subscript \"%s\"", $3); + hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED, "Field \"%s\" is not defined.", $3); YYABORT; } } @@ -2578,14 +2589,14 @@ postfix_expr: if (!(swizzle = get_swizzle(ctx, node, $3, &@3))) { - hlsl_error(ctx, @3, "invalid swizzle \"%s\"", $3); + hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "Invalid swizzle \"%s\".", $3); YYABORT; } $$ = append_unop($1, &swizzle->node); } else { - hlsl_error(ctx, @3, "invalid subscript \"%s\"", $3); + hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "Invalid subscript \"%s\".", $3); YYABORT; } } @@ -2598,7 +2609,7 @@ postfix_expr: if (index->data_type->type != HLSL_CLASS_SCALAR) { - hlsl_error(ctx, @3, "array index is not scalar"); + hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, "Array index is not scalar."); hlsl_free_instr_list($1); YYABORT; } @@ -2623,20 +2634,20 @@ postfix_expr: if ($1) { - hlsl_error(ctx, @1, - "unexpected modifier on a constructor\n"); + hlsl_error(ctx, @1, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, + "Modifiers are not allowed on constructors."); YYABORT; } if ($2->type > HLSL_CLASS_LAST_NUMERIC) { - hlsl_error(ctx, @2, - "constructors may only be used with numeric data types\n"); + hlsl_error(ctx, @2, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Constructors may only be used with numeric data types."); YYABORT; } if ($2->dimx * $2->dimy != initializer_size(&$4)) { - hlsl_error(ctx, @4, - "expected %u components in constructor, but got %u\n", + hlsl_error(ctx, @4, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Expected %u components in constructor, but got %u.", $2->dimx * $2->dimy, initializer_size(&$4)); YYABORT; } @@ -2654,7 +2665,8 @@ postfix_expr: if (arg->data_type->type == HLSL_CLASS_OBJECT) { - hlsl_error(ctx, arg->loc, "invalid constructor argument"); + hlsl_error(ctx, arg->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Invalid type for constructor argument."); continue; } width = hlsl_type_component_count(arg->data_type); @@ -2687,7 +2699,7 @@ unary_expr: { if (node_from_list($2)->data_type->modifiers & HLSL_MODIFIER_CONST) { - hlsl_error(ctx, @1, "modifying a const expression"); + hlsl_error(ctx, @1, VKD3D_SHADER_ERROR_HLSL_MODIFIES_CONST, "Statement modifies a const expression."); YYABORT; } $$ = append_unop($2, hlsl_new_unary_expr(HLSL_IR_UNOP_PREINC, node_from_list($2), @1)); @@ -2696,7 +2708,7 @@ unary_expr: { if (node_from_list($2)->data_type->modifiers & HLSL_MODIFIER_CONST) { - hlsl_error(ctx, @1, "modifying a const expression"); + hlsl_error(ctx, @1, VKD3D_SHADER_ERROR_HLSL_MODIFIES_CONST, "Statement modifies a const expression."); YYABORT; } $$ = append_unop($2, hlsl_new_unary_expr(HLSL_IR_UNOP_PREDEC, node_from_list($2), @1)); @@ -2720,7 +2732,8 @@ unary_expr: if ($2) { - hlsl_error(ctx, @3, "unexpected modifier in a cast"); + hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, + "Modifiers are not allowed on casts."); YYABORT; } @@ -2734,7 +2747,8 @@ unary_expr: char *src_string = hlsl_type_to_string(src_type), *dst_string = hlsl_type_to_string(dst_type); if (src_string && dst_string) - hlsl_error(ctx, @3, "Can't cast from %s to %s.", src_string, dst_string); + hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, "Can't cast from %s to %s.", + src_string, dst_string); vkd3d_free(src_string); vkd3d_free(dst_string); YYABORT; @@ -2879,7 +2893,7 @@ assignment_expr: if (lhs->data_type->modifiers & HLSL_MODIFIER_CONST) { - hlsl_error(ctx, @2, "l-value is const"); + hlsl_error(ctx, @2, VKD3D_SHADER_ERROR_HLSL_MODIFIES_CONST, "Statement modifies a const expression."); YYABORT; } list_move_tail($3, $1); @@ -3103,8 +3117,8 @@ int hlsl_parser_compile(struct hlsl_ctx *ctx, const char *entrypoint) if (!hlsl_type_is_void(entry_func->return_type) && entry_func->return_type->type != HLSL_CLASS_STRUCT && !entry_func->semantic) { - hlsl_error(ctx, entry_func->loc, - "entry point \"%s\" is missing a return value semantic", entry_func->func->name); + hlsl_error(ctx, entry_func->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_SEMANTIC, + "Entry point \"%s\" is missing a return value semantic.", entry_func->func->name); } list_move_head(entry_func->body, &ctx->static_initializers); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 6101c385..2d7eb05b 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -91,6 +91,24 @@ enum vkd3d_shader_error VKD3D_SHADER_WARNING_PP_UNTERMINATED_MACRO = 4304, VKD3D_SHADER_WARNING_PP_UNTERMINATED_IF = 4305, VKD3D_SHADER_WARNING_PP_DIV_BY_ZERO = 4306, + + VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX = 5000, + VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER = 5001, + VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE = 5002, + VKD3D_SHADER_ERROR_HLSL_MODIFIES_CONST = 5003, + VKD3D_SHADER_ERROR_HLSL_MISSING_SEMANTIC = 5004, + VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED = 5005, + VKD3D_SHADER_ERROR_HLSL_REDEFINED = 5006, + VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT = 5007, + VKD3D_SHADER_ERROR_HLSL_INVALID_SIZE = 5008, + VKD3D_SHADER_ERROR_HLSL_MISSING_INITIALIZER = 5009, + VKD3D_SHADER_ERROR_HLSL_INVALID_LVALUE = 5010, + VKD3D_SHADER_ERROR_HLSL_INVALID_WRITEMASK = 5011, + VKD3D_SHADER_ERROR_HLSL_INVALID_INDEX = 5012, + VKD3D_SHADER_ERROR_HLSL_INVALID_SEMANTIC = 5013, + VKD3D_SHADER_ERROR_HLSL_INVALID_RETURN = 5014, + + VKD3D_SHADER_WARNING_HLSL_IMPLICIT_TRUNCATION = 5300, }; enum vkd3d_shader_opcode -- 2.30.1 [View Less]

3 8

[PATCH 4/5] d3d11: Implement d3d11_immediate_context_SwapDeviceContextState() on top of wined3d_device_set_state().
by Henri Verbeet 23 Feb '21

23 Feb '21

Based on a patch by Rémi Bernon. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 200188. dlls/d3d11/d3d11_private.h | 36 ++--- dlls/d3d11/device.c | 293 +++++++++++++++++++++++-------------- dlls/d3d11/tests/d3d11.c | 140 +++++++----------- 3 files changed, 250 insertions(+), 219 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 650b5c358716..a64d6975f857 100644 --- a/dlls/d3d11/d3d11_private.h +++ … [View More]b/dlls/d3d11/d3d11_private.h @@ -516,6 +516,12 @@ struct d3d_query *unsafe_impl_from_ID3D11Query(ID3D11Query *iface) DECLSPEC_HIDD struct d3d_query *unsafe_impl_from_ID3D10Query(ID3D10Query *iface) DECLSPEC_HIDDEN; struct d3d_query *unsafe_impl_from_ID3D11Asynchronous(ID3D11Asynchronous *iface) DECLSPEC_HIDDEN; +struct d3d_device_context_state_entry +{ + struct d3d_device *device; + struct wined3d_state *wined3d_state; +}; + /* ID3DDeviceContextState */ struct d3d_device_context_state { @@ -523,30 +529,12 @@ struct d3d_device_context_state LONG refcount, private_refcount; struct wined3d_private_store private_store; - struct - { - ID3D11VertexShader *shader; - ID3D11SamplerState *samplers[D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT]; - ID3D11ShaderResourceView *srvs[D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT]; - ID3D11Buffer *cbs[D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT]; - } vs; - struct - { - ID3D11GeometryShader *shader; - ID3D11SamplerState *samplers[D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT]; - ID3D11ShaderResourceView *srvs[D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT]; - ID3D11Buffer *cbs[D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT]; - } gs; - struct - { - ID3D11PixelShader *shader; - ID3D11SamplerState *samplers[D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT]; - ID3D11ShaderResourceView *srvs[D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT]; - ID3D11Buffer *cbs[D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT]; - } ps; - GUID emulated_interface; + struct d3d_device_context_state_entry *entries; + SIZE_T entries_size; + SIZE_T entry_count; + struct wined3d_device *wined3d_device; ID3D11Device2 *device; }; @@ -585,6 +573,10 @@ struct d3d_device struct wine_rb_tree depthstencil_states; struct wine_rb_tree rasterizer_states; struct wine_rb_tree sampler_states; + + struct d3d_device_context_state **context_states; + SIZE_T context_states_size; + SIZE_T context_state_count; }; static inline struct d3d_device *impl_from_ID3D11Device(ID3D11Device *iface) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index b0041c858816..a5d9dc1aa7be 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -22,6 +22,32 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); +static BOOL d3d_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, SIZE_T size) +{ + SIZE_T max_capacity, new_capacity; + void *new_elements; + + if (count <= *capacity) + return TRUE; + + max_capacity = ~(SIZE_T)0 / size; + if (count > max_capacity) + return FALSE; + + new_capacity = max(1, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = count; + + if (!(new_elements = heap_realloc(*elements, new_capacity * size))) + return FALSE; + + *elements = new_elements; + *capacity = new_capacity; + return TRUE; +} + static void STDMETHODCALLTYPE d3d_null_wined3d_object_destroyed(void *parent) {} static const struct wined3d_parent_ops d3d_null_wined3d_parent_ops = @@ -88,9 +114,27 @@ static ULONG STDMETHODCALLTYPE d3d_device_context_state_AddRef(ID3DDeviceContext return refcount; } +static void d3d_device_remove_context_state(struct d3d_device *device, struct d3d_device_context_state *state) +{ + unsigned int i; + + for (i = 0; i < device->context_state_count; ++i) + { + if (device->context_states[i] != state) + continue; + + if (i != device->context_state_count - 1) + device->context_states[i] = device->context_states[device->context_state_count - 1]; + --device->context_state_count; + break; + } +} + static void d3d_device_context_state_private_release(struct d3d_device_context_state *state) { ULONG refcount = InterlockedDecrement(&state->private_refcount); + struct d3d_device_context_state_entry *entry; + struct d3d_device *device; unsigned int i; TRACE("%p decreasing private refcount to %u.\n", state, refcount); @@ -98,27 +142,17 @@ static void d3d_device_context_state_private_release(struct d3d_device_context_s if (!refcount) { wined3d_private_store_cleanup(&state->private_store); - if (state->vs.shader) ID3D11VertexShader_Release(state->vs.shader); - if (state->gs.shader) ID3D11GeometryShader_Release(state->gs.shader); - if (state->ps.shader) ID3D11PixelShader_Release(state->ps.shader); - for (i = 0; i < D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT; ++i) - { - if (state->vs.samplers[i]) ID3D11SamplerState_Release(state->vs.samplers[i]); - if (state->gs.samplers[i]) ID3D11SamplerState_Release(state->gs.samplers[i]); - if (state->ps.samplers[i]) ID3D11SamplerState_Release(state->ps.samplers[i]); - } - for (i = 0; i < D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT; ++i) + for (i = 0; i < state->entry_count; ++i) { - if (state->vs.srvs[i]) ID3D11ShaderResourceView_Release(state->vs.srvs[i]); - if (state->gs.srvs[i]) ID3D11ShaderResourceView_Release(state->gs.srvs[i]); - if (state->ps.srvs[i]) ID3D11ShaderResourceView_Release(state->ps.srvs[i]); - } - for (i = 0; i < D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT; ++i) - { - if (state->vs.cbs[i]) ID3D11Buffer_Release(state->vs.cbs[i]); - if (state->gs.cbs[i]) ID3D11Buffer_Release(state->gs.cbs[i]); - if (state->ps.cbs[i]) ID3D11Buffer_Release(state->ps.cbs[i]); + entry = &state->entries[i]; + device = entry->device; + + if (entry->wined3d_state != wined3d_device_get_state(device->wined3d_device)) + wined3d_state_destroy(entry->wined3d_state); + + d3d_device_remove_context_state(device, state); } + heap_free(state->entries); wined3d_device_decref(state->wined3d_device); heap_free(state); } @@ -194,6 +228,85 @@ static const struct ID3DDeviceContextStateVtbl d3d_device_context_state_vtbl = /* ID3DDeviceContextState methods */ }; +static struct d3d_device_context_state_entry *d3d_device_context_state_get_entry( + struct d3d_device_context_state *state, struct d3d_device *device) +{ + unsigned int i; + + for (i = 0; i < state->entry_count; ++i) + { + if (state->entries[i].device == device) + return &state->entries[i]; + } + + return NULL; +} + +static BOOL d3d_device_context_state_add_entry(struct d3d_device_context_state *state, + struct d3d_device *device, struct wined3d_state *wined3d_state) +{ + struct d3d_device_context_state_entry *entry; + + if (!d3d_array_reserve((void **)&state->entries, &state->entries_size, + state->entry_count + 1, sizeof(*state->entries))) + return FALSE; + + if (!d3d_array_reserve((void **)&device->context_states, &device->context_states_size, + device->context_state_count + 1, sizeof(*device->context_states))) + return FALSE; + + entry = &state->entries[state->entry_count++]; + entry->device = device; + entry->wined3d_state = wined3d_state; + + device->context_states[device->context_state_count++] = state; + + return TRUE; +} + +static void d3d_device_context_state_remove_entry(struct d3d_device_context_state *state, struct d3d_device *device) +{ + struct d3d_device_context_state_entry *entry; + unsigned int i; + + for (i = 0; i < state->entry_count; ++i) + { + entry = &state->entries[i]; + if (entry->device != device) + continue; + + if (entry->wined3d_state != wined3d_device_get_state(device->wined3d_device)) + wined3d_state_destroy(entry->wined3d_state); + + if (i != state->entry_count) + state->entries[i] = state->entries[state->entry_count - 1]; + --state->entry_count; + + break; + } +} + +static struct wined3d_state *d3d_device_context_state_get_wined3d_state(struct d3d_device_context_state *state, + struct d3d_device *device) +{ + struct d3d_device_context_state_entry *entry; + struct wined3d_state *wined3d_state; + + if ((entry = d3d_device_context_state_get_entry(state, device))) + return entry->wined3d_state; + + if (FAILED(wined3d_state_create(device->wined3d_device, &wined3d_state))) + return NULL; + + if (!d3d_device_context_state_add_entry(state, device, wined3d_state)) + { + wined3d_state_destroy(wined3d_state); + return NULL; + } + + return wined3d_state; +} + static void d3d_device_context_state_init(struct d3d_device_context_state *state, struct d3d_device *device, REFIID emulated_interface) { @@ -201,9 +314,6 @@ static void d3d_device_context_state_init(struct d3d_device_context_state *state state->refcount = state->private_refcount = 0; wined3d_private_store_init(&state->private_store); - memset(&state->vs, 0, sizeof(state->vs)); - memset(&state->gs, 0, sizeof(state->gs)); - memset(&state->ps, 0, sizeof(state->ps)); state->emulated_interface = *emulated_interface; wined3d_device_incref(state->wined3d_device = device->wined3d_device); @@ -2722,98 +2832,39 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetConstantBuffers1(ID3D iface, start_slot, buffer_count, buffers, first_constant, num_constants); } -static void d3d11_immediate_context_capture_state(ID3D11DeviceContext1 *iface, struct d3d_device_context_state *state) +static void STDMETHODCALLTYPE d3d11_immediate_context_SwapDeviceContextState(ID3D11DeviceContext1 *iface, + ID3DDeviceContextState *state, ID3DDeviceContextState **prev) { - wined3d_mutex_lock(); - - d3d11_immediate_context_VSGetShader(iface, &state->vs.shader, NULL, 0); - d3d11_immediate_context_VSGetSamplers(iface, 0, - D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT, state->vs.samplers); - d3d11_immediate_context_VSGetShaderResources(iface, 0, - D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT, state->vs.srvs); - d3d11_immediate_context_VSGetConstantBuffers(iface, 0, - D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, state->vs.cbs); - - d3d11_immediate_context_GSGetShader(iface, &state->gs.shader, NULL, 0); - d3d11_immediate_context_GSGetSamplers(iface, 0, - D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT, state->gs.samplers); - d3d11_immediate_context_GSGetShaderResources(iface, 0, - D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT, state->gs.srvs); - d3d11_immediate_context_GSGetConstantBuffers(iface, 0, - D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, state->gs.cbs); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d_device_context_state *state_impl, *prev_impl; + struct wined3d_state *wined3d_state; - d3d11_immediate_context_PSGetShader(iface, &state->ps.shader, NULL, 0); - d3d11_immediate_context_PSGetSamplers(iface, 0, - D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT, state->ps.samplers); - d3d11_immediate_context_PSGetShaderResources(iface, 0, - D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT, state->ps.srvs); - d3d11_immediate_context_PSGetConstantBuffers(iface, 0, - D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, state->ps.cbs); + FIXME("iface %p, state %p, prev %p semi-stub!\n", iface, state, prev); - wined3d_mutex_unlock(); -} + if (!state) + { + if (prev) + *prev = NULL; + return; + } -static void d3d11_immediate_context_restore_state(ID3D11DeviceContext1 *iface, struct d3d_device_context_state *state) -{ wined3d_mutex_lock(); - d3d11_immediate_context_VSSetShader(iface, state->vs.shader, NULL, 0); - d3d11_immediate_context_VSSetSamplers(iface, 0, - D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT, state->vs.samplers); - d3d11_immediate_context_VSSetShaderResources(iface, 0, - D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT, state->vs.srvs); - d3d11_immediate_context_VSSetConstantBuffers(iface, 0, - D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, state->vs.cbs); + prev_impl = device->state; + state_impl = impl_from_ID3DDeviceContextState(state); + if (!(wined3d_state = d3d_device_context_state_get_wined3d_state(state_impl, device))) + ERR("Failed to get wined3d state for device context state %p.\n", state_impl); + wined3d_device_set_state(device->wined3d_device, wined3d_state); - d3d11_immediate_context_GSSetShader(iface, state->gs.shader, NULL, 0); - d3d11_immediate_context_GSSetSamplers(iface, 0, - D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT, state->gs.samplers); - d3d11_immediate_context_GSSetShaderResources(iface, 0, - D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT, state->gs.srvs); - d3d11_immediate_context_GSSetConstantBuffers(iface, 0, - D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, state->gs.cbs); + if (prev) + ID3DDeviceContextState_AddRef(*prev = &prev_impl->ID3DDeviceContextState_iface); - d3d11_immediate_context_PSSetShader(iface, state->ps.shader, NULL, 0); - d3d11_immediate_context_PSSetSamplers(iface, 0, - D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT, state->ps.samplers); - d3d11_immediate_context_PSSetShaderResources(iface, 0, - D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT, state->ps.srvs); - d3d11_immediate_context_PSSetConstantBuffers(iface, 0, - D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, state->ps.cbs); + d3d_device_context_state_private_addref(state_impl); + device->state = state_impl; + d3d_device_context_state_private_release(prev_impl); - wined3d_mutex_unlock(); -} - -static void STDMETHODCALLTYPE d3d11_immediate_context_SwapDeviceContextState(ID3D11DeviceContext1 *iface, - ID3DDeviceContextState *state, ID3DDeviceContextState **prev_state) -{ - struct d3d_device_context_state *state_impl; - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); - - FIXME("iface %p, state %p, prev_state %p semi-stub!\n", iface, state, prev_state); - - if (prev_state) *prev_state = NULL; - if (!state) return; - - wined3d_mutex_lock(); - if (prev_state) - { - *prev_state = NULL; - if ((state_impl = heap_alloc(sizeof(*state_impl)))) - { - d3d_device_context_state_init(state_impl, device, &device->state->emulated_interface); - d3d11_immediate_context_capture_state(iface, state_impl); - *prev_state = &state_impl->ID3DDeviceContextState_iface; - } - } - - if ((state_impl = impl_from_ID3DDeviceContextState(state))) - { - d3d11_immediate_context_restore_state(iface, state_impl); - device->state->emulated_interface = state_impl->emulated_interface; - if (d3d_device_is_d3d10_active(device)) - FIXME("D3D10 interface emulation not fully implemented yet!\n"); - } + if (d3d_device_is_d3d10_active(device)) + FIXME("D3D10 interface emulation not fully implemented yet!\n"); wined3d_mutex_unlock(); } @@ -4027,9 +4078,12 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeviceContextState(ID3D11Dev if (state) { - *state = NULL; - if (!(state_impl = heap_alloc(sizeof(*state_impl)))) + if (!(state_impl = heap_alloc_zero(sizeof(*state_impl)))) + { + *state = NULL; return E_OUTOFMEMORY; + } + d3d_device_context_state_init(state_impl, device, emulated_interface); *state = &state_impl->ID3DDeviceContextState_iface; } @@ -4211,12 +4265,19 @@ static ULONG STDMETHODCALLTYPE d3d_device_inner_Release(IUnknown *iface) { struct d3d_device *device = impl_from_IUnknown(iface); ULONG refcount = InterlockedDecrement(&device->refcount); + unsigned int i; TRACE("%p decreasing refcount to %u.\n", device, refcount); if (!refcount) { - if (device->state) d3d_device_context_state_private_release(device->state); + if (device->state) + d3d_device_context_state_private_release(device->state); + for (i = 0; i < device->context_state_count; ++i) + { + d3d_device_context_state_remove_entry(device->context_states[i], device); + } + heap_free(device->context_states); d3d11_immediate_context_destroy(&device->immediate_context); if (device->wined3d_device) { @@ -6394,6 +6455,7 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par struct wined3d_device *wined3d_device) { struct d3d_device *device = device_from_wined3d_device_parent(device_parent); + struct wined3d_state *wined3d_state; ID3DDeviceContextState *state; HRESULT hr; @@ -6407,13 +6469,18 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par if (FAILED(hr = d3d11_device_CreateDeviceContextState(&device->ID3D11Device2_iface, 0, &device->feature_level, 1, D3D11_SDK_VERSION, device->d3d11_only ? &IID_ID3D11Device2 : &IID_ID3D10Device1, NULL, &state))) - ERR("Failed to create the initial device context state, hr %#x.\n", hr); - else { - device->state = impl_from_ID3DDeviceContextState(state); - d3d_device_context_state_private_addref(device->state); - ID3DDeviceContextState_Release(state); + ERR("Failed to create the initial device context state, hr %#x.\n", hr); + return; } + + device->state = impl_from_ID3DDeviceContextState(state); + wined3d_state = wined3d_device_get_state(device->wined3d_device); + if (!d3d_device_context_state_add_entry(device->state, device, wined3d_state)) + ERR("Failed to add entry for wined3d state %p, device %p.\n", wined3d_state, device); + + d3d_device_context_state_private_addref(device->state); + ID3DDeviceContextState_Release(state); } static void CDECL device_parent_mode_changed(struct wined3d_device_parent *device_parent) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 1505b3fddbc7..2eff98fe8fcf 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -7083,7 +7083,7 @@ static void test_device_context_state(void) ID3D11DeviceContext1_SwapDeviceContextState(context, context_state, &previous_context_state); ok(previous_context_state != NULL, "Failed to get previous context state\n"); refcount = get_refcount(vs); - todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); hr = ID3DDeviceContextState_SetPrivateData(context_state, &test_guid, sizeof(constant), &constant); ok(hr == S_OK, "Failed to set private data, hr %#x.\n", hr); @@ -7093,9 +7093,9 @@ static void test_device_context_state(void) data_size = sizeof(data); memset(data, 0xa5, sizeof(data)); hr = ID3DDeviceContextState_GetPrivateData(context_state, &test_guid, &data_size, data); - todo_wine ok(hr == S_OK, "Failed to get private data, hr %#x.\n", hr); - todo_wine ok(data_size == sizeof(constant), "Got private data size %x, expected %x.\n", data_size, sizeof(constant)); - todo_wine ok(!memcmp(data, &constant, sizeof(constant)), "Got unexpected private data.\n"); + ok(hr == S_OK, "Failed to get private data, hr %#x.\n", hr); + ok(data_size == sizeof(constant), "Got private data size %x, expected %x.\n", data_size, sizeof(constant)); + ok(!memcmp(data, &constant, sizeof(constant)), "Got unexpected private data.\n"); ID3D11DeviceContext1_SwapDeviceContextState(context, context_state, NULL); context_type = ID3D11DeviceContext1_GetType(context); @@ -7142,118 +7142,96 @@ static void test_device_context_state(void) tmp_cb = (ID3D11Buffer *)0xdeadbeef; ID3D11DeviceContext1_HSGetConstantBuffers(context, 0, 1, &tmp_cb); - todo_wine ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); - if (tmp_cb) ID3D11Buffer_Release(tmp_cb); + ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; ID3D11DeviceContext1_HSGetSamplers(context, 0, 1, &tmp_sampler); - todo_wine ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); - if (tmp_sampler) ID3D11SamplerState_Release(tmp_sampler); + ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); tmp_hs = (ID3D11HullShader *)0xdeadbeef; ID3D11DeviceContext1_HSGetShader(context, &tmp_hs, NULL, NULL); - if (hs) todo_wine ok(!tmp_hs, "Got unexpected shader %p.\n", tmp_hs); - if (tmp_hs) ID3D11HullShader_Release(tmp_hs); + if (hs) ok(!tmp_hs, "Got unexpected shader %p.\n", tmp_hs); tmp_srv = (ID3D11ShaderResourceView *)0xdeadbeef; ID3D11DeviceContext1_HSGetShaderResources(context, 0, 1, &tmp_srv); - todo_wine ok(!tmp_srv, "Got unexpected srv %p.\n", tmp_srv); - if (tmp_srv) ID3D11ShaderResourceView_Release(tmp_srv); + ok(!tmp_srv, "Got unexpected srv %p.\n", tmp_srv); tmp_cb = (ID3D11Buffer *)0xdeadbeef; ID3D11DeviceContext1_DSGetConstantBuffers(context, 0, 1, &tmp_cb); - todo_wine ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); - if (tmp_cb) ID3D11Buffer_Release(tmp_cb); + ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; ID3D11DeviceContext1_DSGetSamplers(context, 0, 1, &tmp_sampler); - todo_wine ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); - if (tmp_sampler) ID3D11SamplerState_Release(tmp_sampler); + ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); tmp_ds = (ID3D11DomainShader *)0xdeadbeef; ID3D11DeviceContext1_DSGetShader(context, &tmp_ds, NULL, NULL); - if (ds) todo_wine ok(!tmp_ds, "Got unexpected shader %p.\n", tmp_ds); - if (tmp_ds) ID3D11DomainShader_Release(tmp_ds); + if (ds) ok(!tmp_ds, "Got unexpected shader %p.\n", tmp_ds); tmp_srv = (ID3D11ShaderResourceView *)0xdeadbeef; ID3D11DeviceContext1_DSGetShaderResources(context, 0, 1, &tmp_srv); - todo_wine ok(!tmp_srv, "Got unexpected srv %p.\n", tmp_srv); - if (tmp_srv) ID3D11ShaderResourceView_Release(tmp_srv); + ok(!tmp_srv, "Got unexpected srv %p.\n", tmp_srv); tmp_cb = (ID3D11Buffer *)0xdeadbeef; ID3D11DeviceContext1_CSGetConstantBuffers(context, 0, 1, &tmp_cb); - todo_wine ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); - if (tmp_cb) ID3D11Buffer_Release(tmp_cb); + ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; ID3D11DeviceContext1_CSGetSamplers(context, 0, 1, &tmp_sampler); - todo_wine ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); - if (tmp_sampler) ID3D11SamplerState_Release(tmp_sampler); + ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); tmp_cs = (ID3D11ComputeShader *)0xdeadbeef; ID3D11DeviceContext1_CSGetShader(context, &tmp_cs, NULL, NULL); - if (cs) todo_wine ok(!tmp_cs, "Got unexpected shader %p.\n", tmp_cs); - if (tmp_cs) ID3D11ComputeShader_Release(tmp_cs); + if (cs) ok(!tmp_cs, "Got unexpected shader %p.\n", tmp_cs); tmp_srv = (ID3D11ShaderResourceView *)0xdeadbeef; ID3D11DeviceContext1_CSGetShaderResources(context, 0, 1, &tmp_srv); - todo_wine ok(!tmp_srv, "Got unexpected srv %p.\n", tmp_srv); - if (tmp_srv) ID3D11ShaderResourceView_Release(tmp_srv); + ok(!tmp_srv, "Got unexpected srv %p.\n", tmp_srv); tmp_uav = (ID3D11UnorderedAccessView *)0xdeadbeef; ID3D11DeviceContext1_CSGetUnorderedAccessViews(context, 0, 1, &tmp_uav); - todo_wine ok(!tmp_uav, "Got unexpected uav %p.\n", tmp_uav); - if (tmp_uav) ID3D11UnorderedAccessView_Release(tmp_uav); + ok(!tmp_uav, "Got unexpected uav %p.\n", tmp_uav); topo = 0xdeadbeef; ID3D11DeviceContext1_IAGetPrimitiveTopology(context, &topo); - todo_wine ok(topo == D3D11_PRIMITIVE_TOPOLOGY_UNDEFINED, "Got unexpected topology %#x.\n", topo); + ok(topo == D3D11_PRIMITIVE_TOPOLOGY_UNDEFINED, "Got unexpected topology %#x.\n", topo); tmp_il = (ID3D11InputLayout *)0xdeadbeef; ID3D11DeviceContext1_IAGetInputLayout(context, &tmp_il); - todo_wine ok(!tmp_il, "Got unexpected input layout %p.\n", tmp_il); - if (tmp_il) ID3D11InputLayout_Release(tmp_il); + ok(!tmp_il, "Got unexpected input layout %p.\n", tmp_il); tmp_ib = (ID3D11Buffer *)0xdeadbeef; format = 0xdeadbeef; offset = 0xdeadbeef; ID3D11DeviceContext1_IAGetIndexBuffer(context, &tmp_ib, &format, &offset); - todo_wine ok(!tmp_ib, "Got unexpected input buffer %p.\n", tmp_ib); - if (tmp_ib) ID3D11Buffer_Release(tmp_ib); - todo_wine ok(format == DXGI_FORMAT_UNKNOWN, "Got unexpected input buffer format %#x.\n", format); - todo_wine ok(offset == 0, "Got unexpected input buffer offset %#x.\n", offset); + ok(!tmp_ib, "Got unexpected input buffer %p.\n", tmp_ib); + ok(format == DXGI_FORMAT_UNKNOWN, "Got unexpected input buffer format %#x.\n", format); + ok(offset == 0, "Got unexpected input buffer offset %#x.\n", offset); tmp_vb = (ID3D11Buffer *)0xdeadbeef; stride = 0xdeadbeef; offset = 0xdeadbeef; ID3D11DeviceContext1_IAGetVertexBuffers(context, 0, 1, &tmp_vb, &stride, &offset); - todo_wine ok(!tmp_vb, "Got unexpected vertex buffer %p.\n", tmp_vb); - if (tmp_vb) ID3D11Buffer_Release(tmp_vb); - todo_wine ok(stride == 0, "Got unexpected vertex buffer stride %#x.\n", stride); - todo_wine ok(offset == 0, "Got unexpected vertex buffer offset %#x.\n", offset); + ok(!tmp_vb, "Got unexpected vertex buffer %p.\n", tmp_vb); + ok(stride == 0, "Got unexpected vertex buffer stride %#x.\n", stride); + ok(offset == 0, "Got unexpected vertex buffer offset %#x.\n", offset); tmp_rtv = (ID3D11RenderTargetView *)0xdeadbeef; tmp_dsv = (ID3D11DepthStencilView *)0xdeadbeef; tmp_uav = (ID3D11UnorderedAccessView *)0xdeadbeef; ID3D11DeviceContext1_OMGetRenderTargetsAndUnorderedAccessViews(context, 1, &tmp_rtv, &tmp_dsv, 1, 1, &tmp_uav); - todo_wine ok(!tmp_rtv, "Got unexpected rendertarget view %p.\n", tmp_rtv); - if (tmp_rtv) ID3D11RenderTargetView_Release(tmp_rtv); - todo_wine ok(!tmp_dsv, "Got unexpected depth/stencil view %p.\n", tmp_dsv); - if (tmp_dsv) ID3D11DepthStencilView_Release(tmp_dsv); - todo_wine ok(!tmp_uav, "Got unexpected unordered access view %p.\n", tmp_uav); - if (tmp_uav) ID3D11UnorderedAccessView_Release(tmp_uav); + ok(!tmp_rtv, "Got unexpected rendertarget view %p.\n", tmp_rtv); + ok(!tmp_dsv, "Got unexpected depth/stencil view %p.\n", tmp_dsv); + ok(!tmp_uav, "Got unexpected unordered access view %p.\n", tmp_uav); tmp_bs = (ID3D11BlendState *)0xdeadbeef; memset(blend_factor, 0xcd, sizeof(blend_factor)); sample_mask = 0xdeadbeef; ID3D11DeviceContext1_OMGetBlendState(context, &tmp_bs, blend_factor, &sample_mask); - todo_wine ok(!tmp_bs, "Got unexpected blend state %p.\n", tmp_bs); - if (tmp_bs) ID3D11BlendState_Release(tmp_bs); - todo_wine ok(!memcmp(blend_factor, default_blend_factor, sizeof(blend_factor)), + ok(!tmp_bs, "Got unexpected blend state %p.\n", tmp_bs); + ok(!memcmp(blend_factor, default_blend_factor, sizeof(blend_factor)), "Got unexpected blend factor %f,%f,%f,%f.\n", blend_factor[0], blend_factor[1], blend_factor[2], blend_factor[3]); - todo_wine ok(sample_mask == ~0, "Got unexpected sample mask %#x.\n", sample_mask); + ok(sample_mask == ~0, "Got unexpected sample mask %#x.\n", sample_mask); tmp_dss = (ID3D11DepthStencilState *)0xdeadbeef; stencil_ref = 0xdeadbeef; ID3D11DeviceContext1_OMGetDepthStencilState(context, &tmp_dss, &stencil_ref); - todo_wine ok(!tmp_dss, "Got unexpected depth/stencil state %p.\n", tmp_dss); - if (tmp_dss) ID3D11DepthStencilState_Release(tmp_dss); - todo_wine ok(stencil_ref == 0, "Got unexpected stencil ref %#x.\n", stencil_ref); + ok(!tmp_dss, "Got unexpected depth/stencil state %p.\n", tmp_dss); + ok(stencil_ref == 0, "Got unexpected stencil ref %#x.\n", stencil_ref); tmp_rs = (ID3D11RasterizerState *)0xdeadbeef; ID3D11DeviceContext1_RSGetState(context, &tmp_rs); - todo_wine ok(!tmp_rs, "Got unexpected rasterizer state %p.\n", tmp_rs); - if (tmp_rs) ID3D11RasterizerState_Release(tmp_rs); + ok(!tmp_rs, "Got unexpected rasterizer state %p.\n", tmp_rs); memset(tmp_vp, 0xa5, sizeof(tmp_vp)); count = 2; ID3D11DeviceContext1_RSGetViewports(context, &count, tmp_vp); - todo_wine ok(count == 0, "Got unexpected viewport count %u.\n", count); + ok(count == 0, "Got unexpected viewport count %u.\n", count); memset(tmp_rect, 0xa5, sizeof(tmp_rect)); count = 2; ID3D11DeviceContext1_RSGetScissorRects(context, &count, tmp_rect); @@ -7261,15 +7239,13 @@ static void test_device_context_state(void) tmp_sob = (ID3D11Buffer *)0xdeadbeef; ID3D11DeviceContext1_SOGetTargets(context, 1, &tmp_sob); - todo_wine ok(!tmp_sob, "Got unexpected stream output buffer %p.\n", tmp_sob); - if (tmp_sob) ID3D11Buffer_Release(tmp_sob); + ok(!tmp_sob, "Got unexpected stream output buffer %p.\n", tmp_sob); tmp_pred = (ID3D11Predicate *)0xdeadbeef; pred_value = 0xdeadbeef; ID3D11DeviceContext1_GetPredication(context, &tmp_pred, &pred_value); - todo_wine ok(!tmp_pred, "Got unexpected predicate %p.\n", tmp_pred); - if (tmp_pred) ID3D11Predicate_Release(tmp_pred); - todo_wine ok(!pred_value, "Got unexpected predicate value %d.\n", pred_value); + ok(!tmp_pred, "Got unexpected predicate %p.\n", tmp_pred); + ok(!pred_value, "Got unexpected predicate value %d.\n", pred_value); /* updating the device context should also update the device context state */ hr = ID3D11Device1_CreateVertexShader(device, simple_vs, sizeof(simple_vs), NULL, &vs2); @@ -7277,14 +7253,13 @@ static void test_device_context_state(void) ID3D11DeviceContext1_VSSetShader(context, vs2, NULL, 0); ID3D11DeviceContext1_SwapDeviceContextState(context, context_state, &tmp_context_state); refcount = ID3DDeviceContextState_Release(tmp_context_state); - todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); - todo_wine ok(tmp_context_state == context_state, "Got unexpected state pointer.\n"); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + ok(tmp_context_state == context_state, "Got unexpected state pointer.\n"); tmp_vs = (ID3D11VertexShader *)0xdeadbeef; ID3D11DeviceContext1_VSGetShader(context, &tmp_vs, NULL, NULL); - todo_wine ok(tmp_vs == vs2, "Got shader %p, expected %p.\n", tmp_vs, vs2); - if (tmp_vs) refcount = ID3D11VertexShader_Release(tmp_vs); - else refcount = 0; - todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + ok(tmp_vs == vs2, "Got shader %p, expected %p.\n", tmp_vs, vs2); + refcount = ID3D11VertexShader_Release(tmp_vs); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); /* context states may be used with other devices instances too */ d3d11_device2 = create_device(NULL); @@ -7305,17 +7280,16 @@ static void test_device_context_state(void) /* updating context2 vertex shader doesn't update other contexts using the same state */ ID3D11DeviceContext1_VSSetShader(context2, vs, NULL, 0); ID3D11DeviceContext1_VSGetShader(context, &tmp_vs, NULL, NULL); - todo_wine ok(tmp_vs == vs2, "Got shader %p, expected %p.\n", tmp_vs, vs2); - if (tmp_vs) refcount = ID3D11VertexShader_Release(tmp_vs); - else refcount = 0; - todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + ok(tmp_vs == vs2, "Got shader %p, expected %p.\n", tmp_vs, vs2); + refcount = ID3D11VertexShader_Release(tmp_vs); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); ID3D11DeviceContext1_SwapDeviceContextState(context2, tmp_context_state, &context_state2); refcount = ID3DDeviceContextState_Release(tmp_context_state); ok(refcount == 0, "Got refcount %u, expected 1.\n", refcount); refcount = ID3DDeviceContextState_Release(context_state2); - todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); - todo_wine ok(context_state2 == context_state, "Got unexpected state pointer.\n"); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + ok(context_state2 == context_state, "Got unexpected state pointer.\n"); /* swapping the default state on context2 effectively clears the vertex shader */ tmp_vs = (ID3D11VertexShader *)0xdeadbeef; @@ -7333,19 +7307,17 @@ static void test_device_context_state(void) ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); tmp_vs = (ID3D11VertexShader *)0xdeadbeef; ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); - todo_wine ok(tmp_vs == vs, "Got shader %p, expected %p.\n", tmp_vs, vs); - if (tmp_vs) refcount = ID3D11VertexShader_Release(tmp_vs); - else refcount = 0; - todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + ok(tmp_vs == vs, "Got shader %p, expected %p.\n", tmp_vs, vs); + refcount = ID3D11VertexShader_Release(tmp_vs); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); /* even after swapping it again */ ID3D11DeviceContext1_SwapDeviceContextState(context2, context_state, NULL); tmp_vs = (ID3D11VertexShader *)0xdeadbeef; ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); - todo_wine ok(tmp_vs == vs, "Got shader %p, expected %p.\n", tmp_vs, vs); - if (tmp_vs) refcount = ID3D11VertexShader_Release(tmp_vs); - else refcount = 0; - todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + ok(tmp_vs == vs, "Got shader %p, expected %p.\n", tmp_vs, vs); + refcount = ID3D11VertexShader_Release(tmp_vs); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); /* swapping the initial state on context2 doesn't have side effect on context either */ ID3D11DeviceContext1_SwapDeviceContextState(context2, previous_context_state, NULL); @@ -7362,10 +7334,10 @@ static void test_device_context_state(void) refcount = ID3DDeviceContextState_Release(previous_context_state); ok(!refcount, "Got refcount %u, expected 0.\n", refcount); refcount = ID3DDeviceContextState_Release(tmp_context_state); - todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); refcount = ID3DDeviceContextState_Release(context_state); ok(!refcount, "Got refcount %u, expected 0.\n", refcount); - todo_wine ok(tmp_context_state == context_state, "Got unexpected state pointer.\n"); + ok(tmp_context_state == context_state, "Got unexpected state pointer.\n"); refcount = get_refcount(vs); ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); -- 2.20.1 [View Less]

2 1

[PATCH 3/5] wined3d: Introduce public API to set a wined3d_state object on a device.
by Henri Verbeet 23 Feb '21

23 Feb '21

From: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patches 200183 and 200187. dlls/wined3d/device.c | 139 ++++++++++++++++++++++++++++++++++++-- dlls/wined3d/stateblock.c | 22 ++++++ dlls/wined3d/wined3d.spec | 5 ++ include/wine/wined3d.h | 6 ++ 4 files changed, 167 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/… [View More]dlls/wined3d/device.c index c9df09b53483..7405a38e13b8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -251,7 +251,7 @@ void wined3d_device_cleanup(struct wined3d_device *device) wine_rb_destroy(&device->depth_stencil_states, device_leftover_depth_stencil_state, NULL); wine_rb_destroy(&device->so_descs, device_free_so_desc, NULL); - heap_free(device->state); + wined3d_state_destroy(device->state); device->state = NULL; wined3d_decref(device->wined3d); device->wined3d = NULL; @@ -1926,6 +1926,136 @@ void CDECL wined3d_device_get_scissor_rects(const struct wined3d_device *device, *rect_count = state->scissor_rect_count; } +void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3d_state *state) +{ + const struct wined3d_light_info *light; + unsigned int i, j; + + TRACE("device %p, state %p.\n", device, state); + + device->state = state; + + for (i = 0; i < WINED3D_MAX_RENDER_TARGETS; ++i) + { + wined3d_cs_emit_set_rendertarget_view(device->cs, i, state->fb.render_targets[i]); + } + + wined3d_cs_emit_set_depth_stencil_view(device->cs, state->fb.depth_stencil); + wined3d_cs_emit_set_vertex_declaration(device->cs, state->vertex_declaration); + + for (i = 0; i < WINED3D_MAX_STREAM_OUTPUT_BUFFERS; ++i) + { + wined3d_cs_emit_set_stream_output(device->cs, i, + state->stream_output[i].buffer, state->stream_output[i].offset); + } + + for (i = 0; i < WINED3D_MAX_STREAMS; ++i) + { + wined3d_cs_emit_set_stream_source(device->cs, i, state->streams[i].buffer, + state->streams[i].offset, state->streams[i].stride); + } + + wined3d_cs_emit_set_index_buffer(device->cs, state->index_buffer, state->index_format, state->index_offset); + + wined3d_cs_emit_set_predication(device->cs, state->predicate, state->predicate_value); + + for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) + { + wined3d_cs_emit_set_shader(device->cs, i, state->shader[i]); + for (j = 0; j < MAX_CONSTANT_BUFFERS; ++j) + { + wined3d_cs_emit_set_constant_buffer(device->cs, i, j, state->cb[i][j]); + } + for (j = 0; j < MAX_SAMPLER_OBJECTS; ++j) + { + wined3d_cs_emit_set_sampler(device->cs, i, j, state->sampler[i][j]); + } + for (j = 0; j < MAX_SHADER_RESOURCE_VIEWS; ++j) + { + wined3d_cs_emit_set_shader_resource_view(device->cs, i, j, state->shader_resource_view[i][j]); + } + } + + for (i = 0; i < WINED3D_PIPELINE_COUNT; ++i) + { + for (j = 0; j < MAX_UNORDERED_ACCESS_VIEWS; ++j) + { + wined3d_cs_emit_set_unordered_access_view(device->cs, i, j, state->unordered_access_view[i][j], ~0); + } + } + + wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_F, + 0, WINED3D_MAX_VS_CONSTS_F, state->vs_consts_f); + wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_I, + 0, WINED3D_MAX_CONSTS_I, state->vs_consts_i); + wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_B, + 0, WINED3D_MAX_CONSTS_B, state->vs_consts_b); + + wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_PS_F, + 0, WINED3D_MAX_PS_CONSTS_F, state->ps_consts_f); + wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_PS_I, + 0, WINED3D_MAX_CONSTS_I, state->ps_consts_i); + wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_PS_B, + 0, WINED3D_MAX_CONSTS_B, state->ps_consts_b); + + for (i = 0; i < WINED3D_MAX_COMBINED_SAMPLERS; ++i) + { + wined3d_cs_emit_set_texture(device->cs, i, state->textures[i]); + for (j = 0; j < WINED3D_HIGHEST_SAMPLER_STATE + 1; ++j) + { + wined3d_cs_emit_set_sampler_state(device->cs, i, j, state->sampler_states[i][j]); + } + } + + for (i = 0; i < WINED3D_MAX_TEXTURES; ++i) + { + for (j = 0; j < WINED3D_HIGHEST_TEXTURE_STATE + 1; ++j) + { + wined3d_cs_emit_set_texture_state(device->cs, i, j, state->texture_states[i][j]); + } + } + + for (i = 0; i < WINED3D_HIGHEST_TRANSFORM_STATE + 1; ++i) + { + wined3d_cs_emit_set_transform(device->cs, i, state->transforms + i); + } + + for (i = 0; i < WINED3D_MAX_CLIP_DISTANCES; ++i) + { + wined3d_cs_emit_set_clip_plane(device->cs, i, state->clip_planes + i); + } + + wined3d_cs_emit_set_material(device->cs, &state->material); + + wined3d_cs_emit_set_viewports(device->cs, state->viewport_count, state->viewports); + wined3d_cs_emit_set_scissor_rects(device->cs, state->scissor_rect_count, state->scissor_rects); + + for (i = 0; i < LIGHTMAP_SIZE; ++i) + { + LIST_FOR_EACH_ENTRY(light, &state->light_state.light_map[i], struct wined3d_light_info, entry) + { + wined3d_device_set_light(device, light->OriginalIndex, &light->OriginalParms); + wined3d_cs_emit_set_light_enable(device->cs, light->OriginalIndex, light->glIndex != -1); + } + } + + for (i = 0; i < WINEHIGHEST_RENDER_STATE + 1; ++i) + { + wined3d_cs_emit_set_render_state(device->cs, i, state->render_states[i]); + } + + wined3d_cs_emit_set_blend_state(device->cs, state->blend_state, &state->blend_factor, state->sample_mask); + wined3d_cs_emit_set_depth_stencil_state(device->cs, state->depth_stencil_state, state->stencil_ref); + wined3d_cs_emit_set_rasterizer_state(device->cs, state->rasterizer_state); +} + +struct wined3d_state * CDECL wined3d_device_get_state(struct wined3d_device *device) +{ + TRACE("device %p.\n", device); + + return device->state; +} + void CDECL wined3d_device_set_vertex_declaration(struct wined3d_device *device, struct wined3d_vertex_declaration *declaration) { @@ -5952,12 +6082,11 @@ HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined return hr; } - if (!(state = heap_alloc_zero(sizeof(*state)))) + if (FAILED(hr = wined3d_state_create(device, &state))) { - hr = E_OUTOFMEMORY; + ERR("Failed to create device state, hr %#x.\n", hr); goto err; } - state_init(state, &adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); device->state = state; device->max_frame_latency = 3; @@ -5974,7 +6103,7 @@ HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined err: if (state) - heap_free(state); + wined3d_state_destroy(state); for (i = 0; i < ARRAY_SIZE(device->multistate_funcs); ++i) { heap_free(device->multistate_funcs[i]); diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 52124583c90c..97020e1cd407 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1885,6 +1885,28 @@ void state_init(struct wined3d_state *state, const struct wined3d_d3d_info *d3d_ state_init_default(state, d3d_info); } +HRESULT CDECL wined3d_state_create(struct wined3d_device *device, struct wined3d_state **state) +{ + struct wined3d_state *object; + + TRACE("device %p, state %p.\n", device, state); + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + state_init(object, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); + + *state = object; + return S_OK; +} + +void CDECL wined3d_state_destroy(struct wined3d_state *state) +{ + TRACE("state %p.\n", state); + + state_cleanup(state); + heap_free(state); +} + static void stateblock_state_init_default(struct wined3d_stateblock_state *state, const struct wined3d_d3d_info *d3d_info) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 44008119a8dd..6b6480cec8f0 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -98,6 +98,7 @@ @ cdecl wined3d_device_get_rendertarget_view(ptr long) @ cdecl wined3d_device_get_scissor_rects(ptr ptr ptr) @ cdecl wined3d_device_get_software_vertex_processing(ptr) +@ cdecl wined3d_device_get_state(ptr) @ cdecl wined3d_device_get_stream_output(ptr long ptr) @ cdecl wined3d_device_get_stream_source(ptr long ptr ptr ptr) @ cdecl wined3d_device_get_swapchain(ptr long) @@ -151,6 +152,7 @@ @ cdecl wined3d_device_set_rendertarget_view(ptr long ptr long) @ cdecl wined3d_device_set_scissor_rects(ptr long ptr) @ cdecl wined3d_device_set_software_vertex_processing(ptr long) +@ cdecl wined3d_device_set_state(ptr ptr) @ cdecl wined3d_device_set_stream_output(ptr long ptr long) @ cdecl wined3d_device_set_stream_source(ptr long ptr long long) @ cdecl wined3d_device_set_unordered_access_view(ptr long ptr long) @@ -237,6 +239,9 @@ @ cdecl wined3d_shader_resource_view_get_parent(ptr) @ cdecl wined3d_shader_resource_view_incref(ptr) +@ cdecl wined3d_state_create(ptr ptr) +@ cdecl wined3d_state_destroy(ptr) + @ cdecl wined3d_stateblock_apply(ptr ptr) @ cdecl wined3d_stateblock_capture(ptr ptr) @ cdecl wined3d_stateblock_create(ptr ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 96cb6fc1d863..0d67e8c89d17 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2223,6 +2223,7 @@ struct wined3d_resource; struct wined3d_sampler; struct wined3d_shader; struct wined3d_shader_resource_view; +struct wined3d_state; struct wined3d_stateblock; struct wined3d_swapchain; struct wined3d_swapchain_state; @@ -2432,6 +2433,7 @@ struct wined3d_rendertarget_view * __cdecl wined3d_device_get_rendertarget_view( void __cdecl wined3d_device_get_scissor_rects(const struct wined3d_device *device, unsigned int *rect_count, RECT *rect); BOOL __cdecl wined3d_device_get_software_vertex_processing(const struct wined3d_device *device); +struct wined3d_state * __cdecl wined3d_device_get_state(struct wined3d_device *device); struct wined3d_buffer * __cdecl wined3d_device_get_stream_output(struct wined3d_device *device, UINT idx, UINT *offset); HRESULT __cdecl wined3d_device_get_stream_source(const struct wined3d_device *device, @@ -2522,6 +2524,7 @@ HRESULT __cdecl wined3d_device_set_rendertarget_view(struct wined3d_device *devi void __cdecl wined3d_device_set_scissor_rects(struct wined3d_device *device, unsigned int rect_count, const RECT *rect); void __cdecl wined3d_device_set_software_vertex_processing(struct wined3d_device *device, BOOL software); +void __cdecl wined3d_device_set_state(struct wined3d_device *device, struct wined3d_state *state); void __cdecl wined3d_device_set_stream_output(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer, UINT offset); HRESULT __cdecl wined3d_device_set_stream_source(struct wined3d_device *device, @@ -2730,6 +2733,9 @@ void __cdecl wined3d_shader_resource_view_generate_mipmaps(struct wined3d_shader void * __cdecl wined3d_shader_resource_view_get_parent(const struct wined3d_shader_resource_view *view); ULONG __cdecl wined3d_shader_resource_view_incref(struct wined3d_shader_resource_view *view); +HRESULT __cdecl wined3d_state_create(struct wined3d_device *device, struct wined3d_state **state); +void __cdecl wined3d_state_destroy(struct wined3d_state *state); + void __cdecl wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, struct wined3d_stateblock *device_state); void __cdecl wined3d_stateblock_capture(struct wined3d_stateblock *stateblock, -- 2.20.1 [View Less]

1 0

[PATCH 2/5] wined3d: Unbind framebuffer state in state_unbind_resources().
by Henri Verbeet 23 Feb '21

23 Feb '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 13 ------------- dlls/wined3d/stateblock.c | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 792263ca7d8b..c9df09b53483 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1196,7 +1196,6 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) struct wined3d_resource *resource, *… [View More]cursor; struct wined3d_rendertarget_view *view; struct wined3d_texture *texture; - unsigned int i; TRACE("device %p.\n", device); @@ -1224,10 +1223,6 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) wined3d_cs_emit_reset_state(device->cs); state_cleanup(state); - for (i = 0; i < device->adapter->d3d_info.limits.max_rt_count; ++i) - { - wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); - } wine_rb_clear(&device->samplers, device_free_sampler, NULL); wine_rb_clear(&device->rasterizer_states, device_free_rasterizer_state, NULL); @@ -1243,14 +1238,6 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) device->adapter->adapter_ops->adapter_uninit_3d(device); device->d3d_initialized = FALSE; - if ((view = state->fb.depth_stencil)) - { - TRACE("Releasing depth/stencil view %p.\n", view); - - state->fb.depth_stencil = NULL; - wined3d_rendertarget_view_decref(view); - } - if ((view = device->auto_depth_stencil_view)) { device->auto_depth_stencil_view = NULL; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 46588fa4246c..52124583c90c 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -374,6 +374,7 @@ void state_unbind_resources(struct wined3d_state *state) struct wined3d_shader_resource_view *srv; struct wined3d_vertex_declaration *decl; struct wined3d_blend_state *blend_state; + struct wined3d_rendertarget_view *rtv; struct wined3d_sampler *sampler; struct wined3d_texture *texture; struct wined3d_buffer *buffer; @@ -473,6 +474,21 @@ void state_unbind_resources(struct wined3d_state *state) state->blend_state = NULL; wined3d_blend_state_decref(blend_state); } + + for (i = 0; i < ARRAY_SIZE(state->fb.render_targets); ++i) + { + if ((rtv = state->fb.render_targets[i])) + { + state->fb.render_targets[i] = NULL; + wined3d_rendertarget_view_decref(rtv); + } + } + + if ((rtv = state->fb.depth_stencil)) + { + state->fb.depth_stencil = NULL; + wined3d_rendertarget_view_decref(rtv); + } } void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) -- 2.20.1 [View Less]

1 0

[PATCH 1/5] wined3d: Use a separate allocation for the device state.
by Henri Verbeet 23 Feb '21

23 Feb '21

From: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patches 200185 and 200184. dlls/wined3d/cs.c | 10 +- dlls/wined3d/device.c | 417 +++++++++++++++++++-------------- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 251 insertions(+), 180 deletions(-) diff --git a/dlls/… [View More]wined3d/cs.c b/dlls/wined3d/cs.c index 0385b8f46937..4ee3d97b7fc4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -677,7 +677,7 @@ static void wined3d_cs_exec_clear(struct wined3d_cs *cs, const void *data) void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) { - const struct wined3d_state *state = &cs->device->state; + const struct wined3d_state *state = cs->device->state; const struct wined3d_viewport *vp = &state->viewports[0]; struct wined3d_rendertarget_view *view; struct wined3d_cs_clear *op; @@ -886,7 +886,7 @@ static void acquire_compute_pipeline_resources(const struct wined3d_state *state void wined3d_cs_emit_dispatch(struct wined3d_cs *cs, unsigned int group_count_x, unsigned int group_count_y, unsigned int group_count_z) { - const struct wined3d_state *state = &cs->device->state; + const struct wined3d_state *state = cs->device->state; struct wined3d_cs_dispatch *op; op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); @@ -904,7 +904,7 @@ void wined3d_cs_emit_dispatch(struct wined3d_cs *cs, void wined3d_cs_emit_dispatch_indirect(struct wined3d_cs *cs, struct wined3d_buffer *buffer, unsigned int offset) { - const struct wined3d_state *state = &cs->device->state; + const struct wined3d_state *state = cs->device->state; struct wined3d_cs_dispatch *op; op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); @@ -1045,7 +1045,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, enum wined3d_primitive_type pri unsigned int index_count, unsigned int start_instance, unsigned int instance_count, bool indexed) { const struct wined3d_d3d_info *d3d_info = &cs->device->adapter->d3d_info; - const struct wined3d_state *state = &cs->device->state; + const struct wined3d_state *state = cs->device->state; struct wined3d_cs_draw *op; op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); @@ -1069,7 +1069,7 @@ void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, enum wined3d_primitive unsigned int patch_vertex_count, struct wined3d_buffer *buffer, unsigned int offset, bool indexed) { const struct wined3d_d3d_info *d3d_info = &cs->device->adapter->d3d_info; - const struct wined3d_state *state = &cs->device->state; + const struct wined3d_state *state = cs->device->state; struct wined3d_cs_draw *op; op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1fd5f4b012e5..792263ca7d8b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -251,6 +251,8 @@ void wined3d_device_cleanup(struct wined3d_device *device) wine_rb_destroy(&device->depth_stencil_states, device_leftover_depth_stencil_state, NULL); wine_rb_destroy(&device->so_descs, device_free_so_desc, NULL); + heap_free(device->state); + device->state = NULL; wined3d_decref(device->wined3d); device->wined3d = NULL; } @@ -1083,6 +1085,7 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, str { static const struct wined3d_color black = {0.0f, 0.0f, 0.0f, 0.0f}; const struct wined3d_swapchain_desc *swapchain_desc; + struct wined3d_fb_state *fb = &device->state->fb; DWORD clear_flags = 0; unsigned int i; HRESULT hr; @@ -1101,11 +1104,13 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, str } device->swapchains[0] = swapchain; - for (i = 0; i < ARRAY_SIZE(device->state.fb.render_targets); ++i) - if (device->state.fb.render_targets[i]) - wined3d_rtv_bind_count_dec(device->state.fb.render_targets[i]); + for (i = 0; i < ARRAY_SIZE(fb->render_targets); ++i) + { + if (fb->render_targets[i]) + wined3d_rtv_bind_count_dec(fb->render_targets[i]); + } + memset(fb->render_targets, 0, sizeof(fb->render_targets)); - memset(device->state.fb.render_targets, 0, sizeof(device->state.fb.render_targets)); if (FAILED(hr = device->adapter->adapter_ops->adapter_init_3d(device))) goto err_out; device->d3d_initialized = TRUE; @@ -1187,6 +1192,7 @@ static void device_free_depth_stencil_state(struct wine_rb_entry *entry, void *c void wined3d_device_uninit_3d(struct wined3d_device *device) { + struct wined3d_state *state = device->state; struct wined3d_resource *resource, *cursor; struct wined3d_rendertarget_view *view; struct wined3d_texture *texture; @@ -1217,7 +1223,7 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) } wined3d_cs_emit_reset_state(device->cs); - state_cleanup(&device->state); + state_cleanup(state); for (i = 0; i < device->adapter->d3d_info.limits.max_rt_count; ++i) { wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); @@ -1237,11 +1243,11 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) device->adapter->adapter_ops->adapter_uninit_3d(device); device->d3d_initialized = FALSE; - if ((view = device->state.fb.depth_stencil)) + if ((view = state->fb.depth_stencil)) { TRACE("Releasing depth/stencil view %p.\n", view); - device->state.fb.depth_stencil = NULL; + state->fb.depth_stencil = NULL; wined3d_rendertarget_view_decref(view); } @@ -1261,8 +1267,8 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) heap_free(device->swapchains); device->swapchains = NULL; - memset(&device->state, 0, sizeof(device->state)); - state_init(&device->state, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); + memset(state, 0, sizeof(*state)); + state_init(state, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); } /* Enables thread safety in the wined3d device and its resources. Called by DirectDraw @@ -1309,7 +1315,7 @@ void CDECL wined3d_device_set_stream_output(struct wined3d_device *device, UINT return; } - stream = &device->state.stream_output[idx]; + stream = &device->state->stream_output[idx]; prev_buffer = stream->buffer; if (buffer) @@ -1333,8 +1339,8 @@ struct wined3d_buffer * CDECL wined3d_device_get_stream_output(struct wined3d_de } if (offset) - *offset = device->state.stream_output[idx].offset; - return device->state.stream_output[idx].buffer; + *offset = device->state->stream_output[idx].offset; + return device->state->stream_output[idx].buffer; } HRESULT CDECL wined3d_device_set_stream_source(struct wined3d_device *device, UINT stream_idx, @@ -1357,7 +1363,7 @@ HRESULT CDECL wined3d_device_set_stream_source(struct wined3d_device *device, UI return WINED3DERR_INVALIDCALL; } - stream = &device->state.streams[stream_idx]; + stream = &device->state->streams[stream_idx]; prev_buffer = stream->buffer; if (prev_buffer == buffer @@ -1394,7 +1400,7 @@ HRESULT CDECL wined3d_device_get_stream_source(const struct wined3d_device *devi return WINED3DERR_INVALIDCALL; } - stream = &device->state.streams[stream_idx]; + stream = &device->state->streams[stream_idx]; *buffer = stream->buffer; if (offset) *offset = stream->offset; @@ -1410,7 +1416,7 @@ static void wined3d_device_set_stream_source_freq(struct wined3d_device *device, TRACE("device %p, stream_idx %u, divider %#x.\n", device, stream_idx, divider); - stream = &device->state.streams[stream_idx]; + stream = &device->state->streams[stream_idx]; old_flags = stream->flags; old_freq = stream->frequency; @@ -1421,10 +1427,10 @@ static void wined3d_device_set_stream_source_freq(struct wined3d_device *device, } static void wined3d_device_set_transform(struct wined3d_device *device, - enum wined3d_transform_state d3dts, const struct wined3d_matrix *matrix) + enum wined3d_transform_state state, const struct wined3d_matrix *matrix) { TRACE("device %p, state %s, matrix %p.\n", - device, debug_d3dtstype(d3dts), matrix); + device, debug_d3dtstype(state), matrix); TRACE("%.8e %.8e %.8e %.8e\n", matrix->_11, matrix->_12, matrix->_13, matrix->_14); TRACE("%.8e %.8e %.8e %.8e\n", matrix->_21, matrix->_22, matrix->_23, matrix->_24); TRACE("%.8e %.8e %.8e %.8e\n", matrix->_31, matrix->_32, matrix->_33, matrix->_34); @@ -1436,14 +1442,14 @@ static void wined3d_device_set_transform(struct wined3d_device *device, * tend towards setting the same matrix repeatedly for some reason. * * From here on we assume that the new matrix is different, wherever it matters. */ - if (!memcmp(&device->state.transforms[d3dts], matrix, sizeof(*matrix))) + if (!memcmp(&device->state->transforms[state], matrix, sizeof(*matrix))) { TRACE("The application is setting the same matrix over again.\n"); return; } - device->state.transforms[d3dts] = *matrix; - wined3d_cs_emit_set_transform(device->cs, d3dts, matrix); + device->state->transforms[state] = *matrix; + wined3d_cs_emit_set_transform(device->cs, state, matrix); } static void wined3d_device_get_transform(const struct wined3d_device *device, @@ -1451,7 +1457,7 @@ static void wined3d_device_get_transform(const struct wined3d_device *device, { TRACE("device %p, state %s, matrix %p.\n", device, debug_d3dtstype(state), matrix); - *matrix = device->state.transforms[state]; + *matrix = device->state->transforms[state]; } /* Note lights are real special cases. Although the device caps state only @@ -1469,7 +1475,7 @@ static void wined3d_device_set_light(struct wined3d_device *device, TRACE("device %p, light_idx %u, light %p.\n", device, light_idx, light); - if (FAILED(wined3d_light_state_set_light(&device->state.light_state, light_idx, light, &object))) + if (FAILED(wined3d_light_state_set_light(&device->state->light_state, light_idx, light, &object))) return; /* Initialize the object. */ @@ -1563,30 +1569,33 @@ static void wined3d_device_set_light(struct wined3d_device *device, static void wined3d_device_set_light_enable(struct wined3d_device *device, UINT light_idx, BOOL enable) { + struct wined3d_light_state *light_state = &device->state->light_state; struct wined3d_light_info *light_info; TRACE("device %p, light_idx %u, enable %#x.\n", device, light_idx, enable); /* Special case - enabling an undefined light creates one with a strict set of parameters. */ - if (!(light_info = wined3d_light_state_get_light(&device->state.light_state, light_idx))) + if (!(light_info = wined3d_light_state_get_light(light_state, light_idx))) { TRACE("Light enabled requested but light not defined, so defining one!\n"); wined3d_device_set_light(device, light_idx, &WINED3D_default_light); - if (!(light_info = wined3d_light_state_get_light(&device->state.light_state, light_idx))) + if (!(light_info = wined3d_light_state_get_light(light_state, light_idx))) { FIXME("Adding default lights has failed dismally\n"); return; } } - wined3d_light_state_enable_light(&device->state.light_state, &device->adapter->d3d_info, light_info, enable); + wined3d_light_state_enable_light(light_state, &device->adapter->d3d_info, light_info, enable); wined3d_cs_emit_set_light_enable(device->cs, light_idx, enable); } static HRESULT wined3d_device_set_clip_plane(struct wined3d_device *device, UINT plane_idx, const struct wined3d_vec4 *plane) { + struct wined3d_vec4 *clip_planes = device->state->clip_planes; + TRACE("device %p, plane_idx %u, plane %p.\n", device, plane_idx, plane); if (plane_idx >= device->adapter->d3d_info.limits.max_clip_distances) @@ -1595,13 +1604,13 @@ static HRESULT wined3d_device_set_clip_plane(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - if (!memcmp(&device->state.clip_planes[plane_idx], plane, sizeof(*plane))) + if (!memcmp(&clip_planes[plane_idx], plane, sizeof(*plane))) { TRACE("Application is setting old values over, nothing to do.\n"); return WINED3D_OK; } - device->state.clip_planes[plane_idx] = *plane; + clip_planes[plane_idx] = *plane; wined3d_cs_emit_set_clip_plane(device->cs, plane_idx, plane); @@ -1634,13 +1643,14 @@ static void wined3d_device_set_material(struct wined3d_device *device, const str { TRACE("device %p, material %p.\n", device, material); - device->state.material = *material; + device->state->material = *material; wined3d_cs_emit_set_material(device->cs, material); } void CDECL wined3d_device_set_index_buffer(struct wined3d_device *device, struct wined3d_buffer *buffer, enum wined3d_format_id format_id, unsigned int offset) { + struct wined3d_state *state = device->state; enum wined3d_format_id prev_format; struct wined3d_buffer *prev_buffer; unsigned int prev_offset; @@ -1648,18 +1658,18 @@ void CDECL wined3d_device_set_index_buffer(struct wined3d_device *device, TRACE("device %p, buffer %p, format %s, offset %u.\n", device, buffer, debug_d3dformat(format_id), offset); - prev_buffer = device->state.index_buffer; - prev_format = device->state.index_format; - prev_offset = device->state.index_offset; + prev_buffer = state->index_buffer; + prev_format = state->index_format; + prev_offset = state->index_offset; if (prev_buffer == buffer && prev_format == format_id && prev_offset == offset) return; if (buffer) wined3d_buffer_incref(buffer); - device->state.index_buffer = buffer; - device->state.index_format = format_id; - device->state.index_offset = offset; + state->index_buffer = buffer; + state->index_format = format_id; + state->index_offset = offset; wined3d_cs_emit_set_index_buffer(device->cs, buffer, format_id, offset); if (prev_buffer) wined3d_buffer_decref(prev_buffer); @@ -1668,24 +1678,27 @@ void CDECL wined3d_device_set_index_buffer(struct wined3d_device *device, struct wined3d_buffer * CDECL wined3d_device_get_index_buffer(const struct wined3d_device *device, enum wined3d_format_id *format, unsigned int *offset) { + const struct wined3d_state *state = device->state; + TRACE("device %p, format %p, offset %p.\n", device, format, offset); - *format = device->state.index_format; + *format = state->index_format; if (offset) - *offset = device->state.index_offset; - return device->state.index_buffer; + *offset = state->index_offset; + return state->index_buffer; } void CDECL wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index) { TRACE("device %p, base_index %d.\n", device, base_index); - device->state.base_vertex_index = base_index; + device->state->base_vertex_index = base_index; } void CDECL wined3d_device_set_viewports(struct wined3d_device *device, unsigned int viewport_count, const struct wined3d_viewport *viewports) { + struct wined3d_state *state = device->state; unsigned int i; TRACE("device %p, viewport_count %u, viewports %p.\n", device, viewport_count, viewports); @@ -1697,10 +1710,10 @@ void CDECL wined3d_device_set_viewports(struct wined3d_device *device, unsigned } if (viewport_count) - memcpy(device->state.viewports, viewports, viewport_count * sizeof(*viewports)); + memcpy(state->viewports, viewports, viewport_count * sizeof(*viewports)); else - memset(device->state.viewports, 0, sizeof(device->state.viewports)); - device->state.viewport_count = viewport_count; + memset(state->viewports, 0, sizeof(state->viewports)); + state->viewport_count = viewport_count; wined3d_cs_emit_set_viewports(device->cs, viewport_count, viewports); } @@ -1708,20 +1721,21 @@ void CDECL wined3d_device_set_viewports(struct wined3d_device *device, unsigned void CDECL wined3d_device_get_viewports(const struct wined3d_device *device, unsigned int *viewport_count, struct wined3d_viewport *viewports) { + const struct wined3d_state *state = device->state; unsigned int count; TRACE("device %p, viewport_count %p, viewports %p.\n", device, viewport_count, viewports); - count = viewport_count ? min(*viewport_count, device->state.viewport_count) : 1; + count = viewport_count ? min(*viewport_count, state->viewport_count) : 1; if (count && viewports) - memcpy(viewports, device->state.viewports, count * sizeof(*viewports)); + memcpy(viewports, state->viewports, count * sizeof(*viewports)); if (viewport_count) - *viewport_count = device->state.viewport_count; + *viewport_count = state->viewport_count; } static void resolve_depth_buffer(struct wined3d_device *device) { - const struct wined3d_state *state = &device->state; + const struct wined3d_state *state = device->state; struct wined3d_rendertarget_view *src_view; struct wined3d_resource *dst_resource; struct wined3d_texture *dst_texture; @@ -1741,7 +1755,7 @@ static void resolve_depth_buffer(struct wined3d_device *device) void CDECL wined3d_device_set_blend_state(struct wined3d_device *device, struct wined3d_blend_state *blend_state, const struct wined3d_color *blend_factor, unsigned int sample_mask) { - struct wined3d_state *state = &device->state; + struct wined3d_state *state = device->state; struct wined3d_blend_state *prev; TRACE("device %p, blend_state %p, blend_factor %s, sample_mask %#x.\n", @@ -1765,7 +1779,7 @@ void CDECL wined3d_device_set_blend_state(struct wined3d_device *device, struct wined3d_blend_state * CDECL wined3d_device_get_blend_state(const struct wined3d_device *device, struct wined3d_color *blend_factor, unsigned int *sample_mask) { - const struct wined3d_state *state = &device->state; + const struct wined3d_state *state = device->state; TRACE("device %p, blend_factor %p, sample_mask %p.\n", device, blend_factor, sample_mask); @@ -1775,47 +1789,52 @@ struct wined3d_blend_state * CDECL wined3d_device_get_blend_state(const struct w } void CDECL wined3d_device_set_depth_stencil_state(struct wined3d_device *device, - struct wined3d_depth_stencil_state *state, unsigned int stencil_ref) + struct wined3d_depth_stencil_state *depth_stencil_state, unsigned int stencil_ref) { + struct wined3d_state *state = device->state; struct wined3d_depth_stencil_state *prev; - TRACE("device %p, state %p, stencil_ref %u.\n", device, state, stencil_ref); + TRACE("device %p, depth_stencil_state %p, stencil_ref %u.\n", device, depth_stencil_state, stencil_ref); - prev = device->state.depth_stencil_state; - if (prev == state && device->state.stencil_ref == stencil_ref) + prev = state->depth_stencil_state; + if (prev == depth_stencil_state && state->stencil_ref == stencil_ref) return; - if (state) - wined3d_depth_stencil_state_incref(state); - device->state.depth_stencil_state = state; - device->state.stencil_ref = stencil_ref; - wined3d_cs_emit_set_depth_stencil_state(device->cs, state, stencil_ref); + if (depth_stencil_state) + wined3d_depth_stencil_state_incref(depth_stencil_state); + state->depth_stencil_state = depth_stencil_state; + state->stencil_ref = stencil_ref; + wined3d_cs_emit_set_depth_stencil_state(device->cs, depth_stencil_state, stencil_ref); if (prev) wined3d_depth_stencil_state_decref(prev); } -struct wined3d_depth_stencil_state * CDECL wined3d_device_get_depth_stencil_state(const struct wined3d_device *device, unsigned int *stencil_ref) +struct wined3d_depth_stencil_state * CDECL wined3d_device_get_depth_stencil_state(const struct wined3d_device *device, + unsigned int *stencil_ref) { + const struct wined3d_state *state = device->state; + TRACE("device %p, stencil_ref %p.\n", device, stencil_ref); - *stencil_ref = device->state.stencil_ref; - return device->state.depth_stencil_state; + *stencil_ref = state->stencil_ref; + return state->depth_stencil_state; } void CDECL wined3d_device_set_rasterizer_state(struct wined3d_device *device, struct wined3d_rasterizer_state *rasterizer_state) { + struct wined3d_state *state = device->state; struct wined3d_rasterizer_state *prev; TRACE("device %p, rasterizer_state %p.\n", device, rasterizer_state); - prev = device->state.rasterizer_state; + prev = state->rasterizer_state; if (prev == rasterizer_state) return; if (rasterizer_state) wined3d_rasterizer_state_incref(rasterizer_state); - device->state.rasterizer_state = rasterizer_state; + state->rasterizer_state = rasterizer_state; wined3d_cs_emit_set_rasterizer_state(device->cs, rasterizer_state); if (prev) wined3d_rasterizer_state_decref(prev); @@ -1825,7 +1844,7 @@ struct wined3d_rasterizer_state * CDECL wined3d_device_get_rasterizer_state(stru { TRACE("device %p.\n", device); - return device->state.rasterizer_state; + return device->state->rasterizer_state; } void CDECL wined3d_device_set_render_state(struct wined3d_device *device, @@ -1839,11 +1858,11 @@ void CDECL wined3d_device_set_render_state(struct wined3d_device *device, return; } - if (value == device->state.render_states[state]) + if (value == device->state->render_states[state]) TRACE("Application is setting the old value over, nothing to do.\n"); else { - device->state.render_states[state] = value; + device->state->render_states[state] = value; wined3d_cs_emit_set_render_state(device->cs, state, value); } @@ -1858,7 +1877,7 @@ DWORD CDECL wined3d_device_get_render_state(const struct wined3d_device *device, { TRACE("device %p, state %s (%#x).\n", device, debug_d3drenderstate(state), state); - return device->state.render_states[state]; + return device->state->render_states[state]; } static void wined3d_device_set_sampler_state(struct wined3d_device *device, @@ -1867,19 +1886,20 @@ static void wined3d_device_set_sampler_state(struct wined3d_device *device, TRACE("device %p, sampler_idx %u, state %s, value %#x.\n", device, sampler_idx, debug_d3dsamplerstate(state), value); - if (value == device->state.sampler_states[sampler_idx][state]) + if (value == device->state->sampler_states[sampler_idx][state]) { TRACE("Application is setting the old value over, nothing to do.\n"); return; } - device->state.sampler_states[sampler_idx][state] = value; + device->state->sampler_states[sampler_idx][state] = value; wined3d_cs_emit_set_sampler_state(device->cs, sampler_idx, state, value); } void CDECL wined3d_device_set_scissor_rects(struct wined3d_device *device, unsigned int rect_count, const RECT *rects) { + struct wined3d_state *state = device->state; unsigned int i; TRACE("device %p, rect_count %u, rects %p.\n", device, rect_count, rects); @@ -1889,48 +1909,51 @@ void CDECL wined3d_device_set_scissor_rects(struct wined3d_device *device, unsig TRACE("%u: %s\n", i, wine_dbgstr_rect(&rects[i])); } - if (device->state.scissor_rect_count == rect_count - && !memcmp(device->state.scissor_rects, rects, rect_count * sizeof(*rects))) + if (state->scissor_rect_count == rect_count + && !memcmp(state->scissor_rects, rects, rect_count * sizeof(*rects))) { TRACE("App is setting the old scissor rectangles over, nothing to do.\n"); return; } if (rect_count) - memcpy(device->state.scissor_rects, rects, rect_count * sizeof(*rects)); + memcpy(state->scissor_rects, rects, rect_count * sizeof(*rects)); else - memset(device->state.scissor_rects, 0, sizeof(device->state.scissor_rects)); - device->state.scissor_rect_count = rect_count; + memset(state->scissor_rects, 0, sizeof(state->scissor_rects)); + state->scissor_rect_count = rect_count; wined3d_cs_emit_set_scissor_rects(device->cs, rect_count, rects); } void CDECL wined3d_device_get_scissor_rects(const struct wined3d_device *device, unsigned int *rect_count, RECT *rects) { + const struct wined3d_state *state = device->state; unsigned int count; TRACE("device %p, rect_count %p, rects %p.\n", device, rect_count, rects); - count = rect_count ? min(*rect_count, device->state.scissor_rect_count) : 1; + count = rect_count ? min(*rect_count, state->scissor_rect_count) : 1; if (count && rects) - memcpy(rects, device->state.scissor_rects, count * sizeof(*rects)); + memcpy(rects, state->scissor_rects, count * sizeof(*rects)); if (rect_count) - *rect_count = device->state.scissor_rect_count; + *rect_count = state->scissor_rect_count; } void CDECL wined3d_device_set_vertex_declaration(struct wined3d_device *device, struct wined3d_vertex_declaration *declaration) { - struct wined3d_vertex_declaration *prev = device->state.vertex_declaration; + struct wined3d_state *state = device->state; + struct wined3d_vertex_declaration *prev; TRACE("device %p, declaration %p.\n", device, declaration); + prev = state->vertex_declaration; if (declaration == prev) return; if (declaration) wined3d_vertex_declaration_incref(declaration); - device->state.vertex_declaration = declaration; + state->vertex_declaration = declaration; wined3d_cs_emit_set_vertex_declaration(device->cs, declaration); if (prev) wined3d_vertex_declaration_decref(prev); @@ -1940,21 +1963,23 @@ struct wined3d_vertex_declaration * CDECL wined3d_device_get_vertex_declaration( { TRACE("device %p.\n", device); - return device->state.vertex_declaration; + return device->state->vertex_declaration; } void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) { - struct wined3d_shader *prev = device->state.shader[WINED3D_SHADER_TYPE_VERTEX]; + struct wined3d_state *state = device->state; + struct wined3d_shader *prev; TRACE("device %p, shader %p.\n", device, shader); + prev = state->shader[WINED3D_SHADER_TYPE_VERTEX]; if (shader == prev) return; if (shader) wined3d_shader_incref(shader); - device->state.shader[WINED3D_SHADER_TYPE_VERTEX] = shader; + state->shader[WINED3D_SHADER_TYPE_VERTEX] = shader; wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_VERTEX, shader); if (prev) wined3d_shader_decref(prev); @@ -1964,12 +1989,13 @@ struct wined3d_shader * CDECL wined3d_device_get_vertex_shader(const struct wine { TRACE("device %p.\n", device); - return device->state.shader[WINED3D_SHADER_TYPE_VERTEX]; + return device->state->shader[WINED3D_SHADER_TYPE_VERTEX]; } void CDECL wined3d_device_set_constant_buffer(struct wined3d_device *device, enum wined3d_shader_type type, UINT idx, struct wined3d_buffer *buffer) { + struct wined3d_state *state = device->state; struct wined3d_buffer *prev; TRACE("device %p, type %#x, idx %u, buffer %p.\n", device, type, idx, buffer); @@ -1980,13 +2006,13 @@ void CDECL wined3d_device_set_constant_buffer(struct wined3d_device *device, return; } - prev = device->state.cb[type][idx]; + prev = state->cb[type][idx]; if (buffer == prev) return; if (buffer) wined3d_buffer_incref(buffer); - device->state.cb[type][idx] = buffer; + state->cb[type][idx] = buffer; wined3d_cs_emit_set_constant_buffer(device->cs, type, idx, buffer); if (prev) wined3d_buffer_decref(prev); @@ -2003,13 +2029,14 @@ struct wined3d_buffer * CDECL wined3d_device_get_constant_buffer(const struct wi return NULL; } - return device->state.cb[shader_type][idx]; + return device->state->cb[shader_type][idx]; } static void wined3d_device_set_shader_resource_view(struct wined3d_device *device, enum wined3d_shader_type type, UINT idx, struct wined3d_shader_resource_view *view) { const struct wined3d_rendertarget_view *dsv; + struct wined3d_state *state = device->state; struct wined3d_shader_resource_view *prev; if (idx >= MAX_SHADER_RESOURCE_VIEWS) @@ -2018,12 +2045,12 @@ static void wined3d_device_set_shader_resource_view(struct wined3d_device *devic return; } - prev = device->state.shader_resource_view[type][idx]; + prev = state->shader_resource_view[type][idx]; if (view == prev) return; if (view && (wined3d_is_srv_rtv_bound(view) - || ((dsv = device->state.fb.depth_stencil) + || ((dsv = state->fb.depth_stencil) && dsv->resource == view->resource && wined3d_dsv_srv_conflict(dsv, view->format)))) { WARN("Application is trying to bind resource which is attached as render target.\n"); @@ -2036,7 +2063,7 @@ static void wined3d_device_set_shader_resource_view(struct wined3d_device *devic wined3d_srv_bind_count_inc(view); } - device->state.shader_resource_view[type][idx] = view; + state->shader_resource_view[type][idx] = view; wined3d_cs_emit_set_shader_resource_view(device->cs, type, idx, view); if (prev) { @@ -2062,7 +2089,7 @@ static struct wined3d_shader_resource_view *wined3d_device_get_shader_resource_v return NULL; } - return device->state.shader_resource_view[shader_type][idx]; + return device->state->shader_resource_view[shader_type][idx]; } struct wined3d_shader_resource_view * CDECL wined3d_device_get_vs_resource_view(const struct wined3d_device *device, @@ -2076,6 +2103,7 @@ struct wined3d_shader_resource_view * CDECL wined3d_device_get_vs_resource_view( static void wined3d_device_set_sampler(struct wined3d_device *device, enum wined3d_shader_type type, UINT idx, struct wined3d_sampler *sampler) { + struct wined3d_state *state = device->state; struct wined3d_sampler *prev; if (idx >= MAX_SAMPLER_OBJECTS) @@ -2084,13 +2112,13 @@ static void wined3d_device_set_sampler(struct wined3d_device *device, return; } - prev = device->state.sampler[type][idx]; + prev = state->sampler[type][idx]; if (sampler == prev) return; if (sampler) wined3d_sampler_incref(sampler); - device->state.sampler[type][idx] = sampler; + state->sampler[type][idx] = sampler; wined3d_cs_emit_set_sampler(device->cs, type, idx, sampler); if (prev) wined3d_sampler_decref(prev); @@ -2112,7 +2140,7 @@ static struct wined3d_sampler *wined3d_device_get_sampler(const struct wined3d_d return NULL; } - return device->state.sampler[shader_type][idx]; + return device->state->sampler[shader_type][idx]; } struct wined3d_sampler * CDECL wined3d_device_get_vs_sampler(const struct wined3d_device *device, UINT idx) @@ -2130,7 +2158,7 @@ static void wined3d_device_set_vs_consts_b(struct wined3d_device *device, TRACE("device %p, start_idx %u, count %u, constants %p.\n", device, start_idx, count, constants); - memcpy(&device->state.vs_consts_b[start_idx], constants, count * sizeof(*constants)); + memcpy(&device->state->vs_consts_b[start_idx], constants, count * sizeof(*constants)); if (TRACE_ON(d3d)) { for (i = 0; i < count; ++i) @@ -2148,7 +2176,7 @@ static void wined3d_device_set_vs_consts_i(struct wined3d_device *device, TRACE("device %p, start_idx %u, count %u, constants %p.\n", device, start_idx, count, constants); - memcpy(&device->state.vs_consts_i[start_idx], constants, count * sizeof(*constants)); + memcpy(&device->state->vs_consts_i[start_idx], constants, count * sizeof(*constants)); if (TRACE_ON(d3d)) { for (i = 0; i < count; ++i) @@ -2166,7 +2194,7 @@ static void wined3d_device_set_vs_consts_f(struct wined3d_device *device, TRACE("device %p, start_idx %u, count %u, constants %p.\n", device, start_idx, count, constants); - memcpy(&device->state.vs_consts_f[start_idx], constants, count * sizeof(*constants)); + memcpy(&device->state->vs_consts_f[start_idx], constants, count * sizeof(*constants)); if (TRACE_ON(d3d)) { for (i = 0; i < count; ++i) @@ -2178,16 +2206,18 @@ static void wined3d_device_set_vs_consts_f(struct wined3d_device *device, void CDECL wined3d_device_set_pixel_shader(struct wined3d_device *device, struct wined3d_shader *shader) { - struct wined3d_shader *prev = device->state.shader[WINED3D_SHADER_TYPE_PIXEL]; + struct wined3d_state *state = device->state; + struct wined3d_shader *prev; TRACE("device %p, shader %p.\n", device, shader); + prev = state->shader[WINED3D_SHADER_TYPE_PIXEL]; if (shader == prev) return; if (shader) wined3d_shader_incref(shader); - device->state.shader[WINED3D_SHADER_TYPE_PIXEL] = shader; + state->shader[WINED3D_SHADER_TYPE_PIXEL] = shader; wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_PIXEL, shader); if (prev) wined3d_shader_decref(prev); @@ -2197,7 +2227,7 @@ struct wined3d_shader * CDECL wined3d_device_get_pixel_shader(const struct wined { TRACE("device %p.\n", device); - return device->state.shader[WINED3D_SHADER_TYPE_PIXEL]; + return device->state->shader[WINED3D_SHADER_TYPE_PIXEL]; } void CDECL wined3d_device_set_ps_resource_view(struct wined3d_device *device, @@ -2238,7 +2268,7 @@ static void wined3d_device_set_ps_consts_b(struct wined3d_device *device, TRACE("device %p, start_idx %u, count %u, constants %p.\n", device, start_idx, count, constants); - memcpy(&device->state.ps_consts_b[start_idx], constants, count * sizeof(*constants)); + memcpy(&device->state->ps_consts_b[start_idx], constants, count * sizeof(*constants)); if (TRACE_ON(d3d)) { for (i = 0; i < count; ++i) @@ -2256,7 +2286,7 @@ static void wined3d_device_set_ps_consts_i(struct wined3d_device *device, TRACE("device %p, start_idx %u, count %u, constants %p.\n", device, start_idx, count, constants); - memcpy(&device->state.ps_consts_i[start_idx], constants, count * sizeof(*constants)); + memcpy(&device->state->ps_consts_i[start_idx], constants, count * sizeof(*constants)); if (TRACE_ON(d3d)) { for (i = 0; i < count; ++i) @@ -2274,7 +2304,7 @@ static void wined3d_device_set_ps_consts_f(struct wined3d_device *device, TRACE("device %p, start_idx %u, count %u, constants %p.\n", device, start_idx, count, constants); - memcpy(&device->state.ps_consts_f[start_idx], constants, count * sizeof(*constants)); + memcpy(&device->state->ps_consts_f[start_idx], constants, count * sizeof(*constants)); if (TRACE_ON(d3d)) { for (i = 0; i < count; ++i) @@ -2286,16 +2316,17 @@ static void wined3d_device_set_ps_consts_f(struct wined3d_device *device, void CDECL wined3d_device_set_hull_shader(struct wined3d_device *device, struct wined3d_shader *shader) { + struct wined3d_state *state = device->state; struct wined3d_shader *prev; TRACE("device %p, shader %p.\n", device, shader); - prev = device->state.shader[WINED3D_SHADER_TYPE_HULL]; + prev = state->shader[WINED3D_SHADER_TYPE_HULL]; if (shader == prev) return; if (shader) wined3d_shader_incref(shader); - device->state.shader[WINED3D_SHADER_TYPE_HULL] = shader; + state->shader[WINED3D_SHADER_TYPE_HULL] = shader; wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_HULL, shader); if (prev) wined3d_shader_decref(prev); @@ -2305,7 +2336,7 @@ struct wined3d_shader * CDECL wined3d_device_get_hull_shader(const struct wined3 { TRACE("device %p.\n", device); - return device->state.shader[WINED3D_SHADER_TYPE_HULL]; + return device->state->shader[WINED3D_SHADER_TYPE_HULL]; } void CDECL wined3d_device_set_hs_resource_view(struct wined3d_device *device, @@ -2341,16 +2372,17 @@ struct wined3d_sampler * CDECL wined3d_device_get_hs_sampler(const struct wined3 void CDECL wined3d_device_set_domain_shader(struct wined3d_device *device, struct wined3d_shader *shader) { + struct wined3d_state *state = device->state; struct wined3d_shader *prev; TRACE("device %p, shader %p.\n", device, shader); - prev = device->state.shader[WINED3D_SHADER_TYPE_DOMAIN]; + prev = state->shader[WINED3D_SHADER_TYPE_DOMAIN]; if (shader == prev) return; if (shader) wined3d_shader_incref(shader); - device->state.shader[WINED3D_SHADER_TYPE_DOMAIN] = shader; + state->shader[WINED3D_SHADER_TYPE_DOMAIN] = shader; wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_DOMAIN, shader); if (prev) wined3d_shader_decref(prev); @@ -2360,7 +2392,7 @@ struct wined3d_shader * CDECL wined3d_device_get_domain_shader(const struct wine { TRACE("device %p.\n", device); - return device->state.shader[WINED3D_SHADER_TYPE_DOMAIN]; + return device->state->shader[WINED3D_SHADER_TYPE_DOMAIN]; } void CDECL wined3d_device_set_ds_resource_view(struct wined3d_device *device, @@ -2396,15 +2428,17 @@ struct wined3d_sampler * CDECL wined3d_device_get_ds_sampler(const struct wined3 void CDECL wined3d_device_set_geometry_shader(struct wined3d_device *device, struct wined3d_shader *shader) { - struct wined3d_shader *prev = device->state.shader[WINED3D_SHADER_TYPE_GEOMETRY]; + struct wined3d_state *state = device->state; + struct wined3d_shader *prev; TRACE("device %p, shader %p.\n", device, shader); + prev = state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; if (shader == prev) return; if (shader) wined3d_shader_incref(shader); - device->state.shader[WINED3D_SHADER_TYPE_GEOMETRY] = shader; + state->shader[WINED3D_SHADER_TYPE_GEOMETRY] = shader; wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_GEOMETRY, shader); if (prev) wined3d_shader_decref(prev); @@ -2414,7 +2448,7 @@ struct wined3d_shader * CDECL wined3d_device_get_geometry_shader(const struct wi { TRACE("device %p.\n", device); - return device->state.shader[WINED3D_SHADER_TYPE_GEOMETRY]; + return device->state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; } void CDECL wined3d_device_set_gs_resource_view(struct wined3d_device *device, @@ -2449,16 +2483,17 @@ struct wined3d_sampler * CDECL wined3d_device_get_gs_sampler(const struct wined3 void CDECL wined3d_device_set_compute_shader(struct wined3d_device *device, struct wined3d_shader *shader) { + struct wined3d_state *state = device->state; struct wined3d_shader *prev; TRACE("device %p, shader %p.\n", device, shader); - prev = device->state.shader[WINED3D_SHADER_TYPE_COMPUTE]; + prev = state->shader[WINED3D_SHADER_TYPE_COMPUTE]; if (shader == prev) return; if (shader) wined3d_shader_incref(shader); - device->state.shader[WINED3D_SHADER_TYPE_COMPUTE] = shader; + state->shader[WINED3D_SHADER_TYPE_COMPUTE] = shader; wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_COMPUTE, shader); if (prev) wined3d_shader_decref(prev); @@ -2468,7 +2503,7 @@ struct wined3d_shader * CDECL wined3d_device_get_compute_shader(const struct win { TRACE("device %p.\n", device); - return device->state.shader[WINED3D_SHADER_TYPE_COMPUTE]; + return device->state->shader[WINED3D_SHADER_TYPE_COMPUTE]; } void CDECL wined3d_device_set_cs_resource_view(struct wined3d_device *device, @@ -2506,6 +2541,7 @@ static void wined3d_device_set_pipeline_unordered_access_view(struct wined3d_dev enum wined3d_pipeline pipeline, unsigned int idx, struct wined3d_unordered_access_view *uav, unsigned int initial_count) { + struct wined3d_state *state = device->state; struct wined3d_unordered_access_view *prev; if (idx >= MAX_UNORDERED_ACCESS_VIEWS) @@ -2514,13 +2550,13 @@ static void wined3d_device_set_pipeline_unordered_access_view(struct wined3d_dev return; } - prev = device->state.unordered_access_view[pipeline][idx]; + prev = state->unordered_access_view[pipeline][idx]; if (uav == prev && initial_count == ~0u) return; if (uav) wined3d_unordered_access_view_incref(uav); - device->state.unordered_access_view[pipeline][idx] = uav; + state->unordered_access_view[pipeline][idx] = uav; wined3d_cs_emit_set_unordered_access_view(device->cs, pipeline, idx, uav, initial_count); if (prev) wined3d_unordered_access_view_decref(prev); @@ -2535,7 +2571,7 @@ static struct wined3d_unordered_access_view *wined3d_device_get_pipeline_unorder return NULL; } - return device->state.unordered_access_view[pipeline][idx]; + return device->state->unordered_access_view[pipeline][idx]; } void CDECL wined3d_device_set_cs_uav(struct wined3d_device *device, unsigned int idx, @@ -3136,7 +3172,7 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO enum wined3d_material_color_source diffuse_source, specular_source, ambient_source, emissive_source; const struct wined3d_color *material_specular_state_colour; struct wined3d_matrix mat, proj_mat, view_mat, world_mat; - const struct wined3d_state *state = &device->state; + const struct wined3d_state *state = device->state; const struct wined3d_format *output_colour_format; static const struct wined3d_color black; struct wined3d_map_desc map_desc; @@ -3454,7 +3490,7 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, UINT src_start_idx, UINT dst_idx, UINT vertex_count, struct wined3d_buffer *dst_buffer, const struct wined3d_vertex_declaration *declaration, DWORD flags, DWORD dst_fvf) { - struct wined3d_state *state = &device->state; + struct wined3d_state *state = device->state; struct wined3d_stream_info stream_info; struct wined3d_resource *resource; struct wined3d_box box = {0}; @@ -3543,13 +3579,13 @@ static void wined3d_device_set_texture_stage_state(struct wined3d_device *device return; } - if (value == device->state.texture_states[stage][state]) + if (value == device->state->texture_states[stage][state]) { TRACE("Application is setting the old value over, nothing to do.\n"); return; } - device->state.texture_states[stage][state] = value; + device->state->texture_states[stage][state] = value; wined3d_cs_emit_set_texture_state(device->cs, stage, state, value); } @@ -3557,18 +3593,19 @@ static void wined3d_device_set_texture_stage_state(struct wined3d_device *device static void wined3d_device_set_texture(struct wined3d_device *device, UINT stage, struct wined3d_texture *texture) { + struct wined3d_state *state = device->state; struct wined3d_texture *prev; TRACE("device %p, stage %u, texture %p.\n", device, stage, texture); /* Windows accepts overflowing this array... we do not. */ - if (stage >= ARRAY_SIZE(device->state.textures)) + if (stage >= ARRAY_SIZE(state->textures)) { WARN("Ignoring invalid stage %u.\n", stage); return; } - prev = device->state.textures[stage]; + prev = state->textures[stage]; TRACE("Previous texture %p.\n", prev); if (texture == prev) @@ -3578,7 +3615,7 @@ static void wined3d_device_set_texture(struct wined3d_device *device, } TRACE("Setting new texture to %p.\n", texture); - device->state.textures[stage] = texture; + state->textures[stage] = texture; if (texture) wined3d_texture_incref(texture); @@ -4047,6 +4084,8 @@ HRESULT CDECL wined3d_device_end_scene(struct wined3d_device *device) HRESULT CDECL wined3d_device_clear(struct wined3d_device *device, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) { + struct wined3d_fb_state *fb = &device->state->fb; + TRACE("device %p, rect_count %u, rects %p, flags %#x, color %s, depth %.8e, stencil %u.\n", device, rect_count, rects, flags, debug_color(color), depth, stencil); @@ -4058,7 +4097,7 @@ HRESULT CDECL wined3d_device_clear(struct wined3d_device *device, DWORD rect_cou if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) { - struct wined3d_rendertarget_view *ds = device->state.fb.depth_stencil; + struct wined3d_rendertarget_view *ds = fb->depth_stencil; if (!ds) { WARN("Clearing depth and/or stencil without a depth stencil buffer attached, returning WINED3DERR_INVALIDCALL\n"); @@ -4067,8 +4106,8 @@ HRESULT CDECL wined3d_device_clear(struct wined3d_device *device, DWORD rect_cou } else if (flags & WINED3DCLEAR_TARGET) { - if (ds->width < device->state.fb.render_targets[0]->width - || ds->height < device->state.fb.render_targets[0]->height) + if (ds->width < fb->render_targets[0]->width + || ds->height < fb->render_targets[0]->height) { WARN("Silently ignoring depth and target clear with mismatching sizes\n"); return WINED3D_OK; @@ -4084,18 +4123,19 @@ HRESULT CDECL wined3d_device_clear(struct wined3d_device *device, DWORD rect_cou void CDECL wined3d_device_set_predication(struct wined3d_device *device, struct wined3d_query *predicate, BOOL value) { + struct wined3d_state *state = device->state; struct wined3d_query *prev; TRACE("device %p, predicate %p, value %#x.\n", device, predicate, value); - prev = device->state.predicate; + prev = state->predicate; if (predicate) { FIXME("Predicated rendering not implemented.\n"); wined3d_query_incref(predicate); } - device->state.predicate = predicate; - device->state.predicate_value = value; + state->predicate = predicate; + state->predicate_value = value; wined3d_cs_emit_set_predication(device->cs, predicate, value); if (prev) wined3d_query_decref(prev); @@ -4103,11 +4143,13 @@ void CDECL wined3d_device_set_predication(struct wined3d_device *device, struct wined3d_query * CDECL wined3d_device_get_predication(struct wined3d_device *device, BOOL *value) { + struct wined3d_state *state = device->state; + TRACE("device %p, value %p.\n", device, value); if (value) - *value = device->state.predicate_value; - return device->state.predicate; + *value = state->predicate_value; + return state->predicate; } void CDECL wined3d_device_dispatch_compute(struct wined3d_device *device, @@ -4130,32 +4172,38 @@ void CDECL wined3d_device_dispatch_compute_indirect(struct wined3d_device *devic void CDECL wined3d_device_set_primitive_type(struct wined3d_device *device, enum wined3d_primitive_type primitive_type, unsigned int patch_vertex_count) { + struct wined3d_state *state = device->state; + TRACE("device %p, primitive_type %s, patch_vertex_count %u.\n", device, debug_d3dprimitivetype(primitive_type), patch_vertex_count); - device->state.primitive_type = primitive_type; - device->state.patch_vertex_count = patch_vertex_count; + state->primitive_type = primitive_type; + state->patch_vertex_count = patch_vertex_count; } void CDECL wined3d_device_get_primitive_type(const struct wined3d_device *device, enum wined3d_primitive_type *primitive_type, unsigned int *patch_vertex_count) { + const struct wined3d_state *state = device->state; + TRACE("device %p, primitive_type %p, patch_vertex_count %p.\n", device, primitive_type, patch_vertex_count); - *primitive_type = device->state.primitive_type; + *primitive_type = state->primitive_type; if (patch_vertex_count) - *patch_vertex_count = device->state.patch_vertex_count; + *patch_vertex_count = state->patch_vertex_count; TRACE("Returning %s.\n", debug_d3dprimitivetype(*primitive_type)); } HRESULT CDECL wined3d_device_draw_primitive(struct wined3d_device *device, UINT start_vertex, UINT vertex_count) { + struct wined3d_state *state = device->state; + TRACE("device %p, start_vertex %u, vertex_count %u.\n", device, start_vertex, vertex_count); - wined3d_cs_emit_draw(device->cs, device->state.primitive_type, - device->state.patch_vertex_count, 0, start_vertex, vertex_count, 0, 0, false); + wined3d_cs_emit_draw(device->cs, state->primitive_type, + state->patch_vertex_count, 0, start_vertex, vertex_count, 0, 0, false); return WINED3D_OK; } @@ -4163,27 +4211,33 @@ HRESULT CDECL wined3d_device_draw_primitive(struct wined3d_device *device, UINT void CDECL wined3d_device_draw_primitive_instanced(struct wined3d_device *device, UINT start_vertex, UINT vertex_count, UINT start_instance, UINT instance_count) { + struct wined3d_state *state = device->state; + TRACE("device %p, start_vertex %u, vertex_count %u, start_instance %u, instance_count %u.\n", device, start_vertex, vertex_count, start_instance, instance_count); - wined3d_cs_emit_draw(device->cs, device->state.primitive_type, device->state.patch_vertex_count, + wined3d_cs_emit_draw(device->cs, state->primitive_type, state->patch_vertex_count, 0, start_vertex, vertex_count, start_instance, instance_count, false); } void CDECL wined3d_device_draw_primitive_instanced_indirect(struct wined3d_device *device, struct wined3d_buffer *buffer, unsigned int offset) { + struct wined3d_state *state = device->state; + TRACE("device %p, buffer %p, offset %u.\n", device, buffer, offset); - wined3d_cs_emit_draw_indirect(device->cs, device->state.primitive_type, - device->state.patch_vertex_count, buffer, offset, false); + wined3d_cs_emit_draw_indirect(device->cs, state->primitive_type, + state->patch_vertex_count, buffer, offset, false); } HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *device, UINT start_idx, UINT index_count) { + struct wined3d_state *state = device->state; + TRACE("device %p, start_idx %u, index_count %u.\n", device, start_idx, index_count); - if (!device->state.index_buffer) + if (!state->index_buffer) { /* D3D9 returns D3DERR_INVALIDCALL when DrawIndexedPrimitive is called * without an index buffer set. (The first time at least...) @@ -4193,8 +4247,8 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *devic return WINED3DERR_INVALIDCALL; } - wined3d_cs_emit_draw(device->cs, device->state.primitive_type, device->state.patch_vertex_count, - device->state.base_vertex_index, start_idx, index_count, 0, 0, true); + wined3d_cs_emit_draw(device->cs, state->primitive_type, state->patch_vertex_count, + state->base_vertex_index, start_idx, index_count, 0, 0, true); return WINED3D_OK; } @@ -4202,20 +4256,24 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *devic void CDECL wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device *device, UINT start_idx, UINT index_count, UINT start_instance, UINT instance_count) { + struct wined3d_state *state = device->state; + TRACE("device %p, start_idx %u, index_count %u, start_instance %u, instance_count %u.\n", device, start_idx, index_count, start_instance, instance_count); - wined3d_cs_emit_draw(device->cs, device->state.primitive_type, device->state.patch_vertex_count, - device->state.base_vertex_index, start_idx, index_count, start_instance, instance_count, true); + wined3d_cs_emit_draw(device->cs, state->primitive_type, state->patch_vertex_count, + state->base_vertex_index, start_idx, index_count, start_instance, instance_count, true); } void CDECL wined3d_device_draw_indexed_primitive_instanced_indirect(struct wined3d_device *device, struct wined3d_buffer *buffer, unsigned int offset) { + struct wined3d_state *state = device->state; + TRACE("device %p, buffer %p, offset %u.\n", device, buffer, offset); - wined3d_cs_emit_draw_indirect(device->cs, device->state.primitive_type, - device->state.patch_vertex_count, buffer, offset, true); + wined3d_cs_emit_draw_indirect(device->cs, state->primitive_type, + state->patch_vertex_count, buffer, offset, true); } HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, @@ -4375,7 +4433,7 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, HRESULT CDECL wined3d_device_validate_device(const struct wined3d_device *device, DWORD *num_passes) { - const struct wined3d_state *state = &device->state; + const struct wined3d_state *state = device->state; struct wined3d_texture *texture; DWORD i; @@ -4418,8 +4476,8 @@ HRESULT CDECL wined3d_device_validate_device(const struct wined3d_device *device if (wined3d_state_uses_depth_buffer(state) || (state->depth_stencil_state && state->depth_stencil_state->desc.stencil)) { - struct wined3d_rendertarget_view *rt = device->state.fb.render_targets[0]; - struct wined3d_rendertarget_view *ds = device->state.fb.depth_stencil; + struct wined3d_rendertarget_view *rt = state->fb.render_targets[0]; + struct wined3d_rendertarget_view *ds = state->fb.depth_stencil; if (ds && rt && (ds->width < rt->width || ds->height < rt->height)) { @@ -4967,19 +5025,21 @@ struct wined3d_rendertarget_view * CDECL wined3d_device_get_rendertarget_view(co return NULL; } - return device->state.fb.render_targets[view_idx]; + return device->state->fb.render_targets[view_idx]; } struct wined3d_rendertarget_view * CDECL wined3d_device_get_depth_stencil_view(const struct wined3d_device *device) { TRACE("device %p.\n", device); - return device->state.fb.depth_stencil; + return device->state->fb.depth_stencil; } static void wined3d_unbind_srv_for_rtv(struct wined3d_device *device, const struct wined3d_rendertarget_view *view, BOOL dsv) { + struct wined3d_state *state = device->state; + if (view && wined3d_is_rtv_srv_bound(view)) { const struct wined3d_resource *resource = view->resource; @@ -4990,7 +5050,7 @@ static void wined3d_unbind_srv_for_rtv(struct wined3d_device *device, for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) for (j = 0; j < MAX_SHADER_RESOURCE_VIEWS; ++j) - if ((srv = device->state.shader_resource_view[i][j]) && srv->resource == resource + if ((srv = state->shader_resource_view[i][j]) && srv->resource == resource && ((!dsv && wined3d_is_srv_rtv_bound(srv)) || (dsv && wined3d_dsv_srv_conflict(view, srv->format)))) wined3d_device_set_shader_resource_view(device, i, j, NULL); @@ -5000,6 +5060,7 @@ static void wined3d_unbind_srv_for_rtv(struct wined3d_device *device, HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device, unsigned int view_idx, struct wined3d_rendertarget_view *view, BOOL set_viewport) { + struct wined3d_state *state = device->state; struct wined3d_rendertarget_view *prev; unsigned int max_rt_count; @@ -5024,8 +5085,6 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device * primary stateblock. */ if (!view_idx && set_viewport) { - struct wined3d_state *state = &device->state; - state->viewports[0].x = 0; state->viewports[0].y = 0; state->viewports[0].width = view->width; @@ -5040,7 +5099,7 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device wined3d_cs_emit_set_scissor_rects(device->cs, 1, state->scissor_rects); } - prev = device->state.fb.render_targets[view_idx]; + prev = state->fb.render_targets[view_idx]; if (view == prev) return WINED3D_OK; @@ -5049,7 +5108,7 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device wined3d_rendertarget_view_incref(view); wined3d_rtv_bind_count_inc(view); } - device->state.fb.render_targets[view_idx] = view; + state->fb.render_targets[view_idx] = view; wined3d_cs_emit_set_rendertarget_view(device->cs, view_idx, view); /* Release after the assignment, to prevent device_resource_released() * from seeing the surface as still in use. */ @@ -5067,6 +5126,7 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device HRESULT CDECL wined3d_device_set_depth_stencil_view(struct wined3d_device *device, struct wined3d_rendertarget_view *view) { + struct wined3d_fb_state *fb = &device->state->fb; struct wined3d_rendertarget_view *prev; TRACE("device %p, view %p.\n", device, view); @@ -5078,14 +5138,14 @@ HRESULT CDECL wined3d_device_set_depth_stencil_view(struct wined3d_device *devic return WINED3DERR_INVALIDCALL; } - prev = device->state.fb.depth_stencil; + prev = fb->depth_stencil; if (prev == view) { TRACE("Trying to do a NOP SetRenderTarget operation.\n"); return WINED3D_OK; } - if ((device->state.fb.depth_stencil = view)) + if ((fb->depth_stencil = view)) wined3d_rendertarget_view_incref(view); wined3d_cs_emit_set_depth_stencil_view(device->cs, view); if (prev) @@ -5341,6 +5401,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; struct wined3d_swapchain_state *swapchain_state; struct wined3d_swapchain_desc *current_desc; + struct wined3d_state *state = device->state; struct wined3d_resource *resource, *cursor; struct wined3d_rendertarget_view *view; struct wined3d_swapchain *swapchain; @@ -5374,7 +5435,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_texture_decref(device->cursor_texture); device->cursor_texture = NULL; } - state_unbind_resources(&device->state); + state_unbind_resources(state); } for (i = 0; i < d3d_info->limits.max_rt_count; ++i) @@ -5584,7 +5645,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, { TRACE("Resetting state.\n"); wined3d_cs_emit_reset_state(device->cs); - state_cleanup(&device->state); + state_cleanup(state); LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) { @@ -5594,8 +5655,8 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, device->adapter->adapter_ops->adapter_uninit_3d(device); - memset(&device->state, 0, sizeof(device->state)); - state_init(&device->state, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); + memset(state, 0, sizeof(*state)); + state_init(state, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); device_init_swapchain_state(device, swapchain); if (wined3d_settings.logo) @@ -5695,18 +5756,19 @@ static void device_resource_remove(struct wined3d_device *device, struct wined3d void device_resource_released(struct wined3d_device *device, struct wined3d_resource *resource) { enum wined3d_resource_type type = resource->type; + struct wined3d_state *state = device->state; struct wined3d_rendertarget_view *rtv; unsigned int i; TRACE("device %p, resource %p, type %s.\n", device, resource, debug_d3dresourcetype(type)); - for (i = 0; i < ARRAY_SIZE(device->state.fb.render_targets); ++i) + for (i = 0; i < ARRAY_SIZE(state->fb.render_targets); ++i) { - if ((rtv = device->state.fb.render_targets[i]) && rtv->resource == resource) + if ((rtv = state->fb.render_targets[i]) && rtv->resource == resource) ERR("Resource %p is still in use as render target %u.\n", resource, i); } - if ((rtv = device->state.fb.depth_stencil) && rtv->resource == resource) + if ((rtv = state->fb.depth_stencil) && rtv->resource == resource) ERR("Resource %p is still in use as depth/stencil buffer.\n", resource); switch (type) @@ -5716,10 +5778,10 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso case WINED3D_RTYPE_TEXTURE_3D: for (i = 0; i < WINED3D_MAX_COMBINED_SAMPLERS; ++i) { - if (&device->state.textures[i]->resource == resource) + if (&state->textures[i]->resource == resource) { ERR("Texture resource %p is still in use, stage %u.\n", resource, i); - device->state.textures[i] = NULL; + state->textures[i] = NULL; } } break; @@ -5727,17 +5789,17 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso case WINED3D_RTYPE_BUFFER: for (i = 0; i < WINED3D_MAX_STREAMS; ++i) { - if (&device->state.streams[i].buffer->resource == resource) + if (&state->streams[i].buffer->resource == resource) { ERR("Buffer resource %p is still in use, stream %u.\n", resource, i); - device->state.streams[i].buffer = NULL; + state->streams[i].buffer = NULL; } } - if (&device->state.index_buffer->resource == resource) + if (&state->index_buffer->resource == resource) { ERR("Buffer resource %p is still in use as index buffer.\n", resource); - device->state.index_buffer = NULL; + state->index_buffer = NULL; } break; @@ -5852,6 +5914,7 @@ HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined struct wined3d_adapter *adapter = wined3d->adapters[adapter_idx]; const struct wined3d_fragment_pipe_ops *fragment_pipeline; const struct wined3d_vertex_pipe_ops *vertex_pipeline; + struct wined3d_state *state; unsigned int i; HRESULT hr; @@ -5902,14 +5965,20 @@ HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined return hr; } - state_init(&device->state, &adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); + if (!(state = heap_alloc_zero(sizeof(*state)))) + { + hr = E_OUTOFMEMORY; + goto err; + } + state_init(state, &adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); + device->state = state; device->max_frame_latency = 3; if (!(device->cs = wined3d_cs_create(device))) { WARN("Failed to create command stream.\n"); - state_cleanup(&device->state); + state_cleanup(state); hr = E_FAIL; goto err; } @@ -5917,6 +5986,8 @@ HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined return WINED3D_OK; err: + if (state) + heap_free(state); for (i = 0; i < ARRAY_SIZE(device->multistate_funcs); ++i) { heap_free(device->multistate_funcs[i]); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f4f929db2cab..b53cd02d75cc 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1610,7 +1610,7 @@ DWORD CDECL wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod) wined3d_texture_gl(texture)->texture_srgb.base_level = ~0u; if (resource->bind_count) wined3d_cs_emit_set_sampler_state(device->cs, texture->sampler, WINED3D_SAMP_MAX_MIP_LEVEL, - device->state.sampler_states[texture->sampler][WINED3D_SAMP_MAX_MIP_LEVEL]); + device->state->sampler_states[texture->sampler][WINED3D_SAMP_MAX_MIP_LEVEL]); } return old; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2a75ab5d43d9..56d3ef8fea21 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3776,7 +3776,7 @@ struct wined3d_device enum wined3d_feature_level feature_level; - struct wined3d_state state; + struct wined3d_state *state; /* Internal use fields */ struct wined3d_device_creation_parameters create_parms; -- 2.20.1 [View Less]

1 0

[PATCH] DirectInput: send wheel events in absolute coords if requested
by Szegeczki Imre 23 Feb '21

23 Feb '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=14025 Signed-off-by: Szegeczki Imre <szegeczki1(a)gmail.com> --- dlls/dinput/mouse.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index e50731fda41..73dd46c7249 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -379,8 +379,12 @@ void dinput_mouse_rawinput_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPA if (ri->data.mouse.usButtonFlags &… [View More]

1 0

[PATCH 3/3] ntdll: Fix compacted legacy xsave area handling.
by Jacek Caban 23 Feb '21

23 Feb '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/signal_x86_64.c | 37 +++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-)

1 0

[PATCH 1/3] ntdll: Use syscall frame in x86_64 call_raise_user_exception_dispatcher implementation.
by Jacek Caban 23 Feb '21

23 Feb '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/signal_x86_64.c | 18 ++++-------------- dlls/ntdll/unix/unix_private.h | 2 +- 2 files changed, 5 insertions(+), 15 deletions(-)

1 0

[PATCH 1/6] winegstreamer: Use wide-char string literals.
by Zebediah Figura 23 Feb '21

23 Feb '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 24 ++++++++---------------- dlls/winegstreamer/main.c | 18 +++++------------- dlls/winegstreamer/mfplat.c | 2 +- 3 files changed, 14 insertions(+), 30 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 84e6bcd61e4..acfd3b3ae4c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -89,7 +89,6 @@ static inline struct … [View More]parser *impl_from_strmbase_filter(struct strmbase_filter *i return CONTAINING_RECORD(iface, struct parser, filter); } -static const WCHAR wcsInputPinName[] = {'i','n','p','u','t',' ','p','i','n',0}; static const IMediaSeekingVtbl GST_Seeking_Vtbl; static const IQualityControlVtbl GSTOutPin_QualityControl_Vtbl; @@ -1007,7 +1006,6 @@ static const struct strmbase_sink_ops sink_ops = static BOOL decodebin_parser_filter_init_gst(struct parser *filter) { - static const WCHAR formatW[] = {'S','t','r','e','a','m',' ','%','0','2','u',0}; struct wg_parser *parser = filter->wg_parser; unsigned int i, stream_count; WCHAR source_name[20]; @@ -1015,7 +1013,7 @@ static BOOL decodebin_parser_filter_init_gst(struct parser *filter) stream_count = unix_funcs->wg_parser_get_stream_count(parser); for (i = 0; i < stream_count; ++i) { - swprintf(source_name, ARRAY_SIZE(source_name), formatW, i); + swprintf(source_name, ARRAY_SIZE(source_name), L"Stream %02u", i); if (!create_pin(filter, unix_funcs->wg_parser_get_stream(parser, i), source_name)) return FALSE; } @@ -1108,7 +1106,7 @@ HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out) } strmbase_filter_init(&object->filter, outer, &CLSID_decodebin_parser, &filter_ops); - strmbase_sink_init(&object->sink, &object->filter, wcsInputPinName, &sink_ops, NULL); + strmbase_sink_init(&object->sink, &object->filter, L"input pin", &sink_ops, NULL); object->init_gst = decodebin_parser_filter_init_gst; object->source_query_accept = decodebin_parser_source_query_accept; @@ -1587,10 +1585,9 @@ static const struct strmbase_sink_ops wave_parser_sink_ops = static BOOL wave_parser_filter_init_gst(struct parser *filter) { - static const WCHAR source_name[] = {'o','u','t','p','u','t',0}; struct wg_parser *parser = filter->wg_parser; - if (!create_pin(filter, unix_funcs->wg_parser_get_stream(parser, 0), source_name)) + if (!create_pin(filter, unix_funcs->wg_parser_get_stream(parser, 0), L"output")) return FALSE; return TRUE; @@ -1625,7 +1622,6 @@ static HRESULT wave_parser_source_get_media_type(struct parser_source *pin, HRESULT wave_parser_create(IUnknown *outer, IUnknown **out) { - static const WCHAR sink_name[] = {'i','n','p','u','t',' ','p','i','n',0}; struct parser *object; if (!parser_init_gstreamer()) @@ -1641,7 +1637,7 @@ HRESULT wave_parser_create(IUnknown *outer, IUnknown **out) } strmbase_filter_init(&object->filter, outer, &CLSID_WAVEParser, &filter_ops); - strmbase_sink_init(&object->sink, &object->filter, sink_name, &wave_parser_sink_ops, NULL); + strmbase_sink_init(&object->sink, &object->filter, L"input pin", &wave_parser_sink_ops, NULL); object->init_gst = wave_parser_filter_init_gst; object->source_query_accept = wave_parser_source_query_accept; object->source_get_media_type = wave_parser_source_get_media_type; @@ -1668,7 +1664,6 @@ static const struct strmbase_sink_ops avi_splitter_sink_ops = static BOOL avi_splitter_filter_init_gst(struct parser *filter) { - static const WCHAR formatW[] = {'S','t','r','e','a','m',' ','%','0','2','u',0}; struct wg_parser *parser = filter->wg_parser; uint32_t i, stream_count; WCHAR source_name[20]; @@ -1676,7 +1671,7 @@ static BOOL avi_splitter_filter_init_gst(struct parser *filter) stream_count = unix_funcs->wg_parser_get_stream_count(parser); for (i = 0; i < stream_count; ++i) { - swprintf(source_name, ARRAY_SIZE(source_name), formatW, i); + swprintf(source_name, ARRAY_SIZE(source_name), L"Stream %02u", i); if (!create_pin(filter, unix_funcs->wg_parser_get_stream(parser, i), source_name)) return FALSE; } @@ -1713,7 +1708,6 @@ static HRESULT avi_splitter_source_get_media_type(struct parser_source *pin, HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out) { - static const WCHAR sink_name[] = {'i','n','p','u','t',' ','p','i','n',0}; struct parser *object; if (!parser_init_gstreamer()) @@ -1729,7 +1723,7 @@ HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out) } strmbase_filter_init(&object->filter, outer, &CLSID_AviSplitter, &filter_ops); - strmbase_sink_init(&object->sink, &object->filter, sink_name, &avi_splitter_sink_ops, NULL); + strmbase_sink_init(&object->sink, &object->filter, L"input pin", &avi_splitter_sink_ops, NULL); object->init_gst = avi_splitter_filter_init_gst; object->source_query_accept = avi_splitter_source_query_accept; object->source_get_media_type = avi_splitter_source_get_media_type; @@ -1761,10 +1755,9 @@ static const struct strmbase_sink_ops mpeg_splitter_sink_ops = static BOOL mpeg_splitter_filter_init_gst(struct parser *filter) { - static const WCHAR source_name[] = {'A','u','d','i','o',0}; struct wg_parser *parser = filter->wg_parser; - if (!create_pin(filter, unix_funcs->wg_parser_get_stream(parser, 0), source_name)) + if (!create_pin(filter, unix_funcs->wg_parser_get_stream(parser, 0), L"Audio")) return FALSE; return TRUE; @@ -1822,7 +1815,6 @@ static const struct strmbase_filter_ops mpeg_splitter_ops = HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out) { - static const WCHAR sink_name[] = {'I','n','p','u','t',0}; struct parser *object; if (!parser_init_gstreamer()) @@ -1838,7 +1830,7 @@ HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out) } strmbase_filter_init(&object->filter, outer, &CLSID_MPEG1Splitter, &mpeg_splitter_ops); - strmbase_sink_init(&object->sink, &object->filter, sink_name, &mpeg_splitter_sink_ops, NULL); + strmbase_sink_init(&object->sink, &object->filter, L"Input", &mpeg_splitter_sink_ops, NULL); object->IAMStreamSelect_iface.lpVtbl = &stream_select_vtbl; object->init_gst = mpeg_splitter_filter_init_gst; diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 6f3be9095d6..ae26745773b 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -31,15 +31,6 @@ LONG object_locks; WINE_DEFAULT_DEBUG_CHANNEL(gstreamer); -static const WCHAR wGstreamer_Splitter[] = -{'G','S','t','r','e','a','m','e','r',' ','s','p','l','i','t','t','e','r',' ','f','i','l','t','e','r',0}; -static const WCHAR wave_parserW[] = -{'W','a','v','e',' ','P','a','r','s','e','r',0}; -static const WCHAR avi_splitterW[] = -{'A','V','I',' ','S','p','l','i','t','t','e','r',0}; -static const WCHAR mpeg_splitterW[] = -{'M','P','E','G','-','I',' ','S','t','r','e','a','m',' ','S','p','l','i','t','t','e','r',0}; - const struct unix_funcs *unix_funcs = NULL; BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) @@ -336,11 +327,12 @@ HRESULT WINAPI DllRegisterServer(void) &IID_IFilterMapper2, (void **)&mapper))) return hr; - IFilterMapper2_RegisterFilter(mapper, &CLSID_AviSplitter, avi_splitterW, NULL, NULL, NULL, &reg_avi_splitter); + IFilterMapper2_RegisterFilter(mapper, &CLSID_AviSplitter, L"AVI Splitter", NULL, NULL, NULL, &reg_avi_splitter); IFilterMapper2_RegisterFilter(mapper, &CLSID_decodebin_parser, - wGstreamer_Splitter, NULL, NULL, NULL, &reg_decodebin_parser); - IFilterMapper2_RegisterFilter(mapper, &CLSID_MPEG1Splitter, mpeg_splitterW, NULL, NULL, NULL, &reg_mpeg_splitter); - IFilterMapper2_RegisterFilter(mapper, &CLSID_WAVEParser, wave_parserW, NULL, NULL, NULL, &reg_wave_parser); + L"GStreamer splitter filter", NULL, NULL, NULL, &reg_decodebin_parser); + IFilterMapper2_RegisterFilter(mapper, &CLSID_MPEG1Splitter, + L"MPEG-I Stream Splitter", NULL, NULL, NULL, &reg_mpeg_splitter); + IFilterMapper2_RegisterFilter(mapper, &CLSID_WAVEParser, L"Wave Parser", NULL, NULL, NULL, &reg_wave_parser); IFilterMapper2_Release(mapper); diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 439fc2ee5ed..22581eb7311 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -446,7 +446,7 @@ HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) return CLASS_E_CLASSNOTAVAILABLE; } -static WCHAR audio_converterW[] = {'A','u','d','i','o',' ','C','o','n','v','e','r','t','e','r',0}; +static WCHAR audio_converterW[] = L"Audio Converter"; static const GUID *audio_converter_supported_types[] = { &MFAudioFormat_PCM, -- 2.30.1 [View Less]

4 11

[PATCH vkd3d 1/6] vkd3d-shader: Correctly dump array types.
by Zebediah Figura 23 Feb '21

23 Feb '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index f181439c..342fe6af 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -693,10 +693,27 @@ char *hlsl_type_to_string(const struct hlsl_type *type) return string; case HLSL_CLASS_ARRAY: - name = … [View More]

6 22

[PATCH] mf/tests: Skip all tests on Vista.
by Nikolay Sivov 23 Feb '21

23 Feb '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- It's not worth it to fix all the crashes and differences that only show up on Vista. dlls/mf/tests/mf.c | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index e3a752553bb..40d8561bb06 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -48,6 +48,12 @@ DEFINE_GUID(MFVideoFormat_ABGR32, 0x00000020, 0x0000, 0x0010, 0x80, 0x00, … [View More]0x00, #include "wine/test.h" static HRESULT (WINAPI *pMFCreateSampleCopierMFT)(IMFTransform **copier); +static HRESULT (WINAPI *pMFGetTopoNodeCurrentType)(IMFTopologyNode *node, DWORD stream, BOOL output, IMFMediaType **type); + +static BOOL is_vista(void) +{ + return !pMFGetTopoNodeCurrentType; +} #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) static void _expect_ref(IUnknown* obj, ULONG expected_refcount, int line) @@ -5089,14 +5095,20 @@ static void test_MFGetTopoNodeCurrentType(void) IMFTopologyNode *node; HRESULT hr; + if (!pMFGetTopoNodeCurrentType) + { + win_skip("MFGetTopoNodeCurrentType() is unsupported.\n"); + return; + } + /* Tee node. */ hr = MFCreateTopologyNode(MF_TOPOLOGY_TEE_NODE, &node); ok(hr == S_OK, "Failed to create a node, hr %#x.\n", hr); - hr = MFGetTopoNodeCurrentType(node, 0, TRUE, &media_type); + hr = pMFGetTopoNodeCurrentType(node, 0, TRUE, &media_type); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); - hr = MFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); + hr = pMFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); hr = MFCreateMediaType(&media_type2); @@ -5109,7 +5121,7 @@ static void test_MFGetTopoNodeCurrentType(void) hr = IMFTopologyNode_SetInputPrefType(node, 0, media_type2); ok(hr == S_OK, "Failed to set media type, hr %#x.\n", hr); - hr = MFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); + hr = pMFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(media_type == media_type2, "Unexpected pointer.\n"); IMFMediaType_Release(media_type); @@ -5117,14 +5129,14 @@ static void test_MFGetTopoNodeCurrentType(void) hr = IMFTopologyNode_SetInputPrefType(node, 0, NULL); ok(hr == S_OK, "Failed to set media type, hr %#x.\n", hr); - hr = MFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); + hr = pMFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); /* Set second output. */ hr = IMFTopologyNode_SetOutputPrefType(node, 1, media_type2); ok(hr == S_OK, "Failed to set media type, hr %#x.\n", hr); - hr = MFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); + hr = pMFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); hr = IMFTopologyNode_SetOutputPrefType(node, 1, NULL); @@ -5134,7 +5146,7 @@ static void test_MFGetTopoNodeCurrentType(void) hr = IMFTopologyNode_SetOutputPrefType(node, 0, media_type2); ok(hr == S_OK, "Failed to set media type, hr %#x.\n", hr); - hr = MFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); + hr = pMFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(media_type == media_type2, "Unexpected pointer.\n"); IMFMediaType_Release(media_type); @@ -5149,12 +5161,12 @@ static void test_MFGetTopoNodeCurrentType(void) hr = IMFTopologyNode_SetUINT32(node, &MF_TOPONODE_PRIMARYOUTPUT, 1); ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); - hr = MFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); + hr = pMFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(media_type == media_type2, "Unexpected pointer.\n"); IMFMediaType_Release(media_type); - hr = MFGetTopoNodeCurrentType(node, 0, TRUE, &media_type); + hr = pMFGetTopoNodeCurrentType(node, 0, TRUE, &media_type); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(media_type == media_type2, "Unexpected pointer.\n"); IMFMediaType_Release(media_type); @@ -5169,6 +5181,7 @@ static void init_functions(void) #define X(f) p##f = (void*)GetProcAddress(mod, #f) X(MFCreateSampleCopierMFT); + X(MFGetTopoNodeCurrentType); #undef X } @@ -5176,6 +5189,12 @@ START_TEST(mf) { init_functions(); + if (is_vista()) + { + win_skip("Skipping tests on Vista.\n"); + return; + } + test_topology(); test_topology_tee_node(); test_topology_loader(); -- 2.30.0 [View Less]

1 0

[PATCH v2 1/2] advapi32: Return ERROR_INVALID_PARAMETER for invalid crypt objects' handles.
by Paul Gofman 23 Feb '21

23 Feb '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- - don't pass error code to helper and always return _INVALID_PARAMETER (renamed patch accordingly). - add tests showing that _INVALID_PARAMETER is returned on Windows where we were previously returning _INVALID_HANDLE. - squash with patch 1. v2: - avoid whitespace changes. dlls/advapi32/crypt.c | 295 +++++++++++++++++++----------------- dlls/advapi32/tests/crypt.c | 55 ++++++- 2 files … [View More]changed, 206 insertions(+), 144 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index a9314d31472..68db1c3382b 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -57,6 +57,31 @@ static HWND crypt_hWindow; #define CRYPT_Alloc(size) (LocalAlloc(LMEM_ZEROINIT, size)) #define CRYPT_Free(buffer) (LocalFree(buffer)) +static void *pointer_from_handle(UINT_PTR handle, DWORD magic) +{ + if (!handle || *(DWORD *)handle != magic) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + return (void *)handle; +} + +static PCRYPTPROV provider_from_handle(HCRYPTPROV handle) +{ + return pointer_from_handle(handle, MAGIC_CRYPTPROV); +} + +static PCRYPTHASH hash_from_handle(HCRYPTHASH handle) +{ + return pointer_from_handle(handle, MAGIC_CRYPTHASH); +} + +static PCRYPTKEY key_from_handle(HCRYPTKEY handle) +{ + return pointer_from_handle(handle, MAGIC_CRYPTKEY); +} + static inline PWSTR CRYPT_GetProvKeyName(PCWSTR pProvName) { static const WCHAR KEYSTR[] = L"Software\\Microsoft\\Cryptography\\Defaults\\Provider\\"; @@ -578,21 +603,12 @@ BOOL WINAPI CryptAcquireContextA (HCRYPTPROV *phProv, LPCSTR pszContainer, */ BOOL WINAPI CryptContextAddRef (HCRYPTPROV hProv, DWORD *pdwReserved, DWORD dwFlags) { - PCRYPTPROV pProv = (PCRYPTPROV)hProv; + PCRYPTPROV pProv = provider_from_handle(hProv); TRACE("(0x%lx, %p, %08x)\n", hProv, pdwReserved, dwFlags); if (!pProv) - { - SetLastError(NTE_BAD_UID); return FALSE; - } - - if (pProv->dwMagic != MAGIC_CRYPTPROV) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } InterlockedIncrement(&pProv->refcount); return TRUE; @@ -613,22 +629,13 @@ BOOL WINAPI CryptContextAddRef (HCRYPTPROV hProv, DWORD *pdwReserved, DWORD dwFl */ BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) { - PCRYPTPROV pProv = (PCRYPTPROV)hProv; + PCRYPTPROV pProv = provider_from_handle(hProv); BOOL ret = TRUE; TRACE("(0x%lx, %08x)\n", hProv, dwFlags); if (!pProv) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - if (pProv->dwMagic != MAGIC_CRYPTPROV) - { - SetLastError(ERROR_INVALID_PARAMETER); return FALSE; - } if (InterlockedDecrement(&pProv->refcount) == 0) { @@ -665,21 +672,12 @@ BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) */ BOOL WINAPI CryptGenRandom (HCRYPTPROV hProv, DWORD dwLen, BYTE *pbBuffer) { - PCRYPTPROV prov = (PCRYPTPROV)hProv; + PCRYPTPROV prov = provider_from_handle(hProv); TRACE("(0x%lx, %d, %p)\n", hProv, dwLen, pbBuffer); - if (!hProv) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - - if (prov->dwMagic != MAGIC_CRYPTPROV) - { - SetLastError(ERROR_INVALID_PARAMETER); + if (!prov) return FALSE; - } return prov->pFuncs->pCPGenRandom(prov->hPrivate, dwLen, pbBuffer); } @@ -706,14 +704,19 @@ BOOL WINAPI CryptGenRandom (HCRYPTPROV hProv, DWORD dwLen, BYTE *pbBuffer) BOOL WINAPI CryptCreateHash (HCRYPTPROV hProv, ALG_ID Algid, HCRYPTKEY hKey, DWORD dwFlags, HCRYPTHASH *phHash) { - PCRYPTPROV prov = (PCRYPTPROV)hProv; - PCRYPTKEY key = (PCRYPTKEY)hKey; + PCRYPTKEY key = NULL; + PCRYPTPROV prov; PCRYPTHASH hash; TRACE("(0x%lx, 0x%x, 0x%lx, %08x, %p)\n", hProv, Algid, hKey, dwFlags, phHash); - if (!prov || !phHash || prov->dwMagic != MAGIC_CRYPTPROV || - (key && key->dwMagic != MAGIC_CRYPTKEY)) + if (!(prov = provider_from_handle(hProv))) + return FALSE; + + if (hKey && !(key = key_from_handle(hKey))) + return FALSE; + + if (!phHash) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -766,15 +769,19 @@ BOOL WINAPI CryptCreateHash (HCRYPTPROV hProv, ALG_ID Algid, HCRYPTKEY hKey, BOOL WINAPI CryptDecrypt (HCRYPTKEY hKey, HCRYPTHASH hHash, BOOL Final, DWORD dwFlags, BYTE *pbData, DWORD *pdwDataLen) { + PCRYPTHASH hash = NULL; PCRYPTPROV prov; - PCRYPTKEY key = (PCRYPTKEY)hKey; - PCRYPTHASH hash = (PCRYPTHASH)hHash; + PCRYPTKEY key; TRACE("(0x%lx, 0x%lx, %d, %08x, %p, %p)\n", hKey, hHash, Final, dwFlags, pbData, pdwDataLen); - if (!key || !pbData || !pdwDataLen || - !key->pProvider || key->dwMagic != MAGIC_CRYPTKEY || - key->pProvider->dwMagic != MAGIC_CRYPTPROV) + if (!(key = key_from_handle(hKey))) + return FALSE; + + if (hHash && !(hash = hash_from_handle(hHash))) + return FALSE; + + if (!pbData || !pdwDataLen || !key->pProvider || key->pProvider->dwMagic != MAGIC_CRYPTPROV) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -804,18 +811,19 @@ BOOL WINAPI CryptDecrypt (HCRYPTKEY hKey, HCRYPTHASH hHash, BOOL Final, BOOL WINAPI CryptDeriveKey (HCRYPTPROV hProv, ALG_ID Algid, HCRYPTHASH hBaseData, DWORD dwFlags, HCRYPTKEY *phKey) { - PCRYPTPROV prov = (PCRYPTPROV)hProv; - PCRYPTHASH hash = (PCRYPTHASH)hBaseData; + PCRYPTPROV prov; + PCRYPTHASH hash; PCRYPTKEY key; TRACE("(0x%lx, 0x%08x, 0x%lx, 0x%08x, %p)\n", hProv, Algid, hBaseData, dwFlags, phKey); - if (!prov || !hash) - { - SetLastError(ERROR_INVALID_HANDLE); + if (!(prov = provider_from_handle(hProv))) return FALSE; - } - if (!phKey || prov->dwMagic != MAGIC_CRYPTPROV || hash->dwMagic != MAGIC_CRYPTHASH) + + if (!(hash = hash_from_handle(hBaseData))) + return FALSE; + + if (!phKey) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -855,20 +863,16 @@ BOOL WINAPI CryptDeriveKey (HCRYPTPROV hProv, ALG_ID Algid, HCRYPTHASH hBaseData */ BOOL WINAPI CryptDestroyHash (HCRYPTHASH hHash) { - PCRYPTHASH hash = (PCRYPTHASH)hHash; + PCRYPTHASH hash; PCRYPTPROV prov; BOOL ret; TRACE("(0x%lx)\n", hHash); - if (!hash) - { - SetLastError(ERROR_INVALID_HANDLE); + if (!(hash = hash_from_handle(hHash))) return FALSE; - } - if (!hash->pProvider || hash->dwMagic != MAGIC_CRYPTHASH || - hash->pProvider->dwMagic != MAGIC_CRYPTPROV) + if (!hash->pProvider || hash->pProvider->dwMagic != MAGIC_CRYPTPROV) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -895,20 +899,16 @@ BOOL WINAPI CryptDestroyHash (HCRYPTHASH hHash) */ BOOL WINAPI CryptDestroyKey (HCRYPTKEY hKey) { - PCRYPTKEY key = (PCRYPTKEY)hKey; PCRYPTPROV prov; + PCRYPTKEY key; BOOL ret; TRACE("(0x%lx)\n", hKey); - if (!key) - { - SetLastError(ERROR_INVALID_HANDLE); + if (!(key = key_from_handle(hKey))) return FALSE; - } - if (!key->pProvider || key->dwMagic != MAGIC_CRYPTKEY || - key->pProvider->dwMagic != MAGIC_CRYPTPROV) + if (!key->pProvider || key->pProvider->dwMagic != MAGIC_CRYPTPROV) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -944,9 +944,10 @@ BOOL WINAPI CryptDuplicateHash (HCRYPTHASH hHash, DWORD *pdwReserved, TRACE("(0x%lx, %p, %08x, %p)\n", hHash, pdwReserved, dwFlags, phHash); - orghash = (PCRYPTHASH)hHash; - if (!orghash || pdwReserved || !phHash || !orghash->pProvider || - orghash->dwMagic != MAGIC_CRYPTHASH || orghash->pProvider->dwMagic != MAGIC_CRYPTPROV) + if (!(orghash = hash_from_handle(hHash))) + return FALSE; + + if (pdwReserved || !phHash || !orghash->pProvider || orghash->pProvider->dwMagic != MAGIC_CRYPTPROV) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -999,10 +1000,10 @@ BOOL WINAPI CryptDuplicateKey (HCRYPTKEY hKey, DWORD *pdwReserved, DWORD dwFlags TRACE("(0x%lx, %p, %08x, %p)\n", hKey, pdwReserved, dwFlags, phKey); - orgkey = (PCRYPTKEY)hKey; - if (!orgkey || pdwReserved || !phKey || !orgkey->pProvider || - orgkey->dwMagic != MAGIC_CRYPTKEY || - orgkey->pProvider->dwMagic != MAGIC_CRYPTPROV) + if (!(orgkey = key_from_handle(hKey))) + return FALSE; + + if (pdwReserved || !phKey || !orgkey->pProvider || orgkey->pProvider->dwMagic != MAGIC_CRYPTPROV) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -1059,14 +1060,19 @@ BOOL WINAPI CryptDuplicateKey (HCRYPTKEY hKey, DWORD *pdwReserved, DWORD dwFlags BOOL WINAPI CryptEncrypt (HCRYPTKEY hKey, HCRYPTHASH hHash, BOOL Final, DWORD dwFlags, BYTE *pbData, DWORD *pdwDataLen, DWORD dwBufLen) { + PCRYPTHASH hash = NULL; PCRYPTPROV prov; - PCRYPTKEY key = (PCRYPTKEY)hKey; - PCRYPTHASH hash = (PCRYPTHASH)hHash; + PCRYPTKEY key; TRACE("(0x%lx, 0x%lx, %d, %08x, %p, %p, %d)\n", hKey, hHash, Final, dwFlags, pbData, pdwDataLen, dwBufLen); - if (!key || !pdwDataLen || !key->pProvider || - key->dwMagic != MAGIC_CRYPTKEY || key->pProvider->dwMagic != MAGIC_CRYPTPROV) + if (!(key = key_from_handle(hKey))) + return FALSE; + + if (hHash && !(hash = hash_from_handle(hHash))) + return FALSE; + + if (!pdwDataLen || !key->pProvider || key->pProvider->dwMagic != MAGIC_CRYPTPROV) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -1367,12 +1373,17 @@ BOOL WINAPI CryptExportKey (HCRYPTKEY hKey, HCRYPTKEY hExpKey, DWORD dwBlobType, DWORD dwFlags, BYTE *pbData, DWORD *pdwDataLen) { PCRYPTPROV prov; - PCRYPTKEY key = (PCRYPTKEY)hKey, expkey = (PCRYPTKEY)hExpKey; + PCRYPTKEY key, expkey = NULL; TRACE("(0x%lx, 0x%lx, %d, %08x, %p, %p)\n", hKey, hExpKey, dwBlobType, dwFlags, pbData, pdwDataLen); - if (!key || !pdwDataLen || !key->pProvider || - key->dwMagic != MAGIC_CRYPTKEY || key->pProvider->dwMagic != MAGIC_CRYPTPROV) + if (!(key = key_from_handle(hKey))) + return FALSE; + + if (hExpKey && !(expkey = key_from_handle(hExpKey))) + return FALSE; + + if (!pdwDataLen || !key->pProvider || key->pProvider->dwMagic != MAGIC_CRYPTPROV) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -1400,12 +1411,15 @@ BOOL WINAPI CryptExportKey (HCRYPTKEY hKey, HCRYPTKEY hExpKey, DWORD dwBlobType, */ BOOL WINAPI CryptGenKey (HCRYPTPROV hProv, ALG_ID Algid, DWORD dwFlags, HCRYPTKEY *phKey) { - PCRYPTPROV prov = (PCRYPTPROV)hProv; + PCRYPTPROV prov; PCRYPTKEY key; TRACE("(0x%lx, %d, %08x, %p)\n", hProv, Algid, dwFlags, phKey); - if (!phKey || !prov || prov->dwMagic != MAGIC_CRYPTPROV) + if (!(prov = provider_from_handle(hProv))) + return FALSE; + + if (!phKey) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -1560,12 +1574,15 @@ BOOL WINAPI CryptGetHashParam (HCRYPTHASH hHash, DWORD dwParam, BYTE *pbData, DWORD *pdwDataLen, DWORD dwFlags) { PCRYPTPROV prov; - PCRYPTHASH hash = (PCRYPTHASH)hHash; + PCRYPTHASH hash; TRACE("(0x%lx, %d, %p, %p, %08x)\n", hHash, dwParam, pbData, pdwDataLen, dwFlags); - if (!hash || !pdwDataLen || !hash->pProvider || - hash->dwMagic != MAGIC_CRYPTHASH || hash->pProvider->dwMagic != MAGIC_CRYPTPROV) + if (!(hash = hash_from_handle(hHash))) + return FALSE; + + + if (!pdwDataLen || !hash->pProvider || hash->pProvider->dwMagic != MAGIC_CRYPTPROV) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -1599,12 +1616,14 @@ BOOL WINAPI CryptGetKeyParam (HCRYPTKEY hKey, DWORD dwParam, BYTE *pbData, DWORD *pdwDataLen, DWORD dwFlags) { PCRYPTPROV prov; - PCRYPTKEY key = (PCRYPTKEY)hKey; + PCRYPTKEY key; TRACE("(0x%lx, %d, %p, %p, %08x)\n", hKey, dwParam, pbData, pdwDataLen, dwFlags); - if (!key || !pdwDataLen || !key->pProvider || - key->dwMagic != MAGIC_CRYPTKEY || key->pProvider->dwMagic != MAGIC_CRYPTPROV) + if (!(key = key_from_handle(hKey))) + return FALSE; + + if (!pdwDataLen || !key->pProvider || key->pProvider->dwMagic != MAGIC_CRYPTPROV) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -1637,15 +1656,12 @@ BOOL WINAPI CryptGetKeyParam (HCRYPTKEY hKey, DWORD dwParam, BYTE *pbData, BOOL WINAPI CryptGetProvParam (HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, DWORD *pdwDataLen, DWORD dwFlags) { - PCRYPTPROV prov = (PCRYPTPROV)hProv; + PCRYPTPROV prov; TRACE("(0x%lx, %d, %p, %p, %08x)\n", hProv, dwParam, pbData, pdwDataLen, dwFlags); - if (!prov || prov->dwMagic != MAGIC_CRYPTPROV) - { - SetLastError(ERROR_INVALID_PARAMETER); + if (!(prov = provider_from_handle(hProv))) return FALSE; - } return prov->pFuncs->pCPGetProvParam(prov->hPrivate, dwParam, pbData, pdwDataLen, dwFlags); } @@ -1666,17 +1682,15 @@ BOOL WINAPI CryptGetProvParam (HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, */ BOOL WINAPI CryptGetUserKey (HCRYPTPROV hProv, DWORD dwKeySpec, HCRYPTKEY *phUserKey) { - PCRYPTPROV prov = (PCRYPTPROV)hProv; + PCRYPTPROV prov; PCRYPTKEY key; TRACE("(0x%lx, %d, %p)\n", hProv, dwKeySpec, phUserKey); - if (!prov) - { - SetLastError(ERROR_INVALID_HANDLE); + if (!(prov = provider_from_handle(hProv))) return FALSE; - } - if (!phUserKey || prov->dwMagic != MAGIC_CRYPTPROV) + + if (!phUserKey) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -1719,18 +1733,15 @@ BOOL WINAPI CryptGetUserKey (HCRYPTPROV hProv, DWORD dwKeySpec, HCRYPTKEY *phUse */ BOOL WINAPI CryptHashData (HCRYPTHASH hHash, const BYTE *pbData, DWORD dwDataLen, DWORD dwFlags) { - PCRYPTHASH hash = (PCRYPTHASH)hHash; + PCRYPTHASH hash; PCRYPTPROV prov; TRACE("(0x%lx, %p, %d, %08x)\n", hHash, pbData, dwDataLen, dwFlags); - if (!hash) - { - SetLastError(ERROR_INVALID_HANDLE); + if (!(hash = hash_from_handle(hHash))) return FALSE; - } - if (!hash->pProvider || hash->dwMagic != MAGIC_CRYPTHASH || - hash->pProvider->dwMagic != MAGIC_CRYPTPROV) + + if (!hash->pProvider || hash->pProvider->dwMagic != MAGIC_CRYPTPROV) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -1756,20 +1767,19 @@ BOOL WINAPI CryptHashData (HCRYPTHASH hHash, const BYTE *pbData, DWORD dwDataLen */ BOOL WINAPI CryptHashSessionKey (HCRYPTHASH hHash, HCRYPTKEY hKey, DWORD dwFlags) { - PCRYPTHASH hash = (PCRYPTHASH)hHash; - PCRYPTKEY key = (PCRYPTKEY)hKey; + PCRYPTHASH hash; + PCRYPTKEY key; PCRYPTPROV prov; TRACE("(0x%lx, 0x%lx, %08x)\n", hHash, hKey, dwFlags); - if (!hash || !key) - { - SetLastError(ERROR_INVALID_HANDLE); + if (!(hash = hash_from_handle(hHash))) + return FALSE; + + if (!(key = key_from_handle(hKey))) return FALSE; - } - if (!hash->pProvider || hash->dwMagic != MAGIC_CRYPTHASH || - hash->pProvider->dwMagic != MAGIC_CRYPTPROV || key->dwMagic != MAGIC_CRYPTKEY) + if (!hash->pProvider || hash->pProvider->dwMagic != MAGIC_CRYPTPROV) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -1799,14 +1809,18 @@ BOOL WINAPI CryptHashSessionKey (HCRYPTHASH hHash, HCRYPTKEY hKey, DWORD dwFlags BOOL WINAPI CryptImportKey (HCRYPTPROV hProv, const BYTE *pbData, DWORD dwDataLen, HCRYPTKEY hPubKey, DWORD dwFlags, HCRYPTKEY *phKey) { - PCRYPTPROV prov = (PCRYPTPROV)hProv; - PCRYPTKEY pubkey = (PCRYPTKEY)hPubKey, importkey; + PCRYPTPROV prov; + PCRYPTKEY pubkey = NULL, importkey; TRACE("(0x%lx, %p, %d, 0x%lx, %08x, %p)\n", hProv, pbData, dwDataLen, hPubKey, dwFlags, phKey); - if (!prov || !pbData || !dwDataLen || !phKey || - prov->dwMagic != MAGIC_CRYPTPROV || - (pubkey && pubkey->dwMagic != MAGIC_CRYPTKEY)) + if (!(prov = provider_from_handle(hProv))) + return FALSE; + + if (hPubKey && !(pubkey = key_from_handle(hPubKey))) + return FALSE; + + if (!pbData || !dwDataLen || !phKey) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -1857,19 +1871,16 @@ BOOL WINAPI CryptImportKey (HCRYPTPROV hProv, const BYTE *pbData, DWORD dwDataLe BOOL WINAPI CryptSignHashW (HCRYPTHASH hHash, DWORD dwKeySpec, LPCWSTR sDescription, DWORD dwFlags, BYTE *pbSignature, DWORD *pdwSigLen) { - PCRYPTHASH hash = (PCRYPTHASH)hHash; + PCRYPTHASH hash; PCRYPTPROV prov; TRACE("(0x%lx, %d, %s, %08x, %p, %p)\n", hHash, dwKeySpec, debugstr_w(sDescription), dwFlags, pbSignature, pdwSigLen); - if (!hash) - { - SetLastError(ERROR_INVALID_HANDLE); + if (!(hash = hash_from_handle(hHash))) return FALSE; - } - if (!pdwSigLen || !hash->pProvider || hash->dwMagic != MAGIC_CRYPTHASH || - hash->pProvider->dwMagic != MAGIC_CRYPTPROV) + + if (!pdwSigLen || !hash->pProvider || hash->pProvider->dwMagic != MAGIC_CRYPTPROV) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -1919,12 +1930,14 @@ BOOL WINAPI CryptSignHashA (HCRYPTHASH hHash, DWORD dwKeySpec, LPCSTR sDescripti BOOL WINAPI CryptSetHashParam (HCRYPTHASH hHash, DWORD dwParam, const BYTE *pbData, DWORD dwFlags) { PCRYPTPROV prov; - PCRYPTHASH hash = (PCRYPTHASH)hHash; + PCRYPTHASH hash; TRACE("(0x%lx, %d, %p, %08x)\n", hHash, dwParam, pbData, dwFlags); - if (!hash || !pbData || !hash->pProvider || - hash->dwMagic != MAGIC_CRYPTHASH || hash->pProvider->dwMagic != MAGIC_CRYPTPROV) + if (!(hash = hash_from_handle(hHash))) + return FALSE; + + if (!pbData || !hash->pProvider || hash->pProvider->dwMagic != MAGIC_CRYPTPROV) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -1953,12 +1966,14 @@ BOOL WINAPI CryptSetHashParam (HCRYPTHASH hHash, DWORD dwParam, const BYTE *pbDa BOOL WINAPI CryptSetKeyParam (HCRYPTKEY hKey, DWORD dwParam, const BYTE *pbData, DWORD dwFlags) { PCRYPTPROV prov; - PCRYPTKEY key = (PCRYPTKEY)hKey; + PCRYPTKEY key; TRACE("(0x%lx, %d, %p, %08x)\n", hKey, dwParam, pbData, dwFlags); - if (!key || !pbData || !key->pProvider || - key->dwMagic != MAGIC_CRYPTKEY || key->pProvider->dwMagic != MAGIC_CRYPTPROV) + if (!(key = key_from_handle(hKey))) + return FALSE; + + if (!pbData || !key->pProvider || key->pProvider->dwMagic != MAGIC_CRYPTPROV) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -2126,20 +2141,13 @@ BOOL WINAPI CryptSetProviderExA (LPCSTR pszProvName, DWORD dwProvType, DWORD *pd */ BOOL WINAPI CryptSetProvParam (HCRYPTPROV hProv, DWORD dwParam, const BYTE *pbData, DWORD dwFlags) { - PCRYPTPROV prov = (PCRYPTPROV)hProv; + PCRYPTPROV prov; TRACE("(0x%lx, %d, %p, %08x)\n", hProv, dwParam, pbData, dwFlags); - if (!prov) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (prov->dwMagic != MAGIC_CRYPTPROV) - { - SetLastError(ERROR_INVALID_PARAMETER); + if (!(prov = provider_from_handle(hProv))) return FALSE; - } + if (dwParam == PP_USE_HARDWARE_RNG) { FIXME("PP_USE_HARDWARE_RNG: What do I do with this?\n"); @@ -2186,15 +2194,20 @@ BOOL WINAPI CryptSetProvParam (HCRYPTPROV hProv, DWORD dwParam, const BYTE *pbDa BOOL WINAPI CryptVerifySignatureW (HCRYPTHASH hHash, const BYTE *pbSignature, DWORD dwSigLen, HCRYPTKEY hPubKey, LPCWSTR sDescription, DWORD dwFlags) { - PCRYPTHASH hash = (PCRYPTHASH)hHash; - PCRYPTKEY key = (PCRYPTKEY)hPubKey; + PCRYPTHASH hash; + PCRYPTKEY key; PCRYPTPROV prov; TRACE("(0x%lx, %p, %d, 0x%lx, %s, %08x)\n", hHash, pbSignature, dwSigLen, hPubKey, debugstr_w(sDescription), dwFlags); - if (!hash || !key || key->dwMagic != MAGIC_CRYPTKEY || hash->dwMagic != MAGIC_CRYPTHASH || - !hash->pProvider || hash->pProvider->dwMagic != MAGIC_CRYPTPROV || + if (!(hash = hash_from_handle(hHash))) + return FALSE; + + if (!(key = key_from_handle(hPubKey))) + return FALSE; + + if (!hash->pProvider || hash->pProvider->dwMagic != MAGIC_CRYPTPROV || !key->pProvider || key->pProvider->dwMagic != MAGIC_CRYPTPROV) { SetLastError(ERROR_INVALID_PARAMETER); diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index f34c99ee9bf..a6e3d447ba8 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -152,6 +152,9 @@ static void test_CryptReleaseContext(void) ret = CryptContextAddRef(prov, NULL, 0); ok(ret, "got %u\n", GetLastError()); + ret = CryptContextAddRef(0, NULL, 0); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); + ret = CryptReleaseContext(prov, 0); ok(ret, "got %u\n", GetLastError()); @@ -272,18 +275,49 @@ static void test_incorrect_api_usage(void) result = CryptCreateHash(hProv, CALG_SHA, 0, 0, &hHash); ok (result, "%d\n", GetLastError()); if (!result) return; - CryptDestroyHash(hHash); - result = CryptCreateHash(0, CALG_SHA, 0, 0, &hHash); + result = CryptDeriveKey(0, CALG_RC4, hHash, 0, &hKey2); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); - result = CryptGenKey(0, CALG_RC4, 0, &hKey); + result = CryptDeriveKey(hProv, CALG_RC4, 0, 0, &hKey2); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); + + result = CryptHashData(0, &temp, 1, 0); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); result = CryptGenKey(hProv, CALG_RC4, 0, &hKey); ok (result, "%d\n", GetLastError()); if (!result) return; + result = pCryptHashSessionKey(hHash, 0, 0); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); + + result = pCryptHashSessionKey(0, hKey, 0); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); + + result = CryptDestroyHash(hHash); + ok (result, "%08x\n", GetLastError()); + + result = CryptDestroyHash(0); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); + + result = CryptCreateHash(0, CALG_SHA, 0, 0, &hHash); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); + + result = CryptGenKey(0, CALG_RC4, 0, &hKey); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); + + dwLen = 1; + result = CryptDecrypt(hKey, 0, TRUE, 0, &temp, &dwLen); + ok (result, "%d\n", GetLastError()); + result = CryptDecrypt(0, 0, TRUE, 0, &temp, &dwLen); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); + + result = CryptEncrypt(hKey, 0, TRUE, 0, &temp, &dwLen, sizeof(temp)); + ok (result, "%d\n", GetLastError()); + result = CryptEncrypt(0, 0, TRUE, 0, &temp, &dwLen, sizeof(temp)); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); + result = CryptDestroyKey(hKey); ok (result, "%d\n", GetLastError()); @@ -294,6 +328,9 @@ static void test_incorrect_api_usage(void) result = CryptDestroyKey(hKey2); ok (result, "%d\n", GetLastError()); + result = CryptDestroyKey(0); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); + dwTemp = CRYPT_MODE_ECB; result = CryptSetKeyParam(hKey2, KP_MODE, (BYTE*)&dwTemp, sizeof(DWORD)); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); @@ -309,6 +346,9 @@ static void test_incorrect_api_usage(void) ok(result, "got %u\n", GetLastError()); if (!result) return; + result = pCryptGenRandom(0, 1, &temp); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); + result = pCryptGenRandom(hProv, 1, &temp); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); @@ -353,6 +393,9 @@ static void test_incorrect_api_usage(void) dwLen = 1; result = CryptGetProvParam(hProv, 0, &temp, &dwLen, 0); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); + + result = CryptGetUserKey(0, 0, &hKey2); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); result = CryptGetUserKey(hProv, 0, &hKey2); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); @@ -372,6 +415,9 @@ static void test_incorrect_api_usage(void) result = pCryptSignHashW(hHash, 0, NULL, 0, &temp, &dwLen); ok (!result && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_CALL_NOT_IMPLEMENTED), "%d\n", GetLastError()); + result = pCryptSignHashW(hHash, 0, NULL, 0, &temp, &dwLen); + ok (!result && (GetLastError() == ERROR_INVALID_PARAMETER || + GetLastError() == ERROR_CALL_NOT_IMPLEMENTED), "%d\n", GetLastError()); } else win_skip("CryptSignHashW is not available\n"); @@ -382,6 +428,9 @@ static void test_incorrect_api_usage(void) result = CryptSetHashParam(hHash, 0, &temp, 1); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); + result = CryptSetProvParam(0, 0, &temp, 1); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); + result = CryptSetProvParam(hProv, 0, &temp, 1); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); -- 2.29.2 [View Less]

1 1

[PATCH] dwrite: Remove unused function.
by Nikolay Sivov 23 Feb '21

23 Feb '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/dwrite_private.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 6528970635b..d28c6cef870 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -118,11 +118,6 @@ static inline unsigned short get_table_entry(const unsigned short *table, WCHAR return table[table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + … [View More]

1 0

[PATCH v3 4/7] wldap32: implement setting the LDAP_OPT_REFERRALS option
by Damjan Jovanovic 23 Feb '21

23 Feb '21

Try 3 treats the "value" as pointer whose own value is meaningful, not a pointer to a ULONG meaningful value. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/wldap32/option.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)

2 1

[PATCH v2] msado15: Add helper function to create CommandText interface
by Alistair Leslie-Hughes 23 Feb '21

23 Feb '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/command.c | 1 + dlls/msado15/connection.c | 83 ++++++++++++++++++++++------------ dlls/msado15/main.c | 1 + dlls/msado15/msado15_private.h | 2 + dlls/msado15/stream.c | 1 + 5 files changed, 58 insertions(+), 30 deletions(-) diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c index d19108a1a25..9a56ced25ac 100644 --- a/dlls/msado15/command.c +++ b/dlls/… [View More]msado15/command.c @@ -20,6 +20,7 @@ #include "winbase.h" #define COBJMACROS #include "objbase.h" +#include "msdasc.h" #include "msado15_backcompat.h" #include "wine/debug.h" diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 500be033199..d55c0d18a35 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -264,61 +264,90 @@ static HRESULT WINAPI connection_Close( _Connection *iface ) return S_OK; } -static HRESULT WINAPI connection_Execute( _Connection *iface, BSTR command, VARIANT *records_affected, - LONG options, _Recordset **record_set ) +HRESULT create_command_text(IUnknown *session, BSTR command, ICommandText **cmd_text) { - struct connection *connection = impl_from_Connection( iface ); HRESULT hr; IOpenRowset *openrowset; - IDBCreateCommand *create_command = NULL; - ICommand *cmd = NULL; - ICommandText *comand_text = NULL; - DBROWCOUNT affected; - IUnknown *rowset = NULL; - _Recordset *recordset = NULL; - ADORecordsetConstruction *construct; + ICommandText *command_text; + ICommand *cmd; + IDBCreateCommand *create_command; - FIXME( "%p, %s, %p, 0x%08x, %p Semi-stub\n", iface, debugstr_w(command), records_affected, options, record_set ); - - if (connection->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); - - hr = IUnknown_QueryInterface(connection->session, &IID_IOpenRowset, (void**)&openrowset); + hr = IUnknown_QueryInterface(session, &IID_IOpenRowset, (void**)&openrowset); if (FAILED(hr)) return hr; hr = IOpenRowset_QueryInterface(openrowset, &IID_IDBCreateCommand, (void**)&create_command); + IOpenRowset_Release(openrowset); if (FAILED(hr)) - goto done; + return hr; hr = IDBCreateCommand_CreateCommand(create_command, NULL, &IID_IUnknown, (IUnknown **)&cmd); + IDBCreateCommand_Release(create_command); if (FAILED(hr)) - goto done; + return hr; - hr = ICommand_QueryInterface(cmd, &IID_ICommandText, (void**)&comand_text); + hr = ICommand_QueryInterface(cmd, &IID_ICommandText, (void**)&command_text); + ICommand_Release(cmd); if (FAILED(hr)) { FIXME("Currently only ICommandText interface is support\n"); - goto done; + return hr; + } + + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, command); + if (FAILED(hr)) + { + ICommandText_Release(command_text); + return hr; } - hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, command); + *cmd_text = command_text; + + return S_OK; +} + +static HRESULT WINAPI connection_Execute( _Connection *iface, BSTR command, VARIANT *records_affected, + LONG options, _Recordset **record_set ) +{ + struct connection *connection = impl_from_Connection( iface ); + HRESULT hr; + ICommandText *comand_text; + DBROWCOUNT affected; + IUnknown *rowset; + _Recordset *recordset; + ADORecordsetConstruction *construct; + + FIXME( "%p, %s, %p, 0x%08x, %p Semi-stub\n", iface, debugstr_w(command), records_affected, options, record_set ); + + if (connection->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + + hr = create_command_text(connection->session, command, &comand_text); if (FAILED(hr)) - goto done; + return hr; hr = ICommandText_Execute(comand_text, NULL, &IID_IUnknown, NULL, &affected, &rowset); + ICommandText_Release(comand_text); if (FAILED(hr)) - goto done; + return hr; hr = Recordset_create( (void**)&recordset); if (FAILED(hr)) - goto done; + { + IUnknown_Release(rowset); + return hr; + } hr = _Recordset_QueryInterface(recordset, &IID_ADORecordsetConstruction, (void**)&construct); if (FAILED(hr)) - goto done; + { + IUnknown_Release(rowset); + _Recordset_Release(recordset); + return hr; + } ADORecordsetConstruction_put_Rowset(construct, rowset); ADORecordsetConstruction_Release(construct); + IUnknown_Release(rowset); if (records_affected) { @@ -329,12 +358,6 @@ static HRESULT WINAPI connection_Execute( _Connection *iface, BSTR command, VARI _Recordset_put_CursorLocation(recordset, connection->location); *record_set = recordset; -done: - if (rowset) IUnknown_Release(rowset); - if (comand_text) ICommandText_Release(comand_text); - if (cmd) ICommand_Release(cmd); - if (create_command) IDBCreateCommand_Release(create_command); - if (openrowset) IOpenRowset_Release(openrowset); return hr; } diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index 770a02fc59d..0b8de1f9117 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -22,6 +22,7 @@ #define COBJMACROS #include "objbase.h" #include "rpcproxy.h" +#include "msdasc.h" #include "msado15_backcompat.h" #include "wine/debug.h" diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index f6c60f0304c..dd98c382e2b 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -26,6 +26,8 @@ HRESULT Connection_create( void ** ) DECLSPEC_HIDDEN; HRESULT Recordset_create( void ** ) DECLSPEC_HIDDEN; HRESULT Stream_create( void ** ) DECLSPEC_HIDDEN; +HRESULT create_command_text(IUnknown *session, BSTR command, ICommandText **cmd_text) DECLSPEC_HIDDEN; + static inline void *heap_realloc_zero( void *mem, SIZE_T len ) { if (!mem) return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index c6add70b1bc..b40f664dcf1 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -21,6 +21,7 @@ #include "winbase.h" #define COBJMACROS #include "objbase.h" +#include "msdasc.h" #include "msado15_backcompat.h" #include "wine/debug.h" -- 2.30.0 [View Less]

2 1

WoW breakage
by Francois Gouget 23 Feb '21

23 Feb '21

On Mon, 22 Feb 2021, Marvin wrote: > Hi, > > While running your changed tests, I think I found new failures. > Being a bot and all I'm not very good at pattern recognition, so I might be > wrong, but could you please double-check? > > Full results can be found at: > https://testbot.winehq.org/JobDetails.pl?Key=85981 So yes, this patch breaks creating the wineprefix in the windows-on-windows case. Per the TestBot log: + time /home/winetest/tools/testbot/var/../var/… [View More]

2 1

[PATCH v3 1/2] iphlpapi: Add a test for GetAdaptersInfo.
by Yeshun Ye 23 Feb '21

23 Feb '21

Signed-off-by: Yeshun Ye <yeyeshun(a)uniontech.com> --- dlls/iphlpapi/tests/iphlpapi.c | 79 ++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 358084fde68..44ead2580bf 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -2338,6 +2338,84 @@ static void test_NotifyUnicastIpAddressChange(void) ok(!CloseHandle(handle), "CloseHandle() succeeded.\n"); } +… [View More]static void test_GetAdaptersInfo_AdapterName(void) +{ + DWORD apiReturn; + ULONG size = 0; + ULONG family = AF_UNSPEC; + ULONG flags = GAA_FLAG_INCLUDE_PREFIX; + + apiReturn = GetAdaptersInfo(NULL, NULL); + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetAdaptersInfo is not supported\n"); + return; + } + apiReturn = GetAdaptersAddresses(0, 0, NULL, NULL, NULL); + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetAdaptersInfo is not supported\n"); + return; + } + apiReturn = GetAdaptersAddresses(family, flags, 0, 0, &size); + ok(apiReturn == ERROR_NO_DATA || apiReturn == ERROR_BUFFER_OVERFLOW, + "GetAdaptersAddresses returned %d, expected ERROR_NO_DATA or ERROR_BUFFER_OVERFLOW\n", + apiReturn); + if (apiReturn == ERROR_NO_DATA) + ; /* no adapter's, that's okay */ + else if (apiReturn == ERROR_BUFFER_OVERFLOW) + { + PIP_ADAPTER_ADDRESSES pAdapterAddress; + PIP_ADAPTER_ADDRESSES pCurrentAddress; + + pAdapterAddress = HeapAlloc(GetProcessHeap(), 0, size); + apiReturn = GetAdaptersAddresses(family, flags, 0, pAdapterAddress, &size); + ok(apiReturn == NO_ERROR, + "GetAdaptersAddresses(family, flags, 0, pAdapterAddress, &size) returned %d, expected NO_ERROR\n", + apiReturn); + + pCurrentAddress = pAdapterAddress; + while (pCurrentAddress) + { + if (pCurrentAddress->IfType == IF_TYPE_ETHERNET_CSMACD && + ((pCurrentAddress->Flags & IP_ADAPTER_IPV4_ENABLED) || (pCurrentAddress->Flags & IP_ADAPTER_IPV6_ENABLED))) + { + ULONG len = 0; + PIP_ADAPTER_INFO ptr, buf; + char IpAddress[16] = {0}; + char IpMask[16] = {0}; + + apiReturn = GetAdaptersInfo(NULL, &len); + ok(apiReturn == ERROR_BUFFER_OVERFLOW, + "GetAdaptersInfo returned %d, expected ERROR_NO_DATA or ERROR_BUFFER_OVERFLOW\n", + apiReturn); + buf = HeapAlloc(GetProcessHeap(), 0, len); + apiReturn = GetAdaptersInfo(buf, &len); + ok(apiReturn == NO_ERROR, + "GetAdaptersInfo(buf, &len) returned %d, expected NO_ERROR\n", + apiReturn); + ptr = buf; + while (ptr) { + if (strcmp(pCurrentAddress->AdapterName, ptr->AdapterName) == 0) + { + ok(ptr->IpAddressList.IpAddress.String[0], "A valid IP must be present\n"); + ok(ptr->IpAddressList.IpMask.String[0], "A valid mask must be present\n"); + trace("Adapter '%s', IP %s, Mask %s\n", ptr->AdapterName, + ptr->IpAddressList.IpAddress.String, ptr->IpAddressList.IpMask.String); + strcpy(IpAddress, ptr->IpAddressList.IpAddress.String); + strcpy(IpMask, ptr->IpAddressList.IpMask.String); + break; + } + ptr = ptr->Next; + } + todo_wine ok(IpAddress[0], "A valid IP must be present for adapter [%s]\n", pCurrentAddress->AdapterName); + todo_wine ok(IpMask[0], "A valid mask must be present for adapter [%s]\n", pCurrentAddress->AdapterName); + HeapFree(GetProcessHeap(), 0, buf); + } + pCurrentAddress = pCurrentAddress->Next; + } + HeapFree(GetProcessHeap(), 0, pAdapterAddress); + } +} + START_TEST(iphlpapi) { @@ -2370,6 +2448,7 @@ START_TEST(iphlpapi) test_GetUdp6Table(); test_ParseNetworkString(); test_NotifyUnicastIpAddressChange(); + test_GetAdaptersInfo_AdapterName(); freeIPHlpApi(); } } -- 2.20.1 [View Less]

2 5

Re: [PATCH] kernelbase: Add rudimentary mui resource support to loader.c
by Craig Schulstad 23 Feb '21

23 Feb '21

Thank you for informing me. On Mon, Feb 22, 2021 at 3:44 PM Marvin <testbot(a)winehq.org> wrote: > Thank you for your contribution to Wine! > > This is an automated notification to let you know that your patch has > been reviewed and its status set to "Rejected". > > This means that the patch has been rejected by a reviewer. You should > have received a mail explaining why it was rejected. You need to fix > the issue and resend the patch, or if you are convinced … [View More]

1 1

[PATCH] winegstreamer: Fully initialize MF object creation context.
by Nikolay Sivov 22 Feb '21

22 Feb '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Problematic field is 'url' which is only set on string duplication. Uninitialize pointer then appears in traces like this: 0230:trace:mfplat:winegstreamer_stream_handler_create_object (0x2b3915e0 L"\8507\1829\8120" 0x2e1ea458 1 (nil) 0x4c9dfaf0 0x4c9dfae8) and later is passed to heap_free(). dlls/winegstreamer/media_source.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/media_source.c … [View More]

1 0

[PATCH 1/4] dwrite: Correct return glyph origins for RTL runs.
by Nikolay Sivov 22 Feb '21

22 Feb '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/main.c | 84 ++++++++++++++-------------------------- dlls/dwrite/tests/font.c | 1 - 2 files changed, 28 insertions(+), 57 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 40c82b6cd05..3b0505231bf 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1551,76 +1551,48 @@ static HRESULT WINAPI dwritefactory4_TranslateColorGlyphRun(IDWriteFactory7 *ifa } static HRESULT … [View More]compute_glyph_origins(DWRITE_GLYPH_RUN const *run, DWRITE_MEASURING_MODE measuring_mode, - D2D1_POINT_2F baseline_origin, DWRITE_MATRIX const *transform, D2D1_POINT_2F *origins) + D2D1_POINT_2F baseline_origin, DWRITE_MATRIX const *transform, D2D1_POINT_2F *origins) { - IDWriteFontFace1 *fontface1 = NULL; - DWRITE_FONT_METRICS metrics; - FLOAT rtl_factor; - HRESULT hr; - UINT32 i; + struct dwrite_fontface *font_obj; + unsigned int i; + float advance; - rtl_factor = run->bidiLevel & 1 ? -1.0f : 1.0f; + font_obj = unsafe_impl_from_IDWriteFontFace(run->fontFace); - if (run->fontFace) { - IDWriteFontFace_GetMetrics(run->fontFace, &metrics); - if (FAILED(hr = IDWriteFontFace_QueryInterface(run->fontFace, &IID_IDWriteFontFace1, (void **)&fontface1))) - WARN("Failed to get IDWriteFontFace1, %#x.\n", hr); - } + for (i = 0; i < run->glyphCount; ++i) + { + origins[i] = baseline_origin; - for (i = 0; i < run->glyphCount; i++) { - FLOAT advance; + if (run->bidiLevel & 1) + { + advance = fontface_get_scaled_design_advance(font_obj, measuring_mode, run->fontEmSize, + 1.0f, transform, run->glyphIndices[i], run->isSideways); - /* Use nominal advances if not provided by caller. */ - if (run->glyphAdvances) - advance = rtl_factor * run->glyphAdvances[i]; - else { - INT32 a; + origins[i].x -= advance; - advance = 0.0f; - switch (measuring_mode) + if (run->glyphOffsets) { - case DWRITE_MEASURING_MODE_NATURAL: - if (SUCCEEDED(IDWriteFontFace1_GetDesignGlyphAdvances(fontface1, 1, run->glyphIndices + i, &a, - run->isSideways))) - advance = rtl_factor * get_scaled_advance_width(a, run->fontEmSize, &metrics); - break; - case DWRITE_MEASURING_MODE_GDI_CLASSIC: - case DWRITE_MEASURING_MODE_GDI_NATURAL: - if (SUCCEEDED(IDWriteFontFace1_GetGdiCompatibleGlyphAdvances(fontface1, run->fontEmSize, - 1.0f, transform, measuring_mode == DWRITE_MEASURING_MODE_GDI_NATURAL, - run->isSideways, 1, run->glyphIndices + i, &a))) - advance = rtl_factor * floorf(a * run->fontEmSize / metrics.designUnitsPerEm + 0.5f); - break; - default: - ; + origins[i].x -= run->glyphOffsets[i].advanceOffset; + origins[i].y -= run->glyphOffsets[i].ascenderOffset; } - } - origins[i] = baseline_origin; + baseline_origin.x -= run->glyphAdvances ? run->glyphAdvances[i] : advance; + } + else + { + if (run->glyphOffsets) + { + origins[i].x += run->glyphOffsets[i].advanceOffset; + origins[i].y -= run->glyphOffsets[i].ascenderOffset; + } - /* Apply offsets. */ - if (run->glyphOffsets) { - FLOAT advanceoffset = rtl_factor * run->glyphOffsets[i].advanceOffset; - FLOAT ascenderoffset = -run->glyphOffsets[i].ascenderOffset; + baseline_origin.x += run->glyphAdvances ? run->glyphAdvances[i] : + fontface_get_scaled_design_advance(font_obj, measuring_mode, run->fontEmSize, 1.0f, transform, + run->glyphIndices[i], run->isSideways); - if (run->isSideways) { - origins[i].x += ascenderoffset; - origins[i].y += advanceoffset; - } - else { - origins[i].x += advanceoffset; - origins[i].y += ascenderoffset; - } } - - if (run->isSideways) - baseline_origin.y += advance; - else - baseline_origin.x += advance; } - if (fontface1) - IDWriteFontFace1_Release(fontface1); return S_OK; } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 872405b1639..d7ced109a2f 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -8468,7 +8468,6 @@ static void test_ComputeGlyphOrigins(void) ok(hr == S_OK, "%u: failed to compute glyph origins, hr %#x.\n", i, hr); for (j = 0; j < run.glyphCount; ++j) { - todo_wine_if(run.bidiLevel & 1) ok(!memcmp(&origins[j], &expected_origins[j], sizeof(origins[j])), "%u: unexpected origin[%u] (%f, %f) - (%f, %f).\n", i, j, origins[j].x, origins[j].y, expected_origins[j].x, expected_origins[j].y); -- 2.30.0 [View Less]

1 3

[PATCH 5/5] ntdll: Use xsavec in x86_64 syscall dispatcher.
by Jacek Caban 22 Feb '21

22 Feb '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/signal_x86_64.c | 5 ++++- dlls/ntdll/unix/system.c | 6 ++++++ include/winternl.h | 1 + tools/winebuild/import.c | 13 ++++++++++++- 4 files changed, 23 insertions(+), 2 deletions(-)

2 1

[PATCH] msvcirt: Implement remainder of fstream class.
by Gijs Vermeulen 22 Feb '21

22 Feb '21

--- dlls/msvcirt/msvcirt.c | 157 ++++++++++++++ dlls/msvcirt/msvcirt.spec | 52 ++--- dlls/msvcirt/tests/msvcirt.c | 397 ++++++++++++++++++++++++++++++++++- dlls/msvcrt20/msvcrt20.spec | 52 ++--- dlls/msvcrt40/msvcrt40.spec | 52 ++--- 5 files changed, 625 insertions(+), 85 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index a8f162e7f702..4d0dc1521f68 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -4811,6 +4811,66 @@ stdiobuf* … [View More]__thiscall stdiostream_rdbuf(const iostream *this) return (stdiobuf*) istream_get_ios(&this->base1)->sb; } +/* ??0fstream@@QAE@ABV0@@Z */ +/* ??0fstream@@QEAA@AEBV0@@Z */ +DEFINE_THISCALL_WRAPPER(fstream_copy_ctor, 12) +iostream* __thiscall fstream_copy_ctor(iostream *this, const iostream *copy, BOOL virt_init) +{ + TRACE("(%p %p %d)\n", this, copy, virt_init); + iostream_internal_copy_ctor(this, copy, &MSVCP_fstream_vtable, virt_init); + return this; +} + +/* ??0fstream@@QAE@HPADH@Z */ +/* ??0fstream@@QEAA@HPEADH@Z */ +DEFINE_THISCALL_WRAPPER(fstream_buffer_ctor, 20) +iostream* __thiscall fstream_buffer_ctor(iostream *this, filedesc fd, char *buffer, int length, BOOL virt_init) +{ + ios *base; + filebuf *fb = MSVCRT_operator_new(sizeof(filebuf)); + + TRACE("(%p %d %p %d %d)\n", this, fd, buffer, length, virt_init); + + if (!fb) { + FIXME("out of memory\n"); + return NULL; + } + + filebuf_fd_reserve_ctor(fb, fd, buffer, length); + + iostream_internal_sb_ctor(this, &fb->base, &MSVCP_fstream_vtable, virt_init); + + base = istream_get_ios(&this->base1); + base->delbuf = 1; + + return this; +} + +/* ??0fstream@@QAE@H@Z */ +/* ??0fstream@@QEAA@H@Z */ +DEFINE_THISCALL_WRAPPER(fstream_fd_ctor, 12) +iostream* __thiscall fstream_fd_ctor(iostream *this, filedesc fd, BOOL virt_init) +{ + ios *base; + filebuf *fb = MSVCRT_operator_new(sizeof(filebuf)); + + TRACE("(%p %d %d)\n", this, fd, virt_init); + + if (!fb) { + FIXME("out of memory\n"); + return NULL; + } + + filebuf_fd_ctor(fb, fd); + + iostream_internal_sb_ctor(this, &fb->base, &MSVCP_fstream_vtable, virt_init); + + base = istream_get_ios(&this->base1); + base->delbuf = 1; + + return this; +} + /* ??0fstream@@QAE@PBDHH@Z */ /* ??0fstream@@QEAA@PEBDHH@Z */ DEFINE_THISCALL_WRAPPER(fstream_open_ctor, 20) @@ -4838,6 +4898,103 @@ iostream* __thiscall fstream_open_ctor(iostream *this, const char *name, ios_ope return this; } +/* ??0fstream@@QAE@XZ */ +/* ??0fstream@@QEAA@XZ */ +DEFINE_THISCALL_WRAPPER(fstream_ctor, 8) +iostream* __thiscall fstream_ctor(iostream *this, BOOL virt_init) +{ + return fstream_fd_ctor(this, -1, virt_init); +} + +/* ?rdbuf@fstream@@QBEPAVfilebuf@@XZ */ +/* ?rdbuf@fstream@@QEBAPEAVfilebuf@@XZ */ +DEFINE_THISCALL_WRAPPER(fstream_rdbuf, 4) +filebuf* __thiscall fstream_rdbuf(const iostream *this) +{ + TRACE("(%p)\n", this); + return (filebuf*) istream_get_ios(&this->base1)->sb; +} + +/* ?fd@fstream@@QBEHXZ */ +/* ?fd@fstream@@QEBAHXZ */ +DEFINE_THISCALL_WRAPPER(fstream_fd, 4) +filedesc __thiscall fstream_fd(iostream *this) +{ + TRACE("(%p)\n", this); + return filebuf_fd(fstream_rdbuf(this)); +} + +/* ?attach@fstream@@QAEXH@Z */ +/* ?attach@fstream@@QEAAXH@Z */ +DEFINE_THISCALL_WRAPPER(fstream_attach, 8) +void __thiscall fstream_attach(iostream *this, filedesc fd) +{ + ios *base = istream_get_ios(&this->base1); + TRACE("(%p %d)\n", this, fd); + if (filebuf_attach(fstream_rdbuf(this), fd) == NULL) + ios_clear(base, base->state | IOSTATE_failbit); +} + +/* ?close@fstream@@QAEXXZ */ +/* ?close@fstream@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(fstream_close, 4) +void __thiscall fstream_close(iostream *this) +{ + ios *base = istream_get_ios(&this->base1); + TRACE("(%p)\n", this); + if (filebuf_close(fstream_rdbuf(this)) == NULL) + ios_clear(base, base->state | IOSTATE_failbit); + else + ios_clear(base, IOSTATE_goodbit); +} + +/* ?is_open@fstream@@QBEHXZ */ +/* ?is_open@fstream@@QEBAHXZ */ +DEFINE_THISCALL_WRAPPER(fstream_is_open, 4) +int __thiscall fstream_is_open(const iostream *this) +{ + TRACE("(%p)\n", this); + return filebuf_is_open(fstream_rdbuf(this)); +} + +/* ?open@fstream@@QAEXPBDHH@Z */ +/* ?open@fstream@@QEAAXPEBDHH@Z */ +DEFINE_THISCALL_WRAPPER(fstream_open, 16) +void __thiscall fstream_open(iostream *this, const char *name, ios_open_mode mode, int protection) +{ + ios *base = istream_get_ios(&this->base1); + TRACE("(%p %s %d %d)\n", this, name, mode, protection); + if (filebuf_open(fstream_rdbuf(this), name, mode|OPENMODE_out, protection) == NULL) + ios_clear(base, base->state | IOSTATE_failbit); +} + +/* ?setbuf@fstream@@QAEPAVstreambuf@@PADH@Z */ +/* ?setbuf@fstream@@QEAAPEAVstreambuf@@PEADH@Z */ +DEFINE_THISCALL_WRAPPER(fstream_setbuf, 12) +streambuf* __thiscall fstream_setbuf(iostream *this, char *buffer, int length) +{ + ios *base = istream_get_ios(&this->base1); + filebuf* fb = fstream_rdbuf(this); + + TRACE("(%p %p %d)\n", this, buffer, length); + + if (filebuf_is_open(fb)) { + ios_clear(base, base->state | IOSTATE_failbit); + return NULL; + } + + return filebuf_setbuf(fb, buffer, length); +} + +/* ?setmode@fstream@@QAEHH@Z */ +/* ?setmode@fstream@@QEAAHH@Z */ +DEFINE_THISCALL_WRAPPER(fstream_setmode, 8) +int __thiscall fstream_setmode(iostream *this, int mode) +{ + TRACE("(%p %d)\n", this, mode); + return filebuf_setmode(fstream_rdbuf(this), mode); +} + /* ??0Iostream_init@@QAE@AAVios@@H@Z */ /* ??0Iostream_init@@QEAA@AEAVios@@H@Z */ DEFINE_THISCALL_WRAPPER(Iostream_init_ios_ctor, 12) diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index 804300f1a3ea..3d943e8a5c45 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -16,16 +16,16 @@ @ cdecl -arch=win64 ??0filebuf@@QEAA@HPEADH@Z(ptr long ptr long) filebuf_fd_reserve_ctor @ thiscall -arch=win32 ??0filebuf@@QAE@XZ(ptr) filebuf_ctor @ cdecl -arch=win64 ??0filebuf@@QEAA@XZ(ptr) filebuf_ctor -@ stub -arch=win32 ??0fstream@@QAE@ABV0@@Z # __thiscall fstream::fstream(class fstream const &) -@ stub -arch=win64 ??0fstream@@QEAA@AEBV0@@Z -@ stub -arch=win32 ??0fstream@@QAE@H@Z # __thiscall fstream::fstream(int) -@ stub -arch=win64 ??0fstream@@QEAA@H@Z -@ stub -arch=win32 ??0fstream@@QAE@HPADH@Z # __thiscall fstream::fstream(int,char *,int) -@ stub -arch=win64 ??0fstream@@QEAA@HPEADH@Z +@ thiscall -arch=win32 ??0fstream@@QAE@ABV0@@Z(ptr ptr long) fstream_copy_ctor +@ cdecl -arch=win64 ??0fstream@@QEAA@AEBV0@@Z(ptr ptr long) fstream_copy_ctor +@ thiscall -arch=win32 ??0fstream@@QAE@H@Z(ptr long long) fstream_fd_ctor +@ cdecl -arch=win64 ??0fstream@@QEAA@H@Z(ptr long long) fstream_fd_ctor +@ thiscall -arch=win32 ??0fstream@@QAE@HPADH@Z(ptr long ptr long long) fstream_buffer_ctor +@ cdecl -arch=win64 ??0fstream@@QEAA@HPEADH@Z(ptr long ptr long long) fstream_buffer_ctor @ thiscall -arch=win32 ??0fstream@@QAE@PBDHH@Z(ptr str long long long) fstream_open_ctor @ cdecl -arch=win64 ??0fstream@@QEAA@PEBDHH@Z(ptr str long long long) fstream_open_ctor -@ stub -arch=win32 ??0fstream@@QAE@XZ # __thiscall fstream::fstream(void) -@ stub -arch=win64 ??0fstream@@QEAA@XZ +@ thiscall -arch=win32 ??0fstream@@QAE@XZ(ptr long) fstream_ctor +@ cdecl -arch=win64 ??0fstream@@QEAA@XZ(ptr long) fstream_ctor @ thiscall -arch=win32 ??0ifstream@@QAE@ABV0@@Z(ptr ptr long) ifstream_copy_ctor @ cdecl -arch=win64 ??0ifstream@@QEAA@AEBV0@@Z(ptr ptr long) ifstream_copy_ctor @ thiscall -arch=win32 ??0ifstream@@QAE@H@Z(ptr long long) ifstream_fd_ctor @@ -176,8 +176,8 @@ @ cdecl -arch=win64 ??4exception@@QEAAAEAV0@AEBV0@@Z(ptr ptr) MSVCP_exception_assign @ thiscall -arch=win32 ??4filebuf@@QAEAAV0@ABV0@@Z(ptr ptr) filebuf_assign @ cdecl -arch=win64 ??4filebuf@@QEAAAEAV0@AEBV0@@Z(ptr ptr) filebuf_assign -@ stub -arch=win32 ??4fstream@@QAEAAV0@AAV0@@Z # class fstream & __thiscall fstream::operator=(class fstream &) -@ stub -arch=win64 ??4fstream@@QEAAAEAV0@AEAV0@@Z +@ thiscall -arch=win32 ??4fstream@@QAEAAV0@AAV0@@Z(ptr ptr) iostream_assign +@ cdecl -arch=win64 ??4fstream@@QEAAAEAV0@AEAV0@@Z(ptr ptr) iostream_assign @ thiscall -arch=win32 ??4ifstream@@QAEAAV0@ABV0@@Z(ptr ptr) istream_assign @ cdecl -arch=win64 ??4ifstream@@QEAAAEAV0@AEBV0@@Z(ptr ptr) istream_assign @ thiscall -arch=win32 ??4ios@@IAEAAV0@ABV0@@Z(ptr ptr) ios_assign @@ -404,8 +404,8 @@ @ cdecl -arch=win64 ?allocate@streambuf@@IEAAHXZ(ptr) streambuf_allocate @ thiscall -arch=win32 ?attach@filebuf@@QAEPAV1@H@Z(ptr long) filebuf_attach @ cdecl -arch=win64 ?attach@filebuf@@QEAAPEAV1@H@Z(ptr long) filebuf_attach -@ stub -arch=win32 ?attach@fstream@@QAEXH@Z # void __thiscall fstream::attach(int) -@ stub -arch=win64 ?attach@fstream@@QEAAXH@Z +@ thiscall -arch=win32 ?attach@fstream@@QAEXH@Z(ptr long) fstream_attach +@ cdecl -arch=win64 ?attach@fstream@@QEAAXH@Z(ptr long) fstream_attach @ thiscall -arch=win32 ?attach@ifstream@@QAEXH@Z(ptr long) ifstream_attach @ cdecl -arch=win64 ?attach@ifstream@@QEAAXH@Z(ptr long) ifstream_attach @ thiscall -arch=win32 ?attach@ofstream@@QAEXH@Z(ptr long) ofstream_attach @@ -426,8 +426,8 @@ @ extern ?clog@@3Vostream_withassign@@A MSVCP_clog @ thiscall -arch=win32 ?close@filebuf@@QAEPAV1@XZ(ptr) filebuf_close @ cdecl -arch=win64 ?close@filebuf@@QEAAPEAV1@XZ(ptr) filebuf_close -@ stub -arch=win32 ?close@fstream@@QAEXXZ # void __thiscall fstream::close(void) -@ stub -arch=win64 ?close@fstream@@QEAAXXZ +@ thiscall -arch=win32 ?close@fstream@@QAEXXZ(ptr) fstream_close +@ cdecl -arch=win64 ?close@fstream@@QEAAXXZ(ptr) fstream_close @ thiscall -arch=win32 ?close@ifstream@@QAEXXZ(ptr) ifstream_close @ cdecl -arch=win64 ?close@ifstream@@QEAAXXZ(ptr) ifstream_close @ thiscall -arch=win32 ?close@ofstream@@QAEXXZ(ptr) ofstream_close @@ -470,8 +470,8 @@ @ cdecl -arch=win64 ?fail@ios@@QEBAHXZ(ptr) ios_fail @ thiscall -arch=win32 ?fd@filebuf@@QBEHXZ(ptr) filebuf_fd @ cdecl -arch=win64 ?fd@filebuf@@QEBAHXZ(ptr) filebuf_fd -@ stub -arch=win32 ?fd@fstream@@QBEHXZ # int __thiscall fstream::fd(void)const -@ stub -arch=win64 ?fd@fstream@@QEBAHXZ +@ thiscall -arch=win32 ?fd@fstream@@QBEHXZ(ptr) fstream_fd +@ cdecl -arch=win64 ?fd@fstream@@QEBAHXZ(ptr) fstream_fd @ thiscall -arch=win32 ?fd@ifstream@@QBEHXZ(ptr) ifstream_fd @ cdecl -arch=win64 ?fd@ifstream@@QEBAHXZ(ptr) ifstream_fd @ thiscall -arch=win32 ?fd@ofstream@@QBEHXZ(ptr) ofstream_fd @@ -539,8 +539,8 @@ @ cdecl -arch=win64 ?ipfx@istream@@QEAAHH@Z(ptr long) istream_ipfx @ thiscall -arch=win32 ?is_open@filebuf@@QBEHXZ(ptr) filebuf_is_open @ cdecl -arch=win64 ?is_open@filebuf@@QEBAHXZ(ptr) filebuf_is_open -@ stub -arch=win32 ?is_open@fstream@@QBEHXZ # int __thiscall fstream::is_open(void)const -@ stub -arch=win64 ?is_open@fstream@@QEBAHXZ +@ thiscall -arch=win32 ?is_open@fstream@@QBEHXZ(ptr) fstream_is_open +@ cdecl -arch=win64 ?is_open@fstream@@QEBAHXZ(ptr) fstream_is_open @ thiscall -arch=win32 ?is_open@ifstream@@QBEHXZ(ptr) ifstream_is_open @ cdecl -arch=win64 ?is_open@ifstream@@QEBAHXZ(ptr) ifstream_is_open @ thiscall -arch=win32 ?is_open@ofstream@@QBEHXZ(ptr) ofstream_is_open @@ -564,8 +564,8 @@ @ cdecl -arch=win64 ?oct@@YAAEAVios@@AEAV1@@Z(ptr) ios_oct @ thiscall -arch=win32 ?open@filebuf@@QAEPAV1@PBDHH@Z(ptr str long long) filebuf_open @ cdecl -arch=win64 ?open@filebuf@@QEAAPEAV1@PEBDHH@Z(ptr str long long) filebuf_open -@ stub -arch=win32 ?open@fstream@@QAEXPBDHH@Z # void __thiscall fstream::open(char const *,int,int) -@ stub -arch=win64 ?open@fstream@@QEAAXPEBDHH@Z +@ thiscall -arch=win32 ?open@fstream@@QAEXPBDHH@Z(ptr str long long) fstream_open +@ cdecl -arch=win64 ?open@fstream@@QEAAXPEBDHH@Z(ptr str long long) fstream_open @ thiscall -arch=win32 ?open@ifstream@@QAEXPBDHH@Z(ptr str long long) ifstream_open @ cdecl -arch=win64 ?open@ifstream@@QEAAXPEBDHH@Z(ptr str long long) ifstream_open @ thiscall -arch=win32 ?open@ofstream@@QAEXPBDHH@Z(ptr str long long) ofstream_open @@ -613,8 +613,8 @@ @ cdecl -arch=win64 ?putback@istream@@QEAAAEAV1@D@Z(ptr long) istream_putback @ thiscall -arch=win32 ?pword@ios@@QBEAAPAXH@Z(ptr long) ios_pword @ cdecl -arch=win64 ?pword@ios@@QEBAAEAPEAXH@Z(ptr long) ios_pword -@ stub -arch=win32 ?rdbuf@fstream@@QBEPAVfilebuf@@XZ # class filebuf * __thiscall fstream::rdbuf(void)const -@ stub -arch=win64 ?rdbuf@fstream@@QEBAPEAVfilebuf@@XZ +@ thiscall -arch=win32 ?rdbuf@fstream@@QBEPAVfilebuf@@XZ(ptr) fstream_rdbuf +@ cdecl -arch=win64 ?rdbuf@fstream@@QEBAPEAVfilebuf@@XZ(ptr) fstream_rdbuf @ thiscall -arch=win32 ?rdbuf@ifstream@@QBEPAVfilebuf@@XZ(ptr) ifstream_rdbuf @ cdecl -arch=win64 ?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ(ptr) ifstream_rdbuf @ thiscall -arch=win32 ?rdbuf@ios@@QBEPAVstreambuf@@XZ(ptr) ios_rdbuf @@ -661,8 +661,8 @@ @ cdecl -arch=win64 ?setb@streambuf@@IEAAXPEAD0H@Z(ptr ptr ptr long) streambuf_setb @ thiscall -arch=win32 ?setbuf@filebuf@@UAEPAVstreambuf@@PADH@Z(ptr ptr long) filebuf_setbuf @ cdecl -arch=win64 ?setbuf@filebuf@@UEAAPEAVstreambuf@@PEADH@Z(ptr ptr long) filebuf_setbuf -@ stub -arch=win32 ?setbuf@fstream@@QAEPAVstreambuf@@PADH@Z # class streambuf * __thiscall fstream::setbuf(char *,int) -@ stub -arch=win64 ?setbuf@fstream@@QEAAPEAVstreambuf@@PEADH@Z +@ thiscall -arch=win32 ?setbuf@fstream@@QAEPAVstreambuf@@PADH@Z(ptr ptr long) fstream_setbuf +@ cdecl -arch=win64 ?setbuf@fstream@@QEAAPEAVstreambuf@@PEADH@Z(ptr ptr long) fstream_setbuf @ thiscall -arch=win32 ?setbuf@ifstream@@QAEPAVstreambuf@@PADH@Z(ptr ptr long) ifstream_setbuf @ cdecl -arch=win64 ?setbuf@ifstream@@QEAAPEAVstreambuf@@PEADH@Z(ptr ptr long) ifstream_setbuf @ thiscall -arch=win32 ?setbuf@ofstream@@QAEPAVstreambuf@@PADH@Z(ptr ptr long) ofstream_setbuf @@ -683,8 +683,8 @@ @ cdecl -arch=win64 ?setlock@streambuf@@QEAAXXZ(ptr) streambuf_setlock @ thiscall -arch=win32 ?setmode@filebuf@@QAEHH@Z(ptr long) filebuf_setmode @ cdecl -arch=win64 ?setmode@filebuf@@QEAAHH@Z(ptr long) filebuf_setmode -@ stub -arch=win32 ?setmode@fstream@@QAEHH@Z # int __thiscall fstream::setmode(int) -@ stub -arch=win64 ?setmode@fstream@@QEAAHH@Z +@ thiscall -arch=win32 ?setmode@fstream@@QAEHH@Z(ptr long) fstream_setmode +@ cdecl -arch=win64 ?setmode@fstream@@QEAAHH@Z(ptr long) fstream_setmode @ thiscall -arch=win32 ?setmode@ifstream@@QAEHH@Z(ptr long) ifstream_setmode @ cdecl -arch=win64 ?setmode@ifstream@@QEAAHH@Z(ptr long) ifstream_setmode @ thiscall -arch=win32 ?setmode@ofstream@@QAEHH@Z(ptr long) ofstream_setmode diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 8ee880480a04..21d513c0fd90 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -455,9 +455,21 @@ static void (*__thiscall p_stdiostream_vbase_dtor)(iostream*); static iostream* (*__thiscall p_stdiostream_assign)(iostream*, const iostream*); /* fstream */ -static iostream* (*__thiscall p_fstream_open_ctor)(iostream*, const char*, ios_open_mode, int, BOOL); +static iostream* (*__thiscall p_fstream_copy_ctor)(iostream*, const iostream*, BOOL); +static iostream* (*__thiscall p_fstream_buffer_ctor)(iostream*, filedesc, char*, int, BOOL); +static iostream* (*__thiscall p_fstream_fd_ctor)(iostream*, filedesc fd, BOOL virt_init); +static iostream* (*__thiscall p_fstream_open_ctor)(iostream*, const char *name, ios_open_mode, int, BOOL); +static iostream* (*__thiscall p_fstream_ctor)(iostream*, BOOL); static void (*__thiscall p_fstream_dtor)(ios*); static void (*__thiscall p_fstream_vbase_dtor)(iostream*); +static void (*__thiscall p_fstream_attach)(iostream*, filedesc); +static void (*__thiscall p_fstream_close)(iostream*); +static filedesc (*__thiscall p_fstream_fd)(iostream*); +static int (*__thiscall p_fstream_is_open)(const iostream*); +static void (*__thiscall p_fstream_open)(iostream*, const char*, ios_open_mode, int); +static filebuf* (*__thiscall p_fstream_rdbuf)(const iostream*); +static streambuf* (*__thiscall p_fstream_setbuf)(iostream*, char*, int); +static int (*__thiscall p_fstream_setmode)(iostream*, int); /* Iostream_init */ static void* (*__thiscall p_Iostream_init_ios_ctor)(void*, ios*, int); @@ -794,9 +806,21 @@ static BOOL init(void) SET(p_stdiostream_vbase_dtor, "??_Dstdiostream@@QEAAXXZ"); SET(p_stdiostream_assign, "??4stdiostream@@QEAAAEAV0@AEAV0@@Z"); + SET(p_fstream_copy_ctor, "??0fstream@@QEAA@AEBV0@@Z"); + SET(p_fstream_buffer_ctor, "??0fstream@@QEAA@HPEADH@Z"); + SET(p_fstream_fd_ctor, "??0fstream@@QEAA@H@Z"); SET(p_fstream_open_ctor, "??0fstream@@QEAA@PEBDHH@Z"); + SET(p_fstream_ctor, "??0fstream@@QEAA@XZ"); SET(p_fstream_dtor, "??1fstream@@UEAA@XZ"); SET(p_fstream_vbase_dtor, "??_Dfstream@@QEAAXXZ"); + SET(p_fstream_attach, "?attach@fstream@@QEAAXH@Z"); + SET(p_fstream_close, "?close@fstream@@QEAAXXZ"); + SET(p_fstream_fd, "?fd@fstream@@QEBAHXZ"); + SET(p_fstream_is_open, "?is_open@fstream@@QEBAHXZ"); + SET(p_fstream_open, "?open@fstream@@QEAAXPEBDHH@Z"); + SET(p_fstream_rdbuf, "?rdbuf@fstream@@QEBAPEAVfilebuf@@XZ"); + SET(p_fstream_setbuf, "?setbuf@fstream@@QEAAPEAVstreambuf@@PEADH@Z"); + SET(p_fstream_setmode, "?setmode@fstream@@QEAAHH@Z"); SET(p_Iostream_init_ios_ctor, "??0Iostream_init@@QEAA@AEAVios@@H@Z"); @@ -1045,9 +1069,21 @@ static BOOL init(void) SET(p_stdiostream_vbase_dtor, "??_Dstdiostream@@QAEXXZ"); SET(p_stdiostream_assign, "??4stdiostream@@QAEAAV0@AAV0@@Z"); + SET(p_fstream_copy_ctor, "??0fstream@@QAE@ABV0@@Z"); + SET(p_fstream_fd_ctor, "??0fstream@@QAE@H@Z"); + SET(p_fstream_buffer_ctor, "??0fstream@@QAE@HPADH@Z"); SET(p_fstream_open_ctor, "??0fstream@@QAE@PBDHH@Z"); + SET(p_fstream_ctor, "??0fstream@@QAE@XZ"); SET(p_fstream_dtor, "??1fstream@@UAE@XZ"); SET(p_fstream_vbase_dtor, "??_Dfstream@@QAEXXZ"); + SET(p_fstream_attach, "?attach@fstream@@QAEXH@Z"); + SET(p_fstream_close, "?close@fstream@@QAEXXZ"); + SET(p_fstream_fd, "?fd@fstream@@QBEHXZ"); + SET(p_fstream_is_open, "?is_open@fstream@@QBEHXZ"); + SET(p_fstream_open, "?open@fstream@@QAEXPBDHH@Z"); + SET(p_fstream_rdbuf, "?rdbuf@fstream@@QBEPAVfilebuf@@XZ"); + SET(p_fstream_setbuf, "?setbuf@fstream@@QAEPAVstreambuf@@PADH@Z"); + SET(p_fstream_setmode, "?setmode@fstream@@QAEHH@Z"); SET(p_Iostream_init_ios_ctor, "??0Iostream_init@@QAE@AAVios@@H@Z"); @@ -4651,7 +4687,7 @@ static void test_ofstream(void) call_func5(p_ofstream_buffer_ctor, &ofs, -1, NULL, 0, TRUE); ok(ofs.base_ios.sb->base == NULL, "wrong base value, expected NULL got %p\n", ofs.base_ios.sb->base); ok(ofs.base_ios.sb->ebuf == NULL, "wrong ebuf value, expected NULL got %p\n", ofs.base_ios.sb->ebuf); - ok(ofs.base_ios.sb->unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", pfb->base.unbuffered); + ok(ofs.base_ios.sb->unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", ofs.base_ios.sb->unbuffered); ok(ofs.base_ios.sb->allocated == 0, "wrong allocated value, expected 0 got %d\n", ofs.base_ios.sb->allocated); psb = call_func3(p_ofstream_setbuf, &ofs, buffer, ARRAY_SIZE(buffer)); @@ -8341,21 +8377,368 @@ static void test_std_streams(void) static void test_fstream(void) { - iostream fs, *pfs; + const char *filename = "fstream_test"; + iostream fs, fs_copy, *pfs; + char buffer[64]; + streambuf *psb; filebuf *pfb; ostream *pos; istream *pis; - int i; char st[8]; - const char *filename = "fstream_test"; + int i, ret, fd; + + memset(&fs, 0xab, sizeof(iostream)); + + /* constructors/destructors */ + pfs = call_func2(p_fstream_ctor, &fs, TRUE); + pfb = (filebuf*) fs.base_ios.sb; + ok(pfs == &fs, "wrong return, expected %p got %p\n", &fs, pfs); + ok(fs.base1.extract_delim == 0, "expected 0 got %d\n", fs.base1.extract_delim); + ok(fs.base1.count == 0, "expected 0 got %d\n", fs.base1.count); + ok(fs.base2.unknown == 0, "expected 0 got %d\n", fs.base2.unknown); + ok(fs.base_ios.sb != NULL, "expected not %p got %p\n", NULL, fs.base_ios.sb); + ok(fs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, fs.base_ios.state); + ok(fs.base_ios.delbuf == 1, "expected 1 got %d\n", fs.base_ios.delbuf); + ok(fs.base_ios.tie == NULL, "expected %p got %p\n", NULL, fs.base_ios.tie); + ok(fs.base_ios.flags == FLAGS_skipws, "expected %x got %x\n", FLAGS_skipws, fs.base_ios.flags); + ok(fs.base_ios.precision == 6, "expected 6 got %d\n", fs.base_ios.precision); + ok(fs.base_ios.fill == ' ', "expected 32 got %d\n", fs.base_ios.fill); + ok(fs.base_ios.width == 0, "expected 0 got %d\n", fs.base_ios.width); + ok(fs.base_ios.do_lock == -1, "expected -1 got %d\n", fs.base_ios.do_lock); + ok(pfb->fd == -1, "wrong fd, expected -1 got %d\n", pfb->fd); + ok(pfb->close == 0, "wrong value, expected 0 got %d\n", pfb->close); + ok(pfb->base.allocated == 0, "wrong allocate value, expected 0 got %d\n", pfb->base.allocated); + ok(pfb->base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", pfb->base.unbuffered); + ok(pfb->base.base == NULL, "wrong buffer, expected %p got %p\n", NULL, pfb->base.base); + ok(pfb->base.ebuf == NULL, "wrong ebuf, expected %p got %p\n", NULL, pfb->base.ebuf); + ok(pfb->fd == -1, "wrong fd, expected 0 got %d\n", pfb->fd); + call_func1(p_fstream_vbase_dtor, &fs); + + pfs = call_func3(p_fstream_fd_ctor, &fs, 42, TRUE); + pfb = (filebuf*) fs.base_ios.sb; + ok(pfs == &fs, "wrong return, expected %p got %p\n", &fs, pfs); + ok(fs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, fs.base_ios.state); + ok(fs.base_ios.delbuf == 1, "expected 1 got %d\n", fs.base_ios.delbuf); + ok(pfb->base.allocated == 0, "wrong allocate value, expected 0 got %d\n", pfb->base.allocated); + ok(pfb->base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", pfb->base.unbuffered); + ok(pfb->base.base == NULL, "wrong buffer, expected %p got %p\n", NULL, pfb->base.base); + ok(pfb->base.ebuf == NULL, "wrong ebuf, expected %p got %p\n", NULL, pfb->base.ebuf); + ok(pfb->fd == 42, "wrong fd, expected 42 got %d\n", pfb->fd); + ok(pfb->close == 0, "wrong value, expected 0 got %d\n", pfb->close); + + pfs = call_func3(p_fstream_copy_ctor, &fs_copy, &fs, TRUE); + pfb = (filebuf*) fs_copy.base_ios.sb; + ok(pfs == &fs_copy, "wrong return, expected %p got %p\n", &fs_copy, pfs); + ok(fs_copy.base_ios.sb == fs.base_ios.sb, "expected shared streambuf\n"); + ok(fs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, fs.base_ios.state); + ok(fs_copy.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, fs_copy.base_ios.state); + + call_func1(p_fstream_vbase_dtor, &fs_copy); + call_func1(p_fstream_dtor, &fs.base_ios); + + pfs = call_func5(p_fstream_buffer_ctor, &fs, 53, buffer, ARRAY_SIZE(buffer), TRUE); + pfb = (filebuf*) fs.base_ios.sb; + ok(fs.base_ios.delbuf == 1, "expected 1 got %d\n", fs.base_ios.delbuf); + ok(pfs == &fs, "wrong return, expected %p got %p\n", &fs, pfs); + ok(fs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, fs.base_ios.state); + ok(pfb->base.allocated == 0, "wrong allocate value, expected 0 got %d\n", pfb->base.allocated); + ok(pfb->base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", pfb->base.unbuffered); + ok(pfb->base.base == buffer, "wrong buffer, expected %p got %p\n", buffer, pfb->base.base); + ok(pfb->base.ebuf == buffer + ARRAY_SIZE(buffer), "wrong ebuf, expected %p got %p\n", buffer + ARRAY_SIZE(buffer), pfb->base.ebuf); + ok(pfb->fd == 53, "wrong fd, expected 53 got %d\n", pfb->fd); + ok(pfb->close == 0, "wrong value, expected 0 got %d\n", pfb->close); + call_func1(p_fstream_dtor, &fs.base_ios); + + pfs = call_func5(p_fstream_buffer_ctor, &fs, 64, NULL, 0, TRUE); + pfb = (filebuf*) fs.base_ios.sb; + ok(fs.base_ios.delbuf == 1, "expected 1 got %d\n", fs.base_ios.delbuf); + ok(fs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, fs.base_ios.state); + ok(pfs == &fs, "wrong return, expected %p got %p\n", &fs, pfs); + ok(fs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, fs.base_ios.state); + ok(pfb->base.allocated == 0, "wrong allocate value, expected 0 got %d\n", pfb->base.allocated); + ok(pfb->base.unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", pfb->base.unbuffered); + ok(pfb->base.base == NULL, "wrong buffer, expected %p got %p\n", NULL, pfb->base.base); + ok(pfb->base.ebuf == NULL, "wrong ebuf, expected %p got %p\n", NULL, pfb->base.ebuf); + ok(pfb->fd == 64, "wrong fd, expected 64 got %d\n", pfb->fd); + ok(pfb->close == 0, "wrong value, expected 0 got %d\n", pfb->close); + call_func1(p_fstream_vbase_dtor, &fs); + + pfs = call_func5(p_fstream_open_ctor, &fs, filename, OPENMODE_out, filebuf_openprot, TRUE); + pfb = (filebuf*) fs.base_ios.sb; + ok(fs.base_ios.delbuf == 1, "expected 1 got %d\n", fs.base_ios.delbuf); + ok(fs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, fs.base_ios.state); + ok(pfs == &fs, "wrong return, expected %p got %p\n", &fs, pfs); + ok(pfb->base.allocated == 1, "wrong allocate value, expected 1 got %d\n", pfb->base.allocated); + ok(pfb->base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", pfb->base.unbuffered); + ok(pfb->base.base != NULL, "wrong buffer, expected not %p got %p\n", NULL, pfb->base.base); + ok(pfb->base.ebuf != NULL, "wrong ebuf, expected not %p got %p\n", NULL, pfb->base.ebuf); + ok(pfb->fd != -1, "wrong fd, expected not -1 got %d\n", pfb->fd); + fd = pfb->fd; + ok(pfb->close == 1, "wrong value, expected 1 got %d\n", pfb->close); + call_func1(p_fstream_vbase_dtor, &fs); + ok(_close(fd) == -1, "expected fstream to close opened file\n"); + ok(_unlink(filename) == 0, "Couldn't unlink file named '%s'\n", filename); + + pfs = call_func5(p_fstream_open_ctor, &fs, filename, OPENMODE_in, filebuf_openprot, TRUE); + pfb = (filebuf*) fs.base_ios.sb; + ok(fs.base_ios.delbuf == 1, "expected 1 got %d\n", fs.base_ios.delbuf); + ok(fs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, fs.base_ios.state); + ok(pfs == &fs, "wrong return, expected %p got %p\n", &fs, pfs); + ok(pfb->base.allocated == 1, "wrong allocate value, expected 1 got %d\n", pfb->base.allocated); + ok(pfb->base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", pfb->base.unbuffered); + ok(pfb->base.base != NULL, "wrong buffer, expected not %p got %p\n", NULL, pfb->base.base); + ok(pfb->base.ebuf != NULL, "wrong ebuf, expected not %p got %p\n", NULL, pfb->base.ebuf); + ok(pfb->fd != -1, "wrong fd, expected not -1 got %d\n", pfb->fd); + fd = pfb->fd; + ok(pfb->close == 1, "wrong value, expected 1 got %d\n", pfb->close); + call_func1(p_fstream_vbase_dtor, &fs); + ok(_close(fd) == -1, "expected fstream to close opened file\n"); + ok(_unlink(filename) == 0, "Couldn't unlink file named '%s'\n", filename); + + /* setbuf */ + call_func5(p_fstream_buffer_ctor, &fs, -1, NULL, 0, TRUE); + ok(fs.base_ios.sb->base == NULL, "wrong base value, expected NULL got %p\n", fs.base_ios.sb->base); + ok(fs.base_ios.sb->ebuf == NULL, "wrong ebuf value, expected NULL got %p\n", fs.base_ios.sb->ebuf); + ok(fs.base_ios.sb->unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", fs.base_ios.sb->unbuffered); + ok(fs.base_ios.sb->allocated == 0, "wrong allocated value, expected 0 got %d\n", fs.base_ios.sb->allocated); + + psb = call_func3(p_fstream_setbuf, &fs, buffer, ARRAY_SIZE(buffer)); + ok(psb == fs.base_ios.sb, "wrong return, expected %p got %p\n", fs.base_ios.sb, psb); + ok(fs.base_ios.sb->base == buffer, "wrong buffer, expected %p got %p\n", buffer, fs.base_ios.sb->base); + ok(fs.base_ios.sb->ebuf == buffer + ARRAY_SIZE(buffer), "wrong ebuf, expected %p got %p\n", buffer + ARRAY_SIZE(buffer), fs.base_ios.sb->ebuf); + ok(fs.base_ios.sb->unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", fs.base_ios.sb->unbuffered); + ok(fs.base_ios.sb->allocated == 0, "wrong allocated value, expected 0 got %d\n", fs.base_ios.sb->allocated); + ok(fs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, fs.base_ios.state); + + psb = call_func3(p_fstream_setbuf, &fs, NULL, 0); + ok(psb == fs.base_ios.sb, "wrong return, expected %p got %p\n", fs.base_ios.sb, psb); + ok(fs.base_ios.sb->base == buffer, "wrong buffer, expected %p got %p\n", buffer, fs.base_ios.sb->base); + ok(fs.base_ios.sb->ebuf == buffer + ARRAY_SIZE(buffer), "wrong ebuf, expected %p got %p\n", buffer + ARRAY_SIZE(buffer), fs.base_ios.sb->ebuf); + ok(fs.base_ios.sb->unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", fs.base_ios.sb->unbuffered); + ok(fs.base_ios.sb->allocated == 0, "wrong allocated value, expected 0 got %d\n", fs.base_ios.sb->allocated); + ok(fs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, fs.base_ios.state); + call_func1(p_fstream_vbase_dtor, &fs); + + call_func2(p_fstream_ctor, &fs, TRUE); + ok(fs.base_ios.sb->base == NULL, "wrong base value, expected NULL got %p\n", fs.base_ios.sb->base); + ok(fs.base_ios.sb->ebuf == NULL, "wrong ebuf value, expected NULL got %p\n", fs.base_ios.sb->ebuf); + ok(fs.base_ios.sb->unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", fs.base_ios.sb->unbuffered); + ok(fs.base_ios.sb->allocated == 0, "wrong allocated value, expected 0 got %d\n", fs.base_ios.sb->allocated); + ok(fs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, fs.base_ios.state); + + psb = call_func3(p_fstream_setbuf, &fs, buffer, ARRAY_SIZE(buffer)); + ok(psb == fs.base_ios.sb, "wrong return, expected %p got %p\n", fs.base_ios.sb, psb); + ok(fs.base_ios.sb->base == buffer, "wrong buffer, expected %p got %p\n", buffer, fs.base_ios.sb->base); + ok(fs.base_ios.sb->ebuf == buffer + ARRAY_SIZE(buffer), "wrong ebuf, expected %p got %p\n", buffer + ARRAY_SIZE(buffer), fs.base_ios.sb->ebuf); + ok(fs.base_ios.sb->unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", fs.base_ios.sb->unbuffered); + ok(fs.base_ios.sb->allocated == 0, "wrong allocated value, expected 0 got %d\n", fs.base_ios.sb->allocated); + ok(fs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, fs.base_ios.state); + + psb = call_func3(p_fstream_setbuf, &fs, NULL, 0); + ok(psb == fs.base_ios.sb, "wrong return, expected %p got %p\n", fs.base_ios.sb, psb); + ok(fs.base_ios.sb->base == buffer, "wrong buffer, expected %p got %p\n", buffer, fs.base_ios.sb->base); + ok(fs.base_ios.sb->ebuf == buffer + ARRAY_SIZE(buffer), "wrong ebuf, expected %p got %p\n", buffer + ARRAY_SIZE(buffer), fs.base_ios.sb->ebuf); + ok(fs.base_ios.sb->unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", fs.base_ios.sb->unbuffered); + ok(fs.base_ios.sb->allocated == 0, "wrong allocated value, expected 0 got %d\n", fs.base_ios.sb->allocated); + ok(fs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, fs.base_ios.state); + + psb = call_func3(p_fstream_setbuf, &fs, buffer + 8, ARRAY_SIZE(buffer) - 8); + ok(psb == fs.base_ios.sb, "wrong return, expected %p got %p\n", fs.base_ios.sb, psb); + ok(fs.base_ios.sb->base == buffer + 8, "wrong buffer, expected %p got %p\n", buffer + 8, fs.base_ios.sb->base); + ok(fs.base_ios.sb->ebuf == buffer + ARRAY_SIZE(buffer), "wrong ebuf, expected %p got %p\n", buffer + ARRAY_SIZE(buffer), fs.base_ios.sb->ebuf); + ok(fs.base_ios.sb->unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", fs.base_ios.sb->unbuffered); + ok(fs.base_ios.sb->allocated == 0, "wrong allocated value, expected 0 got %d\n", fs.base_ios.sb->allocated); + ok(fs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, fs.base_ios.state); + + psb = call_func3(p_fstream_setbuf, &fs, buffer + 8, 0); + ok(psb == fs.base_ios.sb, "wrong return, expected %p got %p\n", fs.base_ios.sb, psb); + ok(fs.base_ios.sb->base == buffer + 8, "wrong buffer, expected %p got %p\n", buffer + 8, fs.base_ios.sb->base); + ok(fs.base_ios.sb->ebuf == buffer + ARRAY_SIZE(buffer), "wrong ebuf, expected %p got %p\n", buffer + ARRAY_SIZE(buffer), fs.base_ios.sb->ebuf); + ok(fs.base_ios.sb->unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", fs.base_ios.sb->unbuffered); + ok(fs.base_ios.sb->allocated == 0, "wrong allocated value, expected 0 got %d\n", fs.base_ios.sb->allocated); + ok(fs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, fs.base_ios.state); + + psb = call_func3(p_fstream_setbuf, &fs, buffer + 4, ARRAY_SIZE(buffer) - 4); + ok(psb == fs.base_ios.sb, "wrong return, expected %p got %p\n", fs.base_ios.sb, psb); + ok(fs.base_ios.sb->base == buffer + 4, "wrong buffer, expected %p got %p\n", buffer + 4, fs.base_ios.sb->base); + ok(fs.base_ios.sb->ebuf == buffer + ARRAY_SIZE(buffer), "wrong ebuf, expected %p got %p\n", buffer + ARRAY_SIZE(buffer), fs.base_ios.sb->ebuf); + ok(fs.base_ios.sb->unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", fs.base_ios.sb->unbuffered); + ok(fs.base_ios.sb->allocated == 0, "wrong allocated value, expected 0 got %d\n", fs.base_ios.sb->allocated); + ok(fs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, fs.base_ios.state); + + psb = call_func3(p_fstream_setbuf, &fs, NULL, 5); + ok(psb == fs.base_ios.sb, "wrong return, expected %p got %p\n", fs.base_ios.sb, psb); + ok(fs.base_ios.sb->base == buffer + 4, "wrong buffer, expected %p got %p\n", buffer + 4, fs.base_ios.sb->base); + ok(fs.base_ios.sb->ebuf == buffer + ARRAY_SIZE(buffer), "wrong ebuf, expected %p got %p\n", buffer + ARRAY_SIZE(buffer), fs.base_ios.sb->ebuf); + ok(fs.base_ios.sb->unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", fs.base_ios.sb->unbuffered); + ok(fs.base_ios.sb->allocated == 0, "wrong allocated value, expected 0 got %d\n", fs.base_ios.sb->allocated); + ok(fs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, fs.base_ios.state); + call_func1(p_fstream_vbase_dtor, &fs); + + /* setbuf - seems to be a nop and always return NULL in those other cases */ + pfs = call_func5(p_fstream_buffer_ctor, &fs, 42, NULL, 0, TRUE); + ok(fs.base_ios.sb->base == NULL, "wrong base value, expected NULL got %p\n", fs.base_ios.sb->base); + ok(fs.base_ios.sb->ebuf == NULL, "wrong ebuf value, expected NULL got %p\n", fs.base_ios.sb->ebuf); + ok(fs.base_ios.sb->unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", fs.base_ios.sb->unbuffered); + ok(fs.base_ios.sb->allocated == 0, "wrong allocated value, expected 0 got %d\n", fs.base_ios.sb->allocated); + + fs.base_ios.state = IOSTATE_eofbit; + psb = call_func3(p_fstream_setbuf, &fs, buffer, ARRAY_SIZE(buffer)); + ok(psb == NULL, "wrong return, expected NULL got %p\n", psb); + ok(fs.base_ios.sb->base == NULL, "wrong base value, expected NULL got %p\n", fs.base_ios.sb->base); + ok(fs.base_ios.sb->ebuf == NULL, "wrong ebuf value, expected NULL got %p\n", fs.base_ios.sb->ebuf); + ok(fs.base_ios.sb->unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", fs.base_ios.sb->unbuffered); + ok(fs.base_ios.sb->allocated == 0, "wrong allocated value, expected 0 got %d\n", fs.base_ios.sb->allocated); + ok(fs.base_ios.state == (IOSTATE_eofbit | IOSTATE_failbit), "attaching on already setup stream did not set failbit\n"); + + fs.base_ios.state = IOSTATE_eofbit; + psb = call_func3(p_fstream_setbuf, &fs, NULL, 0); + ok(psb == NULL, "wrong return, expected NULL got %p\n", psb); + ok(fs.base_ios.sb->base == NULL, "wrong base value, expected NULL got %p\n", fs.base_ios.sb->base); + ok(fs.base_ios.sb->ebuf == NULL, "wrong ebuf value, expected NULL got %p\n", fs.base_ios.sb->ebuf); + ok(fs.base_ios.sb->unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", fs.base_ios.sb->unbuffered); + ok(fs.base_ios.sb->allocated == 0, "wrong allocated value, expected 0 got %d\n", fs.base_ios.sb->allocated); + ok(fs.base_ios.state == (IOSTATE_eofbit | IOSTATE_failbit), "attaching on already setup stream did not set failbit\n"); + call_func1(p_fstream_vbase_dtor, &fs); + + pfs = call_func5(p_fstream_open_ctor, &fs, filename, OPENMODE_out, filebuf_openprot, TRUE); + fs.base_ios.state = IOSTATE_eofbit; + psb = call_func3(p_fstream_setbuf, &fs, NULL, 0); + ok(psb == NULL, "wrong return, expected NULL got %p\n", psb); + ok(fs.base_ios.sb->base != NULL, "wrong base value, expected NULL got %p\n", fs.base_ios.sb->base); + ok(fs.base_ios.sb->ebuf != NULL, "wrong ebuf value, expected NULL got %p\n", fs.base_ios.sb->ebuf); + ok(fs.base_ios.sb->unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", fs.base_ios.sb->unbuffered); + ok(fs.base_ios.sb->allocated == 1, "wrong allocated value, expected 1 got %d\n", fs.base_ios.sb->allocated); + ok(fs.base_ios.state == (IOSTATE_eofbit | IOSTATE_failbit), "attaching on already setup stream did not set failbit\n"); + + fs.base_ios.state = IOSTATE_eofbit; + psb = call_func3(p_fstream_setbuf, &fs, buffer, ARRAY_SIZE(buffer)); + ok(psb == NULL, "wrong return, expected NULL got %p\n", psb); + ok(fs.base_ios.sb->base != NULL, "wrong base value, expected NULL got %p\n", fs.base_ios.sb->base); + ok(fs.base_ios.sb->base != buffer, "wrong base value, expected not %p got %p\n", buffer, fs.base_ios.sb->base); + ok(fs.base_ios.sb->unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", fs.base_ios.sb->unbuffered); + ok(fs.base_ios.sb->allocated == 1, "wrong allocated value, expected 1 got %d\n", fs.base_ios.sb->allocated); + ok(fs.base_ios.state == (IOSTATE_eofbit | IOSTATE_failbit), "attaching on already setup stream did not set failbit\n"); + call_func1(p_fstream_vbase_dtor, &fs); + ok(_unlink(filename) == 0, "Couldn't unlink file named '%s'\n", filename); + + pfs = call_func5(p_fstream_open_ctor, &fs, filename, OPENMODE_in, filebuf_openprot, TRUE); + fs.base_ios.state = IOSTATE_eofbit; + psb = call_func3(p_fstream_setbuf, &fs, NULL, 0); + ok(psb == NULL, "wrong return, expected NULL got %p\n", psb); + ok(fs.base_ios.sb->base != NULL, "wrong base value, expected NULL got %p\n", fs.base_ios.sb->base); + ok(fs.base_ios.sb->ebuf != NULL, "wrong ebuf value, expected NULL got %p\n", fs.base_ios.sb->ebuf); + ok(fs.base_ios.sb->unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", fs.base_ios.sb->unbuffered); + ok(fs.base_ios.sb->allocated == 1, "wrong allocated value, expected 1 got %d\n", fs.base_ios.sb->allocated); + ok(fs.base_ios.state == (IOSTATE_eofbit | IOSTATE_failbit), "attaching on already setup stream did not set failbit\n"); + + fs.base_ios.state = IOSTATE_eofbit; + psb = call_func3(p_fstream_setbuf, &fs, buffer, ARRAY_SIZE(buffer)); + ok(psb == NULL, "wrong return, expected NULL got %p\n", psb); + ok(fs.base_ios.sb->base != NULL, "wrong base value, expected NULL got %p\n", fs.base_ios.sb->base); + ok(fs.base_ios.sb->base != buffer, "wrong base value, expected not %p got %p\n", buffer, fs.base_ios.sb->base); + ok(fs.base_ios.sb->unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", fs.base_ios.sb->unbuffered); + ok(fs.base_ios.sb->allocated == 1, "wrong allocated value, expected 1 got %d\n", fs.base_ios.sb->allocated); + ok(fs.base_ios.state == (IOSTATE_eofbit | IOSTATE_failbit), "attaching on already setup stream did not set failbit\n"); + call_func1(p_fstream_vbase_dtor, &fs); + ok(_unlink(filename) == 0, "Couldn't unlink file named '%s'\n", filename); + + /* attach */ + pfs = call_func2(p_fstream_ctor, &fs, TRUE); + pfb = (filebuf*) fs.base_ios.sb; + ok(pfs == &fs, "wrong return, expected %p got %p\n", &fs, pfs); + call_func2(p_fstream_attach, &fs, 42); + ok(fs.base_ios.state == IOSTATE_goodbit, "attaching on vanilla stream set some state bits\n"); + fd = (int) call_func1(p_fstream_fd, &fs); + ok(fd == 42, "wrong fd, expected 42 got %d\n", fd); + ok(pfb->close == 0, "wrong close value, expected 0 got %d\n", pfb->close); + fs.base_ios.state = IOSTATE_eofbit; + call_func2(p_fstream_attach, &fs, 53); + ok(fs.base_ios.state == (IOSTATE_eofbit | IOSTATE_failbit), "attaching on already setup stream did not set failbit\n"); + ok(fd == 42, "wrong fd, expected 42 got %d\n", fd); + call_func1(p_fstream_vbase_dtor, &fs); + + /* fd */ + pfs = call_func2(p_fstream_ctor, &fs, TRUE); + pfb = (filebuf*) fs.base_ios.sb; + ok(pfs == &fs, "wrong return, expected %p got %p\n", &fs, pfs); + fd = (int) call_func1(p_fstream_fd, &fs); + ok(fs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, fs.base_ios.state); + ok(fd == -1, "wrong fd, expected -1 but got %d\n", fd); + call_func1(p_fstream_vbase_dtor, &fs); + + pfs = call_func5(p_fstream_open_ctor, &fs, filename, OPENMODE_in, filebuf_openprot, TRUE); + pfb = (filebuf*) fs.base_ios.sb; + ok(pfs == &fs, "wrong return, expected %p got %p\n", &fs, pfs); + fd = (int) call_func1(p_fstream_fd, &fs); + ok(fs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, fs.base_ios.state); + ok(fd == pfb->fd, "wrong fd, expected %d but got %d\n", pfb->fd, fd); + call_func1(p_fstream_vbase_dtor, &fs); + ok(_unlink(filename) == 0, "Couldn't unlink file named '%s'\n", filename); + + pfs = call_func2(p_fstream_ctor, &fs, TRUE); + pfb = (filebuf*) fs.base_ios.sb; + ok(pfs == &fs, "wrong return, expected %p got %p\n", &fs, pfs); + fd = (int) call_func1(p_fstream_fd, &fs); + ok(fs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, fs.base_ios.state); + ok(fd == -1, "wrong fd, expected -1 but got %d\n", fd); + call_func1(p_fstream_vbase_dtor, &fs); + + pfs = call_func5(p_fstream_open_ctor, &fs, filename, OPENMODE_out, filebuf_openprot, TRUE); + pfb = (filebuf*) fs.base_ios.sb; + ok(pfs == &fs, "wrong return, expected %p got %p\n", &fs, pfs); + fd = (int) call_func1(p_fstream_fd, &fs); + ok(fs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, fs.base_ios.state); + ok(fd == pfb->fd, "wrong fd, expected %d but got %d\n", pfb->fd, fd); + + /* rdbuf */ + pfb = (filebuf*) call_func1(p_fstream_rdbuf, &fs); + ok((streambuf*) pfb == fs.base_ios.sb, "wrong return, expected %p got %p\n", fs.base_ios.sb, pfb); + ok(fs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, fs.base_ios.state); + + /* setmode */ + ret = (int) call_func2(p_fstream_setmode, &fs, filebuf_binary); + ok(ret == filebuf_text, "wrong return, expected %d got %d\n", filebuf_text, ret); + ok(fs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, fs.base_ios.state); + ret = (int) call_func2(p_fstream_setmode, &fs, filebuf_binary); + ok(ret == filebuf_binary, "wrong return, expected %d got %d\n", filebuf_binary, ret); + ok(fs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, fs.base_ios.state); + ret = (int) call_func2(p_fstream_setmode, &fs, filebuf_text); + ok(ret == filebuf_binary, "wrong return, expected %d got %d\n", filebuf_binary, ret); + ok(fs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, fs.base_ios.state); + ret = (int) call_func2(p_fstream_setmode, &fs, 0x9000); + ok(ret == -1, "wrong return, expected -1 got %d\n", ret); + ok(fs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, fs.base_ios.state); + + /* close && is_open */ + ok((int) call_func1(p_fstream_is_open, &fs) == 1, "expected fstream to be open\n"); + fs.base_ios.state = IOSTATE_eofbit | IOSTATE_failbit; + call_func1(p_fstream_close, &fs); + ok(fs.base_ios.state == IOSTATE_goodbit, "close did not clear state = %d\n", fs.base_ios.state); + fs.base_ios.state = IOSTATE_eofbit; + call_func1(p_fstream_close, &fs); + ok(fs.base_ios.state == (IOSTATE_eofbit | IOSTATE_failbit), "close on a closed stream did not set failbit\n"); + ok((int) call_func1(p_fstream_is_open, &fs) == 0, "expected fstream to not be open\n"); + ok(_close(fd) == -1, "expected close to close the opened file\n"); + + /* open */ + fs.base_ios.state = IOSTATE_eofbit; + call_func4(p_fstream_open, &fs, filename, OPENMODE_out, filebuf_openprot); + fd = (int) call_func1(p_fstream_fd, &fs); + ok(fd != -1, "wrong fd, expected not -1 got %d\n", fd); + ok(fs.base_ios.state == IOSTATE_eofbit, "open did not succeed\n"); + call_func4(p_fstream_open, &fs, filename, OPENMODE_out, filebuf_openprot); + ok(fs.base_ios.state == (IOSTATE_eofbit | IOSTATE_failbit), "second open did not set failbit\n"); + call_func1(p_fstream_close, &fs); + call_func1(p_fstream_vbase_dtor, &fs); + ok(_unlink(filename) == 0, "Couldn't unlink file named '%s'\n", filename); - /* constructors */ pfs = call_func5(p_fstream_open_ctor, &fs, filename, OPENMODE_out, filebuf_openprot, TRUE); ok(pfs == &fs, "constructor returned wrong pointer, expected %p got %p\n", &fs, pfs); ok(fs.base_ios.state == IOSTATE_goodbit, "wrong stream state, expected %d got %d\n", IOSTATE_goodbit, fs.base_ios.state); pfb = (filebuf*) fs.base_ios.sb; ok((int) call_func1(p_filebuf_is_open, pfb) == TRUE, "expected filebuf to be open\n"); - ok(fs.base_ios.delbuf == 1, "internal filebuf not makred for deletion\n"); + ok(fs.base_ios.delbuf == 1, "internal filebuf not marked for deletion\n"); /* integration with ostream */ pos = call_func2(p_ostream_print_str, (ostream*) &fs.base2, "ftest "); diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index e386ed8511d8..8c4e4a233cb4 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -10,16 +10,16 @@ @ cdecl -arch=win64 ??0filebuf@@QEAA@HPEADH@Z(ptr long ptr long) msvcirt.??0filebuf@@QEAA@HPEADH@Z @ thiscall -arch=win32 ??0filebuf@@QAE@XZ(ptr) msvcirt.??0filebuf@@QAE@XZ @ cdecl -arch=win64 ??0filebuf@@QEAA@XZ(ptr) msvcirt.??0filebuf@@QEAA@XZ -@ stub -arch=win32 ??0fstream@@QAE@ABV0@@Z -@ stub -arch=win64 ??0fstream@@QEAA@AEBV0@@Z -@ stub -arch=win32 ??0fstream@@QAE@H@Z -@ stub -arch=win64 ??0fstream@@QEAA@H@Z -@ stub -arch=win32 ??0fstream@@QAE@HPADH@Z -@ stub -arch=win64 ??0fstream@@QEAA@HPEADH@Z +@ thiscall -arch=win32 ??0fstream@@QAE@ABV0@@Z(ptr ptr long) msvcirt.??0fstream@@QAE@ABV0@@Z +@ cdecl -arch=win64 ??0fstream@@QEAA@AEBV0@@Z(ptr ptr long) msvcirt.??0fstream@@QEAA@AEBV0@@Z +@ thiscall -arch=win32 ??0fstream@@QAE@H@Z(ptr long long) msvcirt.??0fstream@@QAE@H@Z +@ cdecl -arch=win64 ??0fstream@@QEAA@H@Z(ptr long long) msvcirt.??0fstream@@QEAA@H@Z +@ thiscall -arch=win32 ??0fstream@@QAE@HPADH@Z(ptr long ptr long long) msvcirt.??0fstream@@QAE@HPADH@Z +@ cdecl -arch=win64 ??0fstream@@QEAA@HPEADH@Z(ptr long ptr long long) msvcirt.??0fstream@@QEAA@HPEADH@Z @ thiscall -arch=win32 ??0fstream@@QAE@PBDHH@Z(ptr str long long long) msvcirt.??0fstream@@QAE@PBDHH@Z @ cdecl -arch=win64 ??0fstream@@QEAA@PEBDHH@Z(ptr str long long long) msvcirt.??0fstream@@QEAA@PEBDHH@Z -@ stub -arch=win32 ??0fstream@@QAE@XZ -@ stub -arch=win64 ??0fstream@@QEAA@XZ +@ thiscall -arch=win32 ??0fstream@@QAE@XZ(ptr long) msvcirt.??0fstream@@QAE@XZ +@ cdecl -arch=win64 ??0fstream@@QEAA@XZ(ptr long) msvcirt.??0fstream@@QEAA@XZ @ thiscall -arch=win32 ??0ifstream@@QAE@ABV0@@Z(ptr ptr long) msvcirt.??0ifstream@@QAE@ABV0@@Z @ cdecl -arch=win64 ??0ifstream@@QEAA@AEBV0@@Z(ptr ptr long) msvcirt.??0ifstream@@QEAA@AEBV0@@Z @ thiscall -arch=win32 ??0ifstream@@QAE@H@Z(ptr long long) msvcirt.??0ifstream@@QAE@H@Z @@ -162,8 +162,8 @@ @ cdecl -arch=win64 ??4Iostream_init@@QEAAAEAV0@AEBV0@@Z(ptr ptr) msvcirt.??4Iostream_init@@QEAAAEAV0@AEBV0@@Z @ thiscall -arch=win32 ??4filebuf@@QAEAAV0@ABV0@@Z(ptr ptr) msvcirt.??4filebuf@@QAEAAV0@ABV0@@Z @ cdecl -arch=win64 ??4filebuf@@QEAAAEAV0@AEBV0@@Z(ptr ptr) msvcirt.??4filebuf@@QEAAAEAV0@AEBV0@@Z -@ stub -arch=win32 ??4fstream@@QAEAAV0@AAV0@@Z -@ stub -arch=win64 ??4fstream@@QEAAAEAV0@AEAV0@@Z +@ thiscall -arch=win32 ??4fstream@@QAEAAV0@AAV0@@Z(ptr ptr) msvcirt.??4fstream@@QAEAAV0@AAV0@@Z +@ cdecl -arch=win64 ??4fstream@@QEAAAEAV0@AEAV0@@Z(ptr ptr) msvcirt.??4fstream@@QEAAAEAV0@AEAV0@@Z @ thiscall -arch=win32 ??4ifstream@@QAEAAV0@ABV0@@Z(ptr ptr) msvcirt.??4ifstream@@QAEAAV0@ABV0@@Z @ cdecl -arch=win64 ??4ifstream@@QEAAAEAV0@AEBV0@@Z(ptr ptr) msvcirt.??4ifstream@@QEAAAEAV0@AEBV0@@Z @ thiscall -arch=win32 ??4ios@@IAEAAV0@ABV0@@Z(ptr ptr) msvcirt.??4ios@@IAEAAV0@ABV0@@Z @@ -392,8 +392,8 @@ @ cdecl -arch=win64 ?allocate@streambuf@@IEAAHXZ(ptr) msvcirt.?allocate@streambuf@@IEAAHXZ @ thiscall -arch=win32 ?attach@filebuf@@QAEPAV1@H@Z(ptr long) msvcirt.?attach@filebuf@@QAEPAV1@H@Z @ cdecl -arch=win64 ?attach@filebuf@@QEAAPEAV1@H@Z(ptr long) msvcirt.?attach@filebuf@@QEAAPEAV1@H@Z -@ stub -arch=win32 ?attach@fstream@@QAEXH@Z -@ stub -arch=win64 ?attach@fstream@@QEAAXH@Z +@ thiscall -arch=win32 ?attach@fstream@@QAEXH@Z(ptr long) msvcirt.?attach@fstream@@QAEXH@Z +@ cdecl -arch=win64 ?attach@fstream@@QEAAXH@Z(ptr long) msvcirt.?attach@fstream@@QEAAXH@Z @ thiscall -arch=win32 ?attach@ifstream@@QAEXH@Z(ptr long) msvcirt.?attach@ifstream@@QAEXH@Z @ cdecl -arch=win64 ?attach@ifstream@@QEAAXH@Z(ptr long) msvcirt.?attach@ifstream@@QEAAXH@Z @ thiscall -arch=win32 ?attach@ofstream@@QAEXH@Z(ptr long) msvcirt.?attach@ofstream@@QAEXH@Z @@ -414,8 +414,8 @@ @ extern ?clog@@3Vostream_withassign@@A msvcirt.?clog@@3Vostream_withassign@@A @ thiscall -arch=win32 ?close@filebuf@@QAEPAV1@XZ(ptr) msvcirt.?close@filebuf@@QAEPAV1@XZ @ cdecl -arch=win64 ?close@filebuf@@QEAAPEAV1@XZ(ptr) msvcirt.?close@filebuf@@QEAAPEAV1@XZ -@ stub -arch=win32 ?close@fstream@@QAEXXZ -@ stub -arch=win64 ?close@fstream@@QEAAXXZ +@ thiscall -arch=win32 ?close@fstream@@QAEXXZ(ptr) msvcirt.?close@fstream@@QAEXXZ +@ cdecl -arch=win64 ?close@fstream@@QEAAXXZ(ptr) msvcirt.?close@fstream@@QEAAXXZ @ thiscall -arch=win32 ?close@ifstream@@QAEXXZ(ptr) msvcirt.?close@ifstream@@QAEXXZ @ cdecl -arch=win64 ?close@ifstream@@QEAAXXZ(ptr) msvcirt.?close@ifstream@@QEAAXXZ @ thiscall -arch=win32 ?close@ofstream@@QAEXXZ(ptr) msvcirt.?close@ofstream@@QAEXXZ @@ -458,8 +458,8 @@ @ cdecl -arch=win64 ?fail@ios@@QEBAHXZ(ptr) msvcirt.?fail@ios@@QEBAHXZ @ thiscall -arch=win32 ?fd@filebuf@@QBEHXZ(ptr) msvcirt.?fd@filebuf@@QBEHXZ @ cdecl -arch=win64 ?fd@filebuf@@QEBAHXZ(ptr) msvcirt.?fd@filebuf@@QEBAHXZ -@ stub -arch=win32 ?fd@fstream@@QBEHXZ -@ stub -arch=win64 ?fd@fstream@@QEBAHXZ +@ thiscall -arch=win32 ?fd@fstream@@QBEHXZ(ptr) msvcirt.?fd@fstream@@QBEHXZ +@ cdecl -arch=win64 ?fd@fstream@@QEBAHXZ(ptr) msvcirt.?fd@fstream@@QEBAHXZ @ thiscall -arch=win32 ?fd@ifstream@@QBEHXZ(ptr) msvcirt.?fd@ifstream@@QBEHXZ @ cdecl -arch=win64 ?fd@ifstream@@QEBAHXZ(ptr) msvcirt.?fd@ifstream@@QEBAHXZ @ thiscall -arch=win32 ?fd@ofstream@@QBEHXZ(ptr) msvcirt.?fd@ofstream@@QBEHXZ @@ -525,8 +525,8 @@ @ cdecl -arch=win64 ?ipfx@istream@@QEAAHH@Z(ptr long) msvcirt.?ipfx@istream@@QEAAHH@Z @ thiscall -arch=win32 ?is_open@filebuf@@QBEHXZ(ptr) msvcirt.?is_open@filebuf@@QBEHXZ @ cdecl -arch=win64 ?is_open@filebuf@@QEBAHXZ(ptr) msvcirt.?is_open@filebuf@@QEBAHXZ -@ stub -arch=win32 ?is_open@fstream@@QBEHXZ -@ stub -arch=win64 ?is_open@fstream@@QEBAHXZ +@ thiscall -arch=win32 ?is_open@fstream@@QBEHXZ(ptr) msvcirt.?is_open@fstream@@QBEHXZ +@ cdecl -arch=win64 ?is_open@fstream@@QEBAHXZ(ptr) msvcirt.?is_open@fstream@@QEBAHXZ @ thiscall -arch=win32 ?is_open@ifstream@@QBEHXZ(ptr) msvcirt.?is_open@ifstream@@QBEHXZ @ cdecl -arch=win64 ?is_open@ifstream@@QEBAHXZ(ptr) msvcirt.?is_open@ifstream@@QEBAHXZ @ thiscall -arch=win32 ?is_open@ofstream@@QBEHXZ(ptr) msvcirt.?is_open@ofstream@@QBEHXZ @@ -550,8 +550,8 @@ @ cdecl -arch=win64 ?oct@@YAAEAVios@@AEAV1@@Z(ptr) msvcirt.?oct@@YAAEAVios@@AEAV1@@Z @ thiscall -arch=win32 ?open@filebuf@@QAEPAV1@PBDHH@Z(ptr str long long) msvcirt.?open@filebuf@@QAEPAV1@PBDHH@Z @ cdecl -arch=win64 ?open@filebuf@@QEAAPEAV1@PEBDHH@Z(ptr str long long) msvcirt.?open@filebuf@@QEAAPEAV1@PEBDHH@Z -@ stub -arch=win32 ?open@fstream@@QAEXPBDHH@Z -@ stub -arch=win64 ?open@fstream@@QEAAXPEBDHH@Z +@ thiscall -arch=win32 ?open@fstream@@QAEXPBDHH@Z(ptr str long long) msvcirt.?open@fstream@@QAEXPBDHH@Z +@ cdecl -arch=win64 ?open@fstream@@QEAAXPEBDHH@Z(ptr str long long) msvcirt.?open@fstream@@QEAAXPEBDHH@Z @ thiscall -arch=win32 ?open@ifstream@@QAEXPBDHH@Z(ptr str long long) msvcirt.?open@ifstream@@QAEXPBDHH@Z @ cdecl -arch=win64 ?open@ifstream@@QEAAXPEBDHH@Z(ptr str long long) msvcirt.?open@ifstream@@QEAAXPEBDHH@Z @ thiscall -arch=win32 ?open@ofstream@@QAEXPBDHH@Z(ptr str long long) msvcirt.?open@ofstream@@QAEXPBDHH@Z @@ -599,8 +599,8 @@ @ cdecl -arch=win64 ?putback@istream@@QEAAAEAV1@D@Z(ptr long) msvcirt.?putback@istream@@QEAAAEAV1@D@Z @ thiscall -arch=win32 ?pword@ios@@QBEAAPAXH@Z(ptr long) msvcirt.?pword@ios@@QBEAAPAXH@Z @ cdecl -arch=win64 ?pword@ios@@QEBAAEAPEAXH@Z(ptr long) msvcirt.?pword@ios@@QEBAAEAPEAXH@Z -@ stub -arch=win32 ?rdbuf@fstream@@QBEPAVfilebuf@@XZ -@ stub -arch=win64 ?rdbuf@fstream@@QEBAPEAVfilebuf@@XZ +@ thiscall -arch=win32 ?rdbuf@fstream@@QBEPAVfilebuf@@XZ(ptr) msvcirt.?rdbuf@fstream@@QBEPAVfilebuf@@XZ +@ cdecl -arch=win64 ?rdbuf@fstream@@QEBAPEAVfilebuf@@XZ(ptr) msvcirt.?rdbuf@fstream@@QEBAPEAVfilebuf@@XZ @ thiscall -arch=win32 ?rdbuf@ifstream@@QBEPAVfilebuf@@XZ(ptr) msvcirt.?rdbuf@ifstream@@QBEPAVfilebuf@@XZ @ cdecl -arch=win64 ?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ(ptr) msvcirt.?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ @ thiscall -arch=win32 ?rdbuf@ios@@QBEPAVstreambuf@@XZ(ptr) msvcirt.?rdbuf@ios@@QBEPAVstreambuf@@XZ @@ -649,8 +649,8 @@ @ cdecl -arch=win64 ?setb@streambuf@@IEAAXPEAD0H@Z(ptr ptr ptr long) msvcirt.?setb@streambuf@@IEAAXPEAD0H@Z @ thiscall -arch=win32 ?setbuf@filebuf@@UAEPAVstreambuf@@PADH@Z(ptr ptr long) msvcirt.?setbuf@filebuf@@UAEPAVstreambuf@@PADH@Z @ cdecl -arch=win64 ?setbuf@filebuf@@UEAAPEAVstreambuf@@PEADH@Z(ptr ptr long) msvcirt.?setbuf@filebuf@@UEAAPEAVstreambuf@@PEADH@Z -@ stub -arch=win32 ?setbuf@fstream@@QAEPAVstreambuf@@PADH@Z -@ stub -arch=win64 ?setbuf@fstream@@QEAAPEAVstreambuf@@PEADH@Z +@ thiscall -arch=win32 ?setbuf@fstream@@QAEPAVstreambuf@@PADH@Z(ptr ptr long) msvcirt.?setbuf@fstream@@QAEPAVstreambuf@@PADH@Z +@ cdecl -arch=win64 ?setbuf@fstream@@QEAAPEAVstreambuf@@PEADH@Z(ptr ptr long) msvcirt.?setbuf@fstream@@QEAAPEAVstreambuf@@PEADH@Z @ thiscall -arch=win32 ?setbuf@ifstream@@QAEPAVstreambuf@@PADH@Z(ptr ptr long) msvcirt.?setbuf@ifstream@@QAEPAVstreambuf@@PADH@Z @ cdecl -arch=win64 ?setbuf@ifstream@@QEAAPEAVstreambuf@@PEADH@Z(ptr ptr long) msvcirt.?setbuf@ifstream@@QEAAPEAVstreambuf@@PEADH@Z @ thiscall -arch=win32 ?setbuf@ofstream@@QAEPAVstreambuf@@PADH@Z(ptr ptr long) msvcirt.?setbuf@ofstream@@QAEPAVstreambuf@@PADH@Z @@ -671,8 +671,8 @@ @ cdecl -arch=win64 ?setlock@streambuf@@QEAAXXZ(ptr) msvcirt.?setlock@streambuf@@QEAAXXZ @ thiscall -arch=win32 ?setmode@filebuf@@QAEHH@Z(ptr long) msvcirt.?setmode@filebuf@@QAEHH@Z @ cdecl -arch=win64 ?setmode@filebuf@@QEAAHH@Z(ptr long) msvcirt.?setmode@filebuf@@QEAAHH@Z -@ stub -arch=win32 ?setmode@fstream@@QAEHH@Z -@ stub -arch=win64 ?setmode@fstream@@QEAAHH@Z +@ thiscall -arch=win32 ?setmode@fstream@@QAEHH@Z(ptr long) msvcirt.?setmode@fstream@@QAEHH@Z +@ cdecl -arch=win64 ?setmode@fstream@@QEAAHH@Z(ptr long) msvcirt.?setmode@fstream@@QEAAHH@Z @ thiscall -arch=win32 ?setmode@ifstream@@QAEHH@Z(ptr long) msvcirt.?setmode@ifstream@@QAEHH@Z @ cdecl -arch=win64 ?setmode@ifstream@@QEAAHH@Z(ptr long) msvcirt.?setmode@ifstream@@QEAAHH@Z @ thiscall -arch=win32 ?setmode@ofstream@@QAEHH@Z(ptr long) msvcirt.?setmode@ofstream@@QAEHH@Z diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index 1024644b29cd..943dcc537018 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -28,16 +28,16 @@ @ cdecl -arch=win64 ??0filebuf@@QEAA@HPEADH@Z(ptr long ptr long) msvcirt.??0filebuf@@QEAA@HPEADH@Z @ thiscall -arch=win32 ??0filebuf@@QAE@XZ(ptr) msvcirt.??0filebuf@@QAE@XZ @ cdecl -arch=win64 ??0filebuf@@QEAA@XZ(ptr) msvcirt.??0filebuf@@QEAA@XZ -@ stub -arch=win32 ??0fstream@@QAE@ABV0@@Z -@ stub -arch=win64 ??0fstream@@QEAA@AEBV0@@Z -@ stub -arch=win32 ??0fstream@@QAE@H@Z -@ stub -arch=win64 ??0fstream@@QEAA@H@Z -@ stub -arch=win32 ??0fstream@@QAE@HPADH@Z -@ stub -arch=win64 ??0fstream@@QEAA@HPEADH@Z +@ thiscall -arch=win32 ??0fstream@@QAE@ABV0@@Z(ptr ptr long) msvcirt.??0fstream@@QAE@ABV0@@Z +@ cdecl -arch=win64 ??0fstream@@QEAA@AEBV0@@Z(ptr ptr long) msvcirt.??0fstream@@QEAA@AEBV0@@Z +@ thiscall -arch=win32 ??0fstream@@QAE@H@Z(ptr long long) msvcirt.??0fstream@@QAE@H@Z +@ cdecl -arch=win64 ??0fstream@@QEAA@H@Z(ptr long long) msvcirt.??0fstream@@QEAA@H@Z +@ thiscall -arch=win32 ??0fstream@@QAE@HPADH@Z(ptr long ptr long long) msvcirt.??0fstream@@QAE@HPADH@Z +@ cdecl -arch=win64 ??0fstream@@QEAA@HPEADH@Z(ptr long ptr long long) msvcirt.??0fstream@@QEAA@HPEADH@Z @ thiscall -arch=win32 ??0fstream@@QAE@PBDHH@Z(ptr str long long long) msvcirt.??0fstream@@QAE@PBDHH@Z @ cdecl -arch=win64 ??0fstream@@QEAA@PEBDHH@Z(ptr str long long long) msvcirt.??0fstream@@QEAA@PEBDHH@Z -@ stub -arch=win32 ??0fstream@@QAE@XZ -@ stub -arch=win64 ??0fstream@@QEAA@XZ +@ thiscall -arch=win32 ??0fstream@@QAE@XZ(ptr long) msvcirt.??0fstream@@QAE@XZ +@ cdecl -arch=win64 ??0fstream@@QEAA@XZ(ptr long) msvcirt.??0fstream@@QEAA@XZ @ thiscall -arch=win32 ??0ifstream@@QAE@ABV0@@Z(ptr ptr long) msvcirt.??0ifstream@@QAE@ABV0@@Z @ cdecl -arch=win64 ??0ifstream@@QEAA@AEBV0@@Z(ptr ptr long) msvcirt.??0ifstream@@QEAA@AEBV0@@Z @ thiscall -arch=win32 ??0ifstream@@QAE@H@Z(ptr long long) msvcirt.??0ifstream@@QAE@H@Z @@ -204,8 +204,8 @@ @ cdecl -arch=win64 ??4exception@@QEAAAEAV0@AEBV0@@Z(ptr ptr) msvcrt.??4exception@@QEAAAEAV0@AEBV0@@Z @ thiscall -arch=win32 ??4filebuf@@QAEAAV0@ABV0@@Z(ptr ptr) msvcirt.??4filebuf@@QAEAAV0@ABV0@@Z @ cdecl -arch=win64 ??4filebuf@@QEAAAEAV0@AEBV0@@Z(ptr ptr) msvcirt.??4filebuf@@QEAAAEAV0@AEBV0@@Z -@ stub -arch=win32 ??4fstream@@QAEAAV0@AAV0@@Z -@ stub -arch=win64 ??4fstream@@QEAAAEAV0@AEAV0@@Z +@ thiscall -arch=win32 ??4fstream@@QAEAAV0@AAV0@@Z(ptr ptr) msvcirt.??4fstream@@QAEAAV0@AAV0@@Z +@ cdecl -arch=win64 ??4fstream@@QEAAAEAV0@AEAV0@@Z(ptr ptr) msvcirt.??4fstream@@QEAAAEAV0@AEAV0@@Z @ thiscall -arch=win32 ??4ifstream@@QAEAAV0@ABV0@@Z(ptr ptr) msvcirt.??4ifstream@@QAEAAV0@ABV0@@Z @ cdecl -arch=win64 ??4ifstream@@QEAAAEAV0@AEBV0@@Z(ptr ptr) msvcirt.??4ifstream@@QEAAAEAV0@AEBV0@@Z @ thiscall -arch=win32 ??4ios@@IAEAAV0@ABV0@@Z(ptr ptr) msvcirt.??4ios@@IAEAAV0@ABV0@@Z @@ -455,8 +455,8 @@ @ cdecl -arch=win64 ?allocate@streambuf@@IEAAHXZ(ptr) msvcirt.?allocate@streambuf@@IEAAHXZ @ thiscall -arch=win32 ?attach@filebuf@@QAEPAV1@H@Z(ptr long) msvcirt.?attach@filebuf@@QAEPAV1@H@Z @ cdecl -arch=win64 ?attach@filebuf@@QEAAPEAV1@H@Z(ptr long) msvcirt.?attach@filebuf@@QEAAPEAV1@H@Z -@ stub -arch=win32 ?attach@fstream@@QAEXH@Z -@ stub -arch=win64 ?attach@fstream@@QEAAXH@Z +@ thiscall -arch=win32 ?attach@fstream@@QAEXH@Z(ptr long) msvcirt.?attach@fstream@@QAEXH@Z +@ cdecl -arch=win64 ?attach@fstream@@QEAAXH@Z(ptr long) msvcirt.?attach@fstream@@QEAAXH@Z @ thiscall -arch=win32 ?attach@ifstream@@QAEXH@Z(ptr long) msvcirt.?attach@ifstream@@QAEXH@Z @ cdecl -arch=win64 ?attach@ifstream@@QEAAXH@Z(ptr long) msvcirt.?attach@ifstream@@QEAAXH@Z @ thiscall -arch=win32 ?attach@ofstream@@QAEXH@Z(ptr long) msvcirt.?attach@ofstream@@QAEXH@Z @@ -479,8 +479,8 @@ @ extern ?clog@@3Vostream_withassign@@A msvcirt.?clog@@3Vostream_withassign@@A @ thiscall -arch=win32 ?close@filebuf@@QAEPAV1@XZ(ptr) msvcirt.?close@filebuf@@QAEPAV1@XZ @ cdecl -arch=win64 ?close@filebuf@@QEAAPEAV1@XZ(ptr) msvcirt.?close@filebuf@@QEAAPEAV1@XZ -@ stub -arch=win32 ?close@fstream@@QAEXXZ -@ stub -arch=win64 ?close@fstream@@QEAAXXZ +@ thiscall -arch=win32 ?close@fstream@@QAEXXZ(ptr) msvcirt.?close@fstream@@QAEXXZ +@ cdecl -arch=win64 ?close@fstream@@QEAAXXZ(ptr) msvcirt.?close@fstream@@QEAAXXZ @ thiscall -arch=win32 ?close@ifstream@@QAEXXZ(ptr) msvcirt.?close@ifstream@@QAEXXZ @ cdecl -arch=win64 ?close@ifstream@@QEAAXXZ(ptr) msvcirt.?close@ifstream@@QEAAXXZ @ thiscall -arch=win32 ?close@ofstream@@QAEXXZ(ptr) msvcirt.?close@ofstream@@QAEXXZ @@ -523,8 +523,8 @@ @ cdecl -arch=win64 ?fail@ios@@QEBAHXZ(ptr) msvcirt.?fail@ios@@QEBAHXZ @ thiscall -arch=win32 ?fd@filebuf@@QBEHXZ(ptr) msvcirt.?fd@filebuf@@QBEHXZ @ cdecl -arch=win64 ?fd@filebuf@@QEBAHXZ(ptr) msvcirt.?fd@filebuf@@QEBAHXZ -@ stub -arch=win32 ?fd@fstream@@QBEHXZ -@ stub -arch=win64 ?fd@fstream@@QEBAHXZ +@ thiscall -arch=win32 ?fd@fstream@@QBEHXZ(ptr) msvcirt.?fd@fstream@@QBEHXZ +@ cdecl -arch=win64 ?fd@fstream@@QEBAHXZ(ptr) msvcirt.?fd@fstream@@QEBAHXZ @ thiscall -arch=win32 ?fd@ifstream@@QBEHXZ(ptr) msvcirt.?fd@ifstream@@QBEHXZ @ cdecl -arch=win64 ?fd@ifstream@@QEBAHXZ(ptr) msvcirt.?fd@ifstream@@QEBAHXZ @ thiscall -arch=win32 ?fd@ofstream@@QBEHXZ(ptr) msvcirt.?fd@ofstream@@QBEHXZ @@ -592,8 +592,8 @@ @ cdecl -arch=win64 ?ipfx@istream@@QEAAHH@Z(ptr long) msvcirt.?ipfx@istream@@QEAAHH@Z @ thiscall -arch=win32 ?is_open@filebuf@@QBEHXZ(ptr) msvcirt.?is_open@filebuf@@QBEHXZ @ cdecl -arch=win64 ?is_open@filebuf@@QEBAHXZ(ptr) msvcirt.?is_open@filebuf@@QEBAHXZ -@ stub -arch=win32 ?is_open@fstream@@QBEHXZ -@ stub -arch=win64 ?is_open@fstream@@QEBAHXZ +@ thiscall -arch=win32 ?is_open@fstream@@QBEHXZ(ptr) msvcirt.?is_open@fstream@@QBEHXZ +@ cdecl -arch=win64 ?is_open@fstream@@QEBAHXZ(ptr) msvcirt.?is_open@fstream@@QEBAHXZ @ thiscall -arch=win32 ?is_open@ifstream@@QBEHXZ(ptr) msvcirt.?is_open@ifstream@@QBEHXZ @ cdecl -arch=win64 ?is_open@ifstream@@QEBAHXZ(ptr) msvcirt.?is_open@ifstream@@QEBAHXZ @ thiscall -arch=win32 ?is_open@ofstream@@QBEHXZ(ptr) msvcirt.?is_open@ofstream@@QBEHXZ @@ -619,8 +619,8 @@ @ cdecl -arch=win64 ?oct@@YAAEAVios@@AEAV1@@Z(ptr) msvcirt.?oct@@YAAEAVios@@AEAV1@@Z @ thiscall -arch=win32 ?open@filebuf@@QAEPAV1@PBDHH@Z(ptr str long long) msvcirt.?open@filebuf@@QAEPAV1@PBDHH@Z @ cdecl -arch=win64 ?open@filebuf@@QEAAPEAV1@PEBDHH@Z(ptr str long long) msvcirt.?open@filebuf@@QEAAPEAV1@PEBDHH@Z -@ stub -arch=win32 ?open@fstream@@QAEXPBDHH@Z -@ stub -arch=win64 ?open@fstream@@QEAAXPEBDHH@Z +@ thiscall -arch=win32 ?open@fstream@@QAEXPBDHH@Z(ptr str long long) msvcirt.?open@fstream@@QAEXPBDHH@Z +@ cdecl -arch=win64 ?open@fstream@@QEAAXPEBDHH@Z(ptr str long long) msvcirt.?open@fstream@@QEAAXPEBDHH@Z @ thiscall -arch=win32 ?open@ifstream@@QAEXPBDHH@Z(ptr str long long) msvcirt.?open@ifstream@@QAEXPBDHH@Z @ cdecl -arch=win64 ?open@ifstream@@QEAAXPEBDHH@Z(ptr str long long) msvcirt.?open@ifstream@@QEAAXPEBDHH@Z @ thiscall -arch=win32 ?open@ofstream@@QAEXPBDHH@Z(ptr str long long) msvcirt.?open@ofstream@@QAEXPBDHH@Z @@ -670,8 +670,8 @@ @ cdecl -arch=win64 ?pword@ios@@QEBAAEAPEAXH@Z(ptr long) msvcirt.?pword@ios@@QEBAAEAPEAXH@Z @ thiscall -arch=i386 ?raw_name@type_info@@QBEPBDXZ(ptr) msvcrt.?raw_name@type_info@@QBEPBDXZ @ cdecl -arch=win64 ?raw_name@type_info@@QEBAPEBDXZ(ptr) msvcrt.?raw_name@type_info@@QEBAPEBDXZ -@ stub -arch=win32 ?rdbuf@fstream@@QBEPAVfilebuf@@XZ -@ stub -arch=win64 ?rdbuf@fstream@@QEBAPEAVfilebuf@@XZ +@ thiscall -arch=win32 ?rdbuf@fstream@@QBEPAVfilebuf@@XZ(ptr) msvcirt.?rdbuf@fstream@@QBEPAVfilebuf@@XZ +@ cdecl -arch=win64 ?rdbuf@fstream@@QEBAPEAVfilebuf@@XZ(ptr) msvcirt.?rdbuf@fstream@@QEBAPEAVfilebuf@@XZ @ thiscall -arch=win32 ?rdbuf@ifstream@@QBEPAVfilebuf@@XZ(ptr) msvcirt.?rdbuf@ifstream@@QBEPAVfilebuf@@XZ @ cdecl -arch=win64 ?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ(ptr) msvcirt.?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ @ thiscall -arch=win32 ?rdbuf@ios@@QBEPAVstreambuf@@XZ(ptr) msvcirt.?rdbuf@ios@@QBEPAVstreambuf@@XZ @@ -721,8 +721,8 @@ @ cdecl -arch=win64 ?setb@streambuf@@IEAAXPEAD0H@Z(ptr ptr ptr long) msvcirt.?setb@streambuf@@IEAAXPEAD0H@Z @ thiscall -arch=win32 ?setbuf@filebuf@@UAEPAVstreambuf@@PADH@Z(ptr ptr long) msvcirt.?setbuf@filebuf@@UAEPAVstreambuf@@PADH@Z @ cdecl -arch=win64 ?setbuf@filebuf@@UEAAPEAVstreambuf@@PEADH@Z(ptr ptr long) msvcirt.?setbuf@filebuf@@UEAAPEAVstreambuf@@PEADH@Z -@ stub -arch=win32 ?setbuf@fstream@@QAEPAVstreambuf@@PADH@Z -@ stub -arch=win64 ?setbuf@fstream@@QEAAPEAVstreambuf@@PEADH@Z +@ thiscall -arch=win32 ?setbuf@fstream@@QAEPAVstreambuf@@PADH@Z(ptr ptr long) msvcirt.?setbuf@fstream@@QAEPAVstreambuf@@PADH@Z +@ cdecl -arch=win64 ?setbuf@fstream@@QEAAPEAVstreambuf@@PEADH@Z(ptr ptr long) msvcirt.?setbuf@fstream@@QEAAPEAVstreambuf@@PEADH@Z @ thiscall -arch=win32 ?setbuf@ifstream@@QAEPAVstreambuf@@PADH@Z(ptr ptr long) msvcirt.?setbuf@ifstream@@QAEPAVstreambuf@@PADH@Z @ cdecl -arch=win64 ?setbuf@ifstream@@QEAAPEAVstreambuf@@PEADH@Z(ptr ptr long) msvcirt.?setbuf@ifstream@@QEAAPEAVstreambuf@@PEADH@Z @ thiscall -arch=win32 ?setbuf@ofstream@@QAEPAVstreambuf@@PADH@Z(ptr ptr long) msvcirt.?setbuf@ofstream@@QAEPAVstreambuf@@PADH@Z @@ -743,8 +743,8 @@ @ cdecl -arch=win64 ?setlock@streambuf@@QEAAXXZ(ptr) msvcirt.?setlock@streambuf@@QEAAXXZ @ thiscall -arch=win32 ?setmode@filebuf@@QAEHH@Z(ptr long) msvcirt.?setmode@filebuf@@QAEHH@Z @ cdecl -arch=win64 ?setmode@filebuf@@QEAAHH@Z(ptr long) msvcirt.?setmode@filebuf@@QEAAHH@Z -@ stub -arch=win32 ?setmode@fstream@@QAEHH@Z -@ stub -arch=win64 ?setmode@fstream@@QEAAHH@Z +@ thiscall -arch=win32 ?setmode@fstream@@QAEHH@Z(ptr long) msvcirt.?setmode@fstream@@QAEHH@Z +@ cdecl -arch=win64 ?setmode@fstream@@QEAAHH@Z(ptr long) msvcirt.?setmode@fstream@@QEAAHH@Z @ thiscall -arch=win32 ?setmode@ifstream@@QAEHH@Z(ptr long) msvcirt.?setmode@ifstream@@QAEHH@Z @ cdecl -arch=win64 ?setmode@ifstream@@QEAAHH@Z(ptr long) msvcirt.?setmode@ifstream@@QEAAHH@Z @ thiscall -arch=win32 ?setmode@ofstream@@QAEHH@Z(ptr long) msvcirt.?setmode@ofstream@@QAEHH@Z -- 2.30.1 [View Less]

2 2

[PATCH] mf/tests: Skip some tests on missing function.
by Nikolay Sivov 22 Feb '21

22 Feb '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 65f2b40faa9..e3a752553bb 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -47,6 +47,8 @@ DEFINE_GUID(MFVideoFormat_ABGR32, 0x00000020, 0x0000, 0x0010, 0x80, 0x00, 0x00, #include "wine/test.h" +static HRESULT (WINAPI *pMFCreateSampleCopierMFT)(IMFTransform … [View More]

2 1

[PATCH 4/5] ntdll: Use syscall dispatcher for restoring context in x86_64 NtSetContextThread implementation.
by Jacek Caban 22 Feb '21

22 Feb '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/server.c | 5 ++++- dlls/ntdll/unix/signal_arm.c | 10 ++++++++++ dlls/ntdll/unix/signal_arm64.c | 10 ++++++++++ dlls/ntdll/unix/signal_i386.c | 11 +++++++++++ dlls/ntdll/unix/signal_x86_64.c | 29 ++++++++++++++++++++++------- dlls/ntdll/unix/unix_private.h | 1 + tools/winebuild/import.c | 13 ++++++++++++- 7 files changed, 70 insertions(+), 9 deletions(-)

1 0

[PATCH 3/5] ntdll: Use NtContinue in RtlRestoreContext.
by Jacek Caban 22 Feb '21

22 Feb '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/signal_arm64.c | 2 +- dlls/ntdll/signal_x86_64.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 2/5] ntdll: Use NtContinue in NtRaiseException.
by Jacek Caban 22 Feb '21

22 Feb '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 1/5] ntdll: Use syscall frames in x86_64 NtSetContextThread implementation.
by Jacek Caban 22 Feb '21

22 Feb '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/signal_x86_64.c | 163 +++++++++++++++++++------------- 1 file changed, 97 insertions(+), 66 deletions(-)

1 0

[PATCH 1/3] api-ms-win-core-crt-l2-1-0: Update time() .spec file entry.
by Gijs Vermeulen 22 Feb '21

22 Feb '21

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/api-ms-win-core-crt-l2-1-0/api-ms-win-core-crt-l2-1-0.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/api-ms-win-core-crt-l2-1-0/api-ms-win-core-crt-l2-1-0.spec b/dlls/api-ms-win-core-crt-l2-1-0/api-ms-win-core-crt-l2-1-0.spec index 69f2629c8d50..86651e0a8bcf 100644 --- a/dlls/api-ms-win-core-crt-l2-1-0/api-ms-win-core-crt-l2-1-0.spec +++ b/dlls/api-ms-win-core-crt-l2-1-0/api-ms-win-core-crt-l2-1-0.… [View More]

2 3

[PATCH] comctl32/ipaddress: Only print an error when it actually occurs.
by Zhiyi Zhang 22 Feb '21

22 Feb '21

IPADDRESS_GetPartIndex() is also used for handling WM_KILLFOCUS and WM_SETFOCUS messages. In this case, it's actually expected that the window receiving or losing focus may not be a IP Address part window. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/ipaddress.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index 82d47d4e576..c7b9ada1f6a 100644 --- a/dlls/comctl32/ipaddress.c +++… [View More]

1 0

[PATCH 6/6] uxtheme: Remove unused code.
by Zhiyi Zhang 22 Feb '21

22 Feb '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/buffer.c | 2 -- dlls/uxtheme/msstyles.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/dlls/uxtheme/buffer.c b/dlls/uxtheme/buffer.c index b07284f8e06..f159d5c1be0 100644 --- a/dlls/uxtheme/buffer.c +++ b/dlls/uxtheme/buffer.c @@ -52,8 +52,6 @@ static void free_paintbuffer(struct paintbuffer *buffer) static struct paintbuffer *get_buffer_obj(HPAINTBUFFER handle) { - if (!handle) - return NULL; … [View More]

1 0

[PATCH 5/6] uxtheme: Support DTT_FONTPROP for DrawThemeTextEx().
by Zhiyi Zhang 22 Feb '21

22 Feb '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/draw.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 023b2dfd61b..8c3c4ae2218 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -1660,6 +1660,7 @@ HRESULT WINAPI DrawThemeTextEx(HTHEME hTheme, HDC hdc, int iPartId, int iStateId COLORREF textColor; COLORREF oldTextColor; int oldBkMode; + int fontProp; … [View More]

1 0

[PATCH 4/6] uxtheme: Support more font properties.
by Zhiyi Zhang 22 Feb '21

22 Feb '21

Add support for TMT_HEADING1FONT, TMT_HEADING2FONT and TMT_BODYFONT. TMT_BODYFONT is used by Command Links. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 3 +++ include/tmschema.h | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 1949028581c..20ed1305da8 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -83,6 +83,9 @@ static const … [View More]

1 0

[PATCH 3/6] uxtheme: Add Command Link part and state definitions.
by Zhiyi Zhang 22 Feb '21

22 Feb '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 13 +++++++++++++ include/tmschema.h | 21 +++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index b38b18b623d..1949028581c 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -374,6 +374,19 @@ static const MSSTYLES_CLASS_MAP classButton[] = { {BP_RADIOBUTTON, GBS_NORMAL, L"NORMAL"}, {BP_RADIOBUTTON, … [View More]

1 0

[PATCH 2/6] comctl32/button: Turn off themed painting if parts are unavailable for Command Links.
by Zhiyi Zhang 22 Feb '21

22 Feb '21

Themed painting for Command Links requires BP_COMMANDLINK and BP_COMMANDLINKGLYPH to be defined in the theme. However, Wine currently only supports the v3 theme file format used by XP, which doesn't support Command Links. So turn off themed painting for Command Links if user uses a third party theme that doesn't have the required parts. Otherwise, only plain text is drawn. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 16 +++++++++++++++- 1 file … [View More]

1 0

[PATCH 1/6] comctl32/theme_scrollbar: Remove an unused variable.
by Zhiyi Zhang 22 Feb '21

22 Feb '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/theme_scrollbar.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/comctl32/theme_scrollbar.c b/dlls/comctl32/theme_scrollbar.c index bb42267bf21..27d31bd4ac5 100644 --- a/dlls/comctl32/theme_scrollbar.c +++ b/dlls/comctl32/theme_scrollbar.c @@ -334,16 +334,12 @@ static void paint_scrollbar(HWND hwnd, HTHEME theme) DrawThemeBackground(theme, dc, SBP_SIZEBOX, state, &r, NULL); } else { - … [View More]

1 0

[PATCH] include: Avoid using C++ keyword.
by Jactry Zeng 22 Feb '21

22 Feb '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50670 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- include/shobjidl.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index e264a3b18e4..52e0c5c9db1 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -3984,7 +3984,7 @@ interface IFileOperation : IUnknown [in, unique] IFileOperationProgressSink *sink); HRESULT DeleteItems(… [View More]

1 0

[PATCH] user32/tests: Add optional messages to test sequences.
by Zhiyi Zhang 22 Feb '21

22 Feb '21

Fix a possible test failure on Win10 2009. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Fix a test failure like in https://testbot.winehq.org/JobDetails.pl?Key=85952#k302 dlls/user32/tests/msg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 11fb764e6cd..63040ef8e45 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13917,6 +13917,7 @@ static const struct message WmCreateDialogParamSeq_1[] = { … [View More]

2 1

[PATCH resend] user32/tests: Fix a test failure on w7u_2qxl TestBot VM.
by Zhiyi Zhang 22 Feb '21

22 Feb '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Fix a test failure like in https://test.winehq.org/data/4de079bb7247c8b849558c0f27a280a9546c5570/win7_… dlls/user32/tests/monitor.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 58b3f0d5e0c..6b233970ace 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -743,17 +743,18 @@ static void test_ChangeDisplaySettingsEx(… [View More]

1 0

[PATCH v2] vkd3d-shader: Add a fall-through to default case in shader_sm4_read_param().
by Andrey Gusev 22 Feb '21

22 Feb '21

Supersedes 200320. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- libs/vkd3d-shader/dxbc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index bfc3cce..d2cf87e 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1551,6 +1551,7 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr default: FIXME("Skipping modifier 0x%08x.\n", m); + … [View More]

2 1

[PATCH] msado15: Add helper function to create CommandText interface
by Alistair Leslie-Hughes 22 Feb '21

22 Feb '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/command.c | 1 + dlls/msado15/connection.c | 82 +++++++++++++++++++++------------- dlls/msado15/main.c | 1 + dlls/msado15/msado15_private.h | 2 + dlls/msado15/stream.c | 1 + 5 files changed, 57 insertions(+), 30 deletions(-) diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c index d19108a1a25..9a56ced25ac 100644 --- a/dlls/msado15/command.c +++ b/dlls/… [View More]msado15/command.c @@ -20,6 +20,7 @@ #include "winbase.h" #define COBJMACROS #include "objbase.h" +#include "msdasc.h" #include "msado15_backcompat.h" #include "wine/debug.h" diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 500be033199..3d7054d073d 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -264,61 +264,89 @@ static HRESULT WINAPI connection_Close( _Connection *iface ) return S_OK; } -static HRESULT WINAPI connection_Execute( _Connection *iface, BSTR command, VARIANT *records_affected, - LONG options, _Recordset **record_set ) +HRESULT create_command_text(IUnknown *session, BSTR command, ICommandText **cmd_text) { - struct connection *connection = impl_from_Connection( iface ); HRESULT hr; IOpenRowset *openrowset; - IDBCreateCommand *create_command = NULL; - ICommand *cmd = NULL; - ICommandText *comand_text = NULL; - DBROWCOUNT affected; - IUnknown *rowset = NULL; - _Recordset *recordset = NULL; - ADORecordsetConstruction *construct; - - FIXME( "%p, %s, %p, 0x%08x, %p Semi-stub\n", iface, debugstr_w(command), records_affected, options, record_set ); - - if (connection->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + ICommandText *command_text; + ICommand *cmd; + IDBCreateCommand *create_command; - hr = IUnknown_QueryInterface(connection->session, &IID_IOpenRowset, (void**)&openrowset); + hr = IUnknown_QueryInterface(session, &IID_IOpenRowset, (void**)&openrowset); if (FAILED(hr)) return hr; hr = IOpenRowset_QueryInterface(openrowset, &IID_IDBCreateCommand, (void**)&create_command); + IOpenRowset_Release(openrowset); if (FAILED(hr)) - goto done; + return hr; hr = IDBCreateCommand_CreateCommand(create_command, NULL, &IID_IUnknown, (IUnknown **)&cmd); + IDBCreateCommand_Release(create_command); if (FAILED(hr)) - goto done; + return hr; - hr = ICommand_QueryInterface(cmd, &IID_ICommandText, (void**)&comand_text); + hr = ICommand_QueryInterface(cmd, &IID_ICommandText, (void**)&command_text); + ICommand_Release(cmd); if (FAILED(hr)) { FIXME("Currently only ICommandText interface is support\n"); - goto done; + return hr; + } + + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, command); + if (FAILED(hr)) + { + ICommandText_Release(command_text); + return hr; } - hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, command); + *cmd_text = command_text; + + return S_OK; +} + +static HRESULT WINAPI connection_Execute( _Connection *iface, BSTR command, VARIANT *records_affected, + LONG options, _Recordset **record_set ) +{ + struct connection *connection = impl_from_Connection( iface ); + HRESULT hr; + ICommandText *comand_text = NULL; + DBROWCOUNT affected; + IUnknown *rowset = NULL; + _Recordset *recordset = NULL; + ADORecordsetConstruction *construct; + + FIXME( "%p, %s, %p, 0x%08x, %p Semi-stub\n", iface, debugstr_w(command), records_affected, options, record_set ); + + if (connection->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + + hr = create_command_text(connection->session, command, &comand_text); if (FAILED(hr)) - goto done; + return hr; hr = ICommandText_Execute(comand_text, NULL, &IID_IUnknown, NULL, &affected, &rowset); + ICommandText_Release(comand_text); if (FAILED(hr)) - goto done; + return hr; hr = Recordset_create( (void**)&recordset); if (FAILED(hr)) - goto done; + { + return hr; + } hr = _Recordset_QueryInterface(recordset, &IID_ADORecordsetConstruction, (void**)&construct); if (FAILED(hr)) - goto done; + { + IUnknown_Release(rowset); + _Recordset_Release(recordset); + return hr; + } ADORecordsetConstruction_put_Rowset(construct, rowset); ADORecordsetConstruction_Release(construct); + IUnknown_Release(rowset); if (records_affected) { @@ -329,12 +357,6 @@ static HRESULT WINAPI connection_Execute( _Connection *iface, BSTR command, VARI _Recordset_put_CursorLocation(recordset, connection->location); *record_set = recordset; -done: - if (rowset) IUnknown_Release(rowset); - if (comand_text) ICommandText_Release(comand_text); - if (cmd) ICommand_Release(cmd); - if (create_command) IDBCreateCommand_Release(create_command); - if (openrowset) IOpenRowset_Release(openrowset); return hr; } diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index 770a02fc59d..0b8de1f9117 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -22,6 +22,7 @@ #define COBJMACROS #include "objbase.h" #include "rpcproxy.h" +#include "msdasc.h" #include "msado15_backcompat.h" #include "wine/debug.h" diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index f6c60f0304c..dd98c382e2b 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -26,6 +26,8 @@ HRESULT Connection_create( void ** ) DECLSPEC_HIDDEN; HRESULT Recordset_create( void ** ) DECLSPEC_HIDDEN; HRESULT Stream_create( void ** ) DECLSPEC_HIDDEN; +HRESULT create_command_text(IUnknown *session, BSTR command, ICommandText **cmd_text) DECLSPEC_HIDDEN; + static inline void *heap_realloc_zero( void *mem, SIZE_T len ) { if (!mem) return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index c6add70b1bc..b40f664dcf1 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -21,6 +21,7 @@ #include "winbase.h" #define COBJMACROS #include "objbase.h" +#include "msdasc.h" #include "msado15_backcompat.h" #include "wine/debug.h" -- 2.30.0 [View Less]

2 1

[PATCH 1/6] regedit/tests: Check for elevated privileges before cleaning up the Windows 3.1 test key and running unit tests
by Hugh McMaster 22 Feb '21

22 Feb '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/tests/regedit.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 66b95624455..de4ddfa76a3 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1094,15 +1094,12 @@ static void test_basic_import_unicode(void) static void test_basic_import_31(void) { HKEY hkey; + … [View More]

2 11

[PATCH] ntoskrnl.exe: Exclude large integer APIs from relay tracing.
by Zhiyi Zhang 22 Feb '21

22 Feb '21

Similar to 8d7ec7968df1750c9c525817f1366b57fa72d839 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 22968913300..145ea3099d7 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1527,16 +1527,16 @@ @ cdecl -private -arch=i386 _CIsin() @ cdecl … [View More]

1 0

[PATCH v3] ddraw: HWTRANSFORMANDLIGHT is not set for software devices
by David Adam 22 Feb '21

22 Feb '21

This patch is from Michael Muller

2 2

[PATCH v2 9/9] reg/tests: Add tests for forward and back slashes in key and value names
by Hugh McMaster 22 Feb '21

22 Feb '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- v2: Use close_key() instead of RegCloseKey in final export test programs/reg/tests/reg.c | 89 ++++++++++++++++++++++++++++++++++------ 1 file changed, 77 insertions(+), 12 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index db02fc770e2..538a274d54f 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -578,6 +578,19 @@ static void test_add(void) ok(r == … [View More]REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); verify_reg(hkey, NULL, REG_MULTI_SZ, buffer, 1, 0); + /* Test forward and back slashes */ + run_reg_exe("reg add HKCU\\" KEY_BASE "\\https://winehq.org /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key(hkey, "https://winehq.org"); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v count/up /d one/two/three /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "count/up", REG_SZ, "one/two/three", 14, 0); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v \\foo\\bar /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "\\foo\\bar", REG_SZ, "", 1, 0); + close_key(hkey); /* Test duplicate switches */ @@ -615,7 +628,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v invalid4 -", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); } static void test_delete(void) @@ -681,6 +694,24 @@ static void test_delete(void) verify_reg_nonexist(hkey, "foo"); verify_key(hkey, "subkey"); + /* Test forward and back slashes */ + add_key(hkey, "https://winehq.org", &hsubkey); + close_key(hsubkey); + add_value(hkey, "count/up", REG_SZ, "one/two/three", 14); + add_value(hkey, "\\foo\\bar", REG_SZ, "", 1); + + run_reg_exe("reg delete HKCU\\" KEY_BASE "\\https://winehq.org /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(hkey, "https://winehq.org"); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v count/up /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "count/up"); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v \\foo\\bar /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "\\foo\\bar"); + close_key(hkey); run_reg_exe("reg delete HKCU\\" KEY_BASE " /f", &r); @@ -2385,9 +2416,20 @@ static void test_import(void) todo_wine verify_reg_nonexist(hkey, "Wine70e"); todo_wine verify_reg_nonexist(hkey, "Wine70f"); + /* Test forward and back slashes */ + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"count/up\"=\"one/two/three\"\n" + "\"\\\\foo\\\\bar\"=\"\"\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\https://winehq.org]\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "count/up", REG_SZ, "one/two/three", 14, 0); + verify_reg(hkey, "\\foo\\bar", REG_SZ, "", 1, 0); + verify_key(hkey, "https://winehq.org"); + close_key(hkey); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); } static void test_unicode_import(void) @@ -3923,9 +3965,20 @@ static void test_unicode_import(void) todo_wine verify_reg_nonexist(hkey, "Wine70e"); todo_wine verify_reg_nonexist(hkey, "Wine70f"); + /* Test forward and back slashes */ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"count/up\"=\"one/two/three\"\n" + "\"\\\\foo\\\\bar\"=\"\"\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\https://winehq.org]\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "count/up", REG_SZ, "one/two/three", 14, 0); + verify_reg(hkey, "\\foo\\bar", REG_SZ, "", 1, 0); + verify_key(hkey, "https://winehq.org"); + close_key(hkey); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); } static void test_import_with_whitespace(void) @@ -4473,6 +4526,13 @@ static void test_export(void) "\"Wine4g\"=\"Value2\"\r\n" "\"Wine4h\"=\"abc\"\r\n\r\n"; + const char *slashes_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"count/up\"=\"one/two/three\"\r\n" + "\"\\\\foo\\\\bar\"=\"\"\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\https://winehq.org]\r\n\r\n"; + delete_tree(HKEY_CURRENT_USER, KEY_BASE); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); @@ -4579,9 +4639,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", complex_test, 0), "compare_export() failed\n"); - - err = delete_tree(HKEY_CURRENT_USER, KEY_BASE); - ok(err == ERROR_SUCCESS, "delete_tree() failed: %d\n", err); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); /* Test the export order of registry keys */ add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); @@ -4593,7 +4651,6 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", key_order_test, 0), "compare_export() failed\n"); - delete_key(hkey, "Subkey1"); delete_key(hkey, "Subkey2"); @@ -4607,7 +4664,6 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", value_order_test, TODO_REG_COMPARE), "compare_export() failed\n"); - delete_key(HKEY_CURRENT_USER, KEY_BASE); /* Test registry export with empty hex data */ @@ -4625,7 +4681,6 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", empty_hex_test, 0), "compare_export() failed\n"); - delete_key(HKEY_CURRENT_USER, KEY_BASE); /* Test registry export after importing alternative registry data types */ @@ -4643,7 +4698,6 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", empty_hex_test2, 0), "compare_export() failed\n"); - delete_key(HKEY_CURRENT_USER, KEY_BASE); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" @@ -4662,7 +4716,6 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", hex_types_test, 0), "compare_export() failed\n"); - delete_key(HKEY_CURRENT_USER, KEY_BASE); /* Test registry export with embedded null characters */ @@ -4700,8 +4753,20 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", embedded_null_test, 0), "compare_export() failed\n"); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + + /* Test registry export with forward and back slashes */ + add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); + add_key(hkey, "https://winehq.org", &subkey); + close_key(subkey); + add_value(hkey, "count/up", REG_SZ, "one/two/three", 14); + add_value(hkey, "\\foo\\bar", REG_SZ, "", 1); + close_key(hkey); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", slashes_test, TODO_REG_COMPARE), "compare_export() failed\n"); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); } #define COPY_DEST KEY_WINE "\\reg_copy" -- 2.30.1 [View Less]

1 0

[PATCH 1/9] reg/tests: Check for elevated privileges before cleaning up the Windows 3.1 test key and running unit tests
by Hugh McMaster 22 Feb '21

22 Feb '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/tests/reg.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index afba8424c1a..4be9e635ed7 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4204,14 +4204,11 @@ static void test_import_31(void) { LONG err; HKEY hkey; - DWORD r; - - err = RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE); - ok(err … [View More]

1 8

[tools] testbot: Deduplicate matching errors in ParseWineTestReport().
by Francois Gouget 22 Feb '21

22 Feb '21

Let ParseWineTestReport() populate the list of errors, and only use GetReportLineCategory() as a fallback. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 59 ++++++++++++++++++----------- 1 file changed, 37 insertions(+), 22 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index dae8292a7..267dcd9ec 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/… [View More]LogUtils.pm @@ -368,6 +368,8 @@ sub _NewCurrentUnit($$) IsBroken => 0, Rc => undef, Pids => {}, + Group => undef, + GroupLineNo => 0, }; } @@ -462,6 +464,25 @@ sub _CloseTestUnit($$$) $LogInfo->{Failures} += $Cur->{LineFailures}; } +sub _AddReportError($$$$) +{ + my ($LogInfo, $Cur, $LineNo, $Line) = @_; + + # Make the timeout messages more user-friendly + my $ErrLine = $Line; + if ($ErrLine =~ /^[^:]+:([^:]*):[0-9a-f]+ done $258$/) + { + my $Unit = $1; + $ErrLine = $Unit ne "" ? "$Unit: Timeout" : "Timeout"; + } + + if (!$Cur->{Group}) + { + $Cur->{Group} = _AddLogGroup($LogInfo, $Cur->{Dll}, $Cur->{GroupLineNo} || $LineNo); + } + _AddLogError($LogInfo, $Cur->{Group}, $ErrLine, $LineNo); +} + =pod =over 12 @@ -522,8 +543,6 @@ sub ParseWineTestReport($$$) } my $LineNo = 0; - my $CurGroupName = ""; - my ($CurGroup, $CurGroupLineNo); my $Cur = _NewCurrentUnit("", ""); foreach my $Line (<$LogFile>) { @@ -533,23 +552,6 @@ sub ParseWineTestReport($$$) chomp $Line; $Line =~ s/\r+$//; - if (GetReportLineCategory($Line) eq "error") - { - # Make the timeout messages more user-friendly - my $ErrLine = $Line; - if ($ErrLine =~ /^[^:]+:([^:]*):[0-9a-f]+ done $258$/) - { - my $Unit = $1; - $ErrLine = $Unit ne "" ? "$Unit: Timeout" : "Timeout"; - } - - if (!$CurGroup) - { - $CurGroup = _AddLogGroup($LogInfo, $CurGroupName, $CurGroupLineNo || $LineNo); - } - _AddLogError($LogInfo, $CurGroup, $ErrLine, $LineNo); - } - if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) (start|skipped) (?:-|[/_.a-z0-9-]+) (?:-|[.0-9a-f]+)$%) { my ($Dll, $Unit, $Type) = ($1, $2, $3); @@ -563,9 +565,8 @@ sub ParseWineTestReport($$$) $Cur->{Rc} = 0 if ($Type eq "skipped"); # The next error will be in a new error group - $CurGroupName = $Dll; - $CurGroupLineNo = $LineNo; - $CurGroup = undef; + $Cur->{GroupLineNo} = $LineNo; + $Cur->{Group} = undef; } elsif ($Line =~ /^([_.a-z0-9-]+)\.c:\d+: Subtest ([_.a-z0-9-]+)$/) { @@ -586,6 +587,7 @@ sub ParseWineTestReport($$$) $Line =~ /^([_a-z0-9]+)\.c:\d+: Test (?:failed|succeeded inside todo block): /) { _CheckUnit($LogInfo, $Cur, $1, "failure"); + _AddReportError($LogInfo, $Cur, $LineNo, $Line); $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and @@ -614,6 +616,7 @@ sub ParseWineTestReport($$$) $Cur->{SummaryFailures}++; $LogInfo->{IsWineTest} = 1; + _AddReportError($LogInfo, $Cur, $LineNo, $Line); $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and @@ -629,6 +632,7 @@ sub ParseWineTestReport($$$) $Cur->{SummaryFailures}++; } _CheckUnit($LogInfo, $Cur, $Unit, "unhandled exception"); + _AddReportError($LogInfo, $Cur, $LineNo, $Line); $Cur->{LineFailures}++; } elsif ($Line =~ /Unhandled exception: .* in .* code /) @@ -636,6 +640,7 @@ sub ParseWineTestReport($$$) # This also replaces a test summary line. The pid is unknown so use 0. $Cur->{Pids}->{0} = 1; $Cur->{SummaryFailures}++; + _AddReportError($LogInfo, $Cur, $LineNo, $Line); $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and @@ -650,6 +655,7 @@ sub ParseWineTestReport($$$) $Cur->{SummaryFailures}++; } _CheckUnit($LogInfo, $Cur, $Unit, "child exception"); + _AddReportError($LogInfo, $Cur, $LineNo, $Line); $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and @@ -704,6 +710,7 @@ sub ParseWineTestReport($$$) $LogInfo->{Failures}++; $Cur->{IsBroken} = 1; $LogInfo->{TimeoutCount}++; + _AddReportError($LogInfo, $Cur, $LineNo, $&); } elsif ((!$Pid and !%{$Cur->{Pids}}) or ($Pid and !$Cur->{Pids}->{$Pid} and !$Cur->{Pids}->{0})) @@ -729,6 +736,14 @@ sub ParseWineTestReport($$$) } $Cur->{Rc} = $Rc; } + elsif (GetReportLineCategory($Line) eq "error") + { + # This should only happen on very garbled lines, or if there is an + # inconsistency between GetReportLineCategory() and + # ParseWineTestReport(). + _AddReportError($LogInfo, $Cur, $LineNo, $Line); + } + } $Cur->{IsBroken} = 1 if ($LogInfo->{TaskTimedOut}); _CloseTestUnit($LogInfo, $Cur, 1); -- 2.20.1 [View Less]

1 0

[tools] testbot/TestWTBS: Check that no extra test units have been run.
by Francois Gouget 22 Feb '21

22 Feb '21

TestUnits is now an exhaustive list of test units that are expected to be run. Any extra test unit is reported as a failure. To compensate one can now add a module name to accept any test unit from that module. This allows dealing with the test=module configurations. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/tests/TestWTBS | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/… [View More]tests/TestWTBS index 8a77b00de..1467c4b4e 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -1038,11 +1038,15 @@ p win.HasTask 0 =item <tests.TestUnits> -Checks that the TestBot ran at least the test units mentioned in this -space-separated list on the VMs matching the specified category. +Checks that the TestBot ran the test units mentioned in this space-separated +list on the VMs matching the specified category. Each entry is either of the +form module:unit, or just module in which case it matches any test unit of the +specified module. Each entry in the list must match at least one test unit. +Two entries can match the same test unit(s). +This is useful when test=module, in which case the TestBot may run many tests. For instance: -p win.TestUnits cabinet:extract cabinet:fdi +p win.TestUnits cabinet:newunit cabinet =item <patch.Grep> =item <patch.GrepV> @@ -1168,11 +1172,31 @@ sub CheckJobTree($;$) my $MissionInfo = $TestInfo->{$MissionType}; next if (!CheckValue($MissionInfo->{TestUnits})); - foreach my $TestUnit (split / +/, $MissionInfo->{TestUnits}) + foreach my $TestGrep (split / +/, $MissionInfo->{TestUnits}) { - ok($TestUnits->{$MissionType}->{$TestUnit}, "Check that $TestUnit was tested by $MissionType VMs for job $JobId") + if ($TestGrep =~ /:/) + { + if (exists $TestUnits->{$MissionType}->{$TestGrep}) + { + $TestUnits->{$MissionType}->{$TestGrep} = 0; + next; + } + fail("Check that $MissionType VMs ran $TestGrep for job $JobId") + or diag("TestUnits=", join(" ", sort keys %{$TestUnits->{$MissionType}})); + } + my $Matched; + foreach my $TestUnit (keys %{$TestUnits->{$MissionType}}) + { + next if ($TestUnit !~/^\Q$TestGrep:\E/); + $TestUnits->{$MissionType}->{$TestUnit} = 0; + $Matched = 1; + } + ok($Matched, "Check that $MissionType VMs ran $TestGrep for job $JobId") or diag("TestUnits=", join(" ", sort keys %{$TestUnits->{$MissionType}})); } + my @ExtraUnits = grep { $TestUnits->{$MissionType}->{$_} } keys %{$TestUnits->{$MissionType}}; + ok(!@ExtraUnits, "Check that $MissionType VMs ran no extra test units") + or diag("Extraneous test runs=". join(" ", sort @ExtraUnits)); } } -- 2.20.1 [View Less]

1 0

[PATCH v2] msvfw32: WS_CHILD is set for window style when parent is not NULL
by David Adam 22 Feb '21

22 Feb '21

1 0

[PATCH] iphlpapi: Include <netinet/in.h> in ifenum.c.
by Gerald Pfeifer 21 Feb '21

21 Feb '21

commit 2d3b1c1288c8a0df5cdecd3929dbb69da0fee7c4 Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Feb 16 22:56:29 2021 -0700 iphlpapi: Use RtlIpv4AddressToStringA instead of inet_ntoa. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> broke FreeBSD by removing #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif from iphlpapi/ifenum.c. Alas that is required there to … [View More]

1 0

[PATCH v2] ddraw: HWTRANSFORMANDLIGHT is not set for software devices
by David Adam 21 Feb '21

21 Feb '21

This patch is from Michael Muller.

2 1

[PATCH] msvfw32: WS_CHILD is set for window style when parent is not NULL
by David Adam 21 Feb '21

21 Feb '21

2 1

[PATCH v2 1/2] ntdll/tests: Correct Thread Termination Error
by David Koolhoven 21 Feb '21

21 Feb '21

STATUS_THREAD_IS_TERMINATING is only used from calls to QueueUserAPC(), and should set the error to ERROR_GEN_FAILURE. This prepares the test to accept the corrective patch. Signed-off-by: David Koolhoven <david(a)koolhoven-home.net> --- v2: Fix test breakage --- dlls/ntdll/tests/error.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/error.c b/dlls/ntdll/tests/error.c index 05ba22223e3..d9ef1791848 100644 --- a/dlls/ntdll/tests/error.c +++ b/dlls/… [View More]

2 2

[PATCH] ntdll: Have QueueUserAPC() set expected error on terminating.
by David Koolhoven 20 Feb '21

20 Feb '21

QueueUserAPC() should set GetLastError() to return ERROR_GEN_FAILURE in the unlikely but inevitable circumstance it's called on a thread set to STATUS_THREAD_IS_TERMINATING. It currenly returns ERROR_ACCESS_DENIED which is unexpected behavior. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50704 Signed-off-by: David Koolhoven <david(a)koolhoven-home.net> --- dlls/ntdll/error.c | 2 +- dlls/ntdll/make_errors | 2 +- dlls/ntdll/tests/error.c | 2 +- 3 files changed, 3 … [View More]insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/error.c b/dlls/ntdll/error.c index fb630fa9864..3b6b2ecdebe 100644 --- a/dlls/ntdll/error.c +++ b/dlls/ntdll/error.c @@ -475,7 +475,7 @@ static const DWORD error_map[1579] = ERROR_INVALID_PARAMETER, /* c0000048 (STATUS_PORT_ALREADY_SET) */ ERROR_INVALID_PARAMETER, /* c0000049 (STATUS_SECTION_NOT_IMAGE) */ ERROR_SIGNAL_REFUSED, /* c000004a (STATUS_SUSPEND_COUNT_EXCEEDED) */ - ERROR_ACCESS_DENIED, /* c000004b (STATUS_THREAD_IS_TERMINATING) */ + ERROR_GEN_FAILURE, /* c000004b (STATUS_THREAD_IS_TERMINATING) */ ERROR_INVALID_PARAMETER, /* c000004c (STATUS_BAD_WORKING_SET_LIMIT) */ ERROR_INVALID_PARAMETER, /* c000004d (STATUS_INCOMPATIBLE_FILE_MAP) */ ERROR_INVALID_PARAMETER, /* c000004e (STATUS_SECTION_PROTECTION) */ diff --git a/dlls/ntdll/make_errors b/dlls/ntdll/make_errors index bedce57fe7a..b7a2a346e5c 100755 --- a/dlls/ntdll/make_errors +++ b/dlls/ntdll/make_errors @@ -307,7 +307,7 @@ my %error_map = qw( STATUS_PORT_ALREADY_SET ERROR_INVALID_PARAMETER STATUS_SECTION_NOT_IMAGE ERROR_INVALID_PARAMETER STATUS_SUSPEND_COUNT_EXCEEDED ERROR_SIGNAL_REFUSED - STATUS_THREAD_IS_TERMINATING ERROR_ACCESS_DENIED + STATUS_THREAD_IS_TERMINATING ERROR_GEN_FAILURE STATUS_BAD_WORKING_SET_LIMIT ERROR_INVALID_PARAMETER STATUS_INCOMPATIBLE_FILE_MAP ERROR_INVALID_PARAMETER STATUS_SECTION_PROTECTION ERROR_INVALID_PARAMETER diff --git a/dlls/ntdll/tests/error.c b/dlls/ntdll/tests/error.c index 05ba22223e3..d9ef1791848 100644 --- a/dlls/ntdll/tests/error.c +++ b/dlls/ntdll/tests/error.c @@ -268,7 +268,7 @@ static void run_error_tests(void) cmp2(STATUS_THREAD_WAS_SUSPENDED, ERROR_THREAD_WAS_SUSPENDED); cmp2(STATUS_TOO_MANY_THREADS, ERROR_TOO_MANY_THREADS); cmp2(STATUS_THREAD_NOT_IN_PROCESS, ERROR_THREAD_NOT_IN_PROCESS); - cmp(STATUS_THREAD_IS_TERMINATING, ERROR_ACCESS_DENIED); + cmp(STATUS_THREAD_IS_TERMINATING, ERROR_GEN_FAILURE); cmp(STATUS_PROCESS_IS_TERMINATING, ERROR_ACCESS_DENIED); cmp2(STATUS_SYSTEM_PROCESS_TERMINATED, ERROR_SYSTEM_PROCESS_TERMINATED); cmp(STATUS_INVALID_LOCK_SEQUENCE, ERROR_ACCESS_DENIED); -- 2.19.1 [View Less]

2 1

[PATCH] quartz: Use free() to free the "pszFileName" member.
by Zebediah Figura 20 Feb '21

20 Feb '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/filesource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index cc252c0e0e0..cf5fe457715 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -340,7 +340,7 @@ static void async_reader_destroy(struct strmbase_filter *iface) DeleteCriticalSection(&filter->sample_cs); strmbase_source_cleanup(&filter-… [View More]

1 0

[PATCH] kernelbase: Add rudimentary mui resource support to loader.c
by Craig Schulstad 20 Feb '21

20 Feb '21

Signed-off-by: Craig Schulstad <craigaschulstad(a)gmail.com> --- dlls/kernelbase/loader.c | 169 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 164 insertions(+), 5 deletions(-) diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index fc9b0ce0083..0fbe9bcd9e8 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -48,6 +48,9 @@ struct exclusive_datafile }; static struct list exclusive_datafile_list = LIST_INIT( exclusive_datafile_list ); +… [View More]static WCHAR mui_locale[LOCALE_NAME_MAX_LENGTH]; +static BOOL locale_found = 0; +static BOOL recursion_flag = 0; /*********************************************************************** * Modules @@ -1011,11 +1014,122 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumResourceTypesExW( HMODULE module, ENUMRESTYPEP return ret; } +/***********************************************************************/ +/* get_mui - Acquire an MUI module for the associated resource */ +/***********************************************************************/ + +HMODULE get_mui(HMODULE module) + +{ + + HMODULE mui_module = NULL; + + WCHAR module_name[MAX_PATH], mui_name[MAX_PATH]; + + INT i, j, k, l; + + /* Initialize the work strings */ + + for (i = 0; i < MAX_PATH; i++) { + module_name[i] = 0; + mui_name[i] = 0; + } + + /* Note - the reference to the Windows file name for an "MUI" file has a structure such as */ + /* "C:\Program Files\Application Directory\xx-XX\Application.exe.mui"; however, in testing */ + /* out the usage of the "GetModuleFileNameW" function, it was determined that it works with */ + /* a relative Linux file structure such as "xx-XX/Application.exe.mui". */ + + /* Acquire the base resource file name */ + + if (!(GetModuleFileNameW(module, module_name, MAX_PATH))) return module; + + /* Stay with the original module reference if this file is not an executable file. */ + + if (!(wcsstr(module_name, L".exe"))) return module; + + /* Acquire the locale name using LCIDToLocaleName. Since this function utilizes the FindResourceExW function, this */ + /* sets up a recursive call to this function. In order to avoid a stack overflow condition that would be caused by */ + /* repeated calls, a flag will be set on to return back to the FindResourceExW function without again calling the */ + /* locale acquisition function. */ + + if (!(locale_found)) { + + if (recursion_flag) return module; + + recursion_flag = 1; + + LCIDToLocaleName( GetUserDefaultLCID(), mui_locale, LOCALE_NAME_MAX_LENGTH, 0 ); + + recursion_flag = 0; + + locale_found = 1; + + } + + /* Locate the position of the final backslash in the retrieved executable file. */ + + j = 0; + + for (i = 0; i < MAX_PATH; i++) { + + if (module_name[i] == 0) break; + + if (module_name[i] == '\\') j = i; + } + + /* Set up the work index that will be used to extract just the executable file from the fully qualified file name. */ + + k = 0; + + for (i = 0; i < MAX_PATH; i++) { + + if (module_name[i] == 0) break; + + /* If work index "j" has been set to -1, then the file portion of the qualified name has been reached and will */ + /* be copied to the "MUI" file reference. */ + + if (j < 0) { + mui_name[k] = module_name[i]; + k++; + } + + /* When the position of the final backslash has been reached, add the locale name as the folder/directory */ + /* containing the "MUI" file and reset work index "j" to -1. */ + + if (i >= j && j > 0) { + for (l = 0; l < 5; l++) { + mui_name[k] = mui_locale[l]; + k++; + } + mui_name[k] = '/'; + k++; + j = -1; + } + } + + /* Finally, append the literal ".mui" onto the file reference. */ + + wcscat(mui_name, L".mui"); + + /* Now, see if there is an associated "MUI" file and if so use its handle for the module handle. */ + + mui_module = LoadLibraryExW(mui_name, 0, 0); + + if (mui_module) { + return mui_module; + } else { + return module; + } + +} + +/***********************************************************************/ +/* get_res_handle - Isolated call of the LdrFindResource function */ +/***********************************************************************/ + +HRSRC get_res_handle(HMODULE module, LPCWSTR type, LPCWSTR name, WORD lang) -/********************************************************************** - * FindResourceExW (kernelbase.@) - */ -HRSRC WINAPI DECLSPEC_HOTPATCH FindResourceExW( HMODULE module, LPCWSTR type, LPCWSTR name, WORD lang ) { NTSTATUS status; UNICODE_STRING nameW, typeW; @@ -1024,7 +1138,6 @@ HRSRC WINAPI DECLSPEC_HOTPATCH FindResourceExW( HMODULE module, LPCWSTR type, LP TRACE( "%p %s %s %04x\n", module, debugstr_w(type), debugstr_w(name), lang ); - if (!module) module = GetModuleHandleW( 0 ); nameW.Buffer = typeW.Buffer = NULL; __TRY @@ -1046,7 +1159,41 @@ HRSRC WINAPI DECLSPEC_HOTPATCH FindResourceExW( HMODULE module, LPCWSTR type, LP if (!IS_INTRESOURCE(nameW.Buffer)) HeapFree( GetProcessHeap(), 0, nameW.Buffer ); if (!IS_INTRESOURCE(typeW.Buffer)) HeapFree( GetProcessHeap(), 0, typeW.Buffer ); + return (HRSRC)entry; + +} + +/********************************************************************** + * FindResourceExW (kernelbase.@) + */ +HRSRC WINAPI DECLSPEC_HOTPATCH FindResourceExW( HMODULE module, LPCWSTR type, LPCWSTR name, WORD lang ) +{ + + HRSRC rsrc; + + TRACE( "%p %s %s %04x\n", module, debugstr_w(type), debugstr_w(name), lang ); + + if (!module) module = GetModuleHandleW( 0 ); + + rsrc = get_res_handle(module, type, name, lang); + + if (rsrc) { + + return rsrc; + + } else { + + /* If a resource retrieval failed using the initial module value, attempt to */ + /* locate an associated MUI file and retry the resource retrieval. */ + + module = get_mui(module); + + rsrc = get_res_handle(module, type, name, lang); + + return rsrc; + + } } @@ -1074,11 +1221,23 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeResource( HGLOBAL handle ) HGLOBAL WINAPI DECLSPEC_HOTPATCH LoadResource( HINSTANCE module, HRSRC rsrc ) { void *ret; + HMODULE mui_module = NULL; TRACE( "%p %p\n", module, rsrc ); if (!rsrc) return 0; if (!module) module = GetModuleHandleW( 0 ); + + + /* Only check for an MUI reference if the resource handle value is less than the module value, */ + /* or if an MUI reference was found and the MUI reference and handle value are larger than the */ + /* module value for the executable file. That is a signal that the resource handle is to be */ + /* associated with the MUI file instead of the executable file. */ + + mui_module = get_mui(module); + + if (((HMODULE)rsrc < module) || ((mui_module > module) && ((HMODULE)rsrc > mui_module))) module = mui_module; + if (!set_ntstatus( LdrAccessResource( module, (IMAGE_RESOURCE_DATA_ENTRY *)rsrc, &ret, NULL ))) return 0; return ret; -- 2.17.1 [View Less]

2 1

[PATCH] vkd3d-shader: Set default case the last one in shader_sm4_read_param().
by Andrey Gusev 20 Feb '21

20 Feb '21

In file included from ../include/private/vkd3d_memory.h:27, з ../libs/vkd3d-shader/vkd3d_shader_private.h:50, з ../libs/vkd3d-shader/dxbc.c:20: ../libs/vkd3d-shader/dxbc.c: In function ‘shader_sm4_read_param’: ../include/private/vkd3d_debug.h:71:9: warning: this statement may fall through [-Wimplicit-fallthrough=] 71 | vkd3d_dbg_printf(vkd3d_dbg_level, __FUNCTION__, __VA_ARGS__); } while (0) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~… [View More]

2 1

[PATCH 2/2] krnl386.exe: Cap GetFreeSpace value to 2GB.
by Akihiro Sagawa 20 Feb '21

20 Feb '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46962 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/krnl386.exe16/global.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel