wine-commits November 2010

wine-commits@winehq.org

2 participants
866 discussions

Maarten Lankhorst : quartz: Fix stub for GetVideoPaletteEntries.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 06ca6fb184dd26a95726f9749c851b85beb4cf96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06ca6fb184dd26a95726f9749… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 11 00:14:18 2010 +0100 quartz: Fix stub for GetVideoPaletteEntries. --- dlls/quartz/videorenderer.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index bf0fa7b..5fbedaf 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -1413,9 +1413,11 @@ static HRESULT WINAPI Basicvideo_GetVideoPaletteEntries(IBasicVideo *iface, LONG *pPalette) { ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface); - FIXME("(%p/%p)->(%d, %d, %p, %p): stub !!!\n", This, iface, StartIndex, Entries, pRetrieved, pPalette); + TRACE("(%p/%p)->(%d, %d, %p, %p)\n", This, iface, StartIndex, Entries, pRetrieved, pPalette); - return S_OK; + if (pRetrieved) + *pRetrieved = 0; + return VFW_E_NO_PALETTE_AVAILABLE; } static HRESULT WINAPI Basicvideo_GetCurrentImage(IBasicVideo *iface,

1 0

Maarten Lankhorst : winegstreamer: Set correct state when ending processing .
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 47725db6339d21d9fad6a60db23ec419cb41c73f URL: http://source.winehq.org/git/wine.git/?a=commit;h=47725db6339d21d9fad6a60db… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Nov 10 23:22:45 2010 +0100 winegstreamer: Set correct state when ending processing. --- dlls/winegstreamer/gsttffilter.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index f56cc40..d3b2922 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -267,7 +267,7 @@ static HRESULT WINAPI Gstreamer_transform_ProcessEnd(TransformFilter *iface) { GstTfImpl *This = (GstTfImpl*)iface; int ret; - ret = gst_element_set_state(This->filter, GST_STATE_PAUSED); + ret = gst_element_set_state(This->filter, GST_STATE_READY); TRACE("Returned: %i\n", ret); return S_OK; }

1 0

Maarten Lankhorst : winegstreamer: Fix regression from d62b4dcb664.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 50d8b0db7aa7b4380a947fac7163c43bfea015c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50d8b0db7aa7b4380a947fac7… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Nov 10 20:58:56 2010 +0100 winegstreamer: Fix regression from d62b4dcb664. Accidentally made a worse leak by plugging a smaller one. --- dlls/winegstreamer/gstdemux.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 94903c1..1f98a7d 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -519,6 +519,7 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstBuffer *buf) { } else { BYTE *ptr = NULL; hr = BaseOutputPinImpl_GetDeliveryBuffer(&pin->pin, &sample, NULL, NULL, 0); + freeSamp = TRUE; if (hr == VFW_E_NOT_CONNECTED) { gst_buffer_unref(buf); return GST_FLOW_NOT_LINKED;

1 0

Maarten Lankhorst : winegstreamer: Fix playing .flv and realmedia files.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 97393cd557e6d5154029d916943a5ec7b515756e URL: http://source.winehq.org/git/wine.git/?a=commit;h=97393cd557e6d5154029d9169… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Nov 10 14:41:38 2010 +0100 winegstreamer: Fix playing .flv and realmedia files. --- dlls/winegstreamer/gstdemux.c | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index abca29c..94903c1 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -757,12 +757,6 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, gboolean last, GS static void existing_new_pad(GstElement *bin, GstPad *pad, gboolean last, GSTImpl *This) { int x; - GstCaps *caps; - GstStructure *arg; - const char *typename, *ownname; - caps = gst_pad_get_caps_reffed(pad); - arg = gst_caps_get_structure(caps, 0); - typename = gst_structure_get_name(arg); if (gst_pad_is_linked(pad)) return; @@ -777,10 +771,7 @@ static void existing_new_pad(GstElement *bin, GstPad *pad, gboolean last, GSTImp for (x = 0; x < This->cStreams; ++x) { GSTOutPin *pin = This->ppPins[x]; if (!pin->their_src) { - caps = gst_pad_get_caps_reffed(pin->my_sink); - arg = gst_caps_get_structure(caps, 0); - ownname = gst_structure_get_name(arg); - if (!strcmp(typename, ownname) && gst_pad_link(pad, pin->my_sink) >= 0) { + if (gst_pad_link(pad, pin->my_sink) >= 0) { pin->their_src = pad; gst_segment_init(pin->segment, GST_FORMAT_TIME); gst_object_ref(pin->their_src);

1 0

Maarten Lankhorst : winegstreamer: Add better support for unsupported audio /video.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: bdde3f1a7d79eed7b8b676272a145b7ab5798e3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdde3f1a7d79eed7b8b676272… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Nov 10 13:52:11 2010 +0100 winegstreamer: Add better support for unsupported audio/video. This will fix the hangs caused by trying to play audio/video files for which the codecs are not enabled in gstreamer. --- dlls/winegstreamer/gstdemux.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 709dc42..abca29c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -875,6 +875,32 @@ static GstAutoplugSelectResult autoplug_blacklist(GstElement *bin, GstPad *pad, return GST_AUTOPLUG_SELECT_TRY; } +static GstBusSyncReply watch_bus(GstBus *bus, GstMessage *msg, gpointer data) { + GSTImpl *This = data; + GError *err = NULL; + gchar *dbg_info = NULL; + if (GST_MESSAGE_TYPE(msg) & GST_MESSAGE_ERROR) { + gst_message_parse_error(msg, &err, &dbg_info); + FIXME("%s: %s\n", GST_OBJECT_NAME(msg->src), err->message); + WARN("%s\n", dbg_info); + SetEvent(This->event); + } else if (GST_MESSAGE_TYPE(msg) & GST_MESSAGE_WARNING) { + gst_message_parse_warning(msg, &err, &dbg_info); + WARN("%s: %s\n", GST_OBJECT_NAME(msg->src), err->message); + WARN("%s\n", dbg_info); + } + if (err) + g_error_free(err); + g_free(dbg_info); + return GST_BUS_DROP; +} + +static void unknown_type(GstElement *bin, GstPad *pad, GstCaps *caps, GSTImpl *This) { + gchar *strcaps = gst_caps_to_string(caps); + FIXME("Could not find a filter for caps: %s\n", strcaps); + g_free(strcaps); +} + static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTIES *props) { GSTImpl *This = (GSTImpl*)pPin->pin.pinInfo.pFilter; HRESULT hr; @@ -891,15 +917,22 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI This->props = *props; IAsyncReader_Length(pPin->pReader, &This->filesize, &avail); + if (!This->bus) { + This->bus = gst_bus_new(); + gst_bus_set_sync_handler(This->bus, watch_bus, This); + } + This->gstfilter = gst_element_factory_make("decodebin2", NULL); if (!This->gstfilter) { FIXME("Could not make source filter, are gstreamer-plugins-* installed for %u bits?\n", 8 * (int)sizeof(void*)); return E_FAIL; } + gst_element_set_bus(This->gstfilter, This->bus); g_signal_connect(This->gstfilter, "new-decoded-pad", G_CALLBACK(existing_new_pad), This); g_signal_connect(This->gstfilter, "pad-removed", G_CALLBACK(removed_decoded_pad), This); g_signal_connect(This->gstfilter, "autoplug-select", G_CALLBACK(autoplug_blacklist), This); + g_signal_connect(This->gstfilter, "unknown-type", G_CALLBACK(unknown_type), This); This->my_src = gst_pad_new_from_static_template(&src_template, "quartz-src"); gst_pad_set_getrange_function(This->my_src, request_buffer_src); @@ -922,6 +955,7 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI /* Add initial pins */ This->initial = This->discont = 1; + ResetEvent(This->event); gst_element_set_state(This->gstfilter, GST_STATE_PLAYING); gst_pad_set_active(This->my_src, 1); WaitForSingleObject(This->event, -1); @@ -1009,6 +1043,7 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *punkout, HRESULT *phr) { This->ppPins = NULL; This->push_thread = NULL; This->event = CreateEventW(NULL, 0, 0, NULL); + This->bus = NULL; piInput = &This->pInputPin.pin.pinInfo; piInput->dir = PINDIR_INPUT; @@ -1047,6 +1082,10 @@ static void GST_Destroy(GSTImpl *This) { while (pinref) pinref = IPin_Release((IPin *)&This->pInputPin); } + if (This->bus) { + gst_bus_set_sync_handler(This->bus, NULL, NULL); + gst_object_unref(This->bus); + } CoTaskMemFree(This); } @@ -1458,6 +1497,7 @@ static HRESULT GST_RemoveOutputPins(GSTImpl *This) { if (!This->gstfilter) return S_OK; + gst_element_set_bus(This->gstfilter, NULL); gst_element_set_state(This->gstfilter, GST_STATE_NULL); gst_pad_unlink(This->my_src, This->their_sink); This->my_src = This->their_sink = NULL;

1 0

Alexandre Julliard : shell32: Store the raw AUTHORS file in resources instead of trying to convert to a C array .
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 40977bf1d2f0f11a24fd9330dffac264fced2306 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40977bf1d2f0f11a24fd9330d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 11 12:24:46 2010 +0100 shell32: Store the raw AUTHORS file in resources instead of trying to convert to a C array. --- .gitignore | 1 + Makefile.in | 2 ++ configure | 3 +++ configure.ac | 1 + dlls/shell32/.gitignore | 1 - dlls/shell32/Makefile.in | 10 ---------- dlls/shell32/shell32_main.c | 39 +++++++++++++++++++++++++++++---------- dlls/shell32/shres.rc | 3 +++ tools/make_makefiles | 1 + 9 files changed, 40 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index c15e617..b57ea54 100644 --- a/.gitignore +++ b/.gitignore @@ -135,6 +135,7 @@ dlls/rpcrt4/tests/server.h dlls/rpcrt4/tests/server_c.c dlls/rpcrt4/tests/server_s.c dlls/shdocvw/shdocvw_v1.tlb +dlls/shell32/AUTHORS dlls/stdole2.tlb/std_ole_v2.tlb dlls/stdole32.tlb/std_ole_v1.tlb dlls/sti/sti_wia.h diff --git a/Makefile.in b/Makefile.in index f8d760d..eec29bc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -73,6 +73,8 @@ tools/wmc tools/wrc: tools tools tools/wmc tools/wrc: libs/wine tools/widl tools/wmc tools/wrc: libs/wpp +dlls/shell32/Makefile dlls/shell32/__depend__: dlls/shell32/AUTHORS + $(MAKEDEP): include/config.h tools/Makefile @cd $(TOOLSDIR)/tools && $(MAKE) makedep$(TOOLSEXT) diff --git a/configure b/configure index 4d89bd8..9b1cb22 100755 --- a/configure +++ b/configure @@ -14569,6 +14569,8 @@ then "crosstest: @echo \"crosstest is not supported (mingw not installed?)\" && false" fi +ac_config_links="$ac_config_links dlls/shell32/AUTHORS:AUTHORS" +wine_fn_config_symlink dlls/shell32/AUTHORS ac_config_links="$ac_config_links dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd" test "$srcdir" = "." || wine_fn_config_symlink dlls/wineps.drv/generic.ppd if test "x$enable_fonts" != xno; then @@ -15962,6 +15964,7 @@ do case $ac_config_target in "include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;; "include/stamp-h") CONFIG_COMMANDS="$CONFIG_COMMANDS include/stamp-h" ;; + "dlls/shell32/AUTHORS") CONFIG_LINKS="$CONFIG_LINKS dlls/shell32/AUTHORS:AUTHORS" ;; "dlls/wineps.drv/generic.ppd") CONFIG_LINKS="$CONFIG_LINKS dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd" ;; "fonts/marlett.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/marlett.ttf:fonts/marlett.ttf" ;; "fonts/symbol.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/symbol.ttf:fonts/symbol.ttf" ;; diff --git a/configure.ac b/configure.ac index f0ebc03..04ed14f 100644 --- a/configure.ac +++ b/configure.ac @@ -2263,6 +2263,7 @@ AH_BOTTOM([#endif /* WINE_CROSSTEST */]) AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) +WINE_CONFIG_SYMLINK(dlls/shell32/AUTHORS,AUTHORS) WINE_CONFIG_SYMLINK(dlls/wineps.drv/generic.ppd) WINE_CONFIG_SYMLINK(fonts/marlett.ttf,,enable_fonts) WINE_CONFIG_SYMLINK(fonts/symbol.ttf,,enable_fonts) diff --git a/dlls/shell32/.gitignore b/dlls/shell32/.gitignore deleted file mode 100644 index a6683e2..0000000 --- a/dlls/shell32/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/authors.c diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index a101c75..1997c01 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -106,14 +106,4 @@ SVG_SRCS = \ shortcut.svg \ trash_file.svg -EXTRA_OBJS = authors.o - @MAKE_DLL_RULES@ - -authors.c: $(top_srcdir)/AUTHORS - (LC_ALL=C; export LC_ALL; echo 'const char * const SHELL_Authors[] = {' && \ - sed -e '1,2d' -e 's/$.*$/ \"\1\",/' $(top_srcdir)/AUTHORS && \ - echo ' 0 };') >$@ || ($(RM) $@ && false) - -clean:: - $(RM) authors.c diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 7d78ab5..227b63e 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -51,8 +51,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); -extern const char * const SHELL_Authors[]; - /************************************************************************* * CommandLineToArgvW [SHELL32.@] * @@ -932,6 +930,34 @@ HRESULT WINAPI SHLoadInProc (REFCLSID rclsid) return DISP_E_MEMBERNOTFOUND; } +static void add_authors( HWND list ) +{ + static const WCHAR eol[] = {'\r','\n',0}; + static const WCHAR authors[] = {'A','U','T','H','O','R','S',0}; + WCHAR *strW, *start, *end; + HRSRC rsrc = FindResourceW( shell32_hInstance, authors, (LPCWSTR)RT_RCDATA ); + char *strA = LockResource( LoadResource( shell32_hInstance, rsrc )); + DWORD sizeW, sizeA = SizeofResource( shell32_hInstance, rsrc ); + + if (!strA) return; + sizeW = MultiByteToWideChar( CP_UTF8, 0, strA, sizeA, NULL, 0 ) + 1; + if (!(strW = HeapAlloc( GetProcessHeap(), 0, sizeW * sizeof(WCHAR) ))) return; + MultiByteToWideChar( CP_UTF8, 0, strA, sizeA, strW, sizeW ); + strW[sizeW - 1] = 0; + + start = strpbrkW( strW, eol ); /* skip the header line */ + while (start) + { + while (*start && strchrW( eol, *start )) start++; + if (!*start) break; + end = strpbrkW( start, eol ); + if (end) *end++ = 0; + SendMessageW( list, LB_ADDSTRING, -1, (LPARAM)start ); + start = end; + } + HeapFree( GetProcessHeap(), 0, strW ); +} + /************************************************************************* * AboutDlgProc (internal) */ @@ -952,7 +978,6 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, if (info) { - const char* const *pstr = SHELL_Authors; SendDlgItemMessageW(hWnd, stc1, STM_SETICON,(WPARAM)info->hIcon, 0); GetWindowTextW( hWnd, template, sizeof(template)/sizeof(WCHAR) ); sprintfW( buffer, template, info->szApp ); @@ -968,13 +993,7 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, hWndCtl = GetDlgItem(hWnd, IDC_ABOUT_LISTBOX); SendMessageW( hWndCtl, WM_SETREDRAW, 0, 0 ); SendMessageW( hWndCtl, WM_SETFONT, (WPARAM)info->hFont, 0 ); - while (*pstr) - { - /* authors list is in utf-8 format */ - MultiByteToWideChar( CP_UTF8, 0, *pstr, -1, buffer, sizeof(buffer)/sizeof(WCHAR) ); - SendMessageW( hWndCtl, LB_ADDSTRING, -1, (LPARAM)buffer ); - pstr++; - } + add_authors( hWndCtl ); SendMessageW( hWndCtl, WM_SETREDRAW, 1, 0 ); } } diff --git a/dlls/shell32/shres.rc b/dlls/shell32/shres.rc index 11cc344..6ff4d98 100644 --- a/dlls/shell32/shres.rc +++ b/dlls/shell32/shres.rc @@ -125,3 +125,6 @@ IDR_AVI_FILENUKE AVI searching.avi /* @makedep: searching.avi */ IDR_AVI_FILEDELETE AVI searching.avi + +/* @makedep: AUTHORS */ +AUTHORS RCDATA AUTHORS diff --git a/tools/make_makefiles b/tools/make_makefiles index 4673fea..7084258 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -90,6 +90,7 @@ my @ignores = ( "Makefile", "dlldata.c", "dlls/*/*.def", + "dlls/shell32/AUTHORS", "*/*/tests/*crosstest.exe", "*/*/tests/testlist.c", "include/config.h",

1 0

Nikolay Sivov : cryptui: Stub CryptUIDlgViewSignerInfoA.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: f7c99379b279832555aad29f629f937a88b7a550 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7c99379b279832555aad29f6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 11 04:14:53 2010 +0300 cryptui: Stub CryptUIDlgViewSignerInfoA. --- dlls/cryptui/cryptui.spec | 2 +- dlls/cryptui/main.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/cryptui.spec b/dlls/cryptui/cryptui.spec index a60c2e6..d243217 100644 --- a/dlls/cryptui/cryptui.spec +++ b/dlls/cryptui/cryptui.spec @@ -16,7 +16,7 @@ 16 stub CryptUIDlgViewCertificatePropertiesW 17 stdcall CryptUIDlgViewCertificateW(ptr ptr) 18 stdcall CryptUIDlgViewContext(long ptr ptr wstr long ptr) -19 stub CryptUIDlgViewSignerInfoA +19 stdcall CryptUIDlgViewSignerInfoA(ptr) 20 stub CryptUIDlgViewSignerInfoW 21 stub CryptUIFreeCertificatePropertiesPagesA 22 stub CryptUIFreeCertificatePropertiesPagesW diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 3a8f8f8..b823b6e 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -7038,3 +7038,9 @@ BOOL WINAPI CryptUIWizExport(DWORD dwFlags, HWND hwndParent, } return ret; } + +BOOL WINAPI CryptUIDlgViewSignerInfoA(CRYPTUI_VIEWSIGNERINFO_STRUCTA *pcvsi) +{ + FIXME("%p: stub\n", pcvsi); + return FALSE; +}

1 0

Hans Leidekker : msi: Add support for installing side-by-side assemblies.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: a23514eece083011140513853c5db10357af6cea URL: http://source.winehq.org/git/wine.git/?a=commit;h=a23514eece083011140513853… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 11 10:45:42 2010 +0100 msi: Add support for installing side-by-side assemblies. --- dlls/msi/Makefile.in | 1 + dlls/msi/action.c | 533 ++++---------------------------------------------- dlls/msi/assembly.c | 371 +++++++++++++++++++++++++++++++++++ dlls/msi/files.c | 33 +++- dlls/msi/msipriv.h | 19 ++ dlls/msi/package.c | 12 ++ 6 files changed, 469 insertions(+), 500 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a23514eece08301114051…

1 0

Hans Leidekker : msi: Calculate file install states after evaluating component conditions, not before.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 3faddc21b3beb429a5d82848868c1585a9500f37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3faddc21b3beb429a5d828488… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 11 10:45:20 2010 +0100 msi: Calculate file install states after evaluating component conditions, not before. --- dlls/msi/action.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 06bbc45..e8ad30b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2162,8 +2162,7 @@ static UINT set_file_install_states( MSIPACKAGE *package ) DWORD file_size; LPWSTR p; - if (!comp) - continue; + if (!comp->Enabled) continue; if (file->IsCompressed) comp->ForceLocalState = TRUE; @@ -2264,9 +2263,6 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) ACTION_GetComponentInstallStates(package); ACTION_GetFeatureInstallStates(package); - TRACE("Calculating file install states\n"); - set_file_install_states( package ); - if (!process_overrides( package, msi_get_property_int( package->db, szlevel, 1 ) )) { TRACE("Evaluating feature conditions\n"); @@ -2291,6 +2287,9 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) comp->Enabled = TRUE; } + TRACE("Calculating file install states\n"); + set_file_install_states( package ); + msi_set_property( package->db, szCosting, szOne ); /* set default run level if not set */ level = msi_dup_property( package->db, szlevel );

1 0

Hans Leidekker : msi: Put quotes around the filename in MsiApplyPatch.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: fa9757bd7320706fbce350901a0f70dd084cd4dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa9757bd7320706fbce350901… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 11 10:45:05 2010 +0100 msi: Put quotes around the filename in MsiApplyPatch. --- dlls/msi/msi.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 85bdc96..9e2225c 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -351,7 +351,7 @@ static UINT MSI_ApplyPatchW(LPCWSTR szPatchPackage, LPCWSTR szProductCode, LPCWS LPWSTR beg, end, cmd, codes = NULL; BOOL succeeded = FALSE; - static const WCHAR patcheq[] = {'P','A','T','C','H','=',0}; + static const WCHAR fmt[] = {'%','s',' ','P','A','T','C','H','=','"','%','s','"',0}; static WCHAR empty[] = {0}; if (!szPatchPackage || !szPatchPackage[0]) @@ -363,18 +363,14 @@ static UINT MSI_ApplyPatchW(LPCWSTR szPatchPackage, LPCWSTR szProductCode, LPCWS if (!szCommandLine) cmd_ptr = empty; - size = lstrlenW(cmd_ptr) + lstrlenW(patcheq) + lstrlenW(szPatchPackage) + 1; + size = strlenW(cmd_ptr) + strlenW(fmt) + strlenW(szPatchPackage) + 1; cmd = msi_alloc(size * sizeof(WCHAR)); if (!cmd) { msi_free(codes); return ERROR_OUTOFMEMORY; } - - lstrcpyW(cmd, cmd_ptr); - if (szCommandLine) lstrcatW(cmd, szSpace); - lstrcatW(cmd, patcheq); - lstrcatW(cmd, szPatchPackage); + sprintfW(cmd, fmt, cmd_ptr, szPatchPackage); if (szProductCode) r = MsiConfigureProductExW(szProductCode, INSTALLLEVEL_DEFAULT, INSTALLSTATE_DEFAULT, cmd);

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
87
Older →

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 November 2010