March 2019 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Store weak GeckoBrowser reference in HTMLDocumentNode.
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: wine Branch: master Commit: 5e581621ab55be8658a495d867086f0ee221cc94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e581621ab55be8658a495d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 11 14:24:26 2019 +0100 mshtml: Store weak GeckoBrowser reference in HTMLDocumentNode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 8 ++++++++ dlls/mshtml/mshtml_private.h | 5 +++++ dlls/mshtml/nsembed.c | 9 +++++++++ 3 files changed, 22 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 7478785..afb4a8a 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4911,6 +4911,11 @@ void detach_document_node(HTMLDocumentNode *doc) IHTMLWindow2_Release(&doc->window->base.IHTMLWindow2_iface); doc->window = NULL; } + + if(doc->browser) { + list_remove(&doc->browser_entry); + doc->browser = NULL; + } } static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) @@ -5194,6 +5199,9 @@ HRESULT create_document_node(nsIDOMHTMLDocument *nsdoc, GeckoBrowser *browser, H doc->node.vtbl = &HTMLDocumentNodeImplVtbl; + list_add_head(&browser->document_nodes, &doc->browser_entry); + doc->browser = browser; + *ret = doc; return S_OK; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 93265d6..2808ca9 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -722,6 +722,8 @@ struct GeckoBrowser { nsIURIContentListener *content_listener; HWND hwnd; + + struct list document_nodes; }; typedef struct { @@ -830,6 +832,9 @@ struct HTMLDocumentNode { HTMLInnerWindow *window; + GeckoBrowser *browser; + struct list browser_entry; + compat_mode_t document_mode; BOOL document_mode_locked; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index fb0d2b8..49bbbfd 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1359,6 +1359,8 @@ static nsrefcnt NSAPI nsWebBrowserChrome_Release(nsIWebBrowserChrome *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + if(This->doc) + detach_gecko_browser(This); if(This->weak_reference) { This->weak_reference->browser = NULL; nsIWeakReference_Release(&This->weak_reference->nsIWeakReference_iface); @@ -2155,6 +2157,7 @@ HRESULT create_gecko_browser(HTMLDocumentObj *doc, GeckoBrowser **_ret) ret->doc = doc; ret->ref = 1; + list_init(&ret->document_nodes); hres = init_browser(ret); if(SUCCEEDED(hres)) @@ -2170,6 +2173,12 @@ void detach_gecko_browser(GeckoBrowser *This) This->doc = NULL; + while(!list_empty(&This->document_nodes)) { + HTMLDocumentNode *doc = LIST_ENTRY(list_head(&This->document_nodes), HTMLDocumentNode, browser_entry); + list_remove(&doc->browser_entry); + doc->browser = NULL; + } + ShowWindow(This->hwnd, SW_HIDE); SetParent(This->hwnd, NULL);

1 0

Jacek Caban : mshtml: Pass GeckoBrowser instead of HTMLDocumentObj to create_outer_window.
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: wine Branch: master Commit: 2d8610050df647065080e30d1d10b9bd16f505ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d8610050df647065080e30d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 11 14:24:59 2019 +0100 mshtml: Pass GeckoBrowser instead of HTMLDocumentObj to create_outer_window. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 9 +-------- dlls/mshtml/htmlframe.c | 10 ++-------- dlls/mshtml/htmlwindow.c | 18 +++++++----------- dlls/mshtml/mshtml_private.h | 2 +- 4 files changed, 11 insertions(+), 28 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index afb4a8a..5731d36 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5445,7 +5445,6 @@ static HRESULT create_document_object(BOOL is_mhtml, IUnknown *outer, REFIID rii { mozIDOMWindowProxy *mozwindow; HTMLDocumentObj *doc; - nsIDOMWindow *nswindow = NULL; nsresult nsres; HRESULT hres; @@ -5497,13 +5496,7 @@ static HRESULT create_document_object(BOOL is_mhtml, IUnknown *outer, REFIID rii if(NS_FAILED(nsres)) ERR("GetContentDOMWindow failed: %08x\n", nsres); - nsres = mozIDOMWindowProxy_QueryInterface(mozwindow, &IID_nsIDOMWindow, (void**)&nswindow); - mozIDOMWindowProxy_Release(mozwindow); - assert(nsres == NS_OK); - - hres = HTMLOuterWindow_Create(doc, nswindow, NULL /* FIXME */, &doc->basedoc.window); - if(nswindow) - nsIDOMWindow_Release(nswindow); + hres = create_outer_window(doc->nscontainer, mozwindow, NULL, &doc->basedoc.window); if(FAILED(hres)) { htmldoc_release(&doc->basedoc); return hres; diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index 17a78e5..1a0d017 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -54,15 +54,9 @@ static HRESULT set_frame_doc(HTMLFrameBase *frame, nsIDOMDocument *nsdoc) return E_FAIL; window = mozwindow_to_window(mozwindow); - if(!window) { - nsIDOMWindow *nswindow; - nsres = mozIDOMWindowProxy_QueryInterface(mozwindow, &IID_nsIDOMWindow, (void**)&nswindow); - assert(nsres == NS_OK); - - hres = HTMLOuterWindow_Create(frame->element.node.doc->basedoc.doc_obj, nswindow, + if(!window && frame->element.node.doc->browser) + hres = create_outer_window(frame->element.node.doc->browser, mozwindow, frame->element.node.doc->basedoc.window, &window); - nsIDOMWindow_Release(nswindow); - } mozIDOMWindowProxy_Release(mozwindow); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 4d36f60..d980645 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3532,10 +3532,11 @@ static HRESULT create_inner_window(HTMLOuterWindow *outer_window, IMoniker *mon, return S_OK; } -HRESULT HTMLOuterWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, +HRESULT create_outer_window(GeckoBrowser *browser, mozIDOMWindowProxy *mozwindow, HTMLOuterWindow *parent, HTMLOuterWindow **ret) { HTMLOuterWindow *window; + nsresult nsres; HRESULT hres; window = alloc_window(sizeof(HTMLOuterWindow)); @@ -3545,17 +3546,12 @@ HRESULT HTMLOuterWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, window->base.outer_window = window; window->base.inner_window = NULL; - window->doc_obj = doc_obj; - - if(nswindow) { - nsresult nsres; - - nsIDOMWindow_AddRef(nswindow); - window->nswindow = nswindow; + window->doc_obj = browser->doc; - nsres = nsIDOMWindow_QueryInterface(nswindow, &IID_mozIDOMWindowProxy, (void**)&window->window_proxy); - assert(nsres == NS_OK); - } + mozIDOMWindowProxy_AddRef(mozwindow); + window->window_proxy = mozwindow; + nsres = mozIDOMWindowProxy_QueryInterface(mozwindow, &IID_nsIDOMWindow, (void**)&window->nswindow); + assert(nsres == NS_OK); window->scriptmode = parent ? parent->scriptmode : SCRIPTMODE_GECKO; window->readystate = READYSTATE_UNINITIALIZED; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2808ca9..aa0cac8 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -867,7 +867,7 @@ HRESULT MHTMLDocument_Create(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT HTMLLoadOptions_Create(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT create_document_node(nsIDOMHTMLDocument*,GeckoBrowser*,HTMLInnerWindow*,HTMLDocumentNode**) DECLSPEC_HIDDEN; -HRESULT HTMLOuterWindow_Create(HTMLDocumentObj*,nsIDOMWindow*,HTMLOuterWindow*,HTMLOuterWindow**) DECLSPEC_HIDDEN; +HRESULT create_outer_window(GeckoBrowser*,mozIDOMWindowProxy*,HTMLOuterWindow*,HTMLOuterWindow**) DECLSPEC_HIDDEN; HRESULT update_window_doc(HTMLInnerWindow*) DECLSPEC_HIDDEN; HTMLOuterWindow *mozwindow_to_window(const mozIDOMWindowProxy*) DECLSPEC_HIDDEN; void get_top_window(HTMLOuterWindow*,HTMLOuterWindow**) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Store GeckoBrowser weak reference in HTMLOuterWindow.
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: wine Branch: master Commit: a007de5242fc4a8cb12e258e9d37af2663879f08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a007de5242fc4a8cb12e258e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 11 14:25:21 2019 +0100 mshtml: Store GeckoBrowser weak reference in HTMLOuterWindow. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 11 +++++++++-- dlls/mshtml/mshtml_private.h | 4 ++++ dlls/mshtml/nsembed.c | 7 +++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index d980645..e5d08c9 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -216,6 +216,11 @@ static ULONG WINAPI HTMLWindow2_AddRef(IHTMLWindow2 *iface) static void release_outer_window(HTMLOuterWindow *This) { + if(This->browser) { + list_remove(&This->browser_entry); + This->browser = NULL; + } + if(This->pending_window) { abort_window_bindings(This->pending_window); This->pending_window->base.outer_window = NULL; @@ -970,7 +975,7 @@ static HRESULT WINAPI HTMLWindow2_open(IHTMLWindow2 *iface, BSTR url, BSTR name, if(replace) FIXME("unsupported relace argument\n"); - if(!window->doc_obj || !window->uri_nofrag) + if(!window->browser || !window->uri_nofrag) return E_UNEXPECTED; if(name && *name == '_') { @@ -3547,6 +3552,8 @@ HRESULT create_outer_window(GeckoBrowser *browser, mozIDOMWindowProxy *mozwindow window->base.inner_window = NULL; window->doc_obj = browser->doc; + window->browser = browser; + list_add_head(&browser->outer_windows, &window->browser_entry); mozIDOMWindowProxy_AddRef(mozwindow); window->window_proxy = mozwindow; @@ -3630,7 +3637,7 @@ HRESULT update_window_doc(HTMLInnerWindow *window) return E_FAIL; } - hres = create_document_node(nshtmldoc, outer_window->doc_obj->nscontainer, window, &window->doc); + hres = create_document_node(nshtmldoc, outer_window->browser, window, &window->doc); nsIDOMHTMLDocument_Release(nshtmldoc); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index aa0cac8..922ac02 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -486,6 +486,9 @@ struct HTMLOuterWindow { HTMLOuterWindow *parent; HTMLFrameBase *frame_element; + GeckoBrowser *browser; + struct list browser_entry; + READYSTATE readystate; BOOL readystate_locked; unsigned readystate_pending; @@ -724,6 +727,7 @@ struct GeckoBrowser { HWND hwnd; struct list document_nodes; + struct list outer_windows; }; typedef struct { diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 49bbbfd..cab41c3 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -2158,6 +2158,7 @@ HRESULT create_gecko_browser(HTMLDocumentObj *doc, GeckoBrowser **_ret) ret->doc = doc; ret->ref = 1; list_init(&ret->document_nodes); + list_init(&ret->outer_windows); hres = init_browser(ret); if(SUCCEEDED(hres)) @@ -2179,6 +2180,12 @@ void detach_gecko_browser(GeckoBrowser *This) doc->browser = NULL; } + while(!list_empty(&This->outer_windows)) { + HTMLOuterWindow *window = LIST_ENTRY(list_head(&This->outer_windows), HTMLOuterWindow, browser_entry); + list_remove(&window->browser_entry); + window->browser = NULL; + } + ShowWindow(This->hwnd, SW_HIDE); SetParent(This->hwnd, NULL);

1 0

Nikolay Sivov : imm32: Replace macros with helper functions.
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: wine Branch: master Commit: c4a4146534cc47f5a60d57a4fd06400ff2472fef URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4a4146534cc47f5a60d57a4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 7 11:23:35 2019 +0300 imm32: Replace macros with helper functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 28eb00f..96a11ab 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -119,8 +119,15 @@ static CRITICAL_SECTION_DEBUG critsect_debug = static CRITICAL_SECTION threaddata_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; static BOOL disable_ime; -#define is_himc_ime_unicode(p) (p->immKbd->imeInfo.fdwProperty & IME_PROP_UNICODE) -#define is_kbd_ime_unicode(p) (p->imeInfo.fdwProperty & IME_PROP_UNICODE) +static inline BOOL is_himc_ime_unicode(const InputContextData *data) +{ + return !!(data->immKbd->imeInfo.fdwProperty & IME_PROP_UNICODE); +} + +static inline BOOL is_kbd_ime_unicode(const ImmHkl *hkl) +{ + return !!(hkl->imeInfo.fdwProperty & IME_PROP_UNICODE); +} static BOOL IMM_DestroyContext(HIMC hIMC); static InputContextData* get_imc_data(HIMC hIMC);

1 0

Alexandre Julliard : winegcc: Get rid of the Mingw Unicode hack.
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: wine Branch: master Commit: d228b3cfd5cf7d758e858f05216cbb349c116c2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d228b3cfd5cf7d758e858f05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 9 20:41:03 2019 +0100 winegcc: Get rid of the Mingw Unicode hack. Mingw supports Unicode nowadays. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 54d4368..4f9498a 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -800,27 +800,6 @@ static void add_library( struct options *opts, strarray *lib_dirs, strarray *fil free(fullname); } -/* hack a main or WinMain function to work around Mingw's lack of Unicode support */ -static const char *mingw_unicode_hack( struct options *opts ) -{ - char *main_stub = get_temp_file( opts->output_name, ".c" ); - - create_file( main_stub, 0644, - "typedef unsigned short wchar_t;\n" - "extern void * __stdcall LoadLibraryA(const char *);\n" - "extern void * __stdcall GetProcAddress(void *,const char *);\n" - "extern int wmain( int argc, wchar_t *argv[] );\n\n" - "int main( int argc, char *argv[] )\n{\n" - " int wargc;\n" - " wchar_t **wargv, **wenv;\n" - " void *msvcrt = LoadLibraryA( \"msvcrt.dll\" );\n" - " void (*__wgetmainargs)(int *argc, wchar_t** *wargv, wchar_t** *wenvp, int expand_wildcards,\n" - " int *new_mode) = GetProcAddress( msvcrt, \"__wgetmainargs\" );\n" - " __wgetmainargs( &wargc, &wargv, &wenv, 0, 0 );\n" - " return wmain( wargc, wargv );\n}\n" ); - return compile_to_object( opts, main_stub, NULL ); -} - static void build(struct options* opts) { strarray *lib_dirs, *files; @@ -972,6 +951,7 @@ static void build(struct options* opts) strarray_add(link_args, opts->gui_app ? "-mwindows" : "-mconsole"); } + if (opts->unicode_app) strarray_add(link_args, "-municode"); if (opts->nodefaultlibs) strarray_add(link_args, "-nodefaultlibs"); if (opts->nostartfiles) strarray_add(link_args, "-nostartfiles" ); @@ -997,9 +977,6 @@ static void build(struct options* opts) if (opts->large_address_aware && opts->target_cpu == CPU_x86) strarray_add( link_args, "-Wl,--large-address-aware" ); - if (opts->unicode_app && !opts->shared) - strarray_add(link_args, mingw_unicode_hack(opts)); - for ( j = 0; j < lib_dirs->size; j++ ) strarray_add(link_args, strmake("-L%s", lib_dirs->base[j]));

1 0

Alexandre Julliard : winegcc: Make get_lddllflags() more generic to return all link flags.
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: wine Branch: master Commit: 9ce91cd56eb191eb7f76834ed4452a25fa7d4205 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ce91cd56eb191eb7f76834e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 9 20:42:37 2019 +0100 winegcc: Make get_lddllflags() more generic to return all link flags. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 130 +++++++++++++++++++++++------------------------- 1 file changed, 63 insertions(+), 67 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 4f9498a..5eafe54 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -213,6 +213,7 @@ struct options const char* section_align; const char* lib_suffix; const char* subsystem; + const char* prelink; strarray* prefix; strarray* lib_dirs; strarray* linker_args; @@ -378,9 +379,17 @@ static int try_link( const strarray *prefix, const strarray *link_tool, const ch return ret; } -static const strarray* get_lddllflags( const struct options *opts, const strarray *link_tool ) +static strarray *get_link_args( struct options *opts, const char *output_name ) { + const strarray *link_tool = get_translator( opts ); strarray *flags = strarray_alloc(); + unsigned int i; + + strarray_addall( flags, link_tool ); + for (i = 0; i < opts->linker_args->size; i++) strarray_add( flags, opts->linker_args->base[i] ); + + if (verbose > 1) strarray_add( flags, "-v" ); + switch (opts->target_platform) { case PLATFORM_APPLE: @@ -392,34 +401,64 @@ static const strarray* get_lddllflags( const struct options *opts, const strarra strarray_add( flags, "-read_only_relocs" ); strarray_add( flags, "warning" ); } - break; + if (opts->image_base) + { + strarray_add( flags, "-image_base" ); + strarray_add( flags, opts->image_base ); + } + if (opts->strip) strarray_add( flags, "-x" ); + return flags; - case PLATFORM_ANDROID: case PLATFORM_SOLARIS: - case PLATFORM_UNSPECIFIED: - strarray_add( flags, "-shared" ); - strarray_add( flags, "-Wl,-Bsymbolic" ); - - /* Try all options first - this is likely to succeed on modern compilers */ - if (!try_link( opts->prefix, link_tool, "-fPIC -shared -Wl,-Bsymbolic " - "-Wl,-z,defs -Wl,-init,__wine_spec_init,-fini,_wine_spec_fini" )) { - strarray_add( flags, "-Wl,-z,defs" ); - strarray_add( flags, "-Wl,-init,__wine_spec_init,-fini,__wine_spec_fini" ); + char *mapfile = get_temp_file( output_name, ".map" ); + const char *align = opts->section_align ? opts->section_align : "0x1000"; + + create_file( mapfile, 0644, "text = A%s;\ndata = A%s;\n", align, align ); + strarray_add( flags, strmake("-Wl,-M,%s", mapfile) ); + strarray_add( tmp_files, mapfile ); } - else /* otherwise figure out which ones are allowed */ + break; + + case PLATFORM_ANDROID: + /* the Android loader requires a soname for all libraries */ + strarray_add( flags, strmake( "-Wl,-soname,%s.so", output_name )); + break; + + default: + if (opts->image_base) { - if (!try_link( opts->prefix, link_tool, "-fPIC -shared -Wl,-Bsymbolic -Wl,-z,defs" )) - strarray_add( flags, "-Wl,-z,defs" ); - if (!try_link( opts->prefix, link_tool, "-fPIC -shared -Wl,-Bsymbolic " - "-Wl,-init,__wine_spec_init,-fini,_wine_spec_fini" )) - strarray_add( flags, "-Wl,-init,__wine_spec_init,-fini,__wine_spec_fini" ); + if (!try_link( opts->prefix, link_tool, strmake("-Wl,-Ttext-segment=%s", opts->image_base)) ) + strarray_add( flags, strmake("-Wl,-Ttext-segment=%s", opts->image_base) ); + else + opts->prelink = PRELINK; } + if (!try_link( opts->prefix, link_tool, "-Wl,-z,max-page-size=0x1000")) + strarray_add( flags, "-Wl,-z,max-page-size=0x1000"); break; + } - default: - assert(0); + /* generic Unix shared library flags */ + + strarray_add( flags, "-shared" ); + strarray_add( flags, "-Wl,-Bsymbolic" ); + + /* Try all options first - this is likely to succeed on modern compilers */ + if (!try_link( opts->prefix, link_tool, "-fPIC -shared -Wl,-Bsymbolic " + "-Wl,-z,defs -Wl,-init,__wine_spec_init,-fini,_wine_spec_fini" )) + { + strarray_add( flags, "-Wl,-z,defs" ); + strarray_add( flags, "-Wl,-init,__wine_spec_init,-fini,__wine_spec_fini" ); } + else /* otherwise figure out which ones are allowed */ + { + if (!try_link( opts->prefix, link_tool, "-fPIC -shared -Wl,-Bsymbolic -Wl,-z,defs" )) + strarray_add( flags, "-Wl,-z,defs" ); + if (!try_link( opts->prefix, link_tool, "-fPIC -shared -Wl,-Bsymbolic " + "-Wl,-init,__wine_spec_init,-fini,_wine_spec_fini" )) + strarray_add( flags, "-Wl,-init,__wine_spec_init,-fini,__wine_spec_fini" ); + } + return flags; } @@ -807,7 +846,6 @@ static void build(struct options* opts) char *output_file; const char *spec_o_name; const char *output_name, *spec_file, *lang; - const char *prelink = NULL; int generate_app_loader = 1; int fake_module = 0; unsigned int j; @@ -1151,53 +1189,11 @@ static void build(struct options* opts) if (fake_module) return; /* nothing else to do */ /* link everything together now */ - strarray_addall(link_args, get_translator(opts)); - strarray_addall(link_args, get_lddllflags(opts, link_args)); + link_args = get_link_args( opts, output_name ); strarray_add(link_args, "-o"); strarray_add(link_args, strmake("%s.so", output_file)); - for ( j = 0 ; j < opts->linker_args->size ; j++ ) - strarray_add(link_args, opts->linker_args->base[j]); - - switch (opts->target_platform) - { - case PLATFORM_APPLE: - if (opts->image_base) - { - strarray_add(link_args, "-image_base"); - strarray_add(link_args, opts->image_base); - } - if (opts->strip) - strarray_add(link_args, "-Wl,-x"); - break; - case PLATFORM_SOLARIS: - { - char *mapfile = get_temp_file( output_name, ".map" ); - const char *align = opts->section_align ? opts->section_align : "0x1000"; - - create_file( mapfile, 0644, "text = A%s;\ndata = A%s;\n", align, align ); - strarray_add(link_args, strmake("-Wl,-M,%s", mapfile)); - strarray_add(tmp_files, mapfile); - } - break; - case PLATFORM_ANDROID: - /* the Android loader requires a soname for all libraries */ - strarray_add( link_args, strmake( "-Wl,-soname,%s.so", output_name )); - break; - default: - if (opts->image_base) - { - if (!try_link(opts->prefix, link_args, strmake("-Wl,-Ttext-segment=%s", opts->image_base))) - strarray_add(link_args, strmake("-Wl,-Ttext-segment=%s", opts->image_base)); - else - prelink = PRELINK; - } - if (!try_link(opts->prefix, link_args, "-Wl,-z,max-page-size=0x1000")) - strarray_add(link_args, "-Wl,-z,max-page-size=0x1000"); - break; - } - for ( j = 0; j < lib_dirs->size; j++ ) strarray_add(link_args, strmake("-L%s", lib_dirs->base[j])); @@ -1229,12 +1225,12 @@ static void build(struct options* opts) strarray_free (link_args); /* set the base address with prelink if linker support is not present */ - if (prelink && !opts->target) + if (opts->prelink && !opts->target) { - if (prelink[0] && strcmp(prelink,"false")) + if (opts->prelink[0] && strcmp(opts->prelink,"false")) { strarray *prelink_args = strarray_alloc(); - strarray_add(prelink_args, prelink); + strarray_add(prelink_args, opts->prelink); strarray_add(prelink_args, "--reloc-only"); strarray_add(prelink_args, opts->image_base); strarray_add(prelink_args, strmake("%s.so", output_file));

1 0

Alexandre Julliard : winegcc: Also return Windows link flags in get_link_args().
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: wine Branch: master Commit: 44839493ae6a99d0e3aa0b2c22a83e1061daff04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44839493ae6a99d0e3aa0b2c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 9 20:43:43 2019 +0100 winegcc: Also return Windows link flags in get_link_args(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 63 ++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 5eafe54..b58c39a 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -425,6 +425,36 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) strarray_add( flags, strmake( "-Wl,-soname,%s.so", output_name )); break; + case PLATFORM_WINDOWS: + case PLATFORM_CYGWIN: + if (opts->shared) + { + strarray_add( flags, "-shared" ); + strarray_add( flags, "-Wl,--kill-at" ); + } + else strarray_add( flags, opts->gui_app ? "-mwindows" : "-mconsole" ); + + if (opts->unicode_app) strarray_add( flags, "-municode" ); + if (opts->nodefaultlibs) strarray_add( flags, "-nodefaultlibs" ); + if (opts->nostartfiles) strarray_add( flags, "-nostartfiles" ); + + if (opts->subsystem) + { + strarray_add( flags, strmake("-Wl,--subsystem,%s", opts->subsystem )); + if (!strcmp( opts->subsystem, "native" )) + { + const char *entry = opts->target_cpu == CPU_x86 ? "_DriverEntry(a)8" : "DriverEntry"; + strarray_add( flags, strmake( "-Wl,--entry,%s", entry )); + } + } + + if (opts->image_base) strarray_add( flags, strmake("-Wl,--image-base,%s", opts->image_base )); + + if (opts->large_address_aware && opts->target_cpu == CPU_x86) + strarray_add( flags, "-Wl,--large-address-aware" ); + + return flags; + default: if (opts->image_base) { @@ -906,7 +936,6 @@ static void build(struct options* opts) /* mark the files with their appropriate type */ spec_file = lang = 0; files = strarray_alloc(); - link_args = strarray_alloc(); for ( j = 0; j < opts->files->size; j++ ) { const char* file = opts->files->base[j]; @@ -961,7 +990,7 @@ static void build(struct options* opts) if (opts->win16_app) error( "Building 16-bit code is not supported for Windows\n" ); - strarray_addall(link_args, get_translator(opts)); + link_args = get_link_args( opts, output_name ); if (opts->shared) { @@ -979,42 +1008,12 @@ static void build(struct options* opts) spawn(opts->prefix, spec_args, 0); strarray_free(spec_args); - strarray_add(link_args, "-shared"); - if (verbose) strarray_add(link_args, "-v"); - strarray_add(link_args, "-Wl,--kill-at"); strarray_add(link_args, spec_def_name); } - else - { - strarray_add(link_args, opts->gui_app ? "-mwindows" : "-mconsole"); - } - - if (opts->unicode_app) strarray_add(link_args, "-municode"); - if (opts->nodefaultlibs) strarray_add(link_args, "-nodefaultlibs"); - if (opts->nostartfiles) strarray_add(link_args, "-nostartfiles" ); - - if (opts->subsystem) - { - strarray_add(link_args, strmake("-Wl,--subsystem,%s", opts->subsystem)); - if (!strcmp( opts->subsystem, "native" )) - { - const char *entry = opts->target_cpu == CPU_x86 ? "_DriverEntry(a)8" : "DriverEntry"; - strarray_add(link_args, strmake( "-Wl,--entry,%s", entry )); - } - } - - for ( j = 0 ; j < opts->linker_args->size ; j++ ) - strarray_add(link_args, opts->linker_args->base[j]); strarray_add(link_args, "-o"); strarray_add(link_args, output_file); - if (opts->image_base) - strarray_add(link_args, strmake("-Wl,--image-base,%s", opts->image_base)); - - if (opts->large_address_aware && opts->target_cpu == CPU_x86) - strarray_add( link_args, "-Wl,--large-address-aware" ); - for ( j = 0; j < lib_dirs->size; j++ ) strarray_add(link_args, strmake("-L%s", lib_dirs->base[j]));

1 0

Alexandre Julliard : configure: Remove a few no longer used definitions.
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: wine Branch: master Commit: 2f149571d5627add6954a7b6bb71306bb779c652 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f149571d5627add6954a7b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 9 21:11:25 2019 +0100 configure: Remove a few no longer used definitions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 17 ----------------- configure.ac | 14 -------------- include/config.h.in | 3 --- 3 files changed, 34 deletions(-) diff --git a/configure b/configure index 1d80c01..9988dcd 100755 --- a/configure +++ b/configure @@ -7788,7 +7788,6 @@ WINEPRELOADER_LDFLAGS="" LIBEXT="so" DLLEXT=".so" -IMPLIBEXT="def" # Extract the first word of "ldd", so it can be a program name with args. set dummy ldd; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -8153,7 +8152,6 @@ fi LIBEXT="dll" DLLEXT="" - IMPLIBEXT="a" enable_iphlpapi=${enable_iphlpapi:-no} enable_kernel32=${enable_kernel32:-no} enable_msvcrt=${enable_msvcrt:-no} @@ -8164,12 +8162,6 @@ fi with_x=${with_x:-no} with_pthread=${with_pthread:-no} - crtlibs="" - case $host_os in - mingw32*) - crtlibs="-lmsvcrt" ;; - esac - LIBWINE_SHAREDLIB="libwine.dll" LIBWINE_IMPORTLIB="libwine.a" @@ -16560,23 +16552,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_asm_func_def" >&5 $as_echo "$ac_cv_asm_func_def" >&6; } - case "$ac_cv_asm_func_def" in ".def") - $as_echo "#define __ASM_FUNC(name) \".def \" __ASM_NAME(name) \"; .scl 2; .type 32; .endef\"" >>confdefs.h - asm_func_header=".def $asm_name_prefix\" #name suffix \"; .scl 2; .type 32; .endef" ;; ".type @function") - $as_echo "#define __ASM_FUNC(name) \".type \" __ASM_NAME(name) \",@function\"" >>confdefs.h - asm_func_header=".type $asm_name_prefix\" #name suffix \",@function" ;; ".type 2") - $as_echo "#define __ASM_FUNC(name) \".type \" __ASM_NAME(name) \",2\"" >>confdefs.h - asm_func_header=".type $asm_name_prefix\" #name suffix \",2" ;; *) - $as_echo "#define __ASM_FUNC(name) \"\"" >>confdefs.h - asm_func_header="" ;; esac diff --git a/configure.ac b/configure.ac index 71e8606..25581a9 100644 --- a/configure.ac +++ b/configure.ac @@ -710,7 +710,6 @@ AC_SUBST(WINELOADER_LDFLAGS,"") AC_SUBST(WINEPRELOADER_LDFLAGS,"") LIBEXT="so" DLLEXT=".so" -IMPLIBEXT="def" WINE_PATH_SONAME_TOOLS WINE_CONFIG_HELPERS @@ -724,7 +723,6 @@ case $host_os in AC_CHECK_TOOL(DLLTOOL,dlltool,false) LIBEXT="dll" DLLEXT="" - IMPLIBEXT="a" dnl Disable modules that can't be used on Windows enable_iphlpapi=${enable_iphlpapi:-no} enable_kernel32=${enable_kernel32:-no} @@ -737,13 +735,6 @@ case $host_os in with_x=${with_x:-no} with_pthread=${with_pthread:-no} - dnl Mingw needs explicit msvcrt for linking libwine and winsock for wininet - crtlibs="" - case $host_os in - mingw32*) - crtlibs="-lmsvcrt" ;; - esac - AC_SUBST(LIBWINE_SHAREDLIB,"libwine.dll") AC_SUBST(LIBWINE_IMPORTLIB,"libwine.a") AC_SUBST(LIBWINE_LDFLAGS,"-shared \$(srcdir)/wine.def") @@ -2058,19 +2049,14 @@ AC_CACHE_CHECK([how to define a function in assembly code], ac_cv_asm_func_def, ac_cv_asm_func_def=".type 2", ac_cv_asm_func_def="unknown")])])) -AH_TEMPLATE(__ASM_FUNC,[Define to a macro to generate an assembly function directive]) case "$ac_cv_asm_func_def" in ".def") - AC_DEFINE([__ASM_FUNC(name)], [".def " __ASM_NAME(name) "; .scl 2; .type 32; .endef"]) asm_func_header=".def $asm_name_prefix\" #name suffix \"; .scl 2; .type 32; .endef" ;; ".type @function") - AC_DEFINE([__ASM_FUNC(name)], [".type " __ASM_NAME(name) ",@function"]) asm_func_header=".type $asm_name_prefix\" #name suffix \",@function" ;; ".type 2") - AC_DEFINE([__ASM_FUNC(name)], [".type " __ASM_NAME(name) ",2"]) asm_func_header=".type $asm_name_prefix\" #name suffix \",2" ;; *) - AC_DEFINE([__ASM_FUNC(name)], [""]) asm_func_header="" ;; esac diff --git a/include/config.h.in b/include/config.h.in index 999f4a6..1d69e2e 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1631,9 +1631,6 @@ /* Define to a macro to define an assembly function */ #undef __ASM_DEFINE_FUNC -/* Define to a macro to generate an assembly function directive */ -#undef __ASM_FUNC - /* Define to a macro to generate an assembly function with C calling convention */ #undef __ASM_GLOBAL_FUNC

1 0

Erich E. Hoover : msidb: Add stub tool for manipulating MSI databases.
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: wine Branch: master Commit: 3d5b606ddea7ede27eb2320e2755666bdbed1f33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d5b606ddea7ede27eb2320e… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Tue Sep 15 17:44:33 2015 -0600 msidb: Add stub tool for manipulating MSI databases. The "Windows SDK Components for Windows Installer Developers" has a command line tool called msidb that is incredibly useful for creating, editing, and exporting MSI installer databases, think of it as winemsibuilder on steroids. This patch series implements much of the functionality of the msidb tool, maintains compatible CLI flags, and the underlying MSI functionality necessary to support these features. Jacek expressed an interest in having these patches resurrected for use by the Gecko build scripts and Austin's VS builds of Valgrind. With this patch series all the existing winemsibuilder functionality is available, plus the ability to drop streams, export the _SummaryInformation table, and export binary streams (Binary/Icon tables). A big feature of the implementation is that it allows you to edit existing installer databases, rather than just creating new ones. 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> --- configure | 3 + configure.ac | 2 + programs/msidb/Makefile.in | 5 ++ programs/msidb/main.c | 153 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 163 insertions(+) diff --git a/configure b/configure index 9988dcd..8a07748 100755 --- a/configure +++ b/configure @@ -1715,6 +1715,7 @@ enable_ipconfig enable_lodctr enable_mofcomp enable_mshta +enable_msidb enable_msiexec enable_msinfo32 enable_net @@ -20292,6 +20293,7 @@ wine_fn_config_makefile programs/ipconfig enable_ipconfig wine_fn_config_makefile programs/lodctr enable_lodctr wine_fn_config_makefile programs/mofcomp enable_mofcomp wine_fn_config_makefile programs/mshta enable_mshta +wine_fn_config_makefile programs/msidb enable_msidb wine_fn_config_makefile programs/msiexec enable_msiexec wine_fn_config_makefile programs/msinfo32 enable_msinfo32 wine_fn_config_makefile programs/net enable_net @@ -20443,6 +20445,7 @@ else fonts \ loader/l_intl.nls \ loader/wine.inf \ +programs/msidb/msidb \ programs/msiexec/msiexec \ programs/notepad/notepad \ programs/regedit/regedit \ diff --git a/configure.ac b/configure.ac index 25581a9..db8bb6c 100644 --- a/configure.ac +++ b/configure.ac @@ -3938,6 +3938,7 @@ WINE_CONFIG_MAKEFILE(programs/ipconfig) WINE_CONFIG_MAKEFILE(programs/lodctr) WINE_CONFIG_MAKEFILE(programs/mofcomp) WINE_CONFIG_MAKEFILE(programs/mshta) +WINE_CONFIG_MAKEFILE(programs/msidb) WINE_CONFIG_MAKEFILE(programs/msiexec) WINE_CONFIG_MAKEFILE(programs/msinfo32) WINE_CONFIG_MAKEFILE(programs/net) @@ -4106,6 +4107,7 @@ else fonts \ loader/l_intl.nls \ loader/wine.inf \ +programs/msidb/msidb \ programs/msiexec/msiexec \ programs/notepad/notepad \ programs/regedit/regedit \ diff --git a/programs/msidb/Makefile.in b/programs/msidb/Makefile.in new file mode 100644 index 0000000..bb74041 --- /dev/null +++ b/programs/msidb/Makefile.in @@ -0,0 +1,5 @@ +MODULE = msidb.exe +APPMODE = -mconsole -municode +IMPORTS = msi + +C_SRCS = main.c diff --git a/programs/msidb/main.c b/programs/msidb/main.c new file mode 100644 index 0000000..a431fd5 --- /dev/null +++ b/programs/msidb/main.c @@ -0,0 +1,153 @@ +/* + * msidb - command line tool for assembling MSI packages + * + * Copyright 2015 Erich E. Hoover + * + * 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 + */ + +#define WIN32_LEAN_AND_MEAN + +#include <stdlib.h> +#include <windows.h> +#include <msi.h> +#include <msiquery.h> + +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msidb); + +struct msidb_state +{ + WCHAR *database_file; + WCHAR *table_folder; + MSIHANDLE database_handle; + BOOL create_database; +}; + +static void show_usage( void ) +{ + WINE_MESSAGE( + "Usage: msidb [OPTION]...[OPTION]...\n" + "Options:\n" + " -? Show this usage message and exit.\n" + " -c Create database file (instead of opening existing file).\n" + " -d package.msi Path to the database file.\n" + " -f folder Folder in which to open/save the tables.\n" + ); +} + +static int valid_state( struct msidb_state *state ) +{ + if (state->database_file == NULL) + { + FIXME( "GUI operation is not currently supported.\n" ); + return 0; + } + if (state->table_folder == NULL) + { + ERR( "No table folder specified (-f option).\n" ); + show_usage(); + return 0; + } + return 1; +} + +static int process_argument( struct msidb_state *state, int i, int argc, WCHAR *argv[] ) +{ + /* msidb accepts either "-" or "/" style flags */ + if (strlenW(argv[i]) != 2 || (argv[i][0] != '-' && argv[i][0] != '/')) + { + WINE_FIXME( "Table names are not currently supported.\n" ); + show_usage(); + exit( 1 ); + } + switch( argv[i][1] ) + { + case '?': + show_usage(); + exit( 0 ); + case 'c': + state->create_database = TRUE; + return 1; + case 'd': + if (i + 1 >= argc) return 0; + state->database_file = argv[i + 1]; + return 2; + case 'f': + if (i + 1 >= argc) return 0; + state->table_folder = argv[i + 1]; + return 2; + default: + break; + } + show_usage(); + exit( 1 ); +} + +static int open_database( struct msidb_state *state ) +{ + LPCWSTR db_mode = state->create_database ? MSIDBOPEN_CREATE : MSIDBOPEN_TRANSACT; + UINT ret; + + ret = MsiOpenDatabaseW( state->database_file, db_mode, &state->database_handle ); + if (ret != ERROR_SUCCESS) + { + ERR( "Failed to open database '%s', error %d\n", wine_dbgstr_w(state->database_file), ret ); + return 0; + } + return 1; +} + +static void close_database( struct msidb_state *state ) +{ + UINT ret; + + ret = MsiDatabaseCommit( state->database_handle ); + if (ret != ERROR_SUCCESS) + { + ERR( "Failed to commit changes to database.\n" ); + return; + } + ret = MsiCloseHandle( state->database_handle ); + if (ret != ERROR_SUCCESS) + { + WARN( "Failed to close database handle.\n" ); + return; + } +} + +int wmain( int argc, WCHAR *argv[] ) +{ + struct msidb_state state; + int i, n = 1; + + memset( &state, 0x0, sizeof(state) ); + /* process and validate all the command line flags */ + for (i = 1; n && i < argc; i += n) + n = process_argument( &state, i, argc, argv ); + if (!valid_state( &state )) + return 1; + + /* perform the requested operations */ + if (!open_database( &state )) + { + ERR( "Failed to open database '%s'.\n", wine_dbgstr_w(state.database_file) ); + return 1; + } + close_database( &state ); + return 0; +}

1 0

Erich E. Hoover : msidb: Add support for importing database tables.
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: wine Branch: master Commit: 68e1ad07750bd6f9fa7b529398f79db1622c4ad5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68e1ad07750bd6f9fa7b5293… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Wed Sep 16 11:58:50 2015 -0600 msidb: Add support for importing database tables. msidb uses a nice CLI syntax for adding multiple database tables in one call with the "-i" mode flag, this patch implements that syntax. For example, this call would import three tables from the current directory (ActionTe.idt, Componen.idt, and InstallE.idt): msidb -d package.msi -f . -i ActionText Component InstallExecuteSequence 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 | 113 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 100 insertions(+), 13 deletions(-) diff --git a/programs/msidb/main.c b/programs/msidb/main.c index a431fd5..9c4628b 100644 --- a/programs/msidb/main.c +++ b/programs/msidb/main.c @@ -27,26 +27,61 @@ #include "wine/debug.h" #include "wine/unicode.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(msidb); +struct msidb_listentry +{ + struct list entry; + WCHAR *name; +}; + struct msidb_state { WCHAR *database_file; WCHAR *table_folder; MSIHANDLE database_handle; BOOL create_database; + BOOL import_tables; + struct list table_list; }; +static void list_free( struct list *list ) +{ + struct msidb_listentry *data, *next; + + LIST_FOR_EACH_ENTRY_SAFE( data, next, list, struct msidb_listentry, entry ) + { + list_remove( &data->entry ); + HeapFree( GetProcessHeap(), 0, data ); + } +} + +static void list_append( struct list *list, WCHAR *name ) +{ + struct msidb_listentry *data; + + data = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct msidb_listentry) ); + if (!data) + { + ERR( "Out of memory for list.\n" ); + exit( 1 ); + } + data->name = name; + list_add_tail( list, &data->entry ); +} + static void show_usage( void ) { WINE_MESSAGE( - "Usage: msidb [OPTION]...[OPTION]...\n" + "Usage: msidb [OPTION]...[OPTION]... [TABLE]...[TABLE]\n" "Options:\n" " -? Show this usage message and exit.\n" " -c Create database file (instead of opening existing file).\n" " -d package.msi Path to the database file.\n" " -f folder Folder in which to open/save the tables.\n" + " -i Import tables into database.\n" ); } @@ -63,6 +98,17 @@ static int valid_state( struct msidb_state *state ) show_usage(); return 0; } + if (!state->create_database && !state->import_tables) + { + ERR( "No mode flag specified (-c, -i).\n" ); + show_usage(); + return 0; + } + if (list_empty( &state->table_list )) + { + ERR( "No tables specified.\n" ); + return 0; + } return 1; } @@ -70,11 +116,7 @@ static int process_argument( struct msidb_state *state, int i, int argc, WCHAR * { /* msidb accepts either "-" or "/" style flags */ if (strlenW(argv[i]) != 2 || (argv[i][0] != '-' && argv[i][0] != '/')) - { - WINE_FIXME( "Table names are not currently supported.\n" ); - show_usage(); - exit( 1 ); - } + return 0; switch( argv[i][1] ) { case '?': @@ -91,6 +133,9 @@ static int process_argument( struct msidb_state *state, int i, int argc, WCHAR * if (i + 1 >= argc) return 0; state->table_folder = argv[i + 1]; return 2; + case 'i': + state->import_tables = TRUE; + return 1; default: break; } @@ -112,11 +157,14 @@ static int open_database( struct msidb_state *state ) return 1; } -static void close_database( struct msidb_state *state ) +static void close_database( struct msidb_state *state, BOOL commit_changes ) { - UINT ret; + UINT ret = ERROR_SUCCESS; - ret = MsiDatabaseCommit( state->database_handle ); + if (state->database_handle == 0) + return; + if (commit_changes) + ret = MsiDatabaseCommit( state->database_handle ); if (ret != ERROR_SUCCESS) { ERR( "Failed to commit changes to database.\n" ); @@ -130,24 +178,63 @@ static void close_database( struct msidb_state *state ) } } +static int import_table( struct msidb_state *state, const WCHAR *table_name ) +{ + const WCHAR format[] = { '%','.','8','s','.','i','d','t',0 }; /* truncate to 8 characters */ + WCHAR table_path[MAX_PATH]; + UINT ret; + + snprintfW( table_path, sizeof(table_path)/sizeof(WCHAR), 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 ); + return 0; + } + return 1; +} + +static int import_tables( struct msidb_state *state ) +{ + struct msidb_listentry *data; + + LIST_FOR_EACH_ENTRY( data, &state->table_list, struct msidb_listentry, entry ) + { + if (!import_table( state, data->name )) + return 0; /* failed, do not commit changes */ + } + return 1; +} + int wmain( int argc, WCHAR *argv[] ) { struct msidb_state state; int i, n = 1; + int ret = 1; memset( &state, 0x0, sizeof(state) ); + list_init( &state.table_list ); /* process and validate all the command line flags */ for (i = 1; n && i < argc; i += n) n = process_argument( &state, i, argc, argv ); + /* process all remaining arguments as table names */ + for (; i < argc; i++) + list_append( &state.table_list, argv[i] ); if (!valid_state( &state )) - return 1; + goto cleanup; /* perform the requested operations */ if (!open_database( &state )) { ERR( "Failed to open database '%s'.\n", wine_dbgstr_w(state.database_file) ); - return 1; + goto cleanup; } - close_database( &state ); - return 0; + if (state.import_tables && !import_tables( &state )) + goto cleanup; /* failed, do not commit changes */ + ret = 0; + +cleanup: + close_database( &state, ret == 0 ); + list_free( &state.table_list ); + return ret; }

1 0