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

André Hentschel : include: Add more error codes.
by Alexandre Julliard 09 Mar '12

09 Mar '12

Module: wine Branch: master Commit: d6d88652729f398bbade378259aa91d319ec1e7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6d88652729f398bbade37825… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 7 16:33:28 2012 +0100 include: Add more error codes. --- include/winerror.h | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/include/winerror.h b/include/winerror.h index 79cc5ed..df67e3c 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -460,6 +460,61 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_MP_PROCESSOR_MISMATCH 725 #define ERROR_HIBERNATED 726 #define ERROR_RESUME_HIBERNATION 727 +#define ERROR_FIRMWARE_UPDATED 728 +#define ERROR_DRIVERS_LEAKING_LOCKED_PAGES 729 +#define ERROR_WAKE_SYSTEM 730 +#define ERROR_ABANDONED_WAIT_0 735 +#define ERROR_ELEVATION_REQUIRED 740 +#define ERROR_REPARSE 741 +#define ERROR_OPLOCK_BREAK_IN_PROGRESS 742 +#define ERROR_VOLUME_MOUNTED 743 +#define ERROR_RXACT_COMMITTED 744 +#define ERROR_NOTIFY_CLEANUP 745 +#define ERROR_PRIMARY_TRANSPORT_CONNECT_FAILED 746 +#define ERROR_PAGE_FAULT_TRANSITION 747 +#define ERROR_PAGE_FAULT_DEMAND_ZERO 748 +#define ERROR_PAGE_FAULT_COPY_ON_WRITE 749 +#define ERROR_PAGE_FAULT_GUARD_PAGE 750 +#define ERROR_PAGE_FAULT_PAGING_FILE 751 +#define ERROR_CACHE_PAGE_LOCKED 752 +#define ERROR_CRASH_DUMP 753 +#define ERROR_BUFFER_ALL_ZEROS 754 +#define ERROR_REPARSE_OBJECT 755 +#define ERROR_RESOURCE_REQUIREMENTS_CHANGED 756 +#define ERROR_TRANSLATION_COMPLETE 757 +#define ERROR_NOTHING_TO_TERMINATE 758 +#define ERROR_PROCESS_NOT_IN_JOB 759 +#define ERROR_PROCESS_IN_JOB 760 +#define ERROR_VOLSNAP_HIBERNATE_READY 761 +#define ERROR_FSFILTER_OP_COMPLETED_SUCCESSFULLY 762 +#define ERROR_INTERRUPT_VECTOR_ALREADY_CONNECTED 763 +#define ERROR_INTERRUPT_STILL_CONNECTED 764 +#define ERROR_WAIT_FOR_OPLOCK 765 +#define ERROR_DBG_EXCEPTION_HANDLED 766 +#define ERROR_DBG_CONTINUE 767 +#define ERROR_CALLBACK_POP_STACK 768 +#define ERROR_COMPRESSION_DISABLED 769 +#define ERROR_CANTFETCHBACKWARDS 770 +#define ERROR_CANTSCROLLBACKWARDS 771 +#define ERROR_ROWSNOTRELEASED 772 +#define ERROR_BAD_ACCESSOR_FLAGS 773 +#define ERROR_ERRORS_ENCOUNTERED 774 +#define ERROR_NOT_CAPABLE 775 +#define ERROR_REQUEST_OUT_OF_SEQUENCE 776 +#define ERROR_VERSION_PARSE_ERROR 777 +#define ERROR_BADSTARTPOSITION 778 +#define ERROR_MEMORY_HARDWARE 779 +#define ERROR_DISK_REPAIR_DISABLED 780 +#define ERROR_INSUFFICIENT_RESOURCE_FOR_SPECIFIED_SHARED_SECTION_SIZE 781 +#define ERROR_SYSTEM_POWERSTATE_TRANSITION 782 +#define ERROR_SYSTEM_POWERSTATE_COMPLEX_TRANSITION 783 +#define ERROR_MCA_EXCEPTION 784 +#define ERROR_ACCESS_AUDIT_BY_POLICY 785 +#define ERROR_ACCESS_DISABLED_NO_SAFER_UI_BY_POLICY 786 +#define ERROR_ABANDON_HIBERFILE 787 +#define ERROR_LOST_WRITEBEHIND_DATA_NETWORK_DISCONNECTED 788 +#define ERROR_LOST_WRITEBEHIND_DATA_NETWORK_SERVER_ERROR 789 +#define ERROR_LOST_WRITEBEHIND_DATA_LOCAL_DISK_ERROR 790 #define ERROR_EA_ACCESS_DENIED 994 #define ERROR_OPERATION_ABORTED 995 #define ERROR_IO_INCOMPLETE 996

1 0

Dmitry Timoshkov : kernel32: Fix file test compilation with PSDK headers.
by Alexandre Julliard 09 Mar '12

09 Mar '12

Module: wine Branch: master Commit: 75209ffdaf83c1be1437e68f5adf741a74a558a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75209ffdaf83c1be1437e68f5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 8 20:29:35 2012 +0800 kernel32: Fix file test compilation with PSDK headers. --- dlls/kernel32/tests/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index f2a9a07..39e6cb9 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1763,7 +1763,7 @@ static BOOL create_fake_dll( LPCSTR filename ) # error You must specify the machine type #endif nt->FileHeader.NumberOfSections = 1; - nt->FileHeader.SizeOfOptionalHeader = IMAGE_SIZEOF_NT_OPTIONAL_HEADER; + nt->FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER); nt->FileHeader.Characteristics = IMAGE_FILE_DLL | IMAGE_FILE_EXECUTABLE_IMAGE; nt->OptionalHeader.Magic = IMAGE_NT_OPTIONAL_HDR_MAGIC; nt->OptionalHeader.MajorLinkerVersion = 1;

1 0

André Hentschel : Fix Google donation (German)
by Jeremy Newman 09 Mar '12

09 Mar '12

Module: website Branch: master Commit: 86def7a5ad9322a13aff012dc2b58e3e35a35e03 URL: http://source.winehq.org/git/website.git/?a=commit;h=86def7a5ad9322a13aff01… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Mar 9 17:36:05 2012 +0100 Fix Google donation (German) --- templates/de/contributing.template | 6 +++--- templates/de/donate.template | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/de/contributing.template b/templates/de/contributing.template index 3a5ac31..c4c5e33 100644 --- a/templates/de/contributing.template +++ b/templates/de/contributing.template @@ -351,7 +351,7 @@ <table border="0" cellpadding="10" cellspacing="1" bgcolor="#EFEFEF"> <tr bgcolor="#ffffff"> <td align="center"> - <script type="text/javascript"> + <script type="text/javascript"> function validateAmount(amount){ if(amount.value.match( /^[0-9]+(\.([0-9]+))?$/)){ return true; @@ -366,13 +366,13 @@ <input name="item_name_1" type="hidden" value="Directed Donation to the Wine Project via Software Freedom Conservancy"/> <input name="item_description_1" type="hidden" value="A directed donation for the Wine project via the Software Freedom Conservancy"/> <input name="item_quantity_1" type="hidden" value="1"/> - <input name="item_currency_1" type="hidden" value="EUR"/> + <input name="item_currency_1" type="hidden" value="USD"/> <input name="item_is_modifiable_1" type="hidden" value="true"/> <input name="item_min_price_1" type="hidden" value="10.0"/> <input name="item_max_price_1" type="hidden" value="25000.0"/> <input name="_charset_" type="hidden" value="utf-8"/> $ <input id="item_price_1" name="item_price_1" onfocus="this.style.color='black'; this.value='';" size="11" style="color:grey;" type="text" value="Enter Amount"/><br /> - <input alt="Donate" src="https://checkout.google.com/buttons/donateNow.gif?merchant_id=6228369851249…" type="image"/> + <input alt="Donate" src="https://checkout.google.com/buttons/donateNow.gif?merchant_id=6228369851249…" type="image"/> </form> </td> <td>über Google Checkout</td> diff --git a/templates/de/donate.template b/templates/de/donate.template index fd023e2..313631b 100644 --- a/templates/de/donate.template +++ b/templates/de/donate.template @@ -14,7 +14,7 @@ <tr bgcolor="#ffffff"> <td align="center"> - <script type="text/javascript"> + <script type="text/javascript"> function validateAmount(amount){ if(amount.value.match( /^[0-9]+(\.([0-9]+))?$/)){ return true; @@ -29,13 +29,13 @@ <input name="item_name_1" type="hidden" value="Directed Donation to the Wine Project via Software Freedom Conservancy"/> <input name="item_description_1" type="hidden" value="A directed donation for the Wine project via the Software Freedom Conservancy"/> <input name="item_quantity_1" type="hidden" value="1"/> - <input name="item_currency_1" type="hidden" value="EUR"/> + <input name="item_currency_1" type="hidden" value="USD"/> <input name="item_is_modifiable_1" type="hidden" value="true"/> <input name="item_min_price_1" type="hidden" value="10.0"/> <input name="item_max_price_1" type="hidden" value="25000.0"/> <input name="_charset_" type="hidden" value="utf-8"/> $ <input id="item_price_1" name="item_price_1" onfocus="this.style.color='black'; this.value='';" size="11" style="color:grey;" type="text" value="Enter Amount"/><br /> - <input alt="Donate" src="https://checkout.google.com/buttons/donateNow.gif?merchant_id=6228369851249…" type="image"/> + <input alt="Donate" src="https://checkout.google.com/buttons/donateNow.gif?merchant_id=6228369851249…" type="image"/> </form> </td> <td valign="top">

1 0

Jeremy Newman : fix missing closing body tag
by Jeremy Newman 09 Mar '12

09 Mar '12

Module: website Branch: master Commit: 5258c47055f7da71d657e98779859af7069f09a7 URL: http://source.winehq.org/git/website.git/?a=commit;h=5258c47055f7da71d657e9… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Mar 9 09:53:16 2012 -0600 fix missing closing body tag --- news/es/2012030701.xml | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/news/es/2012030701.xml b/news/es/2012030701.xml index 762bc0a..0246b40 100644 --- a/news/es/2012030701.xml +++ b/news/es/2012030701.xml @@ -9,4 +9,5 @@ <p></p> <p><p>El código fuente se encuentra <a href="http://prdownloads.sourceforge.net/wine/wine-1.4.tar.bz2">ya disponible </a>. Los paquetes binarios están en el proceso de ser construidos, y aparecerán pronto en sus respectivos <a href="{$root}/download">lugares de descarga </a>. +</body> </news>

1 0

Jaime Rave : Fixes for the spanish version of the homepage
by Jeremy Newman 09 Mar '12

09 Mar '12

Module: website Branch: master Commit: 8a0a984857468c9e6cf5c18656078d87863e374b URL: http://source.winehq.org/git/website.git/?a=commit;h=8a0a984857468c9e6cf5c1… Author: Jaime Rave <jaimerave(a)gmail.com> Date: Thu Mar 8 23:56:40 2012 -0500 Fixes for the spanish version of the homepage -- Jaime Andres Rave Ingeniero de Sistemas - T.P. 08255178427ATL Miembro de la Fundación de Software Libre de Colombia http://www.fslcol.org/ http://sobrelibertad.blogspot.com/ 3003160361 >From 983d4c5b15a9620c64b7d7fbc5c163b37962f0f4 Mon Sep 17 00:00:00 2001 From: Jaime Rave <jaimerave(a)gmail.com> Date: Thu, 8 Mar 2012 23:52:41 -0500 Subject: Fixes for the spanish version of the home page --- include/data.php | 2 +- templates/es/home.template | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/data.php b/include/data.php index d5805fe..0c4dea8 100644 --- a/include/data.php +++ b/include/data.php @@ -38,7 +38,7 @@ class data ), 'es' => array( 'name' => 'Español', - 'change' => 'Cambiar la Lengua' + 'change' => 'Cambiar Idioma' ), 'fr' => array( 'name' => 'Français', diff --git a/templates/es/home.template b/templates/es/home.template index b725fa2..98eb209 100644 --- a/templates/es/home.template +++ b/templates/es/home.template @@ -1,7 +1,7 @@ - - + +  - +  <div id="main_left"> @@ -39,7 +39,7 @@ <div class="icon"></div> <div class="text"> <div class="title"><a href="{$root}/devel/">Desarrollo</a></div> - <div class="subtitle">Conviértete en un desarrollador de Wine.</div> + <div class="subtitle">Conviértase en un desarrollador de Wine.</div> </div> </div> @@ -64,20 +64,20 @@ <b class="rtop"><b class="r1"></b><b class="r2"></b><b class="r3"></b><b class="r4"></b></b> <div class="content" style="padding: 5px 10px 5px 10px; height: 85px; overflow: auto;"> - <h3 class="title" style="margin: 0;">Último lanzamiento</h3> + <h3 class="title" style="margin: 0;">Últimos lanzamientos</h3> <table style="margin: 7px 0 0 15px; border-spacing: 0; border: 0;"> <tr><td>Estable:</td> <td style="padding-left: 15px; padding-bottom: 2px;"> <b><a href="{$root}/announce/{$config_stable_release}">Wine {$config_stable_release}</a></b> <span class="small"> - (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_…">shortlog</a>) + (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_…">cambios</a>) </span> </td></tr> <tr><td>Desarrollo:</td> <td style="padding-left: 15px;"> <b><a href="{$root}/announce/{$config_master_release}">Wine {$config_master_release}</a></b> <span class="small"> - (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_…">shortlog</a>) + (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_…">cambios</a>) </span> </td></tr> </table>

1 0

Jaime Rave : Spanish translation for release 1.4
by Jeremy Newman 09 Mar '12

09 Mar '12

Module: website Branch: master Commit: 4b69a4b950e8d03fca8bb20d3a3678f5c4ee2076 URL: http://source.winehq.org/git/website.git/?a=commit;h=4b69a4b950e8d03fca8bb2… Author: Jaime Rave <jaimerave(a)gmail.com> Date: Fri Mar 9 00:05:16 2012 -0500 Spanish translation for release 1.4 -- Jaime Andres Rave Ingeniero de Sistemas - T.P. 08255178427ATL Miembro de la Fundación de Software Libre de Colombia http://www.fslcol.org/ http://sobrelibertad.blogspot.com/ 3003160361 >From 87ea2d180f269eea072520c99367d25f9a173eae Mon Sep 17 00:00:00 2001 From: Jaime Rave <jaimerave(a)gmail.com> Date: Thu, 8 Mar 2012 23:03:37 -0500 Subject: Spanish translation for release 1.4 --- news/es/2012030701.xml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/news/es/2012030701.xml b/news/es/2012030701.xml new file mode 100644 index 0000000..762bc0a --- /dev/null +++ b/news/es/2012030701.xml @@ -0,0 +1,12 @@ +<news> +<date>Marzo 7, 2012</date> +<title>Wine 1.4 Liberado</title> +<body> +<p> El equipo de Wine está orgulloso de anunciar que la versión estable de Wine 1.4 se encuentra ya disponible.</p> +<p> Este lanzamiento representa 20 meses de arduo trabajo y más de 16,000 cambios individuales. Los aspectos más sobresalientes son un nuevo motor gráfico DIB, una pila de audio rediseñada, y soporte completo para texto bidireccional y la forma de los caracteres. </p> +<p> También contiene muchas mejoras en otros ámbitos, así como el soporte para muchas aplicaciones nuevas, destacando Microsoft Office 2010. Mira las <a href="{$root}/announce/1.4">notas del lanzamiento </a> para un resumen de los cambios más importantes. </p> +<p> Este lanzamiento está dedicado a la memoria de Gé (Greg) van Geldorp, quien falleció en Mayo del 2011. Greg manejó por si solo el diseño, construcción y mantenimiento del Tesbot de Wine, el cual se convirtió en la piedra angular de nuestro proceso de desarrollo. La alta calidad de este lanzamiento se debe en gran parte a su trabajo. Le echamos de menos todos nosotros. </p> +<p></p> +<p><p>El código fuente se encuentra <a href="http://prdownloads.sourceforge.net/wine/wine-1.4.tar.bz2">ya disponible </a>. +Los paquetes binarios están en el proceso de ser construidos, y aparecerán pronto en sus respectivos <a href="{$root}/download">lugares de descarga </a>. +</news>

1 0

Jaime Rave : Spanish version of the about page
by Jeremy Newman 09 Mar '12

09 Mar '12

Module: website Branch: master Commit: ab0987e295c7276dcba8f3abec1fd8d2a10f865a URL: http://source.winehq.org/git/website.git/?a=commit;h=ab0987e295c7276dcba8f3… Author: Jaime Rave <jaimerave(a)gmail.com> Date: Thu Mar 8 23:57:11 2012 -0500 Spanish version of the about page -- Jaime Andres Rave Ingeniero de Sistemas - T.P. 08255178427ATL Miembro de la Fundación de Software Libre de Colombia http://www.fslcol.org/ http://sobrelibertad.blogspot.com/ 3003160361 >From 1b430c605b676d25ab05bb576c2647e3924440bd Mon Sep 17 00:00:00 2001 From: Jaime Rave <jaimerave(a)gmail.com> Date: Thu, 8 Mar 2012 23:53:28 -0500 Subject: Spanish version the the about page --- templates/es/about.template | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/templates/es/about.template b/templates/es/about.template new file mode 100644 index 0000000..83f2249 --- /dev/null +++ b/templates/es/about.template @@ -0,0 +1,27 @@ + + + +<h1 class="title">Acerca de Wine</h1> + +<p>Wine te permite correr software de Windows en otros sistemas operativos. Con Wine, puede instalar y correr estas aplicaciones igual que lo haría en Windows.</p> + +<p>Wine se encuentra todavía en desarrollo. No todos los programas funcionan aun, sin embargo hay <a href="http://wiki.winehq.org/UsageStatistics" title="Wine Usage Statistics">varios millones de personas</a> usando Wine para ejecutar sus programas.</p> + +<h3>Código Abierto y Guiado por el Usuario</h3> + +<p>Wine siempre será <a href="http://wiki.winehq.org/Licensing" title="Wine licensing">software libre</a>. Aproximadamente la mitad del código fuente de Wine es escrito por voluntarios. El resto es patrocinado por intereses comerciales, especialmente de <a href="http://www.codeweavers.com/products/" title="CodeWeavers CrossOver Office">CodeWeavers</a> quienes venden una versión de Wine con soporte.</p> + +<p>Wine depende altamente en su comunidad de usuarios. Sus pruebas llenan nuestra <a href="http://appdb.winehq.org/" title="Wine Application Database">Base de datos de Aplicaciones</a> para seguir que tan bien funcionan los programas, y todas las respuestas en los <a href="http://forums.winehq.org/" title="WineHQ Forums">foros</a> vienen de voluntarios.</p> + +<h3>Aprenda mas:</h3> +<ul> + <li><a href="http://wiki.winehq.org/ImportanceOfWine">¿Por que es tan Importante Wine?</a></li> + <li><a href="http://wiki.winehq.org/Debunking_Wine_Myths">Mitos Comunes sobre Wine</a></li> + <li><a href="http://wiki.winehq.org/WineHistory">Historia del Proyecto Wine</a></li> + <li><a href="http://wiki.winehq.org/ProjectOrganization">Organización y Liderazgo</a></li> +</ul> + +<hr> +<div class="link-container"> + <p class="right-link">Wine's History: <a href="{$root}/history">Siguiente</a></p> +</div>

1 0

Christian Costa : d3dxof/tests: Improve some messages.
by Alexandre Julliard 08 Mar '12

08 Mar '12

Module: wine Branch: master Commit: bfd56e5bdc8001d39b16d10af0352a0524118c55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfd56e5bdc8001d39b16d10af… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Mar 8 09:16:54 2012 +0100 d3dxof/tests: Improve some messages. --- dlls/d3dxof/tests/d3dxof.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 21eba9c..5293b44 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -673,11 +673,11 @@ static void test_dump(void) if (!ReadFile(hFile, pvData, 10000, &cbSize, NULL)) { - skip("Template file is too big\n"); + skip("Templates file is too big\n"); goto exit; } - printf("Load %d bytes\n", cbSize); + printf("Load templates file (%d bytes)\n", cbSize); hr = pDirectXFileCreate(&lpDirectXFile); ok(hr == DXFILE_OK, "DirectXFileCreate: %x\n", hr);

1 0

Christian Costa : d3dxof: Check the right offset before dereferencing next byte.
by Alexandre Julliard 08 Mar '12

08 Mar '12

Module: wine Branch: master Commit: b9353b73ae47dc7cdfcb55f5b7c3a1d8778954a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9353b73ae47dc7cdfcb55f5b… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Mar 8 09:17:02 2012 +0100 d3dxof: Check the right offset before dereferencing next byte. --- dlls/d3dxof/parsing.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index f40c202..9f426c4 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -605,7 +605,7 @@ static BOOL is_string(parse_buffer* buf) if (*buf->buffer != '"') return FALSE; - while (pos < buf->rem_bytes && !is_operator(c = *(buf->buffer+pos+1))) + while ((pos+1) < buf->rem_bytes && !is_operator(c = *(buf->buffer+pos+1))) { if (c == '"') {

1 0

Piotr Caban : urlmon: Added CopyBindInfo implementation.
by Alexandre Julliard 08 Mar '12

08 Mar '12

Module: wine Branch: master Commit: 7f0b7c5ce33f8082bd74a5f77469db8447b1e0f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f0b7c5ce33f8082bd74a5f77… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 8 13:45:12 2012 +0100 urlmon: Added CopyBindInfo implementation. --- dlls/urlmon/urlmon.spec | 2 +- dlls/urlmon/urlmon_main.c | 65 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 575bdc0..72bd21d 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -28,7 +28,7 @@ @ stdcall CoInternetQueryInfo(ptr long long ptr long ptr long) @ stdcall CoInternetSetFeatureEnabled(long long long) @ stdcall CompareSecurityIds(ptr long ptr long long) -@ stub CopyBindInfo +@ stdcall CopyBindInfo(ptr ptr) @ stdcall CopyStgMedium(ptr ptr) @ stdcall CreateAsyncBindCtx(long ptr ptr ptr) @ stdcall CreateAsyncBindCtxEx(ptr long ptr ptr ptr long) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index a3d1c10..94c4b44 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -533,6 +533,8 @@ HRESULT WINAPI CopyStgMedium(const STGMEDIUM *src, STGMEDIUM *dst) if(src->u.lpszFileName && !src->pUnkForRelease) { DWORD size = (strlenW(src->u.lpszFileName)+1)*sizeof(WCHAR); dst->u.lpszFileName = CoTaskMemAlloc(size); + if(!dst->u.lpszFileName) + return E_OUTOFMEMORY; memcpy(dst->u.lpszFileName, src->u.lpszFileName, size); } break; @@ -554,6 +556,69 @@ HRESULT WINAPI CopyStgMedium(const STGMEDIUM *src, STGMEDIUM *dst) return S_OK; } +/*********************************************************************** + * CopyBindInfo (URLMON.@) + */ +HRESULT WINAPI CopyBindInfo(const BINDINFO *pcbiSrc, BINDINFO *pcbiDest) +{ + DWORD size; + HRESULT hres; + + TRACE("(%p %p)\n", pcbiSrc, pcbiDest); + + if(!pcbiSrc || !pcbiDest) + return E_POINTER; + if(!pcbiSrc->cbSize || !pcbiDest->cbSize) + return E_INVALIDARG; + + size = pcbiDest->cbSize; + if(size > pcbiSrc->cbSize) { + memcpy(pcbiDest, pcbiSrc, pcbiSrc->cbSize); + memset((char*)pcbiDest+pcbiSrc->cbSize, 0, size-pcbiSrc->cbSize); + } else { + memcpy(pcbiDest, pcbiSrc, size); + } + pcbiDest->cbSize = size; + + size = FIELD_OFFSET(BINDINFO, szExtraInfo)+sizeof(void*); + if(pcbiSrc->cbSize>=size && pcbiDest->cbSize>=size && pcbiSrc->szExtraInfo) { + size = (strlenW(pcbiSrc->szExtraInfo)+1)*sizeof(WCHAR); + pcbiDest->szExtraInfo = CoTaskMemAlloc(size); + if(!pcbiDest->szExtraInfo) + return E_OUTOFMEMORY; + memcpy(pcbiDest->szExtraInfo, pcbiSrc->szExtraInfo, size); + } + + size = FIELD_OFFSET(BINDINFO, stgmedData)+sizeof(STGMEDIUM); + if(pcbiSrc->cbSize>=size && pcbiDest->cbSize>=size) { + hres = CopyStgMedium(&pcbiSrc->stgmedData, &pcbiDest->stgmedData); + if(FAILED(hres)) { + CoTaskMemFree(pcbiDest->szExtraInfo); + return hres; + } + } + + size = FIELD_OFFSET(BINDINFO, szCustomVerb)+sizeof(void*); + if(pcbiSrc->cbSize>=size && pcbiDest->cbSize>=size && pcbiSrc->szCustomVerb) { + size = (strlenW(pcbiSrc->szCustomVerb)+1)*sizeof(WCHAR); + pcbiDest->szCustomVerb = CoTaskMemAlloc(size); + if(!pcbiDest->szCustomVerb) { + CoTaskMemFree(pcbiDest->szExtraInfo); + ReleaseStgMedium(&pcbiDest->stgmedData); + return E_OUTOFMEMORY; + } + } + + size = FIELD_OFFSET(BINDINFO, securityAttributes)+sizeof(SECURITY_ATTRIBUTES); + if(pcbiDest->cbSize >= size) + memset(&pcbiDest->securityAttributes, 0, sizeof(SECURITY_ATTRIBUTES)); + + if(pcbiSrc->pUnk) + IUnknown_AddRef(pcbiDest->pUnk); + + return S_OK; +} + static BOOL text_richtext_filter(const BYTE *b, DWORD size) { return size > 5 && !memcmp(b, "{\\rtf", 5);

1 0