May 2012 - Wine-commits - list.winehq.org

Huw Davies : winspool: Only perform printer initialisation once per session .
by Alexandre Julliard 18 May '12

18 May '12

Module: wine Branch: master Commit: 7b0cda21406d0d3e3231e220b9d30c0cf813da3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b0cda21406d0d3e3231e220b… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 18 13:43:56 2012 +0100 winspool: Only perform printer initialisation once per session. --- dlls/winspool.drv/info.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 614cfa2..afba8a1 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1076,12 +1076,31 @@ static void old_printer_check( BOOL delete_phase ) HeapFree(GetProcessHeap(), 0, pi); } +static const WCHAR winspool_mutex_name[] = {'_','_','W','I','N','E','_','W','I','N','S','P','O','O','L','_', + 'M','U','T','E','X','_','_','\0'}; + void WINSPOOL_LoadSystemPrinters(void) { HKEY hkey, hkeyPrinters; DWORD needed, num, i; WCHAR PrinterName[256]; BOOL done = FALSE; + HANDLE mutex; + + /* FIXME: The init code should be moved to spoolsv.exe */ + mutex = CreateMutexW( NULL, TRUE, winspool_mutex_name ); + if (!mutex) + { + ERR( "Failed to create mutex\n" ); + return; + } + if (GetLastError() == ERROR_ALREADY_EXISTS) + { + WaitForSingleObject( mutex, INFINITE ); + ReleaseMutex( mutex ); + TRACE( "Init already done\n" ); + return; + } /* This ensures that all printer entries have a valid Name value. If causes problems later if they don't. If one is found to be missed we create one @@ -1114,6 +1133,7 @@ void WINSPOOL_LoadSystemPrinters(void) old_printer_check( TRUE ); + ReleaseMutex( mutex ); return; }

1 0

Christian Costa : dmusic: Display new ref in trace for AddRef and Release for collection object.
by Alexandre Julliard 18 May '12

18 May '12

Module: wine Branch: master Commit: 82f3b86c5c14d968638435206f46a396b019dade URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f3b86c5c14d968638435206… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri May 18 12:01:36 2012 +0200 dmusic: Display new ref in trace for AddRef and Release for collection object. --- dlls/dmusic/collection.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 2614860..5ef7d35 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -77,30 +77,29 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_QueryInt static ULONG WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_AddRef(LPDIRECTMUSICCOLLECTION iface) { - IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); - ULONG refCount = InterlockedIncrement(&This->ref); + IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); + TRACE("(%p/%p)->(): new ref = %u)\n", iface, This, ref); - DMUSIC_LockModule(); + DMUSIC_LockModule(); - return refCount; + return ref; } static ULONG WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_Release(LPDIRECTMUSICCOLLECTION iface) { - IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); - ULONG refCount = InterlockedDecrement(&This->ref); + IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); + ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); + TRACE("(%p/%p)->(): new ref = %u)\n", iface, This, ref); - if (!refCount) { - HeapFree(GetProcessHeap(), 0, This); - } + if (!ref) + HeapFree(GetProcessHeap(), 0, This); - DMUSIC_UnlockModule(); + DMUSIC_UnlockModule(); - return refCount; + return ref; } /* IDirectMusicCollection Interface follows: */

1 0

Christian Costa : dmusic: Cleanup IDirectMusicCollection_GetInstrument.
by Alexandre Julliard 18 May '12

18 May '12

Module: wine Branch: master Commit: 495e3288dbd53570ded60c0b458aa3457dff7729 URL: http://source.winehq.org/git/wine.git/?a=commit;h=495e3288dbd53570ded60c0b4… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri May 18 12:01:44 2012 +0200 dmusic: Cleanup IDirectMusicCollection_GetInstrument. --- dlls/dmusic/collection.c | 44 ++++++++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 5ef7d35..67670b1 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -103,30 +103,30 @@ static ULONG WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_Release(LP } /* IDirectMusicCollection Interface follows: */ -static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_GetInstrument(LPDIRECTMUSICCOLLECTION iface, DWORD dwPatch, IDirectMusicInstrument** ppInstrument) +static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_GetInstrument(LPDIRECTMUSICCOLLECTION iface, DWORD patch, IDirectMusicInstrument** instrument) { - IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); - DMUS_PRIVATE_INSTRUMENTENTRY *tmpEntry; - struct list *listEntry; - DWORD dwInstPatch; + IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); + DMUS_PRIVATE_INSTRUMENTENTRY *inst_entry; + struct list *list_entry; + DWORD inst_patch; + + TRACE("(%p/%p)->(%u, %p)\n", iface, This, patch, instrument); + + LIST_FOR_EACH(list_entry, &This->Instruments) { + inst_entry = LIST_ENTRY(list_entry, DMUS_PRIVATE_INSTRUMENTENTRY, entry); + IDirectMusicInstrument_GetPatch(inst_entry->pInstrument, &inst_patch); + if (patch == inst_patch) { + *instrument = inst_entry->pInstrument; + IDirectMusicInstrument_AddRef(inst_entry->pInstrument); + IDirectMusicInstrumentImpl_Custom_Load(inst_entry->pInstrument, This->pStm); + TRACE(": returning instrument %p\n", *instrument); + return S_OK; + } + } - TRACE("(%p, %d, %p)\n", This, dwPatch, ppInstrument); - - LIST_FOR_EACH (listEntry, &This->Instruments) { - tmpEntry = LIST_ENTRY(listEntry, DMUS_PRIVATE_INSTRUMENTENTRY, entry); - IDirectMusicInstrument_GetPatch (tmpEntry->pInstrument, &dwInstPatch); - if (dwPatch == dwInstPatch) { - *ppInstrument = tmpEntry->pInstrument; - IDirectMusicInstrument_AddRef (tmpEntry->pInstrument); - IDirectMusicInstrumentImpl_Custom_Load (tmpEntry->pInstrument, This->pStm); /* load instrument before returning it */ - TRACE(": returning instrument %p\n", *ppInstrument); - return S_OK; - } - - } - TRACE(": instrument not found\n"); - - return DMUS_E_INVALIDPATCH; + TRACE(": instrument not found\n"); + + return DMUS_E_INVALIDPATCH; } static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_EnumInstrument(LPDIRECTMUSICCOLLECTION iface, DWORD dwIndex, DWORD* pdwPatch, LPWSTR pwszName, DWORD dwNameLen)

1 0

Scott Ritchie : Update Ubuntu download page
by Jeremy Newman 18 May '12

18 May '12

Module: website Branch: master Commit: 552cb6f5dfe5debda894af2d4b0bc9ba628d0f3f URL: http://source.winehq.org/git/website.git/?a=commit;h=552cb6f5dfe5debda894af… Author: Scott Ritchie <scott(a)open-vote.org> Date: Thu May 17 23:16:08 2012 -0700 Update Ubuntu download page Should have done this months ago... >From 75c21d0e23bede6855e2215cc9c700453fa5f5ff Mon Sep 17 00:00:00 2001 From: Scott Ritchie <scott(a)open-vote.org> Date: Fri, 18 May 2012 08:47:05 -0700 Subject: [website] Update Ubuntu download page (translation changes are find/replace so the links work, do not include text changes) --- templates/de/download/ubuntu.template | 14 +++++++------- templates/en/download.template | 2 +- templates/en/download/ubuntu.template | 24 ++++++++++++------------ templates/fr/download/ubuntu.template | 14 +++++++------- templates/pl/download/ubuntu.template | 10 +++++----- 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/templates/de/download/ubuntu.template b/templates/de/download/ubuntu.template index 0afd7ce..de480f9 100644 --- a/templates/de/download/ubuntu.template +++ b/templates/de/download/ubuntu.template @@ -26,20 +26,20 @@ Wähle dann den Software von Drittanbietern-Reiter und klicke auf Hinz <h2>Warnung: Betapakete</h2> -Die 1.3 Pakete hier sind Betapakete. Das bedeutet, dass sie +Die 1.5 Pakete hier sind Betapakete. Das bedeutet, dass sie in regelmäßigen Abständen <a href="http://wiki.winehq.org/Regression">Regressionen</a> erleiden, wodurch eine Aktualisierung die Wine-Funktionalität beeinträchtigen kann. Wenn die stabile Version -Wine 1.2 bei dir funktioniert, willst du diese Betapakete wahrscheinlich nicht benutzen. +Wine 1.4 bei dir funktioniert, willst du diese Betapakete wahrscheinlich nicht benutzen. <h2>Installieren von Wine:</h2> Sobald du das WineHQ PPA Repository hinzugefügt hast, kannst du es installieren. -Für die aktuellste Wine 1.3 Beta, -<a href="apt://wine1.3">klicke diesen Link um das wine1.3 Paket zu installieren</a>. -Für die ältere, stabile Wine 1.2 Version, -<a href="apt://wine1.3">klicke diesen Link um das wine1.2 Paket zu installieren</a>. +Für die aktuellste Wine 1.5 Beta, +<a href="apt://wine1.5">klicke diesen Link um das wine1.5 Paket zu installieren</a>. +Für die ältere, stabile Wine 1.4 Version, +<a href="apt://wine1.5">klicke diesen Link um das wine1.4 Paket zu installieren</a>. <h2>Aktualisierung auf eine neue Ubuntuversion</h2> @@ -58,6 +58,6 @@ Derivate. Zuerst öffne ein Terminalfenster (Anwendungen->Zubehör->Terminal).</ Aktualisiere dann die APT-Paketinformationen durch Ausführen von 'sudo apt-get update'. Du kannst nun Wine durch Ausführen von 'sudo apt-get -install wine1.3' im Terminal installieren. +install wine1.5' im Terminal installieren. Wenn du das PPA durchsuchen willst, kannst du es <a href="https://launchpad.net/~ubuntu-wine/+archive/ppa">bei Launchpad anschauen</a>. diff --git a/templates/en/download.template b/templates/en/download.template index 9bf08d3..5b90bf3 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -61,7 +61,7 @@ requested in exchange for hosting the Wine web site. <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <a href="{$root}/download/ubuntu">Download Ubuntu packages</a> - - binary and source .debs for Ubuntu Karmic (9.10), Lucid (10.04 LTS), Maverick (10.10), and Natty (11.04) + - binary and source .debs for Ubuntu Oneiric (11.10), and Precise (12.04) <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> </tr> diff --git a/templates/en/download/ubuntu.template b/templates/en/download/ubuntu.template index 862f2c0..2a02c90 100644 --- a/templates/en/download/ubuntu.template +++ b/templates/en/download/ubuntu.template @@ -13,11 +13,11 @@ latest Wine package you can use WineHQ's by following these instructions. <h2>Adding the WineHQ PPA Repository:</h2> -Open the Software Sources menu by going to Applications->Ubuntu Software -Center, then selecting Edit->Software Sources. Choose the Other +Open the Software Sources menu by launching the Ubuntu Software +Center and selecting Edit->Software Sources. Choose the Other Software tab and click Add. -<img src="{$root}/images/distro/ubuntu-ppa.png" width="531" height="509" alt="System->Administration->Software Sources->Other Software" border="0"> +<img src="{$root}/images/distro/ubuntu-ppa.png" width="531" height="509" alt="Software Center->Edit->Software Sources->Other Software" border="0"> Then, copy and paste the line below. @@ -25,25 +25,25 @@ Software tab and click Add. <h2>Warning: Beta packages</h2> -The 1.3 packages here are beta packages. This means they will +The 1.5 packages here are beta packages. This means they will periodically suffer from <a href="http://wiki.winehq.org/Regression">regressions</a>, and as a result an -update may break functionality in Wine. If the stable 1.2 Wine version works +update may break functionality in Wine. If the stable 1.4 Wine version works for you, then you may not want to use these beta packages. <h2>Installing Wine:</h2> Once you have added the WineHQ PPA Repository, you are ready to install. -To get the most recent Wine 1.3 beta, -<a href="apt://wine1.3">click this link to install the wine1.3 package</a>. -To install the older, stable Wine 1.2 version, -<a href="apt://wine1.2">click this link to install the wine1.2 package</a>. +To get the most recent Wine 1.5 beta, +<a href="apt://wine1.5">click this link to install the wine1.5 package</a>. +To install the older, stable Wine 1.4 version, +<a href="apt://wine1.4">click this link to install the wine1.4 package</a>. <h2>Upgrading to a new version of Ubuntu</h2> -If you are upgrading the entire system, such as going from Ubuntu 10.04 to -10.10, you will need to come back to this page and add the repository again. +If you are upgrading the entire system, such as going from Ubuntu 11.10 to +12.04, you will need to come back to this page and add the repository again. The built in update manager will not switch the Wine repository automatically. @@ -56,6 +56,6 @@ may be useful on Kubuntu, Xubuntu, and other Ubuntu derivatives. Then update APT package information by running 'sudo apt-get update'. You can now install Wine by typing 'sudo apt-get -install wine1.3'. +install wine1.5'. If you'd like to browse the PPA manually, you can <a href="https://launchpad.net/~ubuntu-wine/+archive/ppa">visit its Launchpad page</a>. diff --git a/templates/fr/download/ubuntu.template b/templates/fr/download/ubuntu.template index 7b1fb2e..cc20744 100644 --- a/templates/fr/download/ubuntu.template +++ b/templates/fr/download/ubuntu.template @@ -27,10 +27,10 @@ alt="Système->Administration->Sources de logiciels->Autres logiciels" border="0 <h2>Avertissement : paquets bêta</h2> -Les paquets 1.3 sont des paquets bêta, c.-à-d. qu'ils +Les paquets 1.5 sont des paquets bêta, c.-à-d. qu'ils peuvent à l'occasion souffrir de <a href="http://wiki.winehq.org/Regression">régressions</a>. Par conséquent, une -mise à jour peut casser une fonctionnalité dans Wine. Si la version stable 1.2 +mise à jour peut casser une fonctionnalité dans Wine. Si la version stable 1.4 de Wine fonctionne dans votre cas, vous ne devriez pas utiliser de paquets bêta. @@ -39,10 +39,10 @@ de Wine fonctionne dans votre cas, vous ne devriez pas utiliser de paquets bêta Une fois le dépôt PPA de WineHQ ajouté, l'installation peut se poursuivre. -Pour la version bêta 1.3 la plus récente, -<a href="apt://wine1.3">utilisez ce lien pour installer le paquet wine1.3</a>. -Pour la version stable 1.2 (plus ancienne) -<a href="apt://wine1.2">utilisez ce lien pour installer le paquet wine1.2</a>. +Pour la version bêta 1.5 la plus récente, +<a href="apt://wine1.5">utilisez ce lien pour installer le paquet wine1.5</a>. +Pour la version stable 1.4 (plus ancienne) +<a href="apt://wine1.4">utilisez ce lien pour installer le paquet wine1.4</a>. <h2>Mise à niveau vers une nouvelle version d'Ubuntu</h2> @@ -62,6 +62,6 @@ Kubuntu, Xubuntu ou d'autres distributions dérivées. Mettez ensuite à jour les informations sur les paquets d'APT en exécutant « sudo apt-get update ». Vous pouvez dès lors installer Wine en tapant - « sudo apt-get install wine1.3 ». + « sudo apt-get install wine1.5 ». Si vous voulez parcourir manuellement le PPA, vous pouvez <a href="https://launchpad.net/~ubuntu-wine/+archive/ppa">visiter sa page Launchpad</a>. diff --git a/templates/pl/download/ubuntu.template b/templates/pl/download/ubuntu.template index be7d33c..2ebe476 100644 --- a/templates/pl/download/ubuntu.template +++ b/templates/pl/download/ubuntu.template @@ -35,10 +35,10 @@ to instalowanie tych paczek może nie być konieczne. Skoro już dodałeś/aś repozytorium WineHQ PPA to jesteś gotowy/a do instalacji. -Aby używać najnowszego Wine 1.3 beta, -<a href="apt://wine1.3">kliknij na ten link, aby zainstalować paczkę wine1.3</a>. -Aby używać ostatniej stabilnej wersji Wine 1.2, -<a href="apt://wine1.2">kliknij na ten link, aby zainstalować paczkę wine1.2</a>. +Aby używać najnowszego Wine 1.5 beta, +<a href="apt://wine1.5">kliknij na ten link, aby zainstalować paczkę wine1.5</a>. +Aby używać ostatniej stabilnej wersji Wine 1.4, +<a href="apt://wine1.4">kliknij na ten link, aby zainstalować paczkę wine1.4</a>. <h2>Aktualizacja do nowej wersji Ubuntu</h2> @@ -57,6 +57,6 @@ Jest to użyteczne w przypadku Kubuntu, Xubuntu, i innych pochodnych Ubuntu. Następnie zaktualizuj informacje o paczkach APT wpisując 'sudo apt-get update'. Teraz możesz zainstalować Wine wpisując w terminalu 'sudo apt-get -install wine1.3'. +install wine1.5'. Jeżeli chciałbyś ręcznie przeglądać PPA, możesz odwiedzić <a href="https://launchpad.net/~ubuntu-wine/+archive/ppa">jego stronę na Launchpad</a>.

1 0

Vincent Povirk : mscoree: Add a fallback for mono_image_open_from_module_handle.
by Alexandre Julliard 17 May '12

17 May '12

Module: wine Branch: master Commit: 56484cc0379697b934a859700d17d277c496daa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56484cc0379697b934a859700… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 17 09:47:46 2012 -0500 mscoree: Add a fallback for mono_image_open_from_module_handle. --- dlls/mscoree/metahost.c | 40 ++++++++++++++++++++++++++++++++-------- dlls/mscoree/mscoree_private.h | 1 + 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 3736dc0..fa12853 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -100,6 +100,29 @@ static void CDECL do_nothing(void) { } +static MonoImage* image_open_module_handle_dummy(HMODULE module_handle, + char* fname, UINT has_entry_point, MonoImageOpenStatus* status, int abi_version) +{ + return loaded_monos[abi_version-1].mono_image_open(fname, status); +} + +static CDECL MonoImage* image_open_module_handle_dummy_1(HMODULE module_handle, + char* fname, UINT has_entry_point, MonoImageOpenStatus* status) +{ + return image_open_module_handle_dummy(module_handle, fname, has_entry_point, status, 1); +} + +static CDECL MonoImage* image_open_module_handle_dummy_2(HMODULE module_handle, + char* fname, UINT has_entry_point, MonoImageOpenStatus* status) +{ + return image_open_module_handle_dummy(module_handle, fname, has_entry_point, status, 2); +} + +MonoImage* (CDECL * const image_from_handle_fn[NUM_ABI_VERSIONS])(HMODULE module_handle, char* fname, UINT has_entry_point, MonoImageOpenStatus* status) = { + image_open_module_handle_dummy_1, + image_open_module_handle_dummy_2 +}; + static void missing_runtime_message(const CLRRuntimeInfo *This) { if (This->major == 1) @@ -172,7 +195,7 @@ static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) LOAD_MONO_FUNCTION(mono_class_from_name); LOAD_MONO_FUNCTION(mono_class_get_method_from_name); LOAD_MONO_FUNCTION(mono_domain_assembly_open); - LOAD_MONO_FUNCTION(mono_image_open_from_module_handle); + LOAD_MONO_FUNCTION(mono_image_open); LOAD_MONO_FUNCTION(mono_install_assembly_preload_hook); LOAD_MONO_FUNCTION(mono_jit_exec); LOAD_MONO_FUNCTION(mono_jit_init); @@ -207,19 +230,20 @@ static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) #undef LOAD_MONO_FUNCTION -#define LOAD_OPT_VOID_MONO_FUNCTION(x) do { \ +#define LOAD_OPT_MONO_FUNCTION(x, default) do { \ (*result)->x = (void*)GetProcAddress((*result)->mono_handle, #x); \ if (!(*result)->x) { \ - (*result)->x = do_nothing; \ + (*result)->x = default; \ } \ } while (0); - LOAD_OPT_VOID_MONO_FUNCTION(mono_runtime_set_shutting_down); - LOAD_OPT_VOID_MONO_FUNCTION(mono_thread_pool_cleanup); - LOAD_OPT_VOID_MONO_FUNCTION(mono_thread_suspend_all_other_threads); - LOAD_OPT_VOID_MONO_FUNCTION(mono_threads_set_shutting_down); + LOAD_OPT_MONO_FUNCTION(mono_image_open_from_module_handle, image_from_handle_fn[This->mono_abi_version-1]); + LOAD_OPT_MONO_FUNCTION(mono_runtime_set_shutting_down, do_nothing); + LOAD_OPT_MONO_FUNCTION(mono_thread_pool_cleanup, do_nothing); + LOAD_OPT_MONO_FUNCTION(mono_thread_suspend_all_other_threads, do_nothing); + LOAD_OPT_MONO_FUNCTION(mono_threads_set_shutting_down, do_nothing); -#undef LOAD_OPT_VOID_MONO_FUNCTION +#undef LOAD_OPT_MONO_FUNCTION (*result)->mono_profiler_install((MonoProfiler*)*result, mono_shutdown_callback_fn); diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index ef9079e..7266687 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -154,6 +154,7 @@ struct loaded_mono void (CDECL *mono_config_parse)(const char *filename); MonoAssembly* (CDECL *mono_domain_assembly_open) (MonoDomain *domain, const char *name); void (CDECL *mono_free)(void *); + MonoImage* (CDECL *mono_image_open)(const char *fname, MonoImageOpenStatus *status); MonoImage* (CDECL *mono_image_open_from_module_handle)(HMODULE module_handle, char* fname, UINT has_entry_point, MonoImageOpenStatus* status); void (CDECL *mono_install_assembly_preload_hook)(MonoAssemblyPreLoadFunc func, void *user_data); int (CDECL *mono_jit_exec)(MonoDomain *domain, MonoAssembly *assembly, int argc, char *argv[]);

1 0

Dmitry Timoshkov : oleaut32: Call OleCreatePictureIndirect directly.
by Alexandre Julliard 17 May '12

17 May '12

Module: wine Branch: master Commit: 340d9c1a78c2453f294c12b75894ebf748813651 URL: http://source.winehq.org/git/wine.git/?a=commit;h=340d9c1a78c2453f294c12b75… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 17 18:29:42 2012 +0900 oleaut32: Call OleCreatePictureIndirect directly. --- dlls/oleaut32/tests/olepicture.c | 22 ++++------------------ 1 files changed, 4 insertions(+), 18 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index ecf88f6..8be8b82 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -55,7 +55,6 @@ static HMODULE hOleaut32; static HRESULT (WINAPI *pOleLoadPicture)(LPSTREAM,LONG,BOOL,REFIID,LPVOID*); static HRESULT (WINAPI *pOleLoadPictureEx)(LPSTREAM,LONG,BOOL,REFIID,DWORD,DWORD,DWORD,LPVOID*); -static HRESULT (WINAPI *pOleCreatePictureIndirect)(PICTDESC*,REFIID,BOOL,LPVOID*); #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) @@ -488,19 +487,13 @@ static void test_OleCreatePictureIndirect(void) HRESULT hr; short type; - if(!pOleCreatePictureIndirect) - { - win_skip("Skipping OleCreatePictureIndirect tests\n"); - return; - } - if (0) { /* crashes on native */ - pOleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, NULL); + OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, NULL); } - hr = pOleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (void**)&pict); + hr = OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (void**)&pict); ok(hr == S_OK, "hr %08x\n", hr); type = PICTYPE_NONE; @@ -901,12 +894,6 @@ static void test_himetric(void) HDC hdc; INT d; - if (!pOleCreatePictureIndirect) - { - win_skip("OleCreatePictureIndirect not available\n"); - return; - } - desc.cbSizeofstruct = sizeof(desc); desc.picType = PICTYPE_BITMAP; desc.u.bmp.hpal = NULL; @@ -919,7 +906,7 @@ static void test_himetric(void) desc.u.bmp.hbitmap = bmp; /* size in himetric units reported rounded up to next integer value */ - hr = pOleCreatePictureIndirect(&desc, &IID_IPicture, FALSE, (void**)&pic); + hr = OleCreatePictureIndirect(&desc, &IID_IPicture, FALSE, (void**)&pic); ok(hr == S_OK, "got 0x%08x\n", hr); cx = 0; @@ -945,7 +932,7 @@ static void test_himetric(void) desc.picType = PICTYPE_ICON; desc.u.icon.hicon = icon; - hr = pOleCreatePictureIndirect(&desc, &IID_IPicture, FALSE, (void**)&pic); + hr = OleCreatePictureIndirect(&desc, &IID_IPicture, FALSE, (void**)&pic); ok(hr == S_OK, "got 0x%08x\n", hr); cx = 0; @@ -971,7 +958,6 @@ START_TEST(olepicture) hOleaut32 = GetModuleHandleA("oleaut32.dll"); pOleLoadPicture = (void*)GetProcAddress(hOleaut32, "OleLoadPicture"); pOleLoadPictureEx = (void*)GetProcAddress(hOleaut32, "OleLoadPictureEx"); - pOleCreatePictureIndirect = (void*)GetProcAddress(hOleaut32, "OleCreatePictureIndirect"); if (!pOleLoadPicture) { win_skip("OleLoadPicture is not available\n");

1 0

Dmitry Timoshkov : oleaut32: Move OLEPicture implementation into its own debug channel.
by Alexandre Julliard 17 May '12

17 May '12

Module: wine Branch: master Commit: 48df41f83462e6aaaa8ed68159ca16b41ba9d727 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48df41f83462e6aaaa8ed6815… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 17 18:29:54 2012 +0900 oleaut32: Move OLEPicture implementation into its own debug channel. --- dlls/oleaut32/olepicture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 348529e..a00d463 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -66,7 +66,7 @@ #include "wine/unicode.h" #include "wine/library.h" -WINE_DEFAULT_DEBUG_CHANNEL(ole); +WINE_DEFAULT_DEBUG_CHANNEL(olepicture); #include "pshpack1.h"

1 0

Dmitry Timoshkov : oleaut32: OleCreatePictureIndirect should set loadtime_format for a bitmap.
by Alexandre Julliard 17 May '12

17 May '12

Module: wine Branch: master Commit: 25fd436db01d39b1a3feea0a878e70780b1ce5ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=25fd436db01d39b1a3feea0a8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 17 18:30:07 2012 +0900 oleaut32: OleCreatePictureIndirect should set loadtime_format for a bitmap. --- dlls/oleaut32/olepicture.c | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index a00d463..395afa9 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -68,6 +68,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(olepicture); +#define BITMAP_FORMAT_BMP 0x4d42 /* "BM" */ +#define BITMAP_FORMAT_JPEG 0xd8ff +#define BITMAP_FORMAT_GIF 0x4947 +#define BITMAP_FORMAT_PNG 0x5089 +#define BITMAP_FORMAT_APM 0xcdd7 + #include "pshpack1.h" /* Header for Aldus Placable Metafiles - a standard metafile follows */ @@ -212,6 +218,8 @@ static void OLEPictureImpl_SetBitmap(OLEPictureImpl *This) This->origWidth = bm.bmWidth; This->origHeight = bm.bmHeight; + TRACE("width %d, height %d, bpp %d\n", bm.bmWidth, bm.bmHeight, bm.bmBitsPixel); + /* The width and height are stored in HIMETRIC units (0.01 mm), so we take our pixel width divide by pixels per inch and multiply by 25.4 * 100 */ @@ -222,6 +230,8 @@ static void OLEPictureImpl_SetBitmap(OLEPictureImpl *This) This->himetricHeight = ypixels_to_himetric(bm.bmHeight, hdcRef); This->stock_bitmap = GetCurrentObject( hdcRef, OBJ_BITMAP ); + This->loadtime_format = BITMAP_FORMAT_BMP; + DeleteDC(hdcRef); } @@ -1322,17 +1332,6 @@ static HRESULT OLEPictureImpl_LoadAPM(OLEPictureImpl *This, } /************************************************************************ - * BITMAP FORMAT FLAGS - - * Flags that differentiate between different types of bitmaps. - */ - -#define BITMAP_FORMAT_BMP 0x4d42 /* "BM" */ -#define BITMAP_FORMAT_JPEG 0xd8ff -#define BITMAP_FORMAT_GIF 0x4947 -#define BITMAP_FORMAT_PNG 0x5089 -#define BITMAP_FORMAT_APM 0xcdd7 - -/************************************************************************ * OLEPictureImpl_IPersistStream_Load (IUnknown) * * Loads the binary data from the IStream. Starts at current position.

1 0

Dmitry Timoshkov : oleaut32: OLEPictureImpl_Save should load bitmap data if it's not yet loaded.
by Alexandre Julliard 17 May '12

17 May '12

Module: wine Branch: master Commit: dc7843590dd3f9d6e3593eed43f3410c063f3a4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc7843590dd3f9d6e3593eed4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 17 18:30:28 2012 +0900 oleaut32: OLEPictureImpl_Save should load bitmap data if it's not yet loaded. --- dlls/oleaut32/olepicture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 395afa9..beb1477 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1776,7 +1776,7 @@ static HRESULT WINAPI OLEPictureImpl_Save( hResult = S_OK; break; case PICTYPE_BITMAP: - if (This->bIsDirty) { + if (This->bIsDirty || !This->data) { switch (This->keepOrigFormat ? This->loadtime_format : BITMAP_FORMAT_BMP) { case BITMAP_FORMAT_BMP: iSerializeResult = serializeBMP(This->desc.u.bmp.hbitmap, &pIconData, &iDataSize);

1 0

Dmitry Timoshkov : oleaut32: Add a test for saving bitmap data into a stream.
by Alexandre Julliard 17 May '12

17 May '12

Module: wine Branch: master Commit: ab816a3a2f82ec9d309e57bc2d7c155b52af1f18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab816a3a2f82ec9d309e57bc2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 17 18:30:44 2012 +0900 oleaut32: Add a test for saving bitmap data into a stream. --- dlls/oleaut32/tests/olepicture.c | 54 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 8be8b82..a70f0b7 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -953,6 +953,59 @@ static void test_himetric(void) DeleteDC(hdc); } +static void test_load_save_bmp(void) +{ + IPicture *pic; + PICTDESC desc; + short type; + OLE_HANDLE handle; + HGLOBAL hmem; + DWORD *mem; + IPersistStream *src_stream; + IStream *dst_stream; + HRESULT hr; + + desc.cbSizeofstruct = sizeof(desc); + desc.picType = PICTYPE_BITMAP; + desc.u.bmp.hpal = 0; + desc.u.bmp.hbitmap = CreateBitmap(1, 1, 1, 1, NULL); + hr = OleCreatePictureIndirect(&desc, &IID_IPicture, FALSE, (void**)&pic); + ok(hr == S_OK, "OleCreatePictureIndirect error %#x\n", hr); + + type = -1; + hr = IPicture_get_Type(pic, &type); + ok(hr == S_OK,"get_Type error %#8x\n", hr); + ok(type == PICTYPE_BITMAP,"expected picture type PICTYPE_BITMAP, got %d\n", type); + + hr = IPicture_get_Handle(pic, &handle); + ok(hr == S_OK,"get_Handle error %#8x\n", hr); + ok(UIntToPtr(handle) == desc.u.bmp.hbitmap, "get_Handle returned wrong handle %#x\n", handle); + + hmem = GlobalAlloc(GMEM_ZEROINIT, 4096); + hr = CreateStreamOnHGlobal(hmem, FALSE, &dst_stream); + ok(hr == S_OK, "createstreamonhglobal error %#x\n", hr); + + hr = IPicture_QueryInterface(pic, &IID_IPersistStream, (void **)&src_stream); + ok(hr == S_OK, "QueryInterface error %#x\n", hr); + + hr = IPersistStream_Save(src_stream, dst_stream, TRUE); + ok(hr == S_OK, "Save error %#x\n", hr); + + IPersistStream_Release(src_stream); + IStream_Release(dst_stream); + + mem = GlobalLock(hmem); + ok(!memcmp(mem, "lt\0\0", 4), "got wrong stream header %04x\n", mem[0]); + ok(mem[1] == 66, "expected stream size 66, got %u\n", mem[1]); + ok(!memcmp(&mem[2], "BM", 2), "got wrong bmp header %04x\n", mem[2]); + + GlobalUnlock(hmem); + GlobalFree(hmem); + + DeleteObject(desc.u.bmp.hbitmap); + IPicture_Release(pic); +} + START_TEST(olepicture) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); @@ -989,6 +1042,7 @@ START_TEST(olepicture) test_get_Type(); test_OleLoadPicturePath(); test_himetric(); + test_load_save_bmp(); }

1 0