April 2024 - Wine-Commits - list.winehq.org

Henri Verbeet : vkd3d-dxbc: Introduce a helper function to handle ACTION_TYPE_EMIT.
by Alexandre Julliard April 4, 2024

April 4, 2024

Module: vkd3d Branch: master Commit: 143b15fc47e472a0c22d8a2917ec1c2e395d9442 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/143b15fc47e472a0c22d8a2917ec1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 3 17:57:40 2024 +0200 vkd3d-dxbc: Introduce a helper function to handle ACTION_TYPE_EMIT. --- programs/vkd3d-dxbc/main.c | 66 ++++++++++++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 26 deletions(-) diff --git a/programs/vkd3d-dxbc/main.c b/programs/vkd3d-dxbc/main.c index 6d065f3b..c23cfa81 100644 --- a/programs/vkd3d-dxbc/main.c +++ b/programs/vkd3d-dxbc/main.c @@ -82,7 +82,10 @@ struct action } type; union { - const char *output_filename; + struct emit + { + const char *output_filename; + } emit; } u; }; @@ -206,7 +209,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) "If this is really what you intended, specify the output explicitly.\n"); return false; } - action->u.output_filename = options->output_filename; + action->u.emit.output_filename = options->output_filename; break; case 'h': @@ -505,17 +508,47 @@ static void dump_dxbc(const struct vkd3d_shader_code *dxbc, const struct vkd3d_s } } +static bool emit_dxbc(const struct vkd3d_shader_dxbc_desc *dxbc_desc, const struct emit *emit) +{ + struct vkd3d_shader_code dxbc; + bool close_output; + char *messages; + FILE *output; + bool success; + int ret; + + ret = vkd3d_shader_serialize_dxbc(dxbc_desc->section_count, dxbc_desc->sections, &dxbc, &messages); + if (messages) + fputs(messages, stderr); + vkd3d_shader_free_messages(messages); + if (ret < 0) + return false; + + if (!(output = open_output(emit->output_filename, &close_output))) + { + vkd3d_shader_free_shader_code(&dxbc); + return false; + } + + if (!(success = write_output(output, &dxbc))) + fprintf(stderr, "Failed to write output blob.\n"); + + if (close_output) + fclose(output); + vkd3d_shader_free_shader_code(&dxbc); + return success; +} + int main(int argc, char **argv) { - bool close_input = false, close_output = false; - struct vkd3d_shader_code dxbc, serialized; struct vkd3d_shader_dxbc_desc dxbc_desc; + struct vkd3d_shader_code dxbc; + bool close_input = false; struct options options; - FILE *input, *output; char *messages; uint32_t flags; - bool success; int fail = 1; + FILE *input; size_t i; int ret; @@ -571,26 +604,7 @@ int main(int argc, char **argv) switch (action->type) { case ACTION_TYPE_EMIT: - ret = vkd3d_shader_serialize_dxbc(dxbc_desc.section_count, dxbc_desc.sections, &serialized, &messages); - if (messages) - fputs(messages, stderr); - vkd3d_shader_free_messages(messages); - if (ret < 0) - goto done; - - if (!(output = open_output(action->u.output_filename, &close_output))) - { - vkd3d_shader_free_shader_code(&serialized); - goto done; - } - - if (!(success = write_output(output, &serialized))) - fprintf(stderr, "Failed to write output blob.\n"); - - if (close_output) - fclose(output); - vkd3d_shader_free_shader_code(&serialized); - if (!success) + if (!emit_dxbc(&dxbc_desc, &action->u.emit)) goto done; break; }

1 0

Henri Verbeet : vkd3d-dxbc: Implement extracting section data.
by Alexandre Julliard April 4, 2024

April 4, 2024

Module: vkd3d Branch: master Commit: 6c3b87bed04857c61610b27d1d1a521af004959f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6c3b87bed04857c61610b27d1d1a5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 3 17:59:48 2024 +0200 vkd3d-dxbc: Implement extracting section data. --- programs/vkd3d-dxbc/main.c | 91 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 81 insertions(+), 10 deletions(-) diff --git a/programs/vkd3d-dxbc/main.c b/programs/vkd3d-dxbc/main.c index aaccffad..ff463584 100644 --- a/programs/vkd3d-dxbc/main.c +++ b/programs/vkd3d-dxbc/main.c @@ -65,6 +65,7 @@ enum { OPTION_COLOUR = CHAR_MAX + 1, OPTION_EMIT, + OPTION_EXTRACT, OPTION_HELP, OPTION_IGNORE_CHECKSUM, OPTION_LIST, @@ -79,6 +80,7 @@ struct action enum action_type { ACTION_TYPE_EMIT, + ACTION_TYPE_EXTRACT, } type; union { @@ -86,6 +88,11 @@ struct action { const char *output_filename; } emit; + struct extract + { + const char *section; + const char *output_filename; + } extract; } u; }; @@ -157,6 +164,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) { {"colour", no_argument, NULL, OPTION_COLOUR}, {"emit", no_argument, NULL, OPTION_EMIT}, + {"extract", required_argument, NULL, OPTION_EXTRACT}, {"help", no_argument, NULL, OPTION_HELP}, {"ignore-checksum", no_argument, NULL, OPTION_IGNORE_CHECKSUM}, {"list", no_argument, NULL, OPTION_LIST}, @@ -191,7 +199,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) for (;;) { - if ((option = getopt_long(argc, argv, "ehtVo:", long_options, NULL)) == -1) + if ((option = getopt_long(argc, argv, "ex:hto:V", long_options, NULL)) == -1) break; switch (option) @@ -212,6 +220,14 @@ static bool parse_command_line(int argc, char **argv, struct options *options) action->u.emit.output_filename = options->output_filename; break; + case 'x': + case OPTION_EXTRACT: + if (!(action = action_push(options, ACTION_TYPE_EXTRACT))) + return false; + action->u.extract.section = optarg; + action->u.extract.output_filename = options->output_filename; + break; + case 'h': case OPTION_HELP: options->print_help = true; @@ -234,8 +250,8 @@ static bool parse_command_line(int argc, char **argv, struct options *options) options->colours = no_colours; break; - case OPTION_OUTPUT: case 'o': + case OPTION_OUTPUT: options->output_filename = optarg; break; @@ -262,27 +278,30 @@ static void print_usage(const char *program_name) "Options:\n" " --colour Enable colour, even when not supported by the output.\n" " -e, --emit Emit the content of the DXBC blob.\n" + " -x, --extract=<section> Extract the data contained in <section>.\n" + " <section> must be of the form 'i:<index>'.\n" " -h, --help Display this information and exit.\n" + " --ignore-checksum Do not validate the checksum when parsing the DXBC\n" + " blob.\n" " -t, --list List the contents of the DXBC blob.\n" " --list-data List the data contained in the DXBC sections.\n" " --no-colour Disable colour, even when supported by the output.\n" + " -o, --output=<file> Set the output filename for --emit or --extract.\n" " -V, --version Display version information and exit.\n" - " --ignore-checksum Do not validate the checksum when parsing the DXBC blob.\n" - " -o, --output=<file> Set the output filename for --emit.\n" " -- Stop option processing. Any subsequent argument is\n" " interpreted as a filename.\n" "\n" "If the input file is '-' or not specified, input will be read from standard\n" "input. Similarly, if the output file is '-' or not specified at the point\n" - "--emit is found, output will be written to the standard output.\n" + "--emit or --extract is found, output will be written to the standard output.\n" "\n" "Currently this tool can only re-emit the same DXBC blob it loaded. However, it\n" - "will recompute the checksum while doing so, so --emit can be useful\n" - "together with --ignore-checksum to fix the checksum for a blob.\n" + "will recompute the checksum while doing so, so --emit can be useful together\n" + "with --ignore-checksum to fix the checksum for a blob.\n" "\n" - "Options --emit and --output can be specified more than once. The DXBC blob\n" - "will be emitted once for each --emit occurrence, each time using the closest\n" - "previous --output occurrence as output filename.\n"; + "Options --emit, --extract, and --output can be specified more than once. The\n" + "DXBC blob will be emitted once for each --emit occurrence, each time using the\n" + "closest previous --output occurrence as output filename.\n"; fprintf(stderr, "Usage: %s %s", program_name, usage); } @@ -539,6 +558,53 @@ static bool emit_dxbc(const struct vkd3d_shader_dxbc_desc *dxbc_desc, const stru return success; } +static struct vkd3d_shader_dxbc_section_desc *get_section(size_t section_count, + struct vkd3d_shader_dxbc_section_desc *sections, const char *s) +{ + size_t idx; + char *end; + + if (!strncmp("i:", s, 2)) + { + s += 2; + idx = strtoul(s, &end, 10); + if (*end || idx >= section_count) + { + fprintf(stderr, "Invalid section index '%s' specified.\n", s); + return NULL; + } + return &sections[idx]; + } + + fprintf(stderr, "Invalid section specifier '%s' specified.\n", s); + return NULL; +} + +static bool extract_section(struct vkd3d_shader_dxbc_desc *dxbc_desc, const struct extract *extract) +{ + const struct vkd3d_shader_dxbc_section_desc *section; + bool close_output, success = true; + FILE *output; + + if (!(section = get_section(dxbc_desc->section_count, dxbc_desc->sections, extract->section))) + return false; + + if (!(output = open_output(extract->output_filename, &close_output))) + return false; + + if (!extract->output_filename && isatty(fileno(output))) + fprintf(stderr, "Output is a tty, skipping section '%s'.\n" + "If this is really what you intended, specify the output explicitly.\n", + extract->section); + else if (!(success = write_output(output, &section->data))) + fprintf(stderr, "Failed to write output.\n"); + + if (close_output) + fclose(output); + + return success; +} + static bool apply_actions(struct vkd3d_shader_dxbc_desc *dxbc_desc, size_t action_count, const struct action *actions) { @@ -552,6 +618,11 @@ static bool apply_actions(struct vkd3d_shader_dxbc_desc *dxbc_desc, if (!emit_dxbc(dxbc_desc, &action->u.emit)) return false; break; + + case ACTION_TYPE_EXTRACT: + if (!extract_section(dxbc_desc, &action->u.extract)) + return false; + break; } }

1 0

Stefan Dösinger : vkd3d: Add an ID3D12ShaderCacheSession stub.
by Alexandre Julliard April 4, 2024

April 4, 2024

Module: vkd3d Branch: master Commit: fb87a724974b4fa67b8ef2b33e6574b256862dc3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fb87a724974b4fa67b8ef2b33e657… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 10 12:50:19 2023 +0300 vkd3d: Add an ID3D12ShaderCacheSession stub. --- libs/vkd3d/device.c | 214 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 211 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 0566e64f..fc777393 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2523,6 +2523,199 @@ static void vkd3d_desc_object_cache_cleanup(struct vkd3d_desc_object_cache *cach } } +/* ID3D12ShaderCacheSession */ +struct d3d12_cache_session +{ + ID3D12ShaderCacheSession ID3D12ShaderCacheSession_iface; + unsigned int refcount; + + struct d3d12_device *device; + struct vkd3d_private_store private_store; +}; + +static inline struct d3d12_cache_session *impl_from_ID3D12ShaderCacheSession(ID3D12ShaderCacheSession *iface) +{ + return CONTAINING_RECORD(iface, struct d3d12_cache_session, ID3D12ShaderCacheSession_iface); +} + +static HRESULT STDMETHODCALLTYPE d3d12_cache_session_QueryInterface(ID3D12ShaderCacheSession *iface, + REFIID iid, void **object) +{ + TRACE("iface %p, iid %s, object %p.\n", iface, debugstr_guid(iid), object); + + if (!object) + { + WARN("Output pointer is NULL, returning E_POINTER.\n"); + return E_POINTER; + } + + if (IsEqualGUID(iid, &IID_ID3D12ShaderCacheSession) + || IsEqualGUID(iid, &IID_ID3D12DeviceChild) + || IsEqualGUID(iid, &IID_ID3D12Object) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID3D12ShaderCacheSession_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d12_cache_session_AddRef(ID3D12ShaderCacheSession *iface) +{ + struct d3d12_cache_session *session = impl_from_ID3D12ShaderCacheSession(iface); + unsigned int refcount = vkd3d_atomic_increment_u32(&session->refcount); + + TRACE("%p increasing refcount to %u.\n", session, refcount); + + return refcount; +} + +static void d3d12_cache_session_destroy(struct d3d12_cache_session *session) +{ + struct d3d12_device *device = session->device; + + TRACE("Destroying cache session %p.\n", session); + + vkd3d_private_store_destroy(&session->private_store); + vkd3d_free(session); + + d3d12_device_release(device); +} + +static ULONG STDMETHODCALLTYPE d3d12_cache_session_Release(ID3D12ShaderCacheSession *iface) +{ + struct d3d12_cache_session *session = impl_from_ID3D12ShaderCacheSession(iface); + unsigned int refcount = vkd3d_atomic_decrement_u32(&session->refcount); + + TRACE("%p decreasing refcount to %u.\n", session, refcount); + + if (!refcount) + d3d12_cache_session_destroy(session); + + return refcount; +} + +static HRESULT STDMETHODCALLTYPE d3d12_cache_session_GetPrivateData(ID3D12ShaderCacheSession *iface, + REFGUID guid, UINT *data_size, void *data) +{ + struct d3d12_cache_session *session = impl_from_ID3D12ShaderCacheSession(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return vkd3d_get_private_data(&session->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d12_cache_session_SetPrivateData(ID3D12ShaderCacheSession *iface, + REFGUID guid, UINT data_size, const void *data) +{ + struct d3d12_cache_session *session = impl_from_ID3D12ShaderCacheSession(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return vkd3d_set_private_data(&session->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d12_cache_session_SetPrivateDataInterface( + ID3D12ShaderCacheSession *iface, REFGUID guid, const IUnknown *data) +{ + struct d3d12_cache_session *session = impl_from_ID3D12ShaderCacheSession(iface); + + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return vkd3d_set_private_data_interface(&session->private_store, guid, data); +} + +static HRESULT STDMETHODCALLTYPE d3d12_cache_session_SetName(ID3D12ShaderCacheSession *iface, + const WCHAR *name) +{ + struct d3d12_cache_session *session = impl_from_ID3D12ShaderCacheSession(iface); + + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, session->device->wchar_size)); + + return name ? S_OK : E_INVALIDARG; +} + +static HRESULT STDMETHODCALLTYPE d3d12_cache_session_GetDevice(ID3D12ShaderCacheSession *iface, + REFIID iid, void **device) +{ + struct d3d12_cache_session *session = impl_from_ID3D12ShaderCacheSession(iface); + + TRACE("iface %p, iid %s, device %p.\n", iface, debugstr_guid(iid), device); + + return d3d12_device_query_interface(session->device, iid, device); +} + +static HRESULT STDMETHODCALLTYPE d3d12_cache_session_FindValue(ID3D12ShaderCacheSession *iface, + const void *key, UINT key_size, void *value, UINT *value_size) +{ + FIXME("iface %p, key %p, key_size %#x, value %p, value_size %p stub!\n", + iface, key, key_size, value, value_size); + + return DXGI_ERROR_NOT_FOUND; +} + +static HRESULT STDMETHODCALLTYPE d3d12_cache_session_StoreValue(ID3D12ShaderCacheSession *iface, + const void *key, UINT key_size, const void *value, UINT value_size) +{ + FIXME("iface %p, key %p, key_size %#x, value %p, value_size %u stub!\n", iface, key, key_size, + value, value_size); + + return E_NOTIMPL; +} + +static void STDMETHODCALLTYPE d3d12_cache_session_SetDeleteOnDestroy(ID3D12ShaderCacheSession *iface) +{ + FIXME("iface %p stub!\n", iface); +} + +static D3D12_SHADER_CACHE_SESSION_DESC * STDMETHODCALLTYPE d3d12_cache_session_GetDesc( + ID3D12ShaderCacheSession *iface, D3D12_SHADER_CACHE_SESSION_DESC *desc) +{ + FIXME("stub %p!\n", iface); + return desc; +} + +static const struct ID3D12ShaderCacheSessionVtbl d3d12_cache_session_vtbl = +{ + /* IUnknown methods */ + d3d12_cache_session_QueryInterface, + d3d12_cache_session_AddRef, + d3d12_cache_session_Release, + /* ID3D12Object methods */ + d3d12_cache_session_GetPrivateData, + d3d12_cache_session_SetPrivateData, + d3d12_cache_session_SetPrivateDataInterface, + d3d12_cache_session_SetName, + /* ID3D12DeviceChild methods */ + d3d12_cache_session_GetDevice, + /* ID3D12ShaderCacheSession methods */ + d3d12_cache_session_FindValue, + d3d12_cache_session_StoreValue, + d3d12_cache_session_SetDeleteOnDestroy, + d3d12_cache_session_GetDesc, +}; + +static HRESULT d3d12_cache_session_init(struct d3d12_cache_session *session, + struct d3d12_device *device, const D3D12_SHADER_CACHE_SESSION_DESC *desc) +{ + HRESULT hr; + + session->ID3D12ShaderCacheSession_iface.lpVtbl = &d3d12_cache_session_vtbl; + session->refcount = 1; + + if (FAILED(hr = vkd3d_private_store_init(&session->private_store))) + return hr; + + d3d12_device_add_ref(session->device = device); + + return S_OK; +} + /* ID3D12Device */ static inline struct d3d12_device *impl_from_ID3D12Device9(ID3D12Device9 *iface) { @@ -4634,10 +4827,25 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints1(ID3D12Device9 static HRESULT STDMETHODCALLTYPE d3d12_device_CreateShaderCacheSession(ID3D12Device9 *iface, const D3D12_SHADER_CACHE_SESSION_DESC *desc, REFIID iid, void **session) { - FIXME("iface %p, desc %p, iid %s, session %p stub!\n", iface, desc, debugstr_guid(iid), - session); + struct d3d12_device *device = impl_from_ID3D12Device9(iface); + struct d3d12_cache_session *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, desc %p, iid %s, session %p.\n", iface, desc, debugstr_guid(iid), session); + + if (!(object = vkd3d_malloc(sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d12_cache_session_init(object, device, desc))) + { + vkd3d_free(object); + return hr; + } + + hr = ID3D12ShaderCacheSession_QueryInterface(&object->ID3D12ShaderCacheSession_iface, iid, + session); + ID3D12ShaderCacheSession_Release(&object->ID3D12ShaderCacheSession_iface); + return hr; } static HRESULT STDMETHODCALLTYPE d3d12_device_ShaderCacheControl(ID3D12Device9 *iface,

1 0

Stefan Dösinger : tests: Add tests for creating D3D12ShaderCacheSession objects.
by Alexandre Julliard April 4, 2024

April 4, 2024

Module: vkd3d Branch: master Commit: 8653ce17cfe65117e2eb4c1877e25c6334ece2a0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8653ce17cfe65117e2eb4c1877e25… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 23 12:28:19 2024 +0300 tests: Add tests for creating D3D12ShaderCacheSession objects. --- include/vkd3d_windows.h | 1 + tests/d3d12.c | 182 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 183 insertions(+) diff --git a/include/vkd3d_windows.h b/include/vkd3d_windows.h index 7b0e972d..df26fef3 100644 --- a/include/vkd3d_windows.h +++ b/include/vkd3d_windows.h @@ -65,6 +65,7 @@ typedef int HRESULT; # define DXGI_ERROR_NOT_FOUND _HRESULT_TYPEDEF_(0x887a0002) # define DXGI_ERROR_MORE_DATA _HRESULT_TYPEDEF_(0x887a0003) # define DXGI_ERROR_UNSUPPORTED _HRESULT_TYPEDEF_(0x887a0004) +# define DXGI_ERROR_ALREADY_EXISTS _HRESULT_TYPEDEF_(0x887a0036) # define D3DERR_INVALIDCALL _HRESULT_TYPEDEF_(0x8876086c) diff --git a/tests/d3d12.c b/tests/d3d12.c index 8e34978f..a374025f 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -38264,6 +38264,187 @@ static void test_unused_interpolated_input(void) destroy_test_context(&context); } +static void test_shader_cache(void) +{ + ID3D12ShaderCacheSession *session, *session2; + D3D12_SHADER_CACHE_SESSION_DESC desc = {0}; + unsigned int refcount, base_refcount; + struct test_context context; + ID3D12Device9 *device; + IUnknown *unk, *unk2; + HRESULT hr; + + static const GUID test_guid + = {0xfdb37466, 0x428f, 0x4edf, {0xa3, 0x7f, 0x9b, 0x1d, 0xf4, 0x88, 0xc5, 0xfc}}; + + if (!init_test_context(&context, NULL)) + return; + + hr = ID3D12Device_QueryInterface(context.device, &IID_ID3D12Device9, (void **)&device); + ok(hr == S_OK || broken(hr == E_NOINTERFACE), "Got unexpected hr %#x.\n", hr); + if (FAILED(hr)) + { + skip("ID3D12Device9 not available, skipping shader cache tests.\n"); + destroy_test_context(&context); + return; + } + + base_refcount = get_refcount(device); + + /* The description needs to be non-NULL and have at least the identifier set. */ + hr = ID3D12Device9_CreateShaderCacheSession(device, NULL, &IID_IUnknown, (void **)&unk); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Device9_CreateShaderCacheSession(device, NULL, &IID_IUnknown, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, &IID_IUnknown, (void **)&unk); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, &IID_IUnknown, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, NULL, (void **)&unk); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + desc.Identifier = test_guid; + desc.Mode = D3D12_SHADER_CACHE_MODE_MEMORY; + if (0) /* This crashes on Windows. */ + { + hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, NULL, (void **)&unk); + ok(0, "Expected to crash, hr %#x.\n", hr); + } + hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, &IID_IUnknown, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, NULL, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + + /* Default values for sizes and number of entries. */ + hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, &IID_ID3D12ShaderCacheSession, + (void **)&session); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + desc = ID3D12ShaderCacheSession_GetDesc(session); + ID3D12ShaderCacheSession_Release(session); + ok(desc.MaximumInMemoryCacheEntries == 128, "Got MaximumInMemoryCacheEntries %u.\n", + desc.MaximumInMemoryCacheEntries); + ok(!desc.Flags, "Got Flags %#x.\n", desc.Flags); + ok(!desc.Version, "Got Version %"PRId64".\n", desc.Version); + ok(desc.MaximumInMemoryCacheSizeBytes == 1024 * 1024, "Got MaximumInMemoryCacheSizeBytes %u.\n", + desc.MaximumInMemoryCacheSizeBytes); + ok(desc.MaximumValueFileSizeBytes == 128 * 1024 * 1024, "Got MaximumValueFileSizeBytes %u.\n", + desc.MaximumValueFileSizeBytes); + + /* A memory size larger than disk size is valid. UINT_MAX is OK for memory size. */ + memset(&desc, 0, sizeof(desc)); + desc.Identifier = test_guid; + desc.MaximumInMemoryCacheSizeBytes = UINT_MAX; + hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, &IID_ID3D12ShaderCacheSession, + (void **)&session); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + desc = ID3D12ShaderCacheSession_GetDesc(session); + ID3D12ShaderCacheSession_Release(session); + ok(desc.MaximumInMemoryCacheSizeBytes == UINT_MAX, "Got MaximumInMemoryCacheSizeBytes %u.\n", + desc.MaximumInMemoryCacheSizeBytes); + ok(desc.MaximumValueFileSizeBytes == 128 * 1024 * 1024, "Got MaximumValueFileSizeBytes %u.\n", + desc.MaximumValueFileSizeBytes); + + /* MaximumValueFileSizeBytes is limited to 1 GiB regardless of cache type. */ + desc.MaximumValueFileSizeBytes = 1024 * 1024 * 1024; + hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, &IID_ID3D12ShaderCacheSession, + (void **)&session); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID3D12ShaderCacheSession_Release(session); + desc.MaximumValueFileSizeBytes = 1024 * 1024 * 1024 + 1; + hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, &IID_ID3D12ShaderCacheSession, + (void **)&session); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + memset(&desc, 0, sizeof(desc)); + desc.Identifier = test_guid; + desc.MaximumValueFileSizeBytes = 1; + desc.MaximumInMemoryCacheSizeBytes = 1; + hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, + &IID_ID3D12ShaderCacheSession, (void **)&session); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + desc = ID3D12ShaderCacheSession_GetDesc(session); + ID3D12ShaderCacheSession_Release(session); + ok(desc.MaximumInMemoryCacheSizeBytes == 1, "Got MaximumInMemoryCacheSizeBytes %u.\n", + desc.MaximumInMemoryCacheSizeBytes); + ok(desc.MaximumValueFileSizeBytes == 1, "Got MaximumValueFileSizeBytes %u.\n", + desc.MaximumValueFileSizeBytes); + + /* Invalid flags and mode are rejected. */ + memset(&desc, 0, sizeof(desc)); + desc.Identifier = test_guid; + desc.Mode = D3D12_SHADER_CACHE_MODE_MEMORY; + desc.Flags = 0x1245670; + hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, + &IID_ID3D12ShaderCacheSession, (void **)&session); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + desc.Flags = 0; + desc.Mode = 9876; /* Same for Mode=2, but 2 is more likely to mean something in the future. */ + hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, + &IID_ID3D12ShaderCacheSession, (void **)&session); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + memset(&desc, 0, sizeof(desc)); + desc.Identifier = test_guid; + desc.Mode = D3D12_SHADER_CACHE_MODE_MEMORY; + desc.Version = 12344; + desc.MaximumInMemoryCacheSizeBytes = 32 * 1024; + hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + refcount = get_refcount(device); + ok(refcount == base_refcount + 1, "Got unexpected refcount %u.\n", refcount); + + refcount = get_refcount(unk); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + + hr = IUnknown_QueryInterface(unk, &IID_ID3D12ShaderCacheSession, (void **)&session); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo ok((IUnknown *)session != unk, "Expected different interface pointers, got %p for both.\n", + session); + hr = ID3D12ShaderCacheSession_QueryInterface(session, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(unk2 == unk, "Got different interface pointers %p and %p.\n", session, unk); + + /* The S_FALSE for CreateSession(session = NULL) does not come from QI. */ + hr = ID3D12ShaderCacheSession_QueryInterface(session, &IID_IUnknown, NULL); + ok(hr == E_POINTER, "Got unexpected hr %#x.\n", hr); + + refcount = get_refcount(unk); + ok(refcount == 3, "Got unexpected refcount %u.\n", refcount); + refcount = get_refcount(session); + ok(refcount == 3, "Got unexpected refcount %u.\n", refcount); + + IUnknown_Release(unk); + IUnknown_Release(unk2); + + /* Ad-hoc testing shows that in-memory sessions are per-process. They are not magically + * shared between processes. If a disk cache is accessed by two processes, it will fail + * with E_INVALIDARG, regardless of version compatibility. */ + desc.Version = 12345; + session2 = (void *)0xdeadbeef; + hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, + &IID_ID3D12ShaderCacheSession, (void **)&session2); + todo ok(hr == DXGI_ERROR_ALREADY_EXISTS, "Got unexpected hr %#x.\n", hr); + todo ok(!session2, "Got unexpected pointer %p.\n", session2); + if (session2) + ID3D12ShaderCacheSession_Release(session2); + hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, &IID_IUnknown, NULL); + ok(hr == S_FALSE, "NULL outptr: Got hr %#x.\n", hr); + + ID3D12ShaderCacheSession_Release(session); + + refcount = get_refcount(device); + ok(refcount == base_refcount, "Got unexpected refcount %u.\n", refcount); + + hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, + &IID_ID3D12ShaderCacheSession, (void **)&session); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID3D12ShaderCacheSession_Release(session); + + ID3D12Device9_Release(device); + destroy_test_context(&context); +} + START_TEST(d3d12) { parse_args(argc, argv); @@ -38448,4 +38629,5 @@ START_TEST(d3d12) run_test(test_get_resource_tiling); run_test(test_hull_shader_punned_array); run_test(test_unused_interpolated_input); + run_test(test_shader_cache); }

1 0

Stefan Dösinger : vkd3d: Validate and store shader cache session descriptors.
by Alexandre Julliard April 4, 2024

April 4, 2024

Module: vkd3d Branch: master Commit: 7c93b5070f2526ee2416334d3d4cf81738661693 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7c93b5070f2526ee2416334d3d4cf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Mar 24 14:42:25 2024 +0300 vkd3d: Validate and store shader cache session descriptors. --- libs/vkd3d/device.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index fc777393..65db8b70 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2531,6 +2531,7 @@ struct d3d12_cache_session struct d3d12_device *device; struct vkd3d_private_store private_store; + D3D12_SHADER_CACHE_SESSION_DESC desc; }; static inline struct d3d12_cache_session *impl_from_ID3D12ShaderCacheSession(ID3D12ShaderCacheSession *iface) @@ -2676,7 +2677,10 @@ static void STDMETHODCALLTYPE d3d12_cache_session_SetDeleteOnDestroy(ID3D12Shade static D3D12_SHADER_CACHE_SESSION_DESC * STDMETHODCALLTYPE d3d12_cache_session_GetDesc( ID3D12ShaderCacheSession *iface, D3D12_SHADER_CACHE_SESSION_DESC *desc) { - FIXME("stub %p!\n", iface); + struct d3d12_cache_session *session = impl_from_ID3D12ShaderCacheSession(iface); + + TRACE("iface %p.\n", iface); + *desc = session->desc; return desc; } @@ -2707,6 +2711,14 @@ static HRESULT d3d12_cache_session_init(struct d3d12_cache_session *session, session->ID3D12ShaderCacheSession_iface.lpVtbl = &d3d12_cache_session_vtbl; session->refcount = 1; + session->desc = *desc; + + if (!session->desc.MaximumValueFileSizeBytes) + session->desc.MaximumValueFileSizeBytes = 128 * 1024 * 1024; + if (!session->desc.MaximumInMemoryCacheSizeBytes) + session->desc.MaximumInMemoryCacheSizeBytes = 1024 * 1024; + if (!session->desc.MaximumInMemoryCacheEntries) + session->desc.MaximumInMemoryCacheEntries = 128; if (FAILED(hr = vkd3d_private_store_init(&session->private_store))) return hr; @@ -4829,10 +4841,40 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateShaderCacheSession(ID3D12Dev { struct d3d12_device *device = impl_from_ID3D12Device9(iface); struct d3d12_cache_session *object; + static const GUID guid_null = {0}; HRESULT hr; + static const UINT valid_flags = D3D12_SHADER_CACHE_FLAG_DRIVER_VERSIONED + | D3D12_SHADER_CACHE_FLAG_USE_WORKING_DIR; + TRACE("iface %p, desc %p, iid %s, session %p.\n", iface, desc, debugstr_guid(iid), session); + if (!desc || !memcmp(&desc->Identifier, &guid_null, sizeof(desc->Identifier))) + { + WARN("No description or identifier, returning E_INVALIDARG.\n"); + return E_INVALIDARG; + } + if (desc->MaximumValueFileSizeBytes > 1024 * 1024 * 1024) + { + WARN("Requested size is larger than 1GiB, returning E_INVALIDARG.\n"); + return E_INVALIDARG; + } + if (desc->Flags & ~valid_flags) + { + WARN("Invalid flags %#x, returning E_INVALIDARG.\n", desc->Flags); + return E_INVALIDARG; + } + if (desc->Mode != D3D12_SHADER_CACHE_MODE_MEMORY && desc->Mode != D3D12_SHADER_CACHE_MODE_DISK) + { + WARN("Invalid mode %#x, returning E_INVALIDARG.\n", desc->Mode); + return E_INVALIDARG; + } + if (!session) + { + WARN("No output pointer, returning S_FALSE.\n"); + return S_FALSE; + } + if (!(object = vkd3d_malloc(sizeof(*object)))) return E_OUTOFMEMORY;

1 0

Stefan Dösinger : vkd3d: Add ID3D12Device9 interface stubs.
by Alexandre Julliard April 4, 2024

April 4, 2024

Module: vkd3d Branch: master Commit: d5c89051ddb1e0a4588e441aab31c02dec505b2a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d5c89051ddb1e0a4588e441aab31c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Mar 3 14:18:40 2024 +0300 vkd3d: Add ID3D12Device9 interface stubs. --- libs/vkd3d/device.c | 293 +++++++++++++++++++++++++-------------------- libs/vkd3d/resource.c | 2 +- libs/vkd3d/vkd3d_main.c | 4 +- libs/vkd3d/vkd3d_private.h | 12 +- 4 files changed, 172 insertions(+), 139 deletions(-)

1 0

Zhiyi Zhang : gdiplus: Search microsoft platform names first in load_ttf_name_id().
by Alexandre Julliard April 4, 2024

April 4, 2024

Module: wine Branch: master Commit: 9786ee25554fa9b3d32488685a9751676d0269db URL: https://gitlab.winehq.org/wine/wine/-/commit/9786ee25554fa9b3d32488685a9751… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Mar 28 17:00:39 2024 +0800 gdiplus: Search microsoft platform names first in load_ttf_name_id(). Search names in fonts in the order of Microsoft, Mac and finally Unicode platform. This is also the order win32u uses to load font names. Fix Granado Espada Japan (1219160) launcher crashes at start in the Japanese locale. The game ships a font with a broken name record of Mac platform and encoding ID 0 (Roman) but the name string is in code page 10001 (Japanese). This broken name record is placed before the name records for the Microsoft platform so it gets selected first. Then the name string in the name record doesn't get converted correctly to Unicode because of the wrong code page. Thus the EnumFontFamiliesExW() in GdipPrivateAddMemoryFont() fails to find the font and causes game crash. --- dlls/gdiplus/font.c | 38 +++++++++++++++++++++++--------------- dlls/gdiplus/tests/font.c | 1 - 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index da37279fbef..67d75ed97f6 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1385,12 +1385,13 @@ static WCHAR *copy_name_table_string( const tt_name_record *name, const BYTE *da static WCHAR *load_ttf_name_id( const BYTE *mem, DWORD_PTR size, DWORD id ) { + static const WORD platform_id_table[] = {TT_PLATFORM_MICROSOFT, TT_PLATFORM_MACINTOSH, TT_PLATFORM_APPLE_UNICODE}; LANGID lang = GetSystemDefaultLangID(); const tt_header *header; const tt_name_table *name_table; - const tt_name_record *name_record; + const tt_name_record *name_record_table, *name_record; DWORD pos, ofs = 0, count; - int i, res, best_lang = 0, best_index = -1; + int i, j, res, best_lang = 0, best_index = -1; if (sizeof(tt_header) > size) return NULL; @@ -1421,26 +1422,33 @@ static WCHAR *load_ttf_name_id( const BYTE *mem, DWORD_PTR size, DWORD id ) if (pos > size) return NULL; name_table = (const tt_name_table*)&mem[ofs]; + name_record_table = (const tt_name_record *)&mem[pos]; count = GET_BE_WORD(name_table->count); if (GET_BE_WORD(name_table->string_offset) >= size - ofs) return NULL; ofs += GET_BE_WORD(name_table->string_offset); - for (i=0; i<count; i++) + for (i = 0; i < ARRAY_SIZE(platform_id_table); i++) { - name_record = (const tt_name_record*)&mem[pos]; - pos += sizeof(*name_record); - if (pos > size) - return NULL; + for (j = 0; j < count; j++) + { + name_record = name_record_table + j; + if ((const BYTE *)name_record - mem > size) + return NULL; - if (GET_BE_WORD(name_record->name_id) != id) continue; - if (GET_BE_WORD(name_record->offset) >= size - ofs) return NULL; - if (GET_BE_WORD(name_record->length) > size - ofs - GET_BE_WORD(name_record->offset)) return NULL; + if (GET_BE_WORD(name_record->platform_id) != platform_id_table[i]) continue; + if (GET_BE_WORD(name_record->name_id) != id) continue; + if (GET_BE_WORD(name_record->offset) >= size - ofs) return NULL; + if (GET_BE_WORD(name_record->length) > size - ofs - GET_BE_WORD(name_record->offset)) return NULL; - res = match_name_table_language( name_record, lang ); - if (res > best_lang) - { - best_lang = res; - best_index = i; + res = match_name_table_language(name_record, lang); + if (res > best_lang) + { + best_lang = res; + best_index = j; + } } + + if (best_index != -1) + break; } if (best_lang) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 6a21ea30361..1bbb18f4c6d 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -1558,7 +1558,6 @@ static void test_GdipPrivateAddMemoryFont(void) { stat = GdipGetFontCollectionFamilyCount(fonts, &count); ok(stat == Ok, "GdipGetFontCollectionFamilyCount failed, error %d\n", stat); - todo_wine ok(count == 1, "Expected count 1, got %d\n", count); } else if (i == 1 && stat == FileNotFound)

1 0

Zhiyi Zhang : gdiplus/tests: Add tests for GdipPrivateAddMemoryFont().
by Alexandre Julliard April 4, 2024

April 4, 2024

Module: wine Branch: master Commit: 242ee3d0133704313473476782ade8a8704fc12a URL: https://gitlab.winehq.org/wine/wine/-/commit/242ee3d0133704313473476782ade8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 29 11:46:14 2024 +0800 gdiplus/tests: Add tests for GdipPrivateAddMemoryFont(). --- dlls/gdiplus/tests/font.c | 64 ++++++++-- dlls/gdiplus/tests/resource.rc | 8 ++ dlls/gdiplus/tests/wine_mac_win.ttf | Bin 0 -> 1140 bytes dlls/gdiplus/tests/wine_mac_win.ttx | 203 ++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/wine_unicode_mac.ttf | Bin 0 -> 1168 bytes dlls/gdiplus/tests/wine_unicode_mac.ttx | 203 ++++++++++++++++++++++++++++++++ 6 files changed, 471 insertions(+), 7 deletions(-)

1 0

Zebediah Figura : wined3d: Require ARB_texture_non_power_of_two.
by Alexandre Julliard April 4, 2024

April 4, 2024

Module: wine Branch: master Commit: 95633ebbd17e3052d4e4522ac4b14dd37b73d7ea URL: https://gitlab.winehq.org/wine/wine/-/commit/95633ebbd17e3052d4e4522ac4b14d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 18 14:35:50 2024 -0500 wined3d: Require ARB_texture_non_power_of_two. Also allowing r500's "normalized texrect" functionality. Keeping WINED3D_GL_NORMALIZED_TEXRECT is far less invasive and painful than the rest of the NP2 fixup code. --- dlls/wined3d/adapter_gl.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 2486686640f..bc9da1f0881 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5330,6 +5330,13 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, } } + if (!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] && !gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) + { + ERR("Required extension ARB_texture_non_power_of_two is not supported.\n"); + wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); + return FALSE; + } + if (gl_info->glsl_version <= MAKEDWORD_VERSION(1, 20)) { ERR("GLSL version %s is too low; 1.20 is required.\n",

1 0

Alistair Leslie-Hughes : include: Add more DBCOLUMN_ defines.
by Alexandre Julliard April 4, 2024

April 4, 2024

Module: wine Branch: master Commit: 74a32e2b43b42321d6f05492c4cf64029df106d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/74a32e2b43b42321d6f05492c4cf64… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 24 15:48:36 2023 +1100 include: Add more DBCOLUMN_ defines. --- include/dbs.idl | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/include/dbs.idl b/include/dbs.idl index f72204b1e90..34e58e5a5d0 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -542,10 +542,38 @@ cpp_quote("DEFINE_DBGUID(DBPROPSET_SESSIONALL, 0xc8b522c7, 0x5cf3, 0x11ce cpp_quote("DEFINE_DBGUID(DBPROPSET_DBINITALL, 0xc8b522ca, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") cpp_quote("DEFINE_DBGUID(DBPROPSET_PROPERTIESINERROR, 0xc8b522d4, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") -cpp_quote("DEFINE_DBID(DB_NULLID, DB_NULLGUID, 0, 0);") -cpp_quote("DEFINE_DBID(DBCOLUMN_BASECOLUMNNAME, DBCIDGUID, DBKIND_GUID_PROPID, 10);") -cpp_quote("DEFINE_DBID(DBCOLUMN_BASETABLENAME, DBCIDGUID, DBKIND_GUID_PROPID, 11);") -cpp_quote("DEFINE_DBID(DBCOLUMN_KEYCOLUMN, DBCIDGUID, DBKIND_GUID_PROPID, 41);") +cpp_quote("DEFINE_DBID(DB_NULLID, DB_NULLGUID, 0, 0);") +cpp_quote("DEFINE_DBID(DBCOLUMN_IDNAME, DBCIDGUID, DBKIND_GUID_PROPID, 2);") +cpp_quote("DEFINE_DBID(DBCOLUMN_NAME, DBCIDGUID, DBKIND_GUID_PROPID, 3);") +cpp_quote("DEFINE_DBID(DBCOLUMN_NUMBER, DBCIDGUID, DBKIND_GUID_PROPID, 4);") +cpp_quote("DEFINE_DBID(DBCOLUMN_TYPE, DBCIDGUID, DBKIND_GUID_PROPID, 5);") +cpp_quote("DEFINE_DBID(DBCOLUMN_PRECISION, DBCIDGUID, DBKIND_GUID_PROPID, 7);") +cpp_quote("DEFINE_DBID(DBCOLUMN_SCALE, DBCIDGUID, DBKIND_GUID_PROPID, 8);") +cpp_quote("DEFINE_DBID(DBCOLUMN_FLAGS, DBCIDGUID, DBKIND_GUID_PROPID, 9);") +cpp_quote("DEFINE_DBID(DBCOLUMN_BASECOLUMNNAME, DBCIDGUID, DBKIND_GUID_PROPID, 10);") +cpp_quote("DEFINE_DBID(DBCOLUMN_BASETABLENAME, DBCIDGUID, DBKIND_GUID_PROPID, 11);") +cpp_quote("DEFINE_DBID(DBCOLUMN_COLLATINGSEQUENCE, DBCIDGUID, DBKIND_GUID_PROPID, 12);") +cpp_quote("DEFINE_DBID(DBCOLUMN_COMPUTEMODE, DBCIDGUID, DBKIND_GUID_PROPID, 13);") +cpp_quote("DEFINE_DBID(DBCOLUMN_DEFAULTVALUE, DBCIDGUID, DBKIND_GUID_PROPID, 14);") +cpp_quote("DEFINE_DBID(DBCOLUMN_DOMAINNAME, DBCIDGUID, DBKIND_GUID_PROPID, 15);") +cpp_quote("DEFINE_DBID(DBCOLUMN_HASDEFAULT, DBCIDGUID, DBKIND_GUID_PROPID, 16);") +cpp_quote("DEFINE_DBID(DBCOLUMN_ISAUTOINCREMENT, DBCIDGUID, DBKIND_GUID_PROPID, 17);") +cpp_quote("DEFINE_DBID(DBCOLUMN_ISCASESENSITIVE, DBCIDGUID, DBKIND_GUID_PROPID, 18);") +cpp_quote("DEFINE_DBID(DBCOLUMN_ISSEARCHABLE, DBCIDGUID, DBKIND_GUID_PROPID, 20);") +cpp_quote("DEFINE_DBID(DBCOLUMN_ISUNIQUE, DBCIDGUID, DBKIND_GUID_PROPID, 21);") +cpp_quote("DEFINE_DBID(DBCOLUMN_BASECATALOGNAME, DBCIDGUID, DBKIND_GUID_PROPID, 23);") +cpp_quote("DEFINE_DBID(DBCOLUMN_BASESCHEMANAME, DBCIDGUID, DBKIND_GUID_PROPID, 24);") +cpp_quote("DEFINE_DBID(DBCOLUMN_GUID, DBCIDGUID, DBKIND_GUID_PROPID, 29);") +cpp_quote("DEFINE_DBID(DBCOLUMN_PROPID, DBCIDGUID, DBKIND_GUID_PROPID, 30);") +cpp_quote("DEFINE_DBID(DBCOLUMN_TYPEINFO, DBCIDGUID, DBKIND_GUID_PROPID, 31);") +cpp_quote("DEFINE_DBID(DBCOLUMN_DOMAINCATALOG, DBCIDGUID, DBKIND_GUID_PROPID, 32);") +cpp_quote("DEFINE_DBID(DBCOLUMN_DOMAINSCHEMA, DBCIDGUID, DBKIND_GUID_PROPID, 33);") +cpp_quote("DEFINE_DBID(DBCOLUMN_DATETIMEPRECISION, DBCIDGUID, DBKIND_GUID_PROPID, 34);") +cpp_quote("DEFINE_DBID(DBCOLUMN_NUMERICPRECISIONRADIX, DBCIDGUID, DBKIND_GUID_PROPID, 35);") +cpp_quote("DEFINE_DBID(DBCOLUMN_OCTETLENGTH, DBCIDGUID, DBKIND_GUID_PROPID, 36);") +cpp_quote("DEFINE_DBID(DBCOLUMN_COLUMNSIZE, DBCIDGUID, DBKIND_GUID_PROPID, 37);") +cpp_quote("DEFINE_DBID(DBCOLUMN_CLSID, DBCIDGUID, DBKIND_GUID_PROPID, 38);") +cpp_quote("DEFINE_DBID(DBCOLUMN_KEYCOLUMN, DBCIDGUID, DBKIND_GUID_PROPID, 41);") cpp_quote("#define DBPROMPT_PROMPT 0x01") cpp_quote("#define DBPROMPT_COMPLETE 0x02")

1 0