December 2010 - Wine-commits

Alexandre Julliard : ole32: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard 05 Dec '10

05 Dec '10

Module: wine Branch: master Commit: 431e369f6258188522cf99813cab92a57a37a13d URL: http://source.winehq.org/git/wine.git/?a=commit;h=431e369f6258188522cf99813… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 19:51:08 2010 +0100 ole32: Convert dll registration to the IRegistrar mechanism. --- dlls/ole32/Makefile.in | 9 +- dlls/ole32/compobj.c | 18 ++- dlls/ole32/ole32_objidl.idl | 85 +++++++ dlls/ole32/regsvr.c | 574 ------------------------------------------- tools/wine.inf.in | 2 +- 5 files changed, 110 insertions(+), 578 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=431e369f6258188522cf9…

1 0

Alexandre Julliard : atl: Generate the class registration and use a copy of the standard winecrt0 mechanism .
by Alexandre Julliard 05 Dec '10

05 Dec '10

Module: wine Branch: master Commit: 48216541fdf434df4c494be188485dd164273b0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=48216541fdf434df4c494be18… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 20:23:54 2010 +0100 atl: Generate the class registration and use a copy of the standard winecrt0 mechanism. --- dlls/atl/Makefile.in | 2 +- dlls/atl/atl.rgs | 17 ------ dlls/atl/{rsrc.rc => atl_classes.idl} | 13 ++++- dlls/atl/registrar.c | 87 ++++++++++++++++++++++++++------ 4 files changed, 81 insertions(+), 38 deletions(-) diff --git a/dlls/atl/Makefile.in b/dlls/atl/Makefile.in index a631ed8..fd7d629 100644 --- a/dlls/atl/Makefile.in +++ b/dlls/atl/Makefile.in @@ -7,6 +7,6 @@ C_SRCS = \ atl_main.c \ registrar.c -RC_SRCS = rsrc.rc +IDL_R_SRCS = atl_classes.idl @MAKE_DLL_RULES@ diff --git a/dlls/atl/atl.rgs b/dlls/atl/atl.rgs deleted file mode 100644 index ee43249..0000000 --- a/dlls/atl/atl.rgs +++ /dev/null @@ -1,17 +0,0 @@ -HKCR -{ - ATL.Registrar = s 'Registrar Class' - { - CLSID = s '%CLSID_Registrar%' - } - NoRemove CLSID { - ForceRemove '%CLSID_Registrar%' = s 'Registrar Class' - { - ProgID = s 'ATL.Registrar' - InprocServer32 = s '%MODULE%' - { - val ThreadingModel = s 'Both' - } - } - } -} diff --git a/dlls/atl/rsrc.rc b/dlls/atl/atl_classes.idl similarity index 75% rename from dlls/atl/rsrc.rc rename to dlls/atl/atl_classes.idl index c559533..90605b4 100644 --- a/dlls/atl/rsrc.rc +++ b/dlls/atl/atl_classes.idl @@ -1,5 +1,7 @@ /* - * Copyright 2005 Jacek Caban + * COM Classes for ATL + * + * Copyright 2010 Alexandre Julliard * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,5 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* @makedep: atl.rgs */ -101 REGISTRY atl.rgs +[ + helpstring("Registrar Class"), + progid("ATL.Registrar"), + threading(both), + uuid(44ec053a-400f-11d0-9dcd-00a0c90391d3) +] +coclass Registrar { interface IRegistrar; } diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 2188850..dad2eaf 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -789,6 +789,58 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, LPVOID *ppvObject) extern HINSTANCE hInst; +/* this is a copy of the winecrt0 registration code that creates the registrar directly, */ +/* since we can't do it through ole32 until it has been registered */ + +struct reg_info +{ + IRegistrar *registrar; + BOOL do_register; + HRESULT result; +}; + +static IRegistrar *create_registrar( HMODULE inst, struct reg_info *info ) +{ + info->result = Registrar_create( NULL, &IID_IRegistrar, (void**)&info->registrar ); + if (SUCCEEDED( info->result )) + { + static const WCHAR moduleW[] = {'M','O','D','U','L','E',0}; + WCHAR str[MAX_PATH]; + + GetModuleFileNameW( hInst, str, MAX_PATH ); + IRegistrar_AddReplacement( info->registrar, moduleW, str ); + } + return info->registrar; +} + +static BOOL CALLBACK register_resource( HMODULE module, LPCWSTR type, LPWSTR name, LONG_PTR arg ) +{ + struct reg_info *info = (struct reg_info *)arg; + WCHAR *buffer; + HRSRC rsrc = FindResourceW( module, name, type ); + char *str = LoadResource( module, rsrc ); + DWORD lenW, lenA = SizeofResource( module, rsrc ); + + if (!str) return FALSE; + if (!info->registrar && !create_registrar( module, info )) return FALSE; + lenW = MultiByteToWideChar( CP_UTF8, 0, str, lenA, NULL, 0 ) + 1; + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, lenW * sizeof(WCHAR) ))) + { + info->result = E_OUTOFMEMORY; + return FALSE; + } + MultiByteToWideChar( CP_UTF8, 0, str, lenA, buffer, lenW ); + buffer[lenW - 1] = 0; + + if (info->do_register) + info->result = IRegistrar_StringRegister( info->registrar, buffer ); + else + info->result = IRegistrar_StringUnregister( info->registrar, buffer ); + + HeapFree( GetProcessHeap(), 0, buffer ); + return SUCCEEDED(info->result); +} + static HRESULT do_register_dll_server(IRegistrar *pRegistrar, LPCOLESTR wszDll, LPCOLESTR wszId, BOOL do_register, const struct _ATL_REGMAP_ENTRY* pMapEntries) @@ -820,19 +872,6 @@ static HRESULT do_register_dll_server(IRegistrar *pRegistrar, LPCOLESTR wszDll, return hres; } -static HRESULT do_register_server(BOOL do_register) -{ - static const WCHAR CLSID_RegistrarW[] = - {'C','L','S','I','D','_','R','e','g','i','s','t','r','a','r',0}; - static const WCHAR atl_dllW[] = {'a','t','l','.','d','l','l',0}; - - WCHAR clsid_str[40]; - const struct _ATL_REGMAP_ENTRY reg_map[] = {{CLSID_RegistrarW, clsid_str}, {NULL,NULL}}; - - StringFromGUID2(&CLSID_Registrar, clsid_str, sizeof(clsid_str)/sizeof(WCHAR)); - return do_register_dll_server(NULL, atl_dllW, MAKEINTRESOURCEW(101), do_register, reg_map); -} - /*********************************************************************** * AtlModuleUpdateRegistryFromResourceD [ATL.@] * @@ -858,13 +897,21 @@ HRESULT WINAPI AtlModuleUpdateRegistryFromResourceD(_ATL_MODULEW* pM, LPCOLESTR return do_register_dll_server(pReg, module_name, lpszRes, bRegister, pMapEntries); } +static const WCHAR regtypeW[] = {'W','I','N','E','_','R','E','G','I','S','T','R','Y',0}; + /*********************************************************************** * DllRegisterServer (ATL.@) */ HRESULT WINAPI DllRegisterServer(void) { - TRACE("\n"); - return do_register_server(TRUE); + struct reg_info info; + + info.registrar = NULL; + info.do_register = TRUE; + info.result = S_OK; + EnumResourceNamesW( hInst, regtypeW, register_resource, (LONG_PTR)&info ); + if (info.registrar) IRegistrar_Release( info.registrar ); + return info.result; } /*********************************************************************** @@ -872,8 +919,14 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllUnregisterServer(void) { - TRACE("\n"); - return do_register_server(FALSE); + struct reg_info info; + + info.registrar = NULL; + info.do_register = FALSE; + info.result = S_OK; + EnumResourceNamesW( hInst, regtypeW, register_resource, (LONG_PTR)&info ); + if (info.registrar) IRegistrar_Release( info.registrar ); + return info.result; } /***********************************************************************

1 0

Alexandre Julliard : sti: Generate the class registration.
by Alexandre Julliard 05 Dec '10

05 Dec '10

Module: wine Branch: master Commit: 30de0fa6977cce5dfc07fdf7a853c76998cdad07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30de0fa6977cce5dfc07fdf7a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 20:27:25 2010 +0100 sti: Generate the class registration. --- dlls/sti/Makefile.in | 2 -- dlls/sti/rsrc.rc | 20 -------------------- dlls/sti/sti.rgs | 13 ------------- dlls/sti/sti_wia.idl | 6 ++++++ 4 files changed, 6 insertions(+), 35 deletions(-) diff --git a/dlls/sti/Makefile.in b/dlls/sti/Makefile.in index 2f5e828..9149cf4 100644 --- a/dlls/sti/Makefile.in +++ b/dlls/sti/Makefile.in @@ -7,8 +7,6 @@ C_SRCS = \ sti.c \ sti_main.c -RC_SRCS = rsrc.rc - IDL_P_SRCS = \ sti_wia.idl diff --git a/dlls/sti/rsrc.rc b/dlls/sti/rsrc.rc deleted file mode 100644 index 9e14da7..0000000 --- a/dlls/sti/rsrc.rc +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2010 Damjan Jovanovic - * - * 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 - */ - -/* @makedep: sti.rgs */ -1 WINE_REGISTRY sti.rgs diff --git a/dlls/sti/sti.rgs b/dlls/sti/sti.rgs deleted file mode 100644 index 8a13c88..0000000 --- a/dlls/sti/sti.rgs +++ /dev/null @@ -1,13 +0,0 @@ -HKCR -{ - NoRemove CLSID - { - ForceRemove '{B323F8E0-2E68-11D0-90EA-00AA0060F86C}' = s 'StillImage' - { - InprocServer32 = s '%MODULE%' - { - val ThreadingModel = s 'Both' - } - } - } -} diff --git a/dlls/sti/sti_wia.idl b/dlls/sti/sti_wia.idl index aaac943..798438e 100644 --- a/dlls/sti/sti_wia.idl +++ b/dlls/sti/sti_wia.idl @@ -17,3 +17,9 @@ */ #include "wia_lh.idl" + +[ + threading(both), + uuid(b323f8e0-2e68-11d0-90ea-00aa0060f86c) +] +coclass StillImage { interface IStillImageW; }

1 0

Maarten Lankhorst : strmbase: Fix reference leak of enumpins.
by Alexandre Julliard 05 Dec '10

05 Dec '10

Module: wine Branch: master Commit: 4416ef9de68e950b281fc380a888ea060b4b86a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4416ef9de68e950b281fc380a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Dec 3 14:38:31 2010 +0100 strmbase: Fix reference leak of enumpins. --- dlls/strmbase/pin.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 1731145..97408e8 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -133,6 +133,7 @@ static HRESULT SendFurther( IPin *from, SendPinFunc fnMiddle, LPVOID arg, SendPi hr_local = fnEnd( from, arg ); hr_return = updatehres( hr_return, hr_local ); } + IEnumPins_Release(enumpins); out: if (pin_info.pFilter)

1 0

Maarten Lankhorst : winegstreamer: Make sure size is set correctly before delivering buffers.
by Alexandre Julliard 05 Dec '10

05 Dec '10

Module: wine Branch: master Commit: c911893e43e16b29dcc0fc2d59bf6bda325671dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c911893e43e16b29dcc0fc2d5… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Dec 3 16:06:43 2010 +0100 winegstreamer: Make sure size is set correctly before delivering buffers. --- dlls/winegstreamer/gstdemux.c | 2 +- dlls/winegstreamer/gsttffilter.c | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 270c93a..ba96789 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -533,10 +533,10 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstBuffer *buf) { return GST_FLOW_WRONG_STATE; } FIXME("Did not get a GST_APP_BUFFER, creating a sample\n"); - IMediaSample_SetActualDataLength(sample, GST_BUFFER_SIZE(buf)); IMediaSample_GetPointer(sample, &ptr); memcpy(ptr, GST_BUFFER_DATA(buf), GST_BUFFER_SIZE(buf)); } + IMediaSample_SetActualDataLength(sample, GST_BUFFER_SIZE(buf)); if (GST_BUFFER_TIMESTAMP_IS_VALID(buf)) { REFERENCE_TIME rtStart = gst_segment_to_running_time(pin->segment, GST_FORMAT_TIME, buf->timestamp); diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index b85ab43..f173fa1 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -178,6 +178,7 @@ static GstFlowReturn got_data(GstPad *pad, GstBuffer *buf) { IMediaSample_SetDiscontinuity(sample, GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLAG_DISCONT)); IMediaSample_SetPreroll(sample, GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLAG_PREROLL)); IMediaSample_SetSyncPoint(sample, !GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLAG_DELTA_UNIT)); + IMediaSample_SetActualDataLength(sample, GST_BUFFER_SIZE(buf)); hr = BaseOutputPinImpl_Deliver((BaseOutputPin*)This->tf.ppPins[1], sample); gst_buffer_unref(buf);

1 0

Maarten Lankhorst : winegstreamer: Kill thread on disconnect.
by Alexandre Julliard 05 Dec '10

05 Dec '10

Module: wine Branch: master Commit: bd4083bd63433e0ededac56db7c90b3b50d0c632 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd4083bd63433e0ededac56db… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Dec 4 11:24:55 2010 +0100 winegstreamer: Kill thread on disconnect. --- dlls/winegstreamer/gstdemux.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index ba96789..403f945 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1564,6 +1564,8 @@ static HRESULT GST_RemoveOutputPins(GSTImpl *This) { 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); + if (This->push_thread) + gst_pad_activate_push(This->my_src, 0); gst_object_unref(This->my_src); This->my_src = This->their_sink = NULL;

1 0

André Hentschel : mshtml: Fix export comment.
by Alexandre Julliard 05 Dec '10

05 Dec '10

Module: wine Branch: master Commit: fd94974e59905572859e0d1f4591772f0b66563c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd94974e59905572859e0d1f4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Dec 3 17:42:40 2010 +0100 mshtml: Fix export comment. --- dlls/mshtml/npplugin.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/npplugin.c b/dlls/mshtml/npplugin.c index 5f21ce1..ba32205 100644 --- a/dlls/mshtml/npplugin.c +++ b/dlls/mshtml/npplugin.c @@ -359,7 +359,7 @@ static void CDECL NPP_LostFocus(NPP instance) } /*********************************************************************** - * NP_GetEntryPoints (npmshtml.@) + * NP_GetEntryPoints (mshtml.@) */ NPError WINAPI NP_GetEntryPoints(NPPluginFuncs* funcs) {

1 0

Andrew Eikum : include: CMIC_MASK_NOASYNC flag.
by Alexandre Julliard 05 Dec '10

05 Dec '10

Module: wine Branch: master Commit: e2592139fa379353adeb24412ace01be0b10e812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2592139fa379353adeb24412… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Dec 3 11:51:14 2010 -0600 include: CMIC_MASK_NOASYNC flag. --- include/shobjidl.idl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 62f9cd0..fece0dd 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -1395,6 +1395,7 @@ cpp_quote("#define CMIC_MASK_HASLINKNAME SEE_MASK_HASLINKNAME") cpp_quote("#define CMIC_MASK_FLAG_SEP_VDM SEE_MASK_FLAG_SEPVDM") cpp_quote("#define CMIC_MASK_HASTITLE SEE_MASK_HASTITLE") cpp_quote("#define CMIC_MASK_ASYNCOK SEE_MASK_ASYNCOK") +cpp_quote("#define CMIC_MASK_NOASYNC SEE_MASK_NOASYNC") cpp_quote("#define CMIC_MASK_SHIFT_DOWN 0x10000000") cpp_quote("#define CMIC_MASK_PTINVOKE 0x20000000") cpp_quote("#define CMIC_MASK_CONTROL_DOWN 0x40000000")

1 0

André Hentschel : Wine 1.2.2 freigegeben
by Jeremy Newman 03 Dec '10

03 Dec '10

Module: website Branch: master Commit: 2dde4527c530cb6335a99929da9435f6eff5dbcf URL: http://source.winehq.org/git/website.git/?a=commit;h=2dde4527c530cb6335a999… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Dec 3 20:03:05 2010 +0100 Wine 1.2.2 freigegeben --- news/de/2010120301.xml | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/news/de/2010120301.xml b/news/de/2010120301.xml new file mode 100644 index 0000000..419607b --- /dev/null +++ b/news/de/2010120301.xml @@ -0,0 +1,14 @@ +<news> +<date>3. Dezember 2010</date> +<title>Wine 1.2.2 freigegeben</title> +<body> + Die Wartungsversion 1.2.2 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.2.2">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für animierte Mauszeiger.</li> + <li>Updates in den Übersetzungen.</li> + <li>Verschiedenste Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.2.2.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.2.2
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: website Branch: master Commit: 695f18bdd4ee13fa6ff68216460c354a9a0609e5 URL: http://source.winehq.org/git/website.git/?a=commit;h=695f18bdd4ee13fa6ff682… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 19:45:08 2010 +0100 Wine release 1.2.2 --- news/en/2010120301.xml | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/news/en/2010120301.xml b/news/en/2010120301.xml new file mode 100644 index 0000000..4784690 --- /dev/null +++ b/news/en/2010120301.xml @@ -0,0 +1,14 @@ +<news> +<date>December 3, 2010</date> +<title>Wine 1.2.2 Released</title> +<body> + The Wine maintenance release 1.2.2 is now available. + <a href="{$root}/announce/1.2.2">What's new</a> in this release: +<ul> + <li>Support for animated cursors.</li> + <li>Translation updates.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.2.2.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0