January 2010 - Wine-Commits

Michael Stefaniuc : devenum: Avoid newlines inside FIXME messages.
by Alexandre Julliard Jan. 14, 2010

Jan. 14, 2010

Module: wine Branch: master Commit: 71d7331932f5055d759515b98367e8c6808835a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71d7331932f5055d759515b98… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 11 23:47:51 2010 +0100 devenum: Avoid newlines inside FIXME messages. --- dlls/devenum/createdevenum.c | 2 +- dlls/devenum/devenum_main.c | 2 +- dlls/devenum/factory.c | 2 +- dlls/devenum/mediacatenum.c | 6 +++--- dlls/devenum/parsedisplayname.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 3891dec..2923b8d 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -76,7 +76,7 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_QueryInterface( return S_OK; } - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } diff --git a/dlls/devenum/devenum_main.c b/dlls/devenum/devenum_main.c index 5c44b75..32caa7e 100644 --- a/dlls/devenum/devenum_main.c +++ b/dlls/devenum/devenum_main.c @@ -78,7 +78,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) IsEqualGUID(rclsid, &CLSID_CDeviceMoniker)) return IClassFactory_QueryInterface((IClassFactory*)&DEVENUM_ClassFactory, iid, ppv); - FIXME("\n\tCLSID:\t%s,\n\tIID:\t%s\n",debugstr_guid(rclsid),debugstr_guid(iid)); + FIXME("CLSID: %s, IID: %s\n", debugstr_guid(rclsid), debugstr_guid(iid)); return CLASS_E_CLASSNOTAVAILABLE; } diff --git a/dlls/devenum/factory.c b/dlls/devenum/factory.c index f169fd6..09861fa 100644 --- a/dlls/devenum/factory.c +++ b/dlls/devenum/factory.c @@ -49,7 +49,7 @@ static HRESULT WINAPI DEVENUM_IClassFactory_QueryInterface( return IClassFactory_CreateInstance(iface, NULL, riid, ppvObj); } - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 946f750..349ea7d 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -61,7 +61,7 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_QueryInterface( return S_OK; } - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -308,7 +308,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_QueryInterface( return S_OK; } - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -723,7 +723,7 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_QueryInterface( return S_OK; } - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } diff --git a/dlls/devenum/parsedisplayname.c b/dlls/devenum/parsedisplayname.c index 2e41983..fa2f995 100644 --- a/dlls/devenum/parsedisplayname.c +++ b/dlls/devenum/parsedisplayname.c @@ -44,7 +44,7 @@ static HRESULT WINAPI DEVENUM_IParseDisplayName_QueryInterface( return S_OK; } - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); return E_NOINTERFACE; }

1 0

Michael Stefaniuc : dmime: Avoid newlines inside FIXME messages.
by Alexandre Julliard Jan. 14, 2010

Jan. 14, 2010

Module: wine Branch: master Commit: bedea431f93e4c477c3e5cd9f7bf2d93d6411dd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bedea431f93e4c477c3e5cd9f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 11 23:47:24 2010 +0100 dmime: Avoid newlines inside FIXME messages. --- dlls/dmime/dmime_main.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/dmime/dmime_main.c b/dlls/dmime/dmime_main.c index f4abddd..9e53e1b 100644 --- a/dlls/dmime/dmime_main.c +++ b/dlls/dmime/dmime_main.c @@ -32,7 +32,7 @@ typedef struct { * DirectMusicPerformance ClassFactory */ static HRESULT WINAPI PerformanceCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -82,7 +82,7 @@ static IClassFactoryImpl Performance_CF = {&PerformanceCF_Vtbl}; * DirectMusicSegment ClassFactory */ static HRESULT WINAPI SegmentCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -132,7 +132,7 @@ static IClassFactoryImpl Segment_CF = {&SegmentCF_Vtbl}; * DirectMusicSegmentState ClassFactory */ static HRESULT WINAPI SegmentStateCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -182,7 +182,7 @@ static IClassFactoryImpl SegmentState_CF = {&SegmentStateCF_Vtbl}; * DirectMusicGraph ClassFactory */ static HRESULT WINAPI GraphCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -232,7 +232,7 @@ static IClassFactoryImpl Graph_CF = {&GraphCF_Vtbl}; * DirectMusicTempoTrack ClassFactory */ static HRESULT WINAPI TempoTrackCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -282,7 +282,7 @@ static IClassFactoryImpl TempoTrack_CF = {&TempoTrackCF_Vtbl}; * DirectMusicSeqTrack ClassFactory */ static HRESULT WINAPI SeqTrackCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -332,7 +332,7 @@ static IClassFactoryImpl SeqTrack_CF = {&SeqTrackCF_Vtbl}; * DirectMusicSysExTrack ClassFactory */ static HRESULT WINAPI SysExTrackCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -381,7 +381,7 @@ static IClassFactoryImpl SysExTrack_CF = {&SysExTrackCF_Vtbl}; * DirectMusicTimeSigTrack ClassFactory */ static HRESULT WINAPI TimeSigTrackCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -431,7 +431,7 @@ static IClassFactoryImpl TimeSigTrack_CF = {&TimeSigTrackCF_Vtbl}; * DirectMusicParamControlTrack ClassFactory */ static HRESULT WINAPI ParamControlTrackCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -481,7 +481,7 @@ static IClassFactoryImpl ParamControlTrack_CF = {&ParamControlTrackCF_Vtbl}; * DirectMusicMarkerTrack ClassFactory */ static HRESULT WINAPI MarkerTrackCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -531,7 +531,7 @@ static IClassFactoryImpl MarkerTrack_CF = {&MarkerTrackCF_Vtbl}; * DirectMusicLyricsTrack ClassFactory */ static HRESULT WINAPI LyricsTrackCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -582,7 +582,7 @@ static IClassFactoryImpl LyricsTrack_CF = {&LyricsTrackCF_Vtbl}; * DirectMusicSegTriggerTrack ClassFactory */ static HRESULT WINAPI SegTriggerTrackCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -632,7 +632,7 @@ static IClassFactoryImpl SegTriggerTrack_CF = {&SegTriggerTrackCF_Vtbl}; * DirectMusicAudioPath ClassFactory */ static HRESULT WINAPI AudioPathCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -682,7 +682,7 @@ static IClassFactoryImpl AudioPath_CF = {&AudioPathCF_Vtbl}; * DirectMusicWaveTrack ClassFactory */ static HRESULT WINAPI WaveTrackCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER;

1 0

Scott Ritchie : Update Spanish translation of download-deb
by Jeremy Newman Jan. 14, 2010

Jan. 14, 2010

Module: website Branch: master Commit: 26e71f23323bba7876d2497b416c2a38363f47d2 URL: http://source.winehq.org/git/website.git/?a=commit;h=26e71f23323bba7876d249… Author: Scott Ritchie <scott(a)open-vote.org> Date: Tue Jan 12 17:10:45 2010 -0800 Update Spanish translation of download-deb [lostwages] Update Spanish translation of download-deb >From d908ea0b214db7bd8989c5c8e5c1cd7a9c087794 Mon Sep 17 00:00:00 2001 From: Scott Ritchie <scott(a)open-vote.org> Date: Tue, 12 Jan 2010 15:58:45 -0800 Subject: Update Spanish translation of download-deb page --- templates/es/download/deb.template | 127 +++++++++++++++++++++++++----------- 1 files changed, 88 insertions(+), 39 deletions(-) diff --git a/templates/es/download/deb.template b/templates/es/download/deb.template index 09d936d..abc2df8 100644 --- a/templates/es/download/deb.template +++ b/templates/es/download/deb.template @@ -5,57 +5,106 @@ Wine para Ubuntu, Debian y distribuciones basadas en Debian <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></h1> -Debian y distribuciones basadas en Debian como Ubuntu utilizan una herramienta -especial para administrar paquetes conocida como APT. APT es capaz de instalar -automáticamente todas las dependencias necesarias para un paquete de software, -así como mantener el paquete actualizado, mediante el escaneo de lo que se -conoce como repositorios de APT. Las distribuciones basadas en Debian tienen sus -propios repositorios de software que incluyen Wine. Sin embargo, mantenemos -nuestro propio repositorio con los últimos paquetes disponibles aquí para su -descarga. - - Podría haber instrucciones gŕaficas aquí, sin embargo hemos encontrado que los -terminales de comandos son en realidad más sencillos de describir y -más rápidos para la entrada de usuario. Debido a que los -comandos de abajo utilizan sudo, puede que tenga que introducir su -contraseña de usuario después de pulsar la tecla Enter. - -<h2>Añadiendo el repositorio APT de WineHQ:</h2> - -En primer lugar, abra una ventana de terminal (Aplicaciones-> Accesorios-> Terminal). Entonces -añada la clave de repositorio a su sistema APT de lista de claves de confianza por copia y -pegue el texto siguiente: +Ubuntu y otras distribuciones basadas en Debian utilizan una herramienta +especial para el manejo de paquetes conocida como APT. APT es capaz de +auto-mágicamente instalar todas las dependencias necesitadas por un +paquete de software, así también como de mantenerlo actualizado a +través del rastreo de los que son conocidos como repositorios APT. +Ubuntu posee su propio repositorio de software que incluye a Wine, sin +embargo nosotros mantenemos aqui uno propio con los últimos paquetes +beta disponibles para su descarga. -wget -q http://wine.budgetdedicated.com/apt/387EE263.gpg -O- | sudo apt-key add - +<h2>Advertencia: Paquetes Beta</h2> + +Los paquetes aquí disponibles son +beta. Esto quiere decir que periodicamente sufren de regresiones y como +resultado de una actualizacion la funcionalidad de Wine puede ser +comprometida. Si la última versión estable de Wine le sirve a usted, +entonces tal vez no quiera usar los paquetes beta. + +<h2>Añadir el repositorio APT WineHQ:</h2> -A continuación, añada el repositorio al sistema de listado de fuentes APT: +Abra el menú de Orígenes del software a través de Sistema->Administracion->Orígenes del Software. Seleccione el tab Otro software y haga click en Añadir. +<img src="{$root}/images/distro/ubuntu-ppa.png" width="531" height="509" alt="Sistema->Administracion->Orígenes del Software" border="0"> + +Entonces copie y pegue una de las lineas debajo de acuerdo a la versión de Ubuntu que está usando: + +Para Ubuntu Karmic (9.10): +ppa:ubuntu-wine/ppa +Para Ubuntu Jaunty (9.04): +deb http://wine.budgetdedicated.com/apt jaunty main #WineHQ - Ubuntu 9.04 "Jaunty Jackalope" +Para Ubuntu Intrepid (8.10): +deb http://wine.budgetdedicated.com/apt intrepid main #WineHQ - Ubuntu 8.10 "Intrepid Ibex" Para Ubuntu Hardy (8.04): -sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/hardy.list -O /etc/apt/sources.list.d/winehq.list -Para Debian Etch (4.0): -sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/etch.list -O /etc/apt/sources.list.d/winehq.list +deb http://wine.budgetdedicated.com/apt hardy main #WineHQ - Ubuntu 8.04 "Hardy Heron" -Luego actualice el paquete de información de APT ejecutando 'sudo apt-get update'. +<h2>Autenticando el repositorio APT WineHQ (9.04 y anteriores):</h2> -Ahora puede instalar Wine mediante <a href="apt://wine">clic en este link</a>. -Si lo prefiere, puede instalarlo desde Aplicaciones-> Agregar o quitar y busque -por Wine. +Luego de añadir el repositorio, también debe añadir la clave del repositorio a la lista de claves autenticas de su sistema. Los usuarios de Ubuntu 9.10 deben evitar este paso. + +Para Ubuntu 9.04 y anteriores, +<a href="http://wine.budgetdedicated.com/apt/Scott%20Ritchie.gpg">descargue +y guarde la clave de Scott Ritchie (boton derecho del mouse -> guardar como) +en su escritorio. Luego abra el tab de autenticación, haga click en +Importar clave y seleccione el archivo que acaba de guardar +(Scott Ritchie.gpg). Es recomendable borrar este archivo luego de +realizar este paso. + +<img src="{$root}/images/distro/ubuntu-softwaresources2.png" width="531" height="509" alt="System->Administration->Software Sources->Authentication" border="0"> + +<h2>Instalando Wine:</h2> + +Haga click en cerrar para finalizar, y luego haga click en +recargar cuando salga el aviso sobre la informacion del software +disponible. Si ya tiene Wine instalado el gestor de actualizaciónes le +informará de la publicación de las versiones beta para su actualización. Si no +ha instalado Wine todavía, vaya a Aplicaciones->Centro de Software de +Ubuntu y busque por Wine o simplemente haga +<a href="apt://wine">click en este enlace</a>. <h2>Actualizando a una nueva versión de Ubuntu</h2> -Si está actualizando todo el sistema, como pasa de Ubuntu 7.10 a 8,04, -tendrá que volver a esta página y introducir el comando para la versión -anterior. La actualización hecha por el administrador de actualizaciones no -cambiará el repositorio de Wine automáticamente. +Si usted está actualizando el sistema entero, como por ejemplo desde Ubuntu +8.04 a Ubuntu 8.10, necesitara volver a esta página y añadir el repositorio +para la nueva versión arriba. + +<h2>Paquetes .deb antiguos.</h2> -<h2>Paquetes .deb antiguos</h2> +Como el repositorio APT sólo contiene los últimos paquetes, las versiones +antiguas estan dispoibles en el +<a href="http://wine.budgetdedicated.com/archive/index.html">archivo de paquetes .deb de WineHQ</a>. -Desde el repositorio de APT sólo pueden mantener los paquetes más recientes, -las versiones antiguas de los paquetes están disponibles en -<a href=http://wine.budgetdedicated.com/archive/index.html>el archivo de -paquetes .deb de WineHQ</a>. +<h2>Instrucciones de linea de comando alternativas para instalar Wine:</h2> + +También es posible añadir los repositorios Wine y realizar la instalación a +través de la linea de comandos como sigue. Esto puede ser útil en Kubuntu, +Xubuntu y otros derivados de Ubuntu. Necesitara correr los siguiente en una +Terminal. + +<h3>Para Karmic (9.10):</h3> + +sudo add-apt-repository ppa:ubuntu-wine/ppa + +<h3>Para 9.04 y anteriores:</h3> +Agregue la clave del repositorio a la lista de claves auténtenticas de sus +sistema copiando los siguiente en una Terminal: + +wget -q http://wine.budgetdedicated.com/apt/387EE263.gpg -O- | sudo apt-key add - + +Luego debe añadir el repositorio a la lista de fuentes APT de su sistema de +acuerdo a la versión de Ubuntu que corre: + +Para Ubuntu Jaunty (9.04): +sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/jaunty.list -O /etc/apt/sources.list.d/winehq.list +Para Ubuntu Intrepid (8.10): +sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/intrepid.list -O /etc/apt/sources.list.d/winehq.list +Para Ubuntu Hardy (8.04): +sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/hardy.list -O /etc/apt/sources.list.d/winehq.list -Puede instalar los paquetes haciendo doble clic sobre ellos. +Luego actualice la información de APT corriendo +'sudo apt-get update'. Ahora puede instalar Wine normalmente o tipeando +'sudo apt-get install wine' en la terminal. Webhosting muy rápido y fiable para repositorios APT suministrado

1 0

Nikolay Sivov : advapi32: Free descriptor if it isn' t returned from GetSecurityInfo().
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: dbd76575ef8353484afa0b0d2da95760c26f34fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbd76575ef8353484afa0b0d2… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jan 8 21:05:21 2010 +0300 advapi32: Free descriptor if it isn't returned from GetSecurityInfo(). --- dlls/advapi32/security.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 629a74a..babe468 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3118,6 +3118,8 @@ DWORD WINAPI GetSecurityInfo( } if (ppSecurityDescriptor) *ppSecurityDescriptor = sd; + else + LocalFree(sd); return ERROR_SUCCESS; }

1 0

Marcus Meissner : shell32: Handle bad menu handle (Coverity).
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: 54aa61798f0f9270400da71807ade4b5f842611f URL: http://source.winehq.org/git/wine.git/?a=commit;h=54aa61798f0f9270400da7180… Author: Marcus Meissner <meissner(a)suse.de> Date: Sat Jan 9 14:59:22 2010 +0100 shell32: Handle bad menu handle (Coverity). --- dlls/shell32/shlmenu.c | 5 +++-- dlls/shell32/tests/shlfileop.c | 13 +++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c index 957711f..aea319c 100644 --- a/dlls/shell32/shlmenu.c +++ b/dlls/shell32/shlmenu.c @@ -869,10 +869,11 @@ HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uI hmDst, hmSrc, uInsert, uIDAdjust, uIDAdjustMax, uFlags); if (!hmDst || !hmSrc) - { return uIDMax; - } + return uIDMax; nItem = GetMenuItemCount(hmDst); + if (nItem == -1) + return uIDMax; if (uInsert >= (UINT)nItem) /* insert position inside menu? */ { diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 0a5cdca..4d74b93 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -2224,6 +2224,17 @@ static void test_unicode(void) ok(!file_existsW(UNICODE_PATH), "The directory should have been removed\n"); } +extern HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uIDAdjust, UINT uIDAdjustMax, ULONG uFlags); + +static void +test_shlmenu(void) { + HRESULT hres; + hres = Shell_MergeMenus (0, 0, 0x42, 0x4242, 0x424242, 0); + ok (hres == 0x4242, "expected 0x4242 but got %x\n", hres); + hres = Shell_MergeMenus ((HMENU)42, 0, 0x42, 0x4242, 0x424242, 0); + ok (hres == 0x4242, "expected 0x4242 but got %x\n", hres); +} + START_TEST(shlfileop) { InitFunctionPointers(); @@ -2263,4 +2274,6 @@ START_TEST(shlfileop) clean_after_shfo_tests(); test_unicode(); + + test_shlmenu(); }

1 0

Uwe Bonnes : msvcrt: In unbuffered text mode reading \r\n with fgetc fails.
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: 59262774733826b45a9420c376ea8a0c8fa7d82c URL: http://source.winehq.org/git/wine.git/?a=commit;h=59262774733826b45a9420c37… Author: Uwe Bonnes <bon(a)hertz.ikp.physik.tu-darmstadt.de> Date: Sun Jan 10 15:08:51 2010 +0100 msvcrt: In unbuffered text mode reading \r\n with fgetc fails. --- dlls/msvcrt/tests/file.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index e164555..da3d16c 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -438,6 +438,14 @@ static void test_fgetc( void ) ret = fgetc(tempfh); ok(ich == ret, "Second fgetc expected %x got %x\n", ich, ret); fclose(tempfh); + tempfh = fopen(tempf,"wt"); + fputc('\n', tempfh); + fclose(tempfh); + tempfh = fopen(tempf,"wt"); + setbuf(tempfh, NULL); + ret = fgetc(tempfh); + ok(ret == -1, "Unbuffered fgetc in text mode must failed on \\r\\n\n"); + fclose(tempfh); unlink(tempf); free(tempf); }

1 0

Alexandre Julliard : winebuild: Do not output an undefined symbol reference for variables.
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: b4c6433063b812ce9e489a0c58785b895c46b71b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4c6433063b812ce9e489a0c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 11 13:54:16 2010 -0600 winebuild: Do not output an undefined symbol reference for variables. --- tools/winebuild/import.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index a81d564..e5e87d3 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -508,7 +508,7 @@ static char *create_undef_symbols_file( DLLSPEC *spec ) for (i = 0; i < spec->nb_entry_points; i++) { ORDDEF *odp = &spec->entry_points[i]; - if (odp->type == TYPE_STUB || odp->type == TYPE_ABS) continue; + if (odp->type == TYPE_STUB || odp->type == TYPE_ABS || odp->type == TYPE_VARIABLE) continue; if (odp->flags & FLAG_FORWARD) continue; fprintf( f, "\t%s %s\n", get_asm_ptr_keyword(), asm_name(odp->link_name) ); }

1 0

Julius Schwartzenberg : avifil32/tests: Initial test data and simple test for avifil32.
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: e2944fc2eeca14bd4a546265d9dfd434ae79ca22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2944fc2eeca14bd4a546265d… Author: Julius Schwartzenberg <julius.schwartzenberg(a)gmail.com> Date: Sun Jan 10 17:37:37 2010 +0100 avifil32/tests: Initial test data and simple test for avifil32. --- dlls/avifil32/tests/api.c | 270 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 270 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e2944fc2eeca14bd4a546…

1 0

Detlef Riekenberg : avifil32/tests: Add initial tests.
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: a60204461afc907f5377d416dbbe8ca5387dc055 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a60204461afc907f5377d416d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jan 10 17:37:36 2010 +0100 avifil32/tests: Add initial tests. --- configure | 9 ++++ configure.ac | 1 + dlls/avifil32/tests/Makefile.in | 13 +++++ dlls/avifil32/tests/api.c | 97 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 120 insertions(+), 0 deletions(-) diff --git a/configure b/configure index a97fe17..b92e426 100755 --- a/configure +++ b/configure @@ -13817,6 +13817,14 @@ dlls/avifil32/Makefile: dlls/avifil32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/avifil32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/avifil32/tests/Makefile" +test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + avifil32/tests" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/avifil32/tests/Makefile: dlls/avifil32/tests/Makefile.in dlls/Maketest.rules" +ac_config_files="$ac_config_files dlls/avifil32/tests/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/avifile.dll16/Makefile" test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ avifile.dll16" @@ -18761,6 +18769,7 @@ do "dlls/authz/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/authz/Makefile" ;; "dlls/avicap32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/avicap32/Makefile" ;; "dlls/avifil32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/avifil32/Makefile" ;; + "dlls/avifil32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/avifil32/tests/Makefile" ;; "dlls/avifile.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/avifile.dll16/Makefile" ;; "dlls/avrt/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/avrt/Makefile" ;; "dlls/bcrypt/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/bcrypt/Makefile" ;; diff --git a/configure.ac b/configure.ac index 6cae9ba..943938b 100644 --- a/configure.ac +++ b/configure.ac @@ -2138,6 +2138,7 @@ WINE_CONFIG_MAKEFILE([dlls/atl/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DI WINE_CONFIG_MAKEFILE([dlls/authz/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/avicap32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/avifil32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/avifil32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/avifile.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/avrt/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/bcrypt/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/avifil32/tests/Makefile.in b/dlls/avifil32/tests/Makefile.in new file mode 100644 index 0000000..c43ac34 --- /dev/null +++ b/dlls/avifil32/tests/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = avifil32.dll +IMPORTS = avifil32 kernel32 + +CTESTS = \ + api.c + +(a)MAKE_TEST_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/avifil32/tests/api.c b/dlls/avifil32/tests/api.c new file mode 100644 index 0000000..55b194f --- /dev/null +++ b/dlls/avifil32/tests/api.c @@ -0,0 +1,97 @@ +/* + * Unit test suite for AVI Functions + * + * Copyright 2008 Detlef Riekenberg + * + * 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 + * + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "wingdi.h" +#include "vfw.h" +#include "wine/test.h" + +/* ########################### */ + +static const CHAR winetest0[] = "winetest0"; +static const CHAR winetest1[] = "winetest1"; + +/* ########################### */ + +static void test_AVISaveOptions(void) +{ + AVICOMPRESSOPTIONS options[2]; + LPAVICOMPRESSOPTIONS poptions[2]; + PAVISTREAM streams[2] = {NULL, NULL}; + HRESULT hres; + DWORD res; + LONG lres; + + poptions[0] = &options[0]; + poptions[1] = &options[1]; + ZeroMemory(options, sizeof(options)); + + SetLastError(0xdeadbeef); + hres = CreateEditableStream(&streams[0], NULL); + ok(hres == AVIERR_OK, "0: got 0x%x and %p (expected AVIERR_OK)\n", hres, streams[0]); + + SetLastError(0xdeadbeef); + hres = CreateEditableStream(&streams[1], NULL); + ok(hres == AVIERR_OK, "1: got 0x%x and %p (expected AVIERR_OK)\n", hres, streams[1]); + + SetLastError(0xdeadbeef); + hres = EditStreamSetNameA(streams[0], winetest0); + todo_wine ok(hres == AVIERR_OK, "0: got 0x%x (expected AVIERR_OK)\n", hres); + + SetLastError(0xdeadbeef); + hres = EditStreamSetNameA(streams[1], winetest1); + todo_wine ok(hres == AVIERR_OK, "1: got 0x%x (expected AVIERR_OK)\n", hres); + + if (winetest_interactive) { + SetLastError(0xdeadbeef); + res = AVISaveOptions(0, ICMF_CHOOSE_DATARATE |ICMF_CHOOSE_KEYFRAME | ICMF_CHOOSE_ALLCOMPRESSORS, + 2, streams, poptions); + trace("got %u with 0x%x/%u\n", res, GetLastError(), GetLastError()); + } + + SetLastError(0xdeadbeef); + lres = AVISaveOptionsFree(2, poptions); + ok(lres == AVIERR_OK, "got 0x%x with 0x%x/%u\n", lres, GetLastError(), GetLastError()); + + SetLastError(0xdeadbeef); + res = AVIStreamRelease(streams[0]); + ok(res == 0, "0: got refcount %u (expected 0)\n", res); + + SetLastError(0xdeadbeef); + res = AVIStreamRelease(streams[1]); + ok(res == 0, "1: got refcount %u (expected 0)\n", res); + +} + +/* ########################### */ + +START_TEST(api) +{ + + AVIFileInit(); + test_AVISaveOptions(); + AVIFileExit(); + +}

1 0

Detlef Riekenberg : commdlg: Fix PrintDlg parameter checks.
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: 93475667a080bf5ea6fd0a4123c52b499ab32067 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93475667a080bf5ea6fd0a412… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jan 10 20:51:21 2010 +0100 commdlg: Fix PrintDlg parameter checks. --- dlls/commdlg.dll16/printdlg.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/commdlg.dll16/printdlg.c b/dlls/commdlg.dll16/printdlg.c index 64bb395..ab6be7c 100644 --- a/dlls/commdlg.dll16/printdlg.c +++ b/dlls/commdlg.dll16/printdlg.c @@ -107,6 +107,8 @@ BOOL16 WINAPI PrintDlg16( LPPRINTDLG16 lppd ) PRINTDLGA pd32; BOOL ret; + if (!lppd) return PrintDlgA(NULL); /* generate failure with CDERR_INITIALIZATION */ + pd32.lStructSize = sizeof(pd32); pd32.Flags = lppd->Flags & ~(PD_ENABLEPRINTTEMPLATE | PD_ENABLEPRINTTEMPLATEHANDLE | PD_ENABLESETUPTEMPLATE | PD_ENABLESETUPTEMPLATEHANDLE | @@ -128,6 +130,9 @@ BOOL16 WINAPI PrintDlg16( LPPRINTDLG16 lppd ) if (lppd->Flags & PD_ENABLESETUPHOOK) FIXME( "custom setup hook %p no longer supported\n", lppd->lpfnSetupHook ); + /* Generate failure with CDERR_STRUCTSIZE, when needed */ + if (lppd->lStructSize != sizeof(PRINTDLG16)) pd32.lStructSize--; + if ((ret = PrintDlgA( &pd32 ))) { lppd->hDC = HDC_16( pd32.hDC );

1 0