wine-commits March 2019

wine-commits@winehq.org

2 participants
1097 discussions

Nikolay Sivov : mfreadwrite: Forward GetPresentationAttribute() to descriptor when appropriate.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: 9dd9602d8c77d2318ff9c8361b9443ea50ec1e33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9dd9602d8c77d2318ff9c836… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 19 11:17:32 2019 +0300 mfreadwrite: Forward GetPresentationAttribute() to descriptor when appropriate. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index eca6075..88482f7 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -317,8 +317,7 @@ static HRESULT WINAPI src_reader_GetPresentationAttribute(IMFSourceReader *iface } else { - FIXME("Unsupported source attribute %s.\n", debugstr_guid(guid)); - return E_NOTIMPL; + return IMFPresentationDescriptor_GetItem(reader->descriptor, guid, value); } break; default:

1 0

Nikolay Sivov : mfreadwrite: Shut down source on reader destruction.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: ff9a6e69dde202d29f95c6116ad3da2684affefd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff9a6e69dde202d29f95c611… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 19 11:17:31 2019 +0300 mfreadwrite: Shut down source on reader destruction. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 86a92b0..eca6075 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -214,6 +214,7 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) if (!refcount) { + IMFMediaSource_Shutdown(reader->source); if (reader->descriptor) IMFPresentationDescriptor_Release(reader->descriptor); IMFMediaSource_Release(reader->source);

1 0

Nikolay Sivov : mfreadwrite: Subscribe to source events on reader creation.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: 13e7887162212c6c3f0be69319600290c4bbad55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13e7887162212c6c3f0be693… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 19 11:17:30 2019 +0300 mfreadwrite: Subscribe to source events on reader creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 87 ++++++++++++++++++++++++++++++++++++++++- dlls/mfreadwrite/tests/mfplat.c | 3 +- 2 files changed, 88 insertions(+), 2 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index df8f89a..86a92b0 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -74,6 +74,7 @@ HRESULT WINAPI DllUnregisterServer(void) typedef struct source_reader { IMFSourceReader IMFSourceReader_iface; + IMFAsyncCallback source_events_callback; LONG refcount; IMFMediaSource *source; IMFPresentationDescriptor *descriptor; @@ -90,11 +91,88 @@ static inline srcreader *impl_from_IMFSourceReader(IMFSourceReader *iface) return CONTAINING_RECORD(iface, srcreader, IMFSourceReader_iface); } +static struct source_reader *impl_from_source_callback_IMFAsyncCallback(IMFAsyncCallback *iface) +{ + return CONTAINING_RECORD(iface, struct source_reader, source_events_callback); +} + static inline struct sink_writer *impl_from_IMFSinkWriter(IMFSinkWriter *iface) { return CONTAINING_RECORD(iface, struct sink_writer, IMFSinkWriter_iface); } +static HRESULT WINAPI source_reader_source_events_callback_QueryInterface(IMFAsyncCallback *iface, + REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFAsyncCallback) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFAsyncCallback_AddRef(iface); + return S_OK; + } + + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI source_reader_source_events_callback_AddRef(IMFAsyncCallback *iface) +{ + struct source_reader *reader = impl_from_source_callback_IMFAsyncCallback(iface); + return IMFSourceReader_AddRef(&reader->IMFSourceReader_iface); +} + +static ULONG WINAPI source_reader_source_events_callback_Release(IMFAsyncCallback *iface) +{ + struct source_reader *reader = impl_from_source_callback_IMFAsyncCallback(iface); + return IMFSourceReader_Release(&reader->IMFSourceReader_iface); +} + +static HRESULT WINAPI source_reader_source_events_callback_GetParameters(IMFAsyncCallback *iface, + DWORD *flags, DWORD *queue) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI source_reader_source_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +{ + struct source_reader *reader = impl_from_source_callback_IMFAsyncCallback(iface); + MediaEventType event_type; + IMFMediaSource *source; + IMFMediaEvent *event; + HRESULT hr; + + TRACE("%p, %p.\n", iface, result); + + source = (IMFMediaSource *)IMFAsyncResult_GetStateNoAddRef(result); + + if (FAILED(hr = IMFMediaSource_EndGetEvent(source, result, &event))) + return hr; + + IMFMediaEvent_GetType(event, &event_type); + + TRACE("Got event %u.\n", event_type); + + IMFMediaEvent_Release(event); + + IMFMediaSource_BeginGetEvent(source, &reader->source_events_callback, + (IUnknown *)source); + + return S_OK; +} + +static const IMFAsyncCallbackVtbl source_events_callback_vtbl = +{ + source_reader_source_events_callback_QueryInterface, + source_reader_source_events_callback_AddRef, + source_reader_source_events_callback_Release, + source_reader_source_events_callback_GetParameters, + source_reader_source_events_callback_Invoke, +}; + static HRESULT WINAPI src_reader_QueryInterface(IMFSourceReader *iface, REFIID riid, void **out) { srcreader *This = impl_from_IMFSourceReader(iface); @@ -273,11 +351,12 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri srcreader *object; HRESULT hr; - object = heap_alloc(sizeof(*object)); + object = heap_alloc_zero(sizeof(*object)); if (!object) return E_OUTOFMEMORY; object->IMFSourceReader_iface.lpVtbl = &srcreader_vtbl; + object->source_events_callback.lpVtbl = &source_events_callback_vtbl; object->refcount = 1; object->source = source; IMFMediaSource_AddRef(object->source); @@ -285,6 +364,12 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri if (FAILED(hr = IMFMediaSource_CreatePresentationDescriptor(object->source, &object->descriptor))) goto failed; + if (FAILED(hr = IMFMediaSource_BeginGetEvent(object->source, &object->source_events_callback, + (IUnknown *)object->source))) + { + goto failed; + } + hr = IMFSourceReader_QueryInterface(&object->IMFSourceReader_iface, riid, out); failed: diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 609510d..5f664b3 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -48,7 +48,7 @@ static void init_functions(void) static void test_MFCreateSourceReaderFromByteStream(void) { static const WCHAR audio[] = {'A','u','d','i','o',0}; - IMFSourceReader *source; + IMFSourceReader *source = NULL; IMFAttributes *attributes; IMFByteStream *bytestream = NULL; IStream *stream = NULL; @@ -76,6 +76,7 @@ static void test_MFCreateSourceReaderFromByteStream(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = MFCreateSourceReaderFromByteStream(bytestream, attributes, &source); +todo_wine ok(hr == S_OK || hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE, "got 0x%08x\n", hr); if(stream)

1 0

Michael Stefaniuc : d3dx9: Don' t expose struct d3dx9_base_effect outside effect.c.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: baf4aaa359c75715e7840b4c045fdb22adf2bc8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=baf4aaa359c75715e7840b4c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 19 08:51:29 2019 +0100 d3dx9: Don't expose struct d3dx9_base_effect outside effect.c. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 6 +++--- dlls/d3dx9_36/effect.c | 33 +++++++++++++++------------------ dlls/d3dx9_36/preshader.c | 18 +++++++++--------- 3 files changed, 27 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=baf4aaa359c75715e784…

1 0

Michael Stefaniuc : d3dx9: Pass a struct d3dx_effect to get_parameter_element_by_name().
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: 09770370c0b9159d3324684146544b6f441e4889 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09770370c0b9159d33246841… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 19 08:51:28 2019 +0100 d3dx9: Pass a struct d3dx_effect to get_parameter_element_by_name(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 9986c8e..8242b70 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -816,7 +816,7 @@ static void set_matrix_transpose(struct d3dx_parameter *param, const D3DXMATRIX } } -static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx9_base_effect *base, +static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx_effect *effect, struct d3dx_parameter *parameter, const char *name) { UINT element; @@ -838,7 +838,7 @@ static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx9_base_ef switch (*part++) { case '.': - return get_parameter_by_name(base, temp_parameter, part); + return get_parameter_by_name(&effect->base_effect, temp_parameter, part); case '\0': TRACE("Returning parameter %p\n", temp_parameter); @@ -886,7 +886,7 @@ static struct d3dx_parameter *get_annotation_by_name(struct d3dx_effect *effect, return get_parameter_by_name(base, temp_parameter, part); case '[': - return get_parameter_element_by_name(base, temp_parameter, part); + return get_parameter_element_by_name(effect, temp_parameter, part); default: FIXME("Unhandled case \"%c\"\n", *--part); @@ -975,7 +975,7 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, return get_parameter_by_name(base, temp_parameter, part); case '[': - return get_parameter_element_by_name(base, temp_parameter, part); + return get_parameter_element_by_name(effect, temp_parameter, part); default: FIXME("Unhandled case \"%c\"\n", *--part);

1 0

Michael Stefaniuc : d3dx9: Move full_name_tmp_size out of struct d3dx9_base_effect.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: 0c6345322983ed3df9100b801aaa56367b37a501 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c6345322983ed3df9100b80… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 19 08:51:27 2019 +0100 d3dx9: Move full_name_tmp_size out of struct d3dx9_base_effect. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 5912e63..9986c8e 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -161,8 +161,6 @@ struct d3dx9_base_effect DWORD flags; ULONG64 version_counter; - - unsigned int full_name_tmp_size; }; struct d3dx_effect @@ -176,6 +174,7 @@ struct d3dx_effect struct d3dx_object *objects; struct wine_rb_tree param_tree; char *full_name_tmp; + unsigned int full_name_tmp_size; struct ID3DXEffectStateManager *manager; struct IDirect3DDevice9 *device; @@ -928,7 +927,7 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, name_len = strlen(name); param_name_len = strlen(parameter->full_name); full_name_size = name_len + param_name_len + 2; - if (base->full_name_tmp_size < full_name_size) + if (effect->full_name_tmp_size < full_name_size) { if (!(full_name = heap_realloc(effect->full_name_tmp, full_name_size))) { @@ -936,7 +935,7 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, return NULL; } effect->full_name_tmp = full_name; - base->full_name_tmp_size = full_name_size; + effect->full_name_tmp_size = full_name_size; } else {

1 0

Michael Stefaniuc : d3dx9: Move full_name_tmp out of struct d3dx9_base_effect.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: 3779ff07b048bfdaf67674db89aedaa1e4b1e810 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3779ff07b048bfdaf67674db… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 19 08:51:26 2019 +0100 d3dx9: Move full_name_tmp out of struct d3dx9_base_effect. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index c7b29ef..5912e63 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -162,7 +162,6 @@ struct d3dx9_base_effect ULONG64 version_counter; - char *full_name_tmp; unsigned int full_name_tmp_size; }; @@ -176,6 +175,7 @@ struct d3dx_effect unsigned int object_count; struct d3dx_object *objects; struct wine_rb_tree param_tree; + char *full_name_tmp; struct ID3DXEffectStateManager *manager; struct IDirect3DDevice9 *device; @@ -690,7 +690,7 @@ static void d3dx9_base_effect_cleanup(struct d3dx_effect *effect) TRACE("base %p.\n", base); - heap_free(base->full_name_tmp); + heap_free(effect->full_name_tmp); if (base->parameters) { @@ -930,17 +930,17 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, full_name_size = name_len + param_name_len + 2; if (base->full_name_tmp_size < full_name_size) { - if (!(full_name = heap_realloc(base->full_name_tmp, full_name_size))) + if (!(full_name = heap_realloc(effect->full_name_tmp, full_name_size))) { ERR("Out of memory.\n"); return NULL; } - base->full_name_tmp = full_name; + effect->full_name_tmp = full_name; base->full_name_tmp_size = full_name_size; } else { - full_name = base->full_name_tmp; + full_name = effect->full_name_tmp; } memcpy(full_name, parameter->full_name, param_name_len); full_name[param_name_len] = '.';

1 0

Michael Stefaniuc : d3dx9: Move param_tree out of struct d3dx9_base_effect.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: adc1b5a8bc6bcce427e231485015da43d24ca5cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=adc1b5a8bc6bcce427e23148… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 19 08:51:25 2019 +0100 d3dx9: Move param_tree out of struct d3dx9_base_effect. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 3a8e152..c7b29ef 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -162,7 +162,6 @@ struct d3dx9_base_effect ULONG64 version_counter; - struct wine_rb_tree param_tree; char *full_name_tmp; unsigned int full_name_tmp_size; }; @@ -176,6 +175,7 @@ struct d3dx_effect unsigned int parameter_count; unsigned int object_count; struct d3dx_object *objects; + struct wine_rb_tree param_tree; struct ID3DXEffectStateManager *manager; struct IDirect3DDevice9 *device; @@ -903,6 +903,7 @@ static struct d3dx_parameter *get_annotation_by_name(struct d3dx_effect *effect, struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, struct d3dx_parameter *parameter, const char *name) { + struct d3dx_effect *effect = base->effect; struct d3dx_parameter *temp_parameter; unsigned int name_len, param_name_len; unsigned int i, count, length; @@ -917,7 +918,7 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, if (!parameter) { - if ((entry = wine_rb_get(&base->param_tree, name))) + if ((entry = wine_rb_get(&effect->param_tree, name))) return WINE_RB_ENTRY_VALUE(entry, struct d3dx_parameter, rb_entry); return NULL; } @@ -946,7 +947,7 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, memcpy(full_name + param_name_len + 1, name, name_len); full_name[param_name_len + 1 + name_len] = 0; - if ((entry = wine_rb_get(&base->param_tree, full_name))) + if ((entry = wine_rb_get(&effect->param_tree, full_name))) return WINE_RB_ENTRY_VALUE(entry, struct d3dx_parameter, rb_entry); return NULL; } @@ -5129,7 +5130,7 @@ static void add_param_to_tree(struct d3dx_effect *effect, struct d3dx_parameter memcpy(param->full_name, param->name, len); } TRACE("Full name is %s.\n", param->full_name); - wine_rb_put(&effect->base_effect.param_tree, param->full_name, &param->rb_entry); + wine_rb_put(&effect->param_tree, param->full_name, &param->rb_entry); if (is_top_level_parameter(param)) for (i = 0; i < param->top_level_param->annotation_count; ++i) @@ -5992,7 +5993,7 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U goto err_out; } - wine_rb_init(&base->param_tree, param_rb_compare); + wine_rb_init(&effect->param_tree, param_rb_compare); if (effect->parameter_count) { base->parameters = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,

1 0

Erich E. Hoover : msidb: Add support for wildcard table import.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: 4e2f48ce2c504ca41e381fbbef2fa909c8a0c688 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e2f48ce2c504ca41e381fbb… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Sat Mar 16 21:15:39 2019 -0600 msidb: Add support for wildcard table import. msidb allows multiple tables to be imported with the use of standard wildcards. For example, both Feature and FeatureComponent tables can be imported simultaneously like so: msidb -d package.msi -f . -i 'Feature*' Please note that it is important to quote the wildcard to prevent files from being passed instead of the intended pattern. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/msidb/main.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/programs/msidb/main.c b/programs/msidb/main.c index 98ba133..36255c4 100644 --- a/programs/msidb/main.c +++ b/programs/msidb/main.c @@ -450,6 +450,7 @@ static int import_table( struct msidb_state *state, const WCHAR *table_path ) static int import_tables( struct msidb_state *state ) { const WCHAR idt_ext[] = { '.','i','d','t',0 }; + const WCHAR wildcard[] = { '*',0 }; struct msidb_listentry *data; LIST_FOR_EACH_ENTRY( data, &state->table_list, struct msidb_listentry, entry ) @@ -458,6 +459,41 @@ static int import_tables( struct msidb_state *state ) WCHAR table_path[MAX_PATH]; WCHAR *ext; + /* permit specifying tables with wildcards ('Feature*') */ + if (strstrW( table_name, wildcard ) != NULL) + { + WIN32_FIND_DATAW f; + HANDLE handle; + WCHAR *path; + DWORD len; + + len = strlenW( state->table_folder ) + 1 + strlenW( table_name ) + 1; /* %s/%s\0 */ + path = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + if (path == NULL) + return 0; + lstrcpyW( path, state->table_folder ); + PathAddBackslashW( path ); + lstrcatW( path, table_name ); + handle = FindFirstFileW( path, &f ); + HeapFree( GetProcessHeap(), 0, path ); + if (handle == INVALID_HANDLE_VALUE) + return 0; + do + { + if (f.cFileName[0] == '.' && !f.cFileName[1]) continue; + if (f.cFileName[0] == '.' && f.cFileName[1] == '.' && !f.cFileName[2]) continue; + if (f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) continue; + if ((ext = PathFindExtensionW( f.cFileName )) == NULL) continue; + if (lstrcmpW( ext, idt_ext ) != 0) continue; + if (!import_table( state, f.cFileName )) + { + FindClose( handle ); + return 0; /* failed, do not commit changes */ + } + } while (FindNextFileW( handle, &f )); + FindClose( handle ); + continue; + } /* permit specifying tables by filename (*.idt) */ if ((ext = PathFindExtensionW( table_name )) == NULL || lstrcmpW( ext, idt_ext ) != 0) {

1 0

Erich E. Hoover : msidb: Permit specifying tables to import by filename.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: dcb3747f5eb4c8bf7ec1ae40a220399e628d7211 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcb3747f5eb4c8bf7ec1ae40… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Sat Mar 16 11:19:26 2019 -0600 msidb: Permit specifying tables to import by filename. msidb permits tables to be imported by filename (rather than just the name of the table) when the '.idt' extension is specified. This feature also allows specifying tables with long filenames: msidb -d package.msi -f . -i InstallExecuteSequence.idt Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/msidb/Makefile.in | 2 +- programs/msidb/main.c | 22 ++++++++++++++++------ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/programs/msidb/Makefile.in b/programs/msidb/Makefile.in index bb74041..5efb431 100644 --- a/programs/msidb/Makefile.in +++ b/programs/msidb/Makefile.in @@ -1,5 +1,5 @@ MODULE = msidb.exe APPMODE = -mconsole -municode -IMPORTS = msi +IMPORTS = msi shlwapi C_SRCS = main.c diff --git a/programs/msidb/main.c b/programs/msidb/main.c index 4bd065a..98ba133 100644 --- a/programs/msidb/main.c +++ b/programs/msidb/main.c @@ -24,6 +24,7 @@ #include <windows.h> #include <msi.h> #include <msiquery.h> +#include <shlwapi.h> #include "wine/debug.h" #include "wine/unicode.h" @@ -433,17 +434,14 @@ static int extract_streams( struct msidb_state *state ) return 1; } -static int import_table( struct msidb_state *state, const WCHAR *table_name ) +static int import_table( struct msidb_state *state, const WCHAR *table_path ) { - const WCHAR format[] = { '%','.','8','s','.','i','d','t',0 }; /* truncate to 8 characters */ - WCHAR table_path[MAX_PATH]; UINT ret; - snprintfW( table_path, ARRAY_SIZE(table_path), format, table_name ); ret = MsiDatabaseImportW( state->database_handle, state->table_folder, table_path ); if (ret != ERROR_SUCCESS) { - ERR( "Failed to import table '%s', error %d.\n", wine_dbgstr_w(table_name), ret ); + ERR( "Failed to import table '%s', error %d.\n", wine_dbgstr_w(table_path), ret ); return 0; } return 1; @@ -451,11 +449,23 @@ static int import_table( struct msidb_state *state, const WCHAR *table_name ) static int import_tables( struct msidb_state *state ) { + const WCHAR idt_ext[] = { '.','i','d','t',0 }; struct msidb_listentry *data; LIST_FOR_EACH_ENTRY( data, &state->table_list, struct msidb_listentry, entry ) { - if (!import_table( state, data->name )) + WCHAR *table_name = data->name; + WCHAR table_path[MAX_PATH]; + WCHAR *ext; + + /* permit specifying tables by filename (*.idt) */ + if ((ext = PathFindExtensionW( table_name )) == NULL || lstrcmpW( ext, idt_ext ) != 0) + { + const WCHAR format[] = { '%','.','8','s','.','i','d','t',0 }; /* truncate to 8 characters */ + snprintfW( table_path, ARRAY_SIZE(table_path), format, table_name ); + table_name = table_path; + } + if (!import_table( state, table_name )) return 0; /* failed, do not commit changes */ } return 1;

1 0

Jump to page:

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-commits March 2019