- wine-devel - winehq.org

[PATCH 1/2] wined3d: Correctly restore texture max level in shader_resource_view_generate_mipmaps().
by Józef Kucia 07 Dec '17

07 Dec '17

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/view.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 4463fabb6ae5..3322baa2b5b7 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -842,7 +842,7 @@ void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view * base_level = view->desc.u.texture.level_idx; max_level = base_level + level_count - 1; - srgb = !!(texture->flags & WINED3D_TEXTURE_IS_SRGB); + srgb = texture->flags & WINED3D_TEXTURE_IS_SRGB; location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; for (i = 0; i < layer_count; ++i) wined3d_texture_load_location(texture, i * level_count + base_level, context, location); @@ -874,11 +874,8 @@ void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view * } } - gl_info->gl_ops.gl.p_glTexParameteri(texture->target, GL_TEXTURE_MAX_LEVEL, level_count - 1); - if (srgb) - texture->texture_srgb.base_level = base_level; - else - texture->texture_rgb.base_level = base_level; + gl_info->gl_ops.gl.p_glTexParameteri(texture->target, GL_TEXTURE_MAX_LEVEL, texture->level_count - 1); + gl_tex->base_level = base_level; context_release(context); } -- 2.13.6

3 3

[PATCH v2] readme: Move WineHQ URLs to https in translations.
by Lauri Kenttä 07 Dec '17

07 Dec '17

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- documentation/README.de | 24 ++++++++++++------------ documentation/README.es | 22 +++++++++++----------- documentation/README.fi | 20 ++++++++++---------- documentation/README.fr | 24 ++++++++++++------------ documentation/README.hu | 14 +++++++------- documentation/README.it | 24 ++++++++++++------------ documentation/README.ja | 20 ++++++++++---------- documentation/README.ko | 16 ++++++++-------- documentation/README.no | 24 ++++++++++++------------ documentation/README.pt | 12 ++++++------ documentation/README.pt_br | 24 ++++++++++++------------ documentation/README.ru | 20 ++++++++++---------- documentation/README.tr | 22 +++++++++++----------- documentation/README.uk | 24 ++++++++++++------------ documentation/README.zh_cn | 24 ++++++++++++------------ 15 files changed, 157 insertions(+), 157 deletions(-) diff --git a/documentation/README.de b/documentation/README.de index 5f450d12aa..2066bdfd04 100644 --- a/documentation/README.de +++ b/documentation/README.de @@ -24,7 +24,7 @@ make Starten Sie Programme mit "wine Programmname". Weitere Informationen und Problemlösungen entnehmen Sie bitte dem Rest dieser Datei, der Man-Page von Wine und insbesondere der Vielzahl an -Informationen, die Sie auf http://www.winehq.org finden. +Informationen, die Sie auf https://www.winehq.org finden. 3. VORAUSSETZUNGEN @@ -45,7 +45,7 @@ Umständen in der Zukunft unterstützt. FreeBSD-Info: Wine wird generell nicht korrekt unter FreeBSD vor 8.0 funktionieren. Für - weitere Informationen überprüfen Sie auch http://wiki.freebsd.org/Wine + weitere Informationen überprüfen Sie auch https://wiki.freebsd.org/Wine Solaris-Info: Höchstwahrscheinlich werden Sie Wine mit der GNU-Toolchain (gcc, gas etc.) @@ -81,13 +81,13 @@ Optionale Bibliotheken: Der Configure-Aufruf zeigt am Ende optionale Bibliotheken an, die von Wine benutzt werden können, aber auf Ihrem System nicht gefunden wurden. Tipps zum Installieren fehlender Pakete finden Sie unter: - http://wiki.winehq.org/Recommended_Packages + https://wiki.winehq.org/Recommended_Packages Unter 64-Bit Plattformen, falls Sie Wine als 32-Bit kompilieren (Standard), benötigen Sie die 32-Bit-Versionen dieser Bibliotheken; Details unter - http://wiki.winehq.org/WineOn64bit + https://wiki.winehq.org/WineOn64bit Für ein reines 64-Bit Wine (oder ein gemischtes 32- und 64-Bit Wine-Setup), - siehe http://wiki.winehq.org/Wine64 + siehe https://wiki.winehq.org/Wine64 4. KOMPILIEREN @@ -116,7 +116,7 @@ der neuen in Konflikt stehen könnten. Versuchen Sie entweder "dpkg -r wine", "rpm -e wine" oder "make uninstall" vor der Installation auszuführen. Nach der Installation können Sie das Tool "winecfg" starten. -Konfigurationshinweise finden Sie im Support-Bereich auf http://www.winehq.org/ +Konfigurationshinweise finden Sie im Support-Bereich auf https://www.winehq.org/ 6. AUSFÜHREN VON PROGRAMMEN @@ -143,19 +143,19 @@ wenn Sie den Fehler melden. 7. WEITERFÜHRENDE INFORMATIONEN WWW: Eine große Menge an Informationen findet sich im WineHQ unter - http://www.winehq.org/ : Verschiedene Wine Guides, + https://www.winehq.org/ : Verschiedene Wine Guides, Applikations-Datenbank, Bugtracker. Das ist vermutlich der beste Ausgangspunkt. -FAQ: Die FAQ zu Wine befindet sich unter http://www.winehq.org/FAQ +FAQ: Die FAQ zu Wine befindet sich unter https://www.winehq.org/FAQ -Wiki: Das Wine-Wiki finden Sie unter http://wiki.winehq.org +Wiki: Das Wine-Wiki finden Sie unter https://wiki.winehq.org Mailing-Listen: Es gibt mehrere Mailing-Listen für Wine-Anwender und -Entwickler; - Schauen Sie sich dazu bitte http://www.winehq.org/forums an. + Schauen Sie sich dazu bitte https://www.winehq.org/forums an. -Fehler: Melden Sie Fehler bitte an Wine-Bugzilla unter http://bugs.winehq.org +Fehler: Melden Sie Fehler bitte an Wine-Bugzilla unter https://bugs.winehq.org Schauen Sie bitte erst in der Bugzilla-Datenbank nach, ob Ihr Problem bereits bekannt ist oder sogar behoben wurde, bevor Sie eine Fehlermeldung verfassen. @@ -163,7 +163,7 @@ Fehler: Melden Sie Fehler bitte an Wine-Bugzilla unter http://bugs.winehq.org IRC: Online-Hilfe ist im IRC-Kanal #WineHQ unter irc.freenode.net verfügbar. Git: Der aktuelle Wine-Entwicklungsstand ist über Git verfügbar. - Besuchen Sie http://www.winehq.org/git für weitere Informationen. + Besuchen Sie https://www.winehq.org/git für weitere Informationen. Wenn Sie etwas hinzufügen oder einen Fehler beheben, senden Sie bitte einen Patch (vorzugsweise mit git-format-patch) an die Liste wine-devel(a)winehq.org, diff --git a/documentation/README.es b/documentation/README.es index 08169115d9..8068217ebc 100644 --- a/documentation/README.es +++ b/documentation/README.es @@ -22,7 +22,7 @@ Wine para compilar e instalar Wine. Desde el directorio base del código de Wine Ejecute aplicaciones con "wine programa". Para más información y resolución de problemas, continúe leyendo este archivo, la página man de Wine, o más específicamente, la numerosa información que puede encontrar en -http://www.winehq.org. +https://www.winehq.org. 3. REQUISITOS @@ -42,7 +42,7 @@ podrían obtener soporte en el futuro. Información sobre FreeBSD: Por lo general Wine no funcionará correctamente en versiones anteriores a - FreeBSD 8.0. Visite http://wiki.freebsd.org/Wine para más información. + FreeBSD 8.0. Visite https://wiki.freebsd.org/Wine para más información. Información sobre Solaris: Lo más probable es que necesite compilar con el conjunto de herramientas GNU @@ -77,14 +77,14 @@ Requisitos básicos: Librerías de soporte adicionales: Configure mostrará advertencias cuando las librerías opcionales no se encuentren disponibles en su sistema. - Visite http://wiki.winehq.org/Recommended_Packages para recomendaciones + Visite https://wiki.winehq.org/Recommended_Packages para recomendaciones acerca de que paquetes debe instalar. En plataformas de 64-bit, si se está compilando Wine 32-bits (es la compilación por defecto), debe estar seguro de tener instaladas las librerías - de desarrollo de 32-bits; visite http://wiki.winehq.org/WineOn64bit para más + de desarrollo de 32-bits; visite https://wiki.winehq.org/WineOn64bit para más detalles. Si usted desea un entorno Wine 64-bits puro (o una mezcla de 32-bits - y 64-bits), vaya a http://wiki.winehq.org/Wine64 para más detalles. + y 64-bits), vaya a https://wiki.winehq.org/Wine64 para más detalles. 4. COMPILACIÓN @@ -114,7 +114,7 @@ crear conflictos. Realice un "dpkg -r wine" o "rpm -e wine" o "make uninstall" antes de instalar. Una vez instalado, puede ejecutar la herramienta de configuración "winecfg". -Visite la zona de Soporte en http://www.winehq.org/ para consejos sobre la +Visite la zona de Soporte en https://www.winehq.org/ para consejos sobre la configuración. @@ -144,18 +144,18 @@ recibirá un log de error que debe adjuntar en caso de reportar un fallo. 7. OBTENIENDO MÁS INFORMACIÓN WWW: Una gran cantidad de información sobre Wine está disponible en WineHQ - en http://www.winehq.org/ : varias guías de Wine, base de datos de + en https://www.winehq.org/ : varias guías de Wine, base de datos de aplicaciones, registro de bugs. Este es probablemente el mejor punto de partida. FAQ: Las preguntas frecuentes de Wine se encuentran en - http://www.winehq.org/FAQ + https://www.winehq.org/FAQ Listas de correo: Hay varias listas de correo, tanto para usuarios como desarrolladores; - Vaya a http://www.winehq.org/forums para más información. + Vaya a https://www.winehq.org/forums para más información. -Bugs: Reporte fallos en el Bugzilla de Wine, http://bugs.winehq.org +Bugs: Reporte fallos en el Bugzilla de Wine, https://bugs.winehq.org Por favor, antes de enviar un informe de fallo busque en la base de datos de bugzilla para comprobar si su problema es un fallo conocido o existe una solución. @@ -163,7 +163,7 @@ Bugs: Reporte fallos en el Bugzilla de Wine, http://bugs.winehq.org IRC: Se puede obtener ayuda online en el canal #WineHQ de irc.freenode.net. Git: El árbol actual de desarrollo de Wine está disponible a través de Git. - Vaya a http://www.winehq.org/git para más información. + Vaya a https://www.winehq.org/git para más información. Si añade algo, o corrige algún bug, por favor envíe un parche (en formato git-format-patch) a la lista wine-devel(a)winehq.org para su inclusión diff --git a/documentation/README.fi b/documentation/README.fi index ae167ee800..30311d8280 100644 --- a/documentation/README.fi +++ b/documentation/README.fi @@ -28,7 +28,7 @@ Tai aja se käännöshakemistosta: Ohjelmat ajetaan komennolla "wine ohjelma". Lisätietoja sekä apua ongelmien ratkaisemiseen on jäljempänä tässä tiedostossa, Winen man-sivuilla sekä -ennen kaikkea Internetissä osoitteessa http://www.winehq.org/. +ennen kaikkea Internetissä osoitteessa https://www.winehq.org/. 3. JÄRJESTELMÄVAATIMUKSET @@ -47,7 +47,7 @@ muillekin käyttöjärjestelmille, joissa on tarvittava tuki säikeille. Tietoa FreeBSD:lle: Pääsääntöisesti Wine ei toimi vanhemmilla versioilla kuin FreeBSD 8.0. - Osoitteessa http://wiki.freebsd.org/Wine kerrotaan tästä lisää. + Osoitteessa https://wiki.freebsd.org/Wine kerrotaan tästä lisää. Tietoa Solarikselle: Wine täytyy luultavasti kääntää GNU-työkaluilla (gcc, gas jne.). @@ -79,7 +79,7 @@ Perusvaatimukset: Valinnaisia tukikirjastoja: configure-skripti näyttää varoituksia, kun valinnaisia kirjastoja puuttuu. - Osoitteessa http://wiki.winehq.org/Recommended_Packages on tietoa, mitkä + Osoitteessa https://wiki.winehq.org/Recommended_Packages on tietoa, mitkä paketit ovat hyödyksi. 64-bittisissä järjestelmissä täytyy varmistaa, että kirjastoista on asennettu 32-bittiset versiot. @@ -111,7 +111,7 @@ Ennen asennusta pitää muistaa poistaa aiemmat Winen versiot. Poistamista voi yrittää komennolla "dpkg -r wine", "rpm -e wine" tai "make uninstall". Kun Wine on asennettu, voidaan ajaa asetusohjelma "winecfg". Sivustolla -http://www.winehq.org/ kohdassa Support on englanninkielisiä lisäohjeita. +https://www.winehq.org/ kohdassa Support on englanninkielisiä lisäohjeita. 6. OHJELMIEN AJAMINEN @@ -136,28 +136,28 @@ mukaan, jos raportoi virheestä. 7. LISÄTIETOJA -WWW: Winestä on paljon tietoa WineHQ:ssa, http://www.winehq.org/. +WWW: Winestä on paljon tietoa WineHQ:ssa, https://www.winehq.org/. Oppaita, ohjelmatietokanta sekä Bugzilla vikojen listaamiseen. Täältä kannattaa yleensä aloittaa. Kysymyksiä: - Sivulle http://www.winehq.org/FAQ on koottu kysymyksiä ja vastauksia. + Sivulle https://www.winehq.org/FAQ on koottu kysymyksiä ja vastauksia. -Wiki: Wine Wiki on osoitteessa http://wiki.winehq.org/. +Wiki: Wine Wiki on osoitteessa https://wiki.winehq.org/. Postituslistat: Winen käyttäjille ja kehittäjille on joitakin postituslistoja, - sivulla http://www.winehq.org/forums kerrotaan niistä lisää. + sivulla https://www.winehq.org/forums kerrotaan niistä lisää. Virheet: - Ilmoita virheistä Winen Bugzillaan, http://bugs.winehq.org/. + Ilmoita virheistä Winen Bugzillaan, https://bugs.winehq.org/. Katso kuitenkin ensin Bugzilla-tietokannasta, onko samasta asiasta ilmoitettu jo aiemmin. IRC: Online-apua voi saada kanavalta #WineHQ palvelimella irc.freenode.net. Git: Winen tämänhetkinen kehitysversio on jaossa Git-järjestelmän kautta. - Sivulla http://www.winehq.org/git kerrotaan tästä lisää. + Sivulla https://www.winehq.org/git kerrotaan tästä lisää. Jos lisäät jotain tai korjaat jonkin virheen, lähetä toki muutoksesi diff --git a/documentation/README.fr b/documentation/README.fr index d42d20a02c..28729a5b41 100644 --- a/documentation/README.fr +++ b/documentation/README.fr @@ -23,7 +23,7 @@ make Pour exécuter un programme, tapez « wine programme ». Pour des informations complémentaires et la résolutions de problèmes, lisez la suite de ce fichier, les pages de manuel de Wine, et surtout les nombreuses -informations que vous trouverez sur http://www.winehq.org. +informations que vous trouverez sur https://www.winehq.org. 3. CONFIGURATION NÉCESSAIRE @@ -45,7 +45,7 @@ futur. Informations FreeBSD : Wine ne fonctionnera généralement pas bien avec les versions FreeBSD - antérieures à 8.0. Voyez http://wiki.freebsd.org/Wine pour plus + antérieures à 8.0. Voyez https://wiki.freebsd.org/Wine pour plus d'informations. Informations Solaris : @@ -85,14 +85,14 @@ Configuration de base requise : Bibliothèques optionnelles : « configure » affiche des messages quand des bibliothèques optionnelles ne sont pas détectées sur votre système. - Consultez http://wiki.winehq.org/Recommended_Packages (en anglais) pour + Consultez https://wiki.winehq.org/Recommended_Packages (en anglais) pour des indications sur les paquets logiciels que vous devriez installer. Sur les plates-formes 64 bits, si vous compilez Wine pour le mode 32 bits (mode par défaut), les versions 32 bits de ces bibliothèques doivent être - installées. Voyez http://wiki.winehq.org/WineOn64bit pour les détails. + installées. Voyez https://wiki.winehq.org/WineOn64bit pour les détails. Si vous désirez un Wine 64 bits pur (ou une configuration mixte - 32/64 bits), consultez http://wiki.winehq.org/Wine64. + 32/64 bits), consultez https://wiki.winehq.org/Wine64. 4. COMPILATION @@ -125,7 +125,7 @@ d'installer une nouvelle version. Une fois l'installation terminée, vous pouvez lancer l'outil de configuration « winecfg ». Consultez la section Support de -http://www.winehq.org/ pour obtenir des astuces de configuration. +https://www.winehq.org/ pour obtenir des astuces de configuration. 6. EXÉCUTER DES PROGRAMMES @@ -156,22 +156,22 @@ d'attacher à un éventuel rapport de bogue. 7. SOURCES D'INFORMATIONS COMPLÉMENTAIRES WWW : Beaucoup d'informations à propos de Wine sont disponibles sur - WineHQ (http://www.winehq.org) : divers guides, base de données + WineHQ (https://www.winehq.org) : divers guides, base de données d'applications, suivi de bogues. C'est probablement le meilleur point de départ. FAQ : La Foire aux Questions de Wine se trouve sur - http://www.winehq.org/FAQ + https://www.winehq.org/FAQ -Wiki : Le wiki Wine est situé sur http://wiki.winehq.org +Wiki : Le wiki Wine est situé sur https://wiki.winehq.org Listes de diffusion : Il existe plusieurs listes de diffusion pour les utilisateurs et - les développeurs Wine ; voyez http://www.winehq.org/forums pour de + les développeurs Wine ; voyez https://www.winehq.org/forums pour de plus amples informations. Bogues : - Signalez les bogues sur le Bugzilla Wine à http://bugs.winehq.org + Signalez les bogues sur le Bugzilla Wine à https://bugs.winehq.org Merci de vérifier au préalable dans la base de données de bugzilla que le problème n'est pas déjà connu, ou corrigé. @@ -179,7 +179,7 @@ IRC : L'aide en ligne est disponible via le canal #WineHQ sur irc.freenode.net. Git : L'arbre de développement actuel de Wine est disponible via Git. - Voyez http://www.winehq.org/git pour plus d'informations. + Voyez https://www.winehq.org/git pour plus d'informations. Si vous ajoutez quelque chose ou corrigez un bogue, merci d'envoyer un correctif (de préférence en utilisant git-format-patch) à la liste de diff --git a/documentation/README.hu b/documentation/README.hu index ca99d9b325..f672dea43d 100644 --- a/documentation/README.hu +++ b/documentation/README.hu @@ -23,7 +23,7 @@ könyvtárából (ami tartalmazza ezt a fájlt), futtassa: A programok futtatása "wine [opciók] program". A további információkhoz és a probléma felvilágosításhoz olvassa el ennek a fájlnak a további részét, a Wine man oldalát, és különösen gazdag információ található itt: -http://www.winehq.org. +https://www.winehq.org. 3. KÖVETELMÉNYEK @@ -130,7 +130,7 @@ Elõször ne felejtse eltávolítani bármely elõzõ Wine telepítést. Próbálja ki a "dpkg -r wine", és az "rpm -e wine", vagy a "make uninstall" parancsot telepítés elõtt. -Látogassa meg a támogatási oldalt itt: http://www.winehq.org/ a konfigurációs +Látogassa meg a támogatási oldalt itt: https://www.winehq.org/ a konfigurációs tippekhez. Függvénykönyvtár betöltési hibák esetén @@ -176,16 +176,16 @@ http://home.nexgo.de/andi.mohr/download/decorrupt_explorer 7. TÖBB INFORMÁCIÓ BESZERZÉSE WWW: A Wine-ról hatalmas mennyiségû információ érhetõ el a WineHQ-n ezen - a címen: http://www.winehq.org/ : különbözõ Wine útmutatók, + a címen: https://www.winehq.org/ : különbözõ Wine útmutatók, alkalmazás adatbázis, és hibakövetés. Ez talán a legjobb kiindulási pont. -GYIK: A Wine GYIK itt található: http://www.winehq.org/FAQ +GYIK: A Wine GYIK itt található: https://www.winehq.org/FAQ Usenet: Társaloghat a Wine-hoz kapcsolódó témákban, és segítséget kérhet itt: comp.emulators.ms-windows.wine. -Hibák: Wine hibabejelentés a Bugzilla-n keresztül itt: http://bugs.winehq.org +Hibák: Wine hibabejelentés a Bugzilla-n keresztül itt: https://bugs.winehq.org Kérem hibabejelentés küldése elõtt ellenõrizze, hogy az ön problémája már megtalálható-e az adatbázisban. Küldhet hibabejelentéseket a comp.emulators.ms-windows.wine címre is. @@ -193,11 +193,11 @@ Hibák: Wine hibabejelentés a Bugzilla-n keresztül itt: http://bugs.winehq.org IRC: Azonnali segítség elérhetõ a #WineHQ csatornán a irc.freenode.net-en. Git: A jelenlegi Wine fejlesztõi fa elérhetõ Git-en keresztül. - Látogasson el ide a további információhoz: http://www.winehq.org/git + Látogasson el ide a további információhoz: https://www.winehq.org/git Levelezõlisták: Elérhetõ néhány levelezõlista a Wine fejlesztõk számára; nézze meg a - http://www.winehq.org/forums címet a további információhoz. + https://www.winehq.org/forums címet a további információhoz. Ha valamit hozzáad, vagy hibát javít, kérem küldjön javítófoltot ('diff -u' formátumban) a wine-devel(a)winehq.org levelezõlista címre, hogy beletehessük a diff --git a/documentation/README.it b/documentation/README.it index 0c2bcd8511..ecb4aed75e 100644 --- a/documentation/README.it +++ b/documentation/README.it @@ -23,7 +23,7 @@ Wine, eseguire: Eseguire i programmi com "wine programma". Per maggiori informazioni e risoluzioni di problemi, leggere il resto di questo file, la pagina man di Wine, ed in modo particolare la notevole quantità di informazioni che -si trova all'indirizzo http://www.winehq.org. +si trova all'indirizzo https://www.winehq.org. 3. REQUISITI @@ -43,7 +43,7 @@ che forniscono kernel threads potrebbero essere supportati in futuro. Informazioni per FreeBSD: In generale Wine non funzionerà correttamente con versioni precedenti a FreeBSD 8.0. - Leggere http://wiki.freebsd.org/Wine per maggiori informazioni. + Leggere https://wiki.freebsd.org/Wine per maggiori informazioni. Informazioni per Solaris: Sarà molto probabilmente necessario compilare Wine con i tool GNU @@ -76,14 +76,14 @@ Requisiti basilari: Librerie opzionali di supporto: Configure notificherà a video quando le librerie opzionali non sono - trovate sul sistema. Leggere http://wiki.winehq.org/Recommended_Packages + trovate sul sistema. Leggere https://wiki.winehq.org/Recommended_Packages per suggerimenti sui pacchetti da installare. Su piattaforme a 64-bit, per compilare Wine a 32-bit (predefinito), assicurarsi di installare la versione a 32-bit di queste librerie; - leggere http://wiki.winehq.org/WineOn64bit per i dettagli. Per avere + leggere https://wiki.winehq.org/WineOn64bit per i dettagli. Per avere Wine solo 64-bit (o un setup di Wine misto tra 32-bit e 64-bit), - leggere http://wiki.winehq.org/Wine64 per maggiori informazioni. + leggere https://wiki.winehq.org/Wine64 per maggiori informazioni. 4. COMPILAZIONE @@ -114,7 +114,7 @@ di Wine in conflitto. Prova sia "dpkg -r wine" o "rpm -e wine" o "make uninstall" prima di installare. Una volta installato, esegui lo strumento di configurazione "winecfg". -Leggi l'area Support su http://www.winehq.org/ per suggerimenti sulla +Leggi l'area Support su https://www.winehq.org/ per suggerimenti sulla configurazione. @@ -142,19 +142,19 @@ di segnalazione del problema. 7. PER OTTENERE PIÙ INFORMAZIONI WWW: Un gran quantitativo di informazioni su Wine è disponibile al - WineHQ, http://www.winehq.org/: varie guide su Wine, database + WineHQ, https://www.winehq.org/: varie guide su Wine, database delle applicazioni, rintracciamento di bug. Questo è probabilmente il miglior punto di partenza. -FAQ: Le FAQ di Wine si trovano all'indirizzo http://www.winehq.org/FAQ +FAQ: Le FAQ di Wine si trovano all'indirizzo https://www.winehq.org/FAQ -Wiki: Il Wiki di Wine si trova all'indirizzo http://wiki.winehq.org +Wiki: Il Wiki di Wine si trova all'indirizzo https://wiki.winehq.org Mailing list: Esistono diverse mailing list per utenti e sviluppatori di Wine; - visitare http://www.winehq.org/forums per ulteriori informazioni. + visitare https://www.winehq.org/forums per ulteriori informazioni. -Bugs: Segnalare i bug su Wine Bugzilla all'indirizzo http://bugs.winehq.org +Bugs: Segnalare i bug su Wine Bugzilla all'indirizzo https://bugs.winehq.org Si prega di controllare il database di Bugzilla per verificare che il problema non sia già conosciuto o risolto prima di creare un rapporto su di esso. @@ -162,7 +162,7 @@ Bugs: Segnalare i bug su Wine Bugzilla all'indirizzo http://bugs.winehq.org IRC: Aiuto online disponibile nel canale #WineHQ su irc.freenode.net. Git: L'albero attuale di sviluppo di Wine è disponibile attraverso Git. - Vedere http://www.winehq.org/git per maggiori informazioni. + Vedere https://www.winehq.org/git per maggiori informazioni. Se aggiungi qualcosa, o correggi un bug, si prega di mandare una patch (preferibilmente usando git-format-patch) alla mailing list diff --git a/documentation/README.ja b/documentation/README.ja index ae21f73dcd..9b44353306 100644 --- a/documentation/README.ja +++ b/documentation/README.ja @@ -21,7 +21,7 @@ make "wine program"のようにプログラムを実行してください。更なる情報や問題解決については、このファイルの残りの部分、Wineのmanページや、 -特にhttp://www.winehq.orgで見つかる豊富な情報を読んでください。 +特にhttps://www.winehq.orgで見つかる豊富な情報を読んでください。 3. 要件 @@ -41,7 +41,7 @@ Wineをコンパイルし実行するには、以下のうち一つを持って FreeBSD情報: Wineは一般的にFreeBSD 8.0より前のバージョン上で正しく動作しないでしょう。 - 詳細については http://wiki.freebsd.org/Wine を参照してください。 + 詳細については https://wiki.freebsd.org/Wine を参照してください。 Solaris情報: GNUツールチェーン（gcc、gasなど）でWineをビルドする必要がある可能性が @@ -77,7 +77,7 @@ Mac OS X情報: オプションのサポートライブラリ: configureはオプションのライブラリがシステム上に見つからなかったときに通知を表示します。インストールすべきパッケージについてのヒントについては - http://wiki.winehq.org/Recommended_Packagesを参照してください。64ビットプ + https://wiki.winehq.org/Recommended_Packagesを参照してください。64ビットプラットフォームでは、これらライブラリの32ビットバージョンをインストールしたことをよく確認してください。 @@ -110,7 +110,7 @@ make または"make uninstall"を試してください。いったんインストールされると、"winecfg"設定ツールを実行できます。 -設定のヒントについてはhttp://www.winehq.org/におけるサポート領域を +設定のヒントについてはhttps://www.winehq.org/におけるサポート領域を参照してください。 @@ -137,26 +137,26 @@ Wineは完璧ではないので、いくつかのプログラムはクラッシ 7. 更なる情報の取得 -WWW: Wineについてのたくさんの情報がhttp://www.winehq.org/にある +WWW: Wineについてのたくさんの情報がhttps://www.winehq.org/にある WineHQから入手できます。多様なWineガイド、アプリケーションデータベース、バグ追跡。これはおそらく最良の出発点です。 -FAQ: Wine FAQはhttp://www.winehq.org/FAQにあります +FAQ: Wine FAQはhttps://www.winehq.org/FAQにあります -Wiki: Wine Wikiはhttp://wiki.winehq.orgにあります +Wiki: Wine Wikiはhttps://wiki.winehq.orgにありますメーリングリスト: Wineユーザと開発者のためのいくつかのメーリングリストがあります。 - 詳細についてはhttp://www.winehq.org/forumsを参照してください。 + 詳細についてはhttps://www.winehq.org/forumsを参照してください。 -バグ: http://bugs.winehq.orgにあるWine Bugzillaでバグを報告してください。 +バグ: https://bugs.winehq.orgにあるWine Bugzillaでバグを報告してください。バグ報告を投稿する前に問題が既知や修正済みかどうかを調べるために bugzillaデータベースを検索してください。 IRC: irc.freenode.net上のチャンネル#WineHQでオンラインヘルプを利用できます。 Git: 現在のWine開発ツリーはGitを通して入手できます。 - 詳細についてはhttp://www.winehq.org/gitに行ってください。 + 詳細についてはhttps://www.winehq.org/gitに行ってください。何かを追加するか、バグを修正するならば、次のリリースに含めるためにパッチ（git-format-patchをなるべく使用）をwine-devel(a)winehq.xn--org-eb4bpa2au41dheqot743g diff --git a/documentation/README.ko b/documentation/README.ko index a0fdcb045e..79b686c6d5 100644 --- a/documentation/README.ko +++ b/documentation/README.ko @@ -20,7 +20,7 @@ LICENSE 파일을 참조하십시오. 프로그램을 실행할 때는 "wine 프로그램명"처럼 합니다. 더 자세한 정보 및 문제 해결 방법은 이 파일의 나머지 부분과 Wine 맨페이지를 참조하십시오. -특히 http://www.winehq.org 사이트에 방대한 정보가 집약되어 있습니다. +특히 https://www.winehq.org 사이트에 방대한 정보가 집약되어 있습니다. 3. 빌드에 필요한 조건 @@ -126,7 +126,7 @@ Wine이 일단 정상적으로 빌드된 다음에는 "make install" 명령으 바랍니다. "dpkg -r wine" 또는 "rpm -e wine" 또는 "make uninstall" 등의 명령으로 이전 버전을 제거할 수 있습니다. -설정 관련 도움말은 http://www.winehq.org/의 Support 페이지에 있습니다. +설정 관련 도움말은 https://www.winehq.org/의 Support 페이지에 있습니다. 라이브러리 로딩 에러("Error while loading shared libraries: libntdll.so")가 발생하는 경우 라이브러리 경로가 /etc/ld.so.conf 파일 안에 지정되어 있는지 @@ -159,15 +159,15 @@ Wine은 아직 완성 단계에 도달하지 못했기 때문에 프로그램이 7. 더 자세한 정보 WWW: 여러 종류의 Wine 가이드, 애플리케이션 데이터베이스, 버그 추적 등 - http://www.winehq.org/ 에 있는 WineHQ 사이트에 가면 많은 정보를 얻을 + https://www.winehq.org/ 에 있는 WineHQ 사이트에 가면 많은 정보를 얻을 수 있습니다. 정보를 찾을 때 대개 이 사이트가 출발점이 됩니다. -FAQ: Wine FAQ은 http://www.winehq.org/FAQ 에 있습니다. +FAQ: Wine FAQ은 https://www.winehq.org/FAQ 에 있습니다. Usenet: Wine 관련 주제를 논의하거나 도움을 받으려면 comp.emulators.ms-windows.wine 그룹을 이용하기 바랍니다. -Bugs: http://bugs.winehq.org 의 Wine Bugzilla에 버그를 보고하십시오. +Bugs: https://bugs.winehq.org 의 Wine Bugzilla에 버그를 보고하십시오. 버그 보고서를 제출하기 전 같은 문제가 이미 제출된 적이 있는지 데이터베이스 검색을 통해 확인하기 바랍니다. comp.emulators.ms-windows.wine 그룹에 버그 보고서를 올려도 됩니다. @@ -175,13 +175,13 @@ Bugs: http://bugs.winehq.org 의 Wine Bugzilla에 버그를 보고하십시오 IRC: irc.freenode.net 의 #WineHQ 채널에서 도움을 받을 수 있습니다. GIT: Wine 개발 트리는 현재 GIT로 관리되고 있습니다. 더 자세한 정보는 - http://www.winehq.org/site/git 를 참조하기 바랍니다. + https://www.winehq.org/site/git 를 참조하기 바랍니다. 메일링 리스트: Wine 사용자와 개발자를 위해 메일링 리스트가 운영되고 있습니다. - 더 자세한 정보는 http://www.winehq.org/forums 를 참조하기 바랍니다. + 더 자세한 정보는 https://www.winehq.org/forums 를 참조하기 바랍니다. -위키: Wine 위키는 http://wiki.winehq.org 에 있습니다. +위키: Wine 위키는 https://wiki.winehq.org 에 있습니다. 추가할 내용이나 수정할 버그가 있다면 다음번 릴리스에 포함될 수 있도록 wine-devel(a)winehq.org 메일링 리스트로 패치('diff -u' 형식으로 된)를 보내 diff --git a/documentation/README.no b/documentation/README.no index 5c42500045..443515e255 100644 --- a/documentation/README.no +++ b/documentation/README.no @@ -20,7 +20,7 @@ rotkatalogen til Wine-kildekoden ./tools/wineinstall Kjør programmer som «wine program». Se resten av denne filen, -Wines man-side og http://www.winehq.org/ for mer informasjon og +Wines man-side og https://www.winehq.org/ for mer informasjon og problemløsing. @@ -40,7 +40,7 @@ støtter kjernetråder støttes kanskje i framtiden. Informasjon for FreeBSD: Wine vil som regel ikke virke på FreeBSD-versjoner eldre enn 8.0. - Se <http://wiki.freebsd.org/Wine> for mer informasjon. + Se <https://wiki.freebsd.org/Wine> for mer informasjon. Informsjon for Solaris: Wine må antakelig bygges med GNU-verktøyene (gcc, gas etc.). @@ -72,15 +72,15 @@ Basiskrav: Valgfrie støttebiblioteker: configure-skriptet viser meldinger når valgfrie biblioteker ikke blir - funnet. Se http://wiki.winehq.org/Recommended_Packages for info om + funnet. Se https://wiki.winehq.org/Recommended_Packages for info om hvilke pakker du bør installere. På 64 bit-systemer trenger du 32 bit-versjoner av disse bibliotekene hvis du skal bygge Wine som et 32 bit-program (standard); - se http://wiki.winehq.org/WineOn64bit for flere detaljer. + se https://wiki.winehq.org/WineOn64bit for flere detaljer. Hvis du ønsker å bygge Wine som et 64 bit-program (eller et oppsett med blandet 32 bit og 64 bit) kan du lese mer på - http://wiki.winehq.org/Wine64 + https://wiki.winehq.org/Wine64 4. BYGGING @@ -105,7 +105,7 @@ Ikke glem å avinstallere tidligere Wine-versjoner først. Prøv enten «dpkg -r wine», «rpm -e wine» eller «make uninstall» før installsjonen. Når Wine er installert kan du bruke oppsettsverktøyet «winecfg». -Se støtteområdet på http://www.winehq.org/ for hint om oppsett. +Se støtteområdet på https://www.winehq.org/ for hint om oppsett. 6. KJØRING AV PROGRAMMER @@ -134,18 +134,18 @@ når du rapporterer en feil. 7. MER INFORMASJON Internett: En god del informasjon om Wine finnes hos WineHQ på - http://www.winehq.org/ : diverse veiledere, en programdatabase + https://www.winehq.org/ : diverse veiledere, en programdatabase og feilsporing. Dette er antakelig det beste stedet å begynnne. -Svar: Wines spørsmål og svar finnes på http://www.winehq.org/FAQ +Svar: Wines spørsmål og svar finnes på https://www.winehq.org/FAQ -Wiki: Wines Wiki er tilgjengelig på http://wiki.winehq.org +Wiki: Wines Wiki er tilgjengelig på https://wiki.winehq.org E-postlister: Det finnes flere e-postlister for Wine-utviklere og -brukere; - besøk http://www.winehq.org/forums for mer informasjon. + besøk https://www.winehq.org/forums for mer informasjon. -Feil: Rapporter feil til Wines Bugzilla på http://bugs.winehq.org +Feil: Rapporter feil til Wines Bugzilla på https://bugs.winehq.org Søk i Bugzilla-databasen og se om probelmet allerede er funnet før du sender en feilrapport. @@ -153,7 +153,7 @@ IRC: Nødhjelp er tilgjengelig på kanalen #WineHQ på irc.freenode.net. Git: Wines oppdaterte utvikler-versjon er tilgjengelig gjennom GIT. - Gå til http://www.winehq.org/git for mer informasjon. + Gå til https://www.winehq.org/git for mer informasjon. Hvis du legger til noe eller fikser en feil er det fint som du sender en oppdateringsfil (helst laget med git format-patch) til listen diff --git a/documentation/README.pt b/documentation/README.pt index 3f3ff2cc5e..848d2d2eb2 100644 --- a/documentation/README.pt +++ b/documentation/README.pt @@ -21,7 +21,7 @@ do Wine source (que contém este ficheiro),corre: Corre os programas conforme as "wine [options] program". Para mais informações e resoçução de problemas. Lê o resto deste ficheiro, a Wine man page, e especialmente a abundância de informação encontrada em -http://www.winehq.org. +https://www.winehq.org. 3.REQUERIMENTOS @@ -130,7 +130,7 @@ instalação do Wine. Tenta outro "dpkg -r wine" ou "rpm -e wine" ou "make uninstall" antes de installar. -Ver http://www.winehq.org/support/ para informação sobre a +Ver https://www.winehq.org/support/ para informação sobre a configuraçao. No caso da livraria carregar erros (e.g. "Error while loading shared @@ -185,11 +185,11 @@ http://home.nexgo.de/andi.mohr/download/decorrupt_explorer 7.ARRANJAR MAIS INFORMAÇÃO www: Uma grande quantidade de informação acerca do Wine está disponivel - pelo WineHQ em http://www.winehq.org/ : varios guias Wine, base de + pelo WineHQ em https://www.winehq.org/ : varios guias Wine, base de dados de aplicações, localizaçao de erros. Isto é provavelmente o melhor ponto de começo. -FAQ: A Wine FAQ está localizada em http://www.winehq.org/FAQ +FAQ: A Wine FAQ está localizada em https://www.winehq.org/FAQ Usenet: Tu podes discutor tópicos relacionados de Wine e obter ajuda em comp.emulators.ms-windows.wine. @@ -198,11 +198,11 @@ IRC: Ajuda online está disponivel em #WineHQ on irc.freenode.net. Git: O currente desenvolvimento do Wine está disponivel por Git. - Vai a http://www.winehq.org/git para mais informação. + Vai a https://www.winehq.org/git para mais informação. Mailing Lists: Há algumas mailing list para responsaveis pelo desenvolvimento Wine; ver em - http://www.winehq.org/forums para mais informação. + https://www.winehq.org/forums para mais informação. Se tu acrescentaste algo,ou corrigiste um bug, por favor envia um patch (em 'diff -u' format) para wine-devel(a)winehq.org lista para inclusão diff --git a/documentation/README.pt_br b/documentation/README.pt_br index 01e0be773a..05a3d037bd 100644 --- a/documentation/README.pt_br +++ b/documentation/README.pt_br @@ -23,7 +23,7 @@ nível do código fonte do Wine, execute: Execute programas conforme "wine programa". Para maiores informações e resolução de problemas, leia o restante deste arquivo, a página "man" do Wine (man wine), e especialmente a abundância de informação -encontrada em http://www.winehq.org. +encontrada em https://www.winehq.org. 3. REQUERIMENTOS @@ -43,7 +43,7 @@ ter suporte no futuro. Informações para o FreeBSD: O Wine em geral não deve funcionar corretamente em versões antes da 8.0. - Veja http://wiki.freebsd.org/Wine para mais informações. + Veja https://wiki.freebsd.org/Wine para mais informações. Informações para o Solaris: Você provavelmente necessitará construir o Wine com as ferramentas GNU @@ -77,14 +77,14 @@ Requisitos básicos: Bibliotecas de suporte opcionais: O script configure irá mostrar diversas mensagens quando bibliotecas opcionais não forem encontradas no seu sistema. - Veja http://wiki.winehq.org/Recommended_Packages para dicas sobre + Veja https://wiki.winehq.org/Recommended_Packages para dicas sobre pacotes que você pode instalar. Em plataformas de 64 bits, se compilar Wine como 32 bits (padrão), você precisa assegurar que as versões 32 bits das bibliotecas estão instaladas, - veja http://wiki.winehq.org/WineOn64bit para mais detalhes. + veja https://wiki.winehq.org/WineOn64bit para mais detalhes. Se você quer um verdadeiro Wine de 64 bits (ou uma configuração mista de - 32 e 64 bits) veja http://wiki.winehq.org/Wine64 para mais detalhes. + 32 e 64 bits) veja https://wiki.winehq.org/Wine64 para mais detalhes. 4. COMPILAÇÃO @@ -114,7 +114,7 @@ Wine que possa ser conflitante. Tente tanto "dpkg -r wine", "rpm -e wine" ou "make uninstall" antes de instalar. Depois de instalado, pode-se executar o programa de configuração "winecfg". -Veja a área de suporte em http://www.winehq.org/ para dicas de configuração. +Veja a área de suporte em https://www.winehq.org/ para dicas de configuração. 6. EXECUTANDO PROGRAMAS @@ -142,20 +142,20 @@ poderá anexar ao bug que for criar. 7. OBTENDO MAIS INFORMAÇÃO WWW: Uma grande quantidade de informação sobre o Wine está disponível - no WineHQ em http://www.winehq.org/ : vários guias do Wine, base + no WineHQ em https://www.winehq.org/ : vários guias do Wine, base de dados de aplicações, rastreamento de erros. Este é provavelmente o melhor ponto para começar. -FAQ: O FAQ (perguntas frequentes) do Wine está em http://www.winehq.org/FAQ +FAQ: O FAQ (perguntas frequentes) do Wine está em https://www.winehq.org/FAQ -Wiki: O wiki do Wine está disponível em http://wiki.winehq.org +Wiki: O wiki do Wine está disponível em https://wiki.winehq.org Listas de discussão: Há diversas listas de mensagens para usuários e colaboradores no - desenvolvimento do Wine; veja http://www.winehq.org/forums para + desenvolvimento do Wine; veja https://www.winehq.org/forums para mais informação. -Bugs: Relate erros ao Bugzilla do Wine em http://bugs.winehq.org +Bugs: Relate erros ao Bugzilla do Wine em https://bugs.winehq.org Por favor, pesquise a base de dados do bugzilla para verificar se seu problema já foi encontrado ou resolvido antes de enviar um relatório do erro. @@ -163,7 +163,7 @@ Bugs: Relate erros ao Bugzilla do Wine em http://bugs.winehq.org IRC: A ajuda online está disponível em #WineHQ em irc.freenode.net. Git: A árvore de desenvolvimento atual do Wine está disponível por Git. - Visite http://www.winehq.org/git para mais informação. + Visite https://www.winehq.org/git para mais informação. Se você alterar algo ou reparar um erro, envie, por favor, um patch (preferencialmente usando git-format-patch) à lista wine-devel(a)winehq.org diff --git a/documentation/README.ru b/documentation/README.ru index 5c068cc6ff..5276b99bd9 100644 --- a/documentation/README.ru +++ b/documentation/README.ru @@ -20,7 +20,7 @@ make Запустите программу с помощью команды «wine имя_программы». Источники дополнительной информации перечислены в конце этого файла. Ознакомьтесь с -руководством по Wine, а также с сайтом http://www.winehq.org. +руководством по Wine, а также с сайтом https://www.winehq.org. 3. ТРЕБОВАНИЯ @@ -40,7 +40,7 @@ make FreeBSD: Wine не будет работать как следует на версиях ниже, чем FreeBSD 8.0. - Посетите <http://wiki.freebsd.org/Wine> для дополнительной информации. + Посетите <https://wiki.freebsd.org/Wine> для дополнительной информации. Solaris: Лучше всего компоновать Wine инструментами GNU @@ -74,7 +74,7 @@ Mac OS X: Дополнительные библиотеки: Конфигурационный скрипт выведет список дополнительных библиотек, которые не были найдены в вашей системе. Ознакомьтесь с перечнем необходимых пакетов по адресу - http://wiki.winehq.org/Recommended_Packages. При работе на 64-битных платформах + https://wiki.winehq.org/Recommended_Packages. При работе на 64-битных платформах убедитесь, что у вас установлены 32-битные версии этих библиотек. 4. КОМПИЛЯЦИЯ @@ -105,7 +105,7 @@ make Попробуйте «dpkg -r wine», «rpm -e wine» или «make uninstall» до установки. После установки запустите конфигурационную программу «winecfg». Посетите -Службу поддержки на http://www.winehq.org/, если возникнут вопросы по конфигурации. +Службу поддержки на https://www.winehq.org/, если возникнут вопросы по конфигурации. 6. ЗАПУСК ПРОГРАММ @@ -132,25 +132,25 @@ Wine не идеален, поэтом некоторые программы м 7. ПОЛУЧЕНИЕ ДОПОЛНИТЕЛЬНОЙ ИНФОРМАЦИИ WWW: Много информации о Wine доступно в WineHQ на - http://www.winehq.org/: различные руководства Wine, база данных приложений, + https://www.winehq.org/: различные руководства Wine, база данных приложений, база данных ошибок. Вероятно лучше всего начать с этого сайта. -FAQ: Wine FAQ расположен на http://www.winehq.org/FAQ +FAQ: Wine FAQ расположен на https://www.winehq.org/FAQ -Wiki: Wine Wiki расположен на http://wiki.winehq.org +Wiki: Wine Wiki расположен на https://wiki.winehq.org Рассылки: Имеется несколько рассылок для пользователей и разработчиков Wine, - обратитесь по адресу http://www.winehq.org/forums за дополнительной информацией. + обратитесь по адресу https://www.winehq.org/forums за дополнительной информацией. -Ошибки: Сообщайте об ошибках в Wine Bugzilla по адресу http://bugs.winehq.org +Ошибки: Сообщайте об ошибках в Wine Bugzilla по адресу https://bugs.winehq.org Прежде чем отправлять сообщение об ошибке проверьте, может эта ошибка уже известна или исправлена в последней версии Wine. IRC: Онлайн помощь доступна на канале #WineHQ на irc.freenode.net. Git: Текущие разработки Wine доступны через Git. - Смотрите http://www.winehq.org/site/git для дополнительной информации. + Смотрите https://www.winehq.org/site/git для дополнительной информации. Если вы что-то добавили или исправили ошибку, пожалуйста отправьте патч (предпочтительно сгенерированный с помощью git-format-patch) на wine-devel(a)winehq.org diff --git a/documentation/README.tr b/documentation/README.tr index f48422d2a2..28b17b8c37 100644 --- a/documentation/README.tr +++ b/documentation/README.tr @@ -21,7 +21,7 @@ Kur'u kullanmanız önerilir. Wine kaynak kodu içerisinde en üst dizine Programları "wine [seçenekler] program" şeklinde çalıştırabilirsiniz. Daha ayrıntılı bilgi ve sorun çözümü için, bu dosyanın geri kalanını, -Wine kullanım kılavuzunu ve özellikle http://www.winehq.org sitesindeki +Wine kullanım kılavuzunu ve özellikle https://www.winehq.org sitesindeki zengin bilgi arşivini tarayabilirsiniz. 3. GEREKSİNİMLER @@ -43,7 +43,7 @@ de gelecekte desteklenebilir. FreeBSD hakkında bilgi: Wine, FreeBSD 8.0'dan önceki sürümlerde genellikle düzgün çalışmaz. - Ayrıntılı bilgi için http://wiki.freebsd.org/Wine adresini ziyaret + Ayrıntılı bilgi için https://wiki.freebsd.org/Wine adresini ziyaret ediniz. Solaris hakkında bilgi: @@ -78,13 +78,13 @@ Temel gereksinimler: Seçeneğe bağlı destek kitaplıkları: Yapılandırılırken, eğer seçeneğe bağlı paketler bulunamadıysa, bildirim alacaksınız. Yüklemeniz gereken paketler hakkında ipuçları için, - http://wiki.winehq.org/Recommended_Packages adresini ziyaret ediniz. + https://wiki.winehq.org/Recommended_Packages adresini ziyaret ediniz. 64 bit üzerinde, eğer Wine'yi 32 bit (varsayılan) olarak derleyecekseniz, bazı kitaplıklarin 32 bit sürümlerinin yüklü olduğundan emin olunuz; - ayrıntılar için http://wiki.winehq.org/WineOn64bit adresini ziyaret + ayrıntılar için https://wiki.winehq.org/WineOn64bit adresini ziyaret ediniz. Eğer gerçek bir 64 bit Wine kurulumu (veya 32-64 bit karışık) - isterseniz, bilgi için http://wiki.winehq.org/Wine64 adresini ziyaret + isterseniz, bilgi için https://wiki.winehq.org/Wine64 adresini ziyaret ediniz. 4. DERLEME @@ -113,7 +113,7 @@ kılavuzunu ve gerekli birkaç dosyayı kuracaktır. uninstall" komutlarından birini deneyiniz. Yüklemeden sonra, "winecfg" yapılandıma aracını -çalıştırabilirsiniz. Yapılandırma ipuçları için http://www.winehq.org/ +çalıştırabilirsiniz. Yapılandırma ipuçları için https://www.winehq.org/ adresinde Destek bölümüne bakınız. 6. UYGULAMALARIN ÇALIŞTIRILMASI @@ -139,16 +139,16 @@ bildirirken eklemelisiniz. 7. DAHA FAZLA BİLGİYE ERİŞİM -WWW: Wine hakkında geniş bilgiyi WineHQ sitesine http://www.winehq.org/ +WWW: Wine hakkında geniş bilgiyi WineHQ sitesine https://www.winehq.org/ adresinden ulaşarak edinebilirsiniz: çeşitli Wine kılavuzları, uygulama veritabanı, hata izleme gibi. Burası muhtemelen en iyi başlangıç noktasıdır. SSS: Wine hakkında sıkça sorulan sorulara buradan ulaşabilirsiniz: - http://www.winehq.org/FAQ + https://www.winehq.org/FAQ Hatalar: - Karşılaştığınız hataları http://bugs.winehq.org adresinden Wine + Karşılaştığınız hataları https://bugs.winehq.org adresinden Wine Bugzilla ile bildirebilirsiniz. Lütfen bir hata bildirmeden önce hatanın önceden girilip girilmediğini öğrenmek için Bugzilla'da arama yapınız. @@ -157,11 +157,11 @@ IRC: irc.freenode.net sunucusundan #WineHQ kanalı ile çevrimiçi yardım alabilirsiniz. Git: Geçerli Wine geliştirme ağacına Git üzerinden erişim sağlanabilir. - Daha fazla bilgi için http://www.winehq.org/git adresine gidiniz. + Daha fazla bilgi için https://www.winehq.org/git adresine gidiniz. E-posta listeleri: Wine geliştiricileri için birtakım e-posta listeleri bulunmaktadır. - Daha fazla bilgi için http://www.winehq.org/forums adresine gidiniz. + Daha fazla bilgi için https://www.winehq.org/forums adresine gidiniz. Eğer bir şey eklemek veya hata düzeltmek istiyorsanız, lütfen sonraki sürümde yer alabilmesii için wine-devel(a)winehq.org e-posta listesine bir diff --git a/documentation/README.uk b/documentation/README.uk index f9a4fa4853..a70e4979f1 100644 --- a/documentation/README.uk +++ b/documentation/README.uk @@ -21,7 +21,7 @@ Wine Installer для компонування і встановлення Wine. Запустіть програму як "wine program". Додаткові джерела інформації перераховані в кінці цього файлу. Ознайомтеся з посібником з Wine, -а також з сайтом http://www.winehq.org. +а також з сайтом https://www.winehq.org. 3. ВИМОГИ @@ -46,7 +46,7 @@ Linux: FreeBSD: Wine не буде працювати як слід на версіях нижче, ніж FreeBSD 6.3 чи 7.0. Для FreeBSD 6.3 є патч, що дозволяє Wine запускатися. - Відвідайте http://wiki.freebsd.org/Wine для додаткової інформації. + Відвідайте https://wiki.freebsd.org/Wine для додаткової інформації. Solaris: Найкраще збирати Wine інструментами GNU (gcc, gas, тощо). Увага: @@ -79,13 +79,13 @@ Mac OS X: Додаткові бібліотеки підтримки: Конфігураційний скрипт виведе список додаткових бібліотек, які не були знайдені у вашій системі. Ознайомтеся з переліком потрібних пакетів за - адресою http://wiki.winehq.org/Recommended_Packages. + адресою https://wiki.winehq.org/Recommended_Packages. На 64-бітних платформах ви повинні переконатися, що у вас встановлені 32-бітні версії цих бібліотек; за більш детальною інформацією зверніться - до http://wiki.winehq.org/WineOn64bit. Якщо вам потрібен 64-бітний Wine + до https://wiki.winehq.org/WineOn64bit. Якщо вам потрібен 64-бітний Wine (чи змішаний 32-бітний та 64-бітний встановлювач Wine), дивіться - http://wiki.winehq.org/Wine64 за більш детальною інформацією. + https://wiki.winehq.org/Wine64 за більш детальною інформацією. 4. ЗБИРАННЯ @@ -113,7 +113,7 @@ make перед встановленням. Після встановлення запустіть конфігураційну програму "winecfg". Відвідайте Службу -підтримки на http://www.winehq.org/, якщо виникнуть питання щодо конфігурування. +підтримки на https://www.winehq.org/, якщо виникнуть питання щодо конфігурування. 6. ЗАПУСК ПРОГРАМ @@ -140,26 +140,26 @@ Wine знаходиться в процесі розробки, тому дея 7. ОТРИМАННЯ ДОДАТКОВОЇ ІНФОРМАЦІЇ WWW: Багато інформації про Wine є в WineHQ на - http://www.winehq.org/: різні керівництва Wine, база даних додатків, + https://www.winehq.org/: різні керівництва Wine, база даних додатків, база даних помилок. Ймовірно найкраще почати з цього сайту. -FAQ: Wine FAQ розташований на http://www.winehq.org/FAQ +FAQ: Wine FAQ розташований на https://www.winehq.org/FAQ -Wiki: Wine Wiki розташована на http://wiki.winehq.org +Wiki: Wine Wiki розташована на https://wiki.winehq.org Списки розсилання: Є кілька розсилок для користувачів і розробників Wine; - дивіться http://www.winehq.org/forums для додаткової інформації. + дивіться https://www.winehq.org/forums для додаткової інформації. Помилки(баги): - Повідомляйте про помилки у Wine Bugzilla на http://bugs.winehq.org + Повідомляйте про помилки у Wine Bugzilla на https://bugs.winehq.org Перш ніж відправляти повідомлення про помилку перевірте в базі, чи ця помилка вже виявлена. IRC: Онлайн допомога доступна на каналі #WineHQ на irc.freenode.net. Git: Поточне дерево розробки Wine доступне через Git. - Дивіться http://www.winehq.org/git за детальною інформацією. + Дивіться https://www.winehq.org/git за детальною інформацією. Якщо ви щось додали або виправили помилку, надішліть патч (найкраще використавши git-format-patch) на wine-devel(a)winehq.org для його diff --git a/documentation/README.zh_cn b/documentation/README.zh_cn index ce23c99b96..936172471b 100644 --- a/documentation/README.zh_cn +++ b/documentation/README.zh_cn @@ -21,7 +21,7 @@ Wine 是自由软件，在 GNU LGPL 协议下发布；请查看 LICENSE 文件运行程序时，请使用“wine [程序名]”的语法。如需了解更多信息或解决遇到的问题，您可以继续阅读本文件的剩余部分，或阅读 Wine 的手册页。 -需特别指出的是，您可以在网站：http://www.winehq.org 上找到十分丰富 +需特别指出的是，您可以在网站：https://www.winehq.org 上找到十分丰富的信息。 @@ -40,7 +40,7 @@ Wine 是自由软件，在 GNU LGPL 协议下发布；请查看 LICENSE 文件 FreeBSD 信息： Wine 通常不会在早于 FreeBSD 8.0 的系统上正常工作。 - 请查看 http://wiki.freebsd.org/Wine 以了解更多信息。 + 请查看 https://wiki.freebsd.org/Wine 以了解更多信息。 Solaris 信息：您大部分情况下可能需要使用 GNU 工具链（gcc、gas 等）来构建 Wine。 @@ -73,13 +73,13 @@ Mac OS X 信息: 可选的支持库：当可选的函数库无法在您的系统中找到时，configure 会显示对应的提示信息。 - 请查看 http://wiki.winehq.org/Recommended_Packages 以了解您应当安装的 + 请查看 https://wiki.winehq.org/Recommended_Packages 以了解您应当安装的软件包的信息。在 64 位平台上，如果以 32 位的方式编译 Wine（这是默认情况），您必须确保 - 对应函数库的 32 位版本已被安装；请查看 http://wiki.winehq.org/WineOn64bit + 对应函数库的 32 位版本已被安装；请查看 https://wiki.winehq.org/WineOn64bit 以了解详情。如果您想安装一个真正的 64 位 Wine（或者一个混合 32 位 Wine 和 - 64 位 Wine 的版本），请参阅 http://wiki.winehq.org/Wine64 以了解具体内容。 + 64 位 Wine 的版本），请参阅 https://wiki.winehq.org/Wine64 以了解具体内容。 4. 编译 @@ -103,7 +103,7 @@ make 不要忘记事先卸载先前任何安装过的、会引起冲突的 Wine 软件集。请在安装前尝试“dpkg -r wine”、“rpm -e wine”或“make uninstall”。 -一旦安装完成，您可以运行“winecfg”配置工具。请参考 http://www.winehq.org/ +一旦安装完成，您可以运行“winecfg”配置工具。请参考 https://www.winehq.org/ 网站中的支持页面以了解配置技巧。 @@ -129,26 +129,26 @@ Wine 不是十全十美的，所以某些程序可能会崩溃。如果这样的 7. 获取更多信息 -WWW: 有关 Wine 的很多信息可以在 WineHQ 网站：http://www.winehq.org/ +WWW: 有关 Wine 的很多信息可以在 WineHQ 网站：https://www.winehq.org/ 上面找到。包括：各类 Wine 相关的向导、应用程序数据库（AppDB）、漏洞跟踪系统等等。这个网站可能是您最佳的起始之处。 -FAQ: Wine 常见问题位于 http://www.winehq.org/FAQ +FAQ: Wine 常见问题位于 https://www.winehq.org/FAQ -维基： Wine 维基位于 http://wiki.winehq.org +维基： Wine 维基位于 https://wiki.winehq.org 邮件列表：存在数个服务于 Wine 用户和开发者的邮件列表； - 请查看 http://www.winehq.org/forums 以了解更多信息。 + 请查看 https://www.winehq.org/forums 以了解更多信息。 -Bugs: 请向位于 http://bugs.winehq.org 的 Wine Bugzilla 提交 bug。 +Bugs: 请向位于 https://bugs.winehq.org 的 Wine Bugzilla 提交 bug。请在提交漏洞报告前先在 bugzilla 数据库中进行搜索，检查先前是否已有类似的已知问题以避免重复，并跟踪这些问题的修复情况。 IRC: 您可以在 irc.freenode.net 的 #WineHQ 频道获取到在线帮助。 Git: 当前 Wine 的开发树可经由 Git 获取。 - 请前往 http://www.winehq.org/git 以了解更多信息。 + 请前往 https://www.winehq.org/git 以了解更多信息。如果您在代码中添加了某些内容，或是修复了某个 bug，请向 wine-devel(a)winehq.org 这个邮件列表发送对应的补丁（建议使用 -- 2.15.1

1 0

[PATCH] testbot/web: Remove some unused escapeHTML() import directives.
by Francois Gouget 07 Dec '17

07 Dec '17

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Feedback.pl | 1 - testbot/web/ForgotPassword.pl | 1 - testbot/web/ResetPassword.pl | 1 - 3 files changed, 3 deletions(-) diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index e22dc3af..ded705a1 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -21,7 +21,6 @@ use strict; package FeedbackPage; -use CGI qw(:standard escapeHTML); use ObjectModel::BasicPropertyDescriptor; use ObjectModel::CGI::FreeFormPage; use WineTestBot::Config; diff --git a/testbot/web/ForgotPassword.pl b/testbot/web/ForgotPassword.pl index 801b50d7..c6240e7d 100644 --- a/testbot/web/ForgotPassword.pl +++ b/testbot/web/ForgotPassword.pl @@ -21,7 +21,6 @@ use strict; package ForgotPasswordPage; -use CGI qw(:standard escapeHTML); use ObjectModel::BasicPropertyDescriptor; use ObjectModel::CGI::FreeFormPage; use WineTestBot::Users; diff --git a/testbot/web/ResetPassword.pl b/testbot/web/ResetPassword.pl index d512968d..431a4da0 100644 --- a/testbot/web/ResetPassword.pl +++ b/testbot/web/ResetPassword.pl @@ -21,7 +21,6 @@ use strict; package ResetPasswordPage; -use CGI qw(:standard escapeHTML); use ObjectModel::BasicPropertyDescriptor; use ObjectModel::CGI::FreeFormPage; use WineTestBot::Users; -- 2.15.0

1 0

[PATCH] testbot/web: Add ids so one can link to a given job on the Home page.
by Francois Gouget 07 Dec '17

07 Dec '17

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/index.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 3f3a91e6..b0c2d450 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -87,7 +87,8 @@ sub GenerateDataCell($$$$) my $PropertyName = $PropertyDescriptor->GetName(); if ($PropertyName eq "Status") { - print "<td><a href='/JobDetails.pl?Key=", uri_escape($Item->GetKey()), "'>"; + my $EscapedKey = uri_escape($Item->GetKey()); + print "<td id='job$EscapedKey'><a href='/JobDetails.pl?Key=$EscapedKey'>"; my %HTMLChunks = ("queued" => "<span class='queued'>queued</span>", "running" => "<span class='running'>running</span>", -- 2.15.0

1 0

[PATCH] testbot/web: Use our escapeHTML() instead of calling directly the CGI one.
by Francois Gouget 07 Dec '17

07 Dec '17

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Login.pl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/testbot/web/Login.pl b/testbot/web/Login.pl index 99757c54..f17d60ed 100644 --- a/testbot/web/Login.pl +++ b/testbot/web/Login.pl @@ -21,7 +21,6 @@ use strict; package LoginPage; -use CGI qw(:standard escapeHTML); use ObjectModel::BasicPropertyDescriptor; use ObjectModel::CGI::FreeFormPage; use WineTestBot::Config; @@ -79,7 +78,7 @@ sub GenerateFields($) if (defined($self->GetParam("Target"))) { print "<div><input type='hidden' name='Target' value='", - escapeHTML($self->GetParam("Target")), "'></div>\n"; + $self->escapeHTML($self->GetParam("Target")), "'></div>\n"; } $self->SUPER::GenerateFields(); -- 2.15.0

1 0

[PATCH] testbot: Remove extraneous colons in new() calls.
by Francois Gouget 07 Dec '17

07 Dec '17

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Branches.pm | 4 ++-- testbot/lib/WineTestBot/Roles.pm | 4 ++-- testbot/lib/WineTestBot/Users.pm | 4 ++-- testbot/lib/WineTestBot/VMs.pm | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/testbot/lib/WineTestBot/Branches.pm b/testbot/lib/WineTestBot/Branches.pm index 63a582c7..bfd24ddc 100644 --- a/testbot/lib/WineTestBot/Branches.pm +++ b/testbot/lib/WineTestBot/Branches.pm @@ -97,8 +97,8 @@ sub CreateItem($) sub CreateBranches(;$) { my ($ScopeObject) = @_; - return WineTestBot::Branches::->new("Branches", "Branches", "Branch", - \@PropertyDescriptors, $ScopeObject); + return WineTestBot::Branches->new("Branches", "Branches", "Branch", + \@PropertyDescriptors, $ScopeObject); } 1; diff --git a/testbot/lib/WineTestBot/Roles.pm b/testbot/lib/WineTestBot/Roles.pm index 86c5a13a..7c59e6a4 100644 --- a/testbot/lib/WineTestBot/Roles.pm +++ b/testbot/lib/WineTestBot/Roles.pm @@ -73,8 +73,8 @@ sub CreateItem($) sub CreateRoles(;$) { my ($ScopeObject) = @_; - return WineTestBot::Roles::->new("Roles", "Roles", "Role", - \@PropertyDescriptors, $ScopeObject); + return WineTestBot::Roles->new("Roles", "Roles", "Role", + \@PropertyDescriptors, $ScopeObject); } 1; diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index 9618a18d..2139b6d5 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -333,8 +333,8 @@ sub CreateItem($) sub CreateUsers(;$) { my ($ScopeObject) = @_; - return WineTestBot::Users::->new("Users", "Users", "User", - \@PropertyDescriptors, $ScopeObject); + return WineTestBot::Users->new("Users", "Users", "User", + \@PropertyDescriptors, $ScopeObject); } sub AuthenticateLDAP($$$) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index b9313429..c6272ee2 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -553,8 +553,8 @@ sub CreateItem($) sub CreateVMs(;$) { my ($ScopeObject) = @_; - return WineTestBot::VMs::->new("VMs", "VMs", "VM", - \@PropertyDescriptors, $ScopeObject); + return WineTestBot::VMs->new("VMs", "VMs", "VM", + \@PropertyDescriptors, $ScopeObject); } sub SortKeysBySortOrder($$) -- 2.15.0

1 0

[PATCH] testbot: Document a quirk of Collection::Add().
by Francois Gouget 07 Dec '17

07 Dec '17

Not only does it not force loading from the database, it marks the Collection as loaded. So if Add() is the first call on a Collection, calling GetKeys() or GetItems() later on will only return the new Item. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/Collection.pm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 9d3d3aef..1b29ec16 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -168,6 +168,11 @@ sub Load($) Instantiates a new Item and adds it to the Collection. +Note that not only does calling Add() not force loading from the database, +it marks the Collection as loaded. So if Add() is the first call on a +Collection, calling GetKeys() or GetItems() later on will only return the new +Item. + See Item->new() for details on the Item's default column values and for important information regarding its primary key. -- 2.15.0

1 0

[Tools] testbot: Don't fail setting the Status of a brand new VM.
by Francois Gouget 07 Dec '17

07 Dec '17

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/VMs.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index c6272ee2..7db0aa51 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -221,7 +221,7 @@ sub Status($;$) my $CurrentStatus = $self->SUPER::Status; return $CurrentStatus if (!defined $NewStatus); - if ($NewStatus ne $CurrentStatus) + if (!defined $CurrentStatus or $NewStatus ne $CurrentStatus) { $self->SUPER::Status($NewStatus); $self->{OldStatus} = $CurrentStatus; -- 2.15.0

1 0

[Tools v3 1/2] testbot: Run make_makefiles when a file is added or removed.
by Zebediah Figura 07 Dec '17

07 Dec '17

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: also run 'git add -A' so that new files will actually be seen by make_makefiles. v3: also check if tools/make_makefiles itself was modified. testbot/bin/build/Build.pl | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 051039f..82cd66a 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -74,6 +74,7 @@ sub ApplyPatch($$$) { my ($PatchFile, $PatchType, $BaseName) = @_; + my $NeedMakeMakefiles = !1; my $NeedMakefile = 0; my $NeedMakeInclude = !1; my $NeedBuildDeps = !1; @@ -84,7 +85,7 @@ sub ApplyPatch($$$) { my $Line; while (defined($Line = <FH>) && - ($NeedMakefile == 0 || ! $NeedMakeInclude || ! $NeedBuildDeps || + (! $NeedMakeMakefiles || $NeedMakefile == 0 || ! $NeedMakeInclude || ! $NeedBuildDeps || ! $NeedImplib || ! $NeedAutoconf || ! $NeedConfigure)) { if ($Line =~ m=^diff.*(?:tests/Makefile\.in|Make\.vars\.in|Make\.rules\.in|Maketest\.rules\.in)$=) @@ -111,13 +112,19 @@ sub ApplyPatch($$$) { $NeedConfigure = 1; } + elsif ($Line =~ m=^new file= || $Line =~ m=^deleted file= || $Line =~ m=^rename= || + $Line =~ m=diff.*tools/make_makefiles=) + { + $NeedMakeMakefiles = $NeedConfigure = 1; + } } close FH; } InfoMsg "Applying patch\n"; system("( cd $DataDir/wine && set -x && " . - " git apply --verbose $PatchFile " . + " git apply --verbose $PatchFile && " . + " git add -A " . ") >> $LogDir/Build.log 2>&1"); if ($? != 0) { @@ -125,6 +132,19 @@ sub ApplyPatch($$$) return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure); } + if ($NeedMakeMakefiles) + { + InfoMsg "Running make_makefiles\n"; + system("( cd $DataDir/wine && set -x && " . + " ./tools/make_makefiles " . + ") >> $LogDir/Build.log 2>&1"); + if ($? != 0) + { + LogMsg "make_makefiles failed\n"; + return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure); + } + } + if ($NeedAutoconf && ! $NeedConfigure) { InfoMsg "Running autoconf\n"; -- 2.7.4

1 1

[PATCH] loader/wine.pl.UTF-8.man.in: Move WineHQ URL to https
by Austin English 06 Dec '17

06 Dec '17

Missed in 3bc68c24b972643aba2b96dcdcf97ea2f9fb82bd Signed-off-by: Austin English <austinenglish(a)gmail.com> --- loader/wine.pl.UTF-8.man.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.pl.UTF-8.man.in b/loader/wine.pl.UTF-8.man.in index 9f1f2cf28d..c487d0a6d8 100644 --- a/loader/wine.pl.UTF-8.man.in +++ b/loader/wine.pl.UTF-8.man.in @@ -305,7 +305,7 @@ można pobrać ze strony Najaktualnieszy zrzut kodu można pobrać przez GIT. Aby dowiedzieć się jak to zrobić, odwiedź stronę .I -http://www.winehq.org/git +https://www.winehq.org/git .PP WineHQ, siedziba rozwoju .B wine -- 2.13.6

1 0

[PATCH v4 3/3] ntdll: Don't require full-page reads in NtReadFileScatter
by Andrew Eikum 06 Dec '17

06 Dec '17

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/kernel32/tests/file.c | 30 +++++++++++++++++++++++++++++- dlls/ntdll/file.c | 5 ++--- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 94feee6372..410c3f0591 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4353,7 +4353,7 @@ static void test_WriteFileGather(void) FILE_SEGMENT_ELEMENT fse[2]; OVERLAPPED ovl, *povl = NULL; SYSTEM_INFO si; - LPVOID wbuf = NULL, rbuf1, rbuf2; + char *wbuf = NULL, *rbuf1, *rbuf2; BOOL br; evt = CreateEventW( NULL, TRUE, FALSE, NULL ); @@ -4492,6 +4492,34 @@ static void test_WriteFileGather(void) ok( memcmp( rbuf2, rbuf1, si.dwPageSize ) == 0, "data should not have been read into buffer\n" ); + ResetEvent( evt ); + + /* partial page read */ + memset( &ovl, 0, sizeof(ovl) ); + ovl.hEvent = evt; + memset( fse, 0, sizeof(fse) ); + fse[0].Buffer = rbuf1; + memset( rbuf1, 0, si.dwPageSize ); + SetLastError( 0xdeadbeef ); + br = ReadFileScatter( hfile, fse, si.dwPageSize / 2, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should be asynchronous\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); + + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); + ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError() ); + ok( povl == &ovl, "wrong ovl %p\n", povl ); + + tx = 0; + br = GetOverlappedResult( hfile, &ovl, &tx, TRUE ); + ok( br == TRUE, "GetOverlappedResult failed: %u\n", GetLastError() ); + ok( tx == si.dwPageSize / 2, "got unexpected bytes transferred: %u\n", tx ); + + ok( memcmp( rbuf1, wbuf, si.dwPageSize / 2 ) == 0, + "invalid data was read into buffer\n" ); + memset( rbuf2, 0, si.dwPageSize ); + ok( memcmp( rbuf1 + si.dwPageSize / 2, rbuf2, si.dwPageSize - si.dwPageSize / 2 ) == 0, + "invalid data was read into buffer\n" ); + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 3d4a94923b..570e46c0a7 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1041,7 +1041,6 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap TRACE( "(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p),partial stub!\n", file, event, apc, apc_user, io_status, segments, length, offset, key); - if (length % page_size) return STATUS_INVALID_PARAMETER; if (!io_status) return STATUS_ACCESS_VIOLATION; status = server_get_unix_fd( file, FILE_READ_DATA, &unix_handle, @@ -1060,9 +1059,9 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap { if (offset && offset->QuadPart != FILE_USE_FILE_POINTER_POSITION) result = pread( unix_handle, (char *)segments->Buffer + pos, - page_size - pos, offset->QuadPart + total ); + min( length - pos, page_size - pos ), offset->QuadPart + total ); else - result = read( unix_handle, (char *)segments->Buffer + pos, page_size - pos ); + result = read( unix_handle, (char *)segments->Buffer + pos, min( length - pos, page_size - pos ) ); if (result == -1) { -- 2.15.1

1 0

[PATCH v4 2/3] ntdll: Don't return an error when reading past EOF in NtReadFileScatter
by Andrew Eikum 06 Dec '17

06 Dec '17

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/kernel32/tests/file.c | 34 +++++++++++++++++++++++++++++++++- dlls/ntdll/file.c | 8 +++----- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 4980e02d7d..94feee6372 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4353,7 +4353,7 @@ static void test_WriteFileGather(void) FILE_SEGMENT_ELEMENT fse[2]; OVERLAPPED ovl, *povl = NULL; SYSTEM_INFO si; - LPVOID wbuf = NULL, rbuf1; + LPVOID wbuf = NULL, rbuf1, rbuf2; BOOL br; evt = CreateEventW( NULL, TRUE, FALSE, NULL ); @@ -4380,6 +4380,9 @@ static void test_WriteFileGather(void) rbuf1 = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); ok( rbuf1 != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + rbuf2 = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); + ok( rbuf2 != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + memset( &ovl, 0, sizeof(ovl) ); ovl.hEvent = evt; memset( fse, 0, sizeof(fse) ); @@ -4461,6 +4464,34 @@ static void test_WriteFileGather(void) ResetEvent( evt ); + /* read past EOF */ + memset( &ovl, 0, sizeof(ovl) ); + ovl.hEvent = evt; + memset( fse, 0, sizeof(fse) ); + fse[0].Buffer = rbuf1; + fse[1].Buffer = rbuf2; + memset( rbuf1, 0, si.dwPageSize ); + memset( rbuf2, 0x17, si.dwPageSize ); + SetLastError( 0xdeadbeef ); + br = ReadFileScatter( hfile, fse, si.dwPageSize * 2, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should be asynchronous\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); + + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); + ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError() ); + ok( povl == &ovl, "wrong ovl %p\n", povl ); + + tx = 0; + br = GetOverlappedResult( hfile, &ovl, &tx, TRUE ); + ok( br == TRUE, "GetOverlappedResult failed: %u\n", GetLastError() ); + ok( tx == si.dwPageSize, "got unexpected bytes transferred: %u\n", tx ); + + ok( memcmp( rbuf1, wbuf, si.dwPageSize ) == 0, + "data was not read into buffer\n" ); + memset( rbuf1, 0x17, si.dwPageSize ); + ok( memcmp( rbuf2, rbuf1, si.dwPageSize ) == 0, + "data should not have been read into buffer\n" ); + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); @@ -4481,6 +4512,7 @@ static void test_WriteFileGather(void) VirtualFree( wbuf, 0, MEM_RELEASE ); VirtualFree( rbuf1, 0, MEM_RELEASE ); + VirtualFree( rbuf2, 0, MEM_RELEASE ); CloseHandle( evt ); DeleteFileA( filename ); } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 9df15ffe1d..3d4a94923b 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1070,11 +1070,7 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap status = FILE_GetNtStatus(); break; } - if (!result) - { - status = STATUS_END_OF_FILE; - break; - } + if (!result) break; total += result; length -= result; if ((pos += result) == page_size) @@ -1084,6 +1080,8 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap } } + if (total == 0) status = STATUS_END_OF_FILE; + send_completion = cvalue != 0; if (needs_close) close( unix_handle ); -- 2.15.1

1 0

[PATCH v4 1/3] ntdll: Report NtReadFileScatter results asynchronously
by Andrew Eikum 06 Dec '17

06 Dec '17

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v4: Return STATUS_PENDING only when we get far enough to actually try to read the file. Also added tests to all patches for GetOverlappedResults with an event. dlls/kernel32/tests/file.c | 104 ++++++++++++++++++++++++++++++++++++++++----- dlls/ntdll/file.c | 29 ++++++------- 2 files changed, 108 insertions(+), 25 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 0b8cef23f8..4980e02d7d 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4347,13 +4347,16 @@ static void test_SetFileValidData(void) static void test_WriteFileGather(void) { char temp_path[MAX_PATH], filename[MAX_PATH]; - HANDLE hfile, hiocp1, hiocp2; - DWORD ret, size; + HANDLE hfile, hiocp1, hiocp2, evt; + DWORD ret, size, tx; ULONG_PTR key; FILE_SEGMENT_ELEMENT fse[2]; OVERLAPPED ovl, *povl = NULL; SYSTEM_INFO si; - LPVOID buf = NULL; + LPVOID wbuf = NULL, rbuf1; + BOOL br; + + evt = CreateEventW( NULL, TRUE, FALSE, NULL ); ret = GetTempPathA( MAX_PATH, temp_path ); ok( ret != 0, "GetTempPathA error %d\n", GetLastError() ); @@ -4371,12 +4374,18 @@ static void test_WriteFileGather(void) ok( hiocp2 != 0, "CreateIoCompletionPort failed err %u\n", GetLastError() ); GetSystemInfo( &si ); - buf = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); - ok( buf != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + wbuf = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); + ok( wbuf != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + + rbuf1 = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); + ok( rbuf1 != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); memset( &ovl, 0, sizeof(ovl) ); + ovl.hEvent = evt; memset( fse, 0, sizeof(fse) ); - fse[0].Buffer = buf; + fse[0].Buffer = wbuf; + memset( wbuf, 0x42, si.dwPageSize ); + SetLastError( 0xdeadbeef ); if (!WriteFileGather( hfile, fse, si.dwPageSize, NULL, &ovl )) ok( GetLastError() == ERROR_IO_PENDING, "WriteFileGather failed err %u\n", GetLastError() ); @@ -4384,20 +4393,95 @@ static void test_WriteFileGather(void) ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError()); ok( povl == &ovl, "wrong ovl %p\n", povl ); + tx = 0; + br = GetOverlappedResult( hfile, &ovl, &tx, TRUE ); + ok( br == TRUE, "GetOverlappedResult failed: %u\n", GetLastError() ); + ok( tx == si.dwPageSize, "got unexpected bytes transferred: %u\n", tx ); + + ResetEvent( evt ); + + /* read exact size */ memset( &ovl, 0, sizeof(ovl) ); + ovl.hEvent = evt; memset( fse, 0, sizeof(fse) ); - fse[0].Buffer = buf; - if (!ReadFileScatter( hfile, fse, si.dwPageSize, NULL, &ovl )) - ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); + fse[0].Buffer = rbuf1; + memset( rbuf1, 0, si.dwPageSize ); + SetLastError( 0xdeadbeef ); + br = ReadFileScatter( hfile, fse, si.dwPageSize, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should be asynchronous\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError()); ok( povl == &ovl, "wrong ovl %p\n", povl ); + tx = 0; + br = GetOverlappedResult( hfile, &ovl, &tx, TRUE ); + ok( br == TRUE, "GetOverlappedResult failed: %u\n", GetLastError() ); + ok( tx == si.dwPageSize, "got unexpected bytes transferred: %u\n", tx ); + + ok( memcmp( rbuf1, wbuf, si.dwPageSize ) == 0, + "data was not read into buffer\n" ); + + ResetEvent( evt ); + + /* start read at EOF */ + memset( &ovl, 0, sizeof(ovl) ); + ovl.hEvent = evt; + S(U(ovl)).OffsetHigh = 0; + S(U(ovl)).Offset = si.dwPageSize; + memset( fse, 0, sizeof(fse) ); + fse[0].Buffer = rbuf1; + SetLastError( 0xdeadbeef ); + br = ReadFileScatter( hfile, fse, si.dwPageSize, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should have failed\n" ); + ok( GetLastError() == ERROR_HANDLE_EOF || + GetLastError() == ERROR_IO_PENDING, "ReadFileScatter gave wrong error %u\n", GetLastError() ); + if (GetLastError() == ERROR_IO_PENDING) + { + SetLastError( 0xdeadbeef ); + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); + ok( !ret, "GetQueuedCompletionStatus should have returned failure\n" ); + ok( GetLastError() == ERROR_HANDLE_EOF, "Got wrong error: %u\n", GetLastError() ); + ok( povl == &ovl, "wrong ovl %p\n", povl ); + + SetLastError( 0xdeadbeef ); + br = GetOverlappedResult( hfile, &ovl, &tx, TRUE ); + ok( br == FALSE, "GetOverlappedResult should have failed\n" ); + ok( GetLastError() == ERROR_HANDLE_EOF, "Got wrong error: %u\n", GetLastError() ); + } + else + { + SetLastError( 0xdeadbeef ); + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 100 ); + ok( !ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError() ); + ok( GetLastError() == WAIT_TIMEOUT, "GetQueuedCompletionStatus gave wrong error %u\n", GetLastError() ); + ok( povl == NULL, "wrong ovl %p\n", povl ); + } + + ResetEvent( evt ); + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); - VirtualFree( buf, 0, MEM_RELEASE ); + + /* file handle must be overlapped */ + hfile = CreateFileA( filename, GENERIC_READ, 0, 0, OPEN_EXISTING, + FILE_FLAG_NO_BUFFERING | FILE_ATTRIBUTE_NORMAL, 0 ); + ok( hfile != INVALID_HANDLE_VALUE, "CreateFile failed err %u\n", GetLastError() ); + + memset( &ovl, 0, sizeof(ovl) ); + memset( fse, 0, sizeof(fse) ); + fse[0].Buffer = rbuf1; + memset( rbuf1, 0, si.dwPageSize ); + SetLastError( 0xdeadbeef ); + br = ReadFileScatter( hfile, fse, si.dwPageSize, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should fail\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "ReadFileScatter failed err %u\n", GetLastError() ); + + VirtualFree( wbuf, 0, MEM_RELEASE ); + VirtualFree( rbuf1, 0, MEM_RELEASE ); + CloseHandle( evt ); DeleteFileA( filename ); } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index ca2afa0e89..9df15ffe1d 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1086,25 +1086,24 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap send_completion = cvalue != 0; - error: if (needs_close) close( unix_handle ); - if (status == STATUS_SUCCESS) - { - io_status->u.Status = status; - io_status->Information = total; - TRACE("= SUCCESS (%u)\n", total); - if (event) NtSetEvent( event, NULL ); - if (apc) NtQueueApcThread( GetCurrentThread(), (PNTAPCFUNC)apc, - (ULONG_PTR)apc_user, (ULONG_PTR)io_status, 0 ); - } - else - { - TRACE("= 0x%08x\n", status); - if (status != STATUS_PENDING && event) NtResetEvent( event, NULL ); - } + io_status->u.Status = status; + io_status->Information = total; + TRACE("= 0x%08x (%u)\n", status, total); + if (event) NtSetEvent( event, NULL ); + if (apc) NtQueueApcThread( GetCurrentThread(), (PNTAPCFUNC)apc, + (ULONG_PTR)apc_user, (ULONG_PTR)io_status, 0 ); if (send_completion) NTDLL_AddCompletion( file, cvalue, status, total ); + return STATUS_PENDING; + +error: + if (needs_close) close( unix_handle ); + + TRACE("= 0x%08x\n", status); + if (event) NtResetEvent( event, NULL ); + return status; } -- 2.15.1

1 0

[PATCH] MAINTAINERS: Move WineHQ URLs to https
by Austin English 06 Dec '17

06 Dec '17

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 2f92151d78..6845a7abb8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3,7 +3,7 @@ List of Wine subsection maintainers When submitting patches to Wine, the guidelines at -<http://wiki.winehq.org/SubmittingPatches> should be followed. This file +<https://wiki.winehq.org/SubmittingPatches> should be followed. This file contains a list of maintainers for subsections of Wine. When submitting patches, you may want to CC relevant people from this list. If you have questions about your work in an area of Wine, you may find a list of @@ -317,7 +317,7 @@ F: */ Stable Branch M: Michael Stefaniuc <mstefani(a)winehq.org> -W: http://wiki.winehq.org/StableRules +W: https://wiki.winehq.org/StableRules Staging Branch M: Sebastian Lackner <sebastian(a)fds-team.de> -- 2.13.6

1 0

[PATCH] msvcp: Disable relay for _Thrd_current function
by Piotr Caban 06 Dec '17

06 Dec '17

Spotted by Stefan. The patch workarounds a crash when relay is enabled in x86_64 and arm case. Another way of fixing it is to define separate spec file entries for different platforms (make_specfiles will also need to be changed in that case). Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp140/msvcp140.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH] mshtml.idl: Added IDOMKeyboardEvent declaration.
by Jacek Caban 06 Dec '17

06 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/mshtmdid.h | 16 +++++++++++++ include/mshtml.idl | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+)

1 0

[PATCH] msvcp: Fix failure class layout and exception information data
by Piotr Caban 06 Dec '17

06 Dec '17

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/cxx.h | 46 ++++++++++++++------ dlls/msvcp90/exception.c | 107 ++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 130 insertions(+), 23 deletions(-)

1 0

[PATCH 01/10] wined3d: Add support for WINED3DFMT_BC4_SNORM format.
by Józef Kucia 06 Dec '17

06 Dec '17

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/utils.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index f73968546fbf..cd0a8e15c908 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -268,6 +268,7 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_BC3_UNORM_SRGB, WINED3DFMT_BC3_TYPELESS, ""}, {WINED3DFMT_BC3_UNORM, WINED3DFMT_BC3_TYPELESS, ""}, {WINED3DFMT_BC4_UNORM, WINED3DFMT_BC4_TYPELESS, ""}, + {WINED3DFMT_BC4_SNORM, WINED3DFMT_BC4_TYPELESS, ""}, {WINED3DFMT_BC5_UNORM, WINED3DFMT_BC5_TYPELESS, ""}, {WINED3DFMT_BC5_SNORM, WINED3DFMT_BC5_TYPELESS, ""}, {WINED3DFMT_BC6H_UF16, WINED3DFMT_BC6H_TYPELESS, ""}, @@ -361,6 +362,7 @@ static const struct wined3d_format_block_info format_block_info[] = {WINED3DFMT_BC2_UNORM, 4, 4, 16, TRUE}, {WINED3DFMT_BC3_UNORM, 4, 4, 16, TRUE}, {WINED3DFMT_BC4_UNORM, 4, 4, 8, TRUE}, + {WINED3DFMT_BC4_SNORM, 4, 4, 8, TRUE}, {WINED3DFMT_BC5_UNORM, 4, 4, 16, TRUE}, {WINED3DFMT_BC5_SNORM, 4, 4, 16, TRUE}, {WINED3DFMT_BC6H_UF16, 4, 4, 16, TRUE}, @@ -1179,6 +1181,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_COMPRESSED, ARB_TEXTURE_COMPRESSION_RGTC, NULL}, + {WINED3DFMT_BC4_SNORM, GL_COMPRESSED_SIGNED_RED_RGTC1, GL_COMPRESSED_SIGNED_RED_RGTC1, 0, + GL_RED, GL_UNSIGNED_BYTE, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_COMPRESSED, + ARB_TEXTURE_COMPRESSION_RGTC, NULL}, {WINED3DFMT_BC5_UNORM, GL_COMPRESSED_RG_RGTC2, GL_COMPRESSED_RG_RGTC2, 0, GL_RG, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING @@ -3434,6 +3441,8 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = get_format_idx(WINED3DFMT_BC4_UNORM); gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + idx = get_format_idx(WINED3DFMT_BC4_SNORM); + gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = get_format_idx(WINED3DFMT_BC5_UNORM); gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = get_format_idx(WINED3DFMT_BC5_SNORM); -- 2.13.6

4 22

[PATCH] wined3d: Add Intel HD Graphics 5000 to the GPU list.
by Li Keqing 06 Dec '17

06 Dec '17

Signed-off-by: Li Keqing <auroracloud4096(a)gmail.com> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e0bf986044..183a37f79e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1487,6 +1487,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_IVBS, "Intel(R) HD Graphics Family", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_HWD, "Intel(R) HD Graphics 4600", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_HWM, "Intel(R) HD Graphics 4600", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_HD5000, "Intel(R) HD Graphics 5000", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_I5100_1, "Intel(R) Iris(TM) Graphics 5100", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_I5100_2, "Intel(R) Iris(TM) Graphics 5100", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_I5100_3, "Intel(R) Iris(TM) Graphics 5100", DRIVER_INTEL_HD4000, 1536}, @@ -2155,6 +2156,7 @@ cards_intel[] = /* Haswell */ {"Iris Pro 5200", CARD_INTEL_IP5200_1}, {"Iris 5100", CARD_INTEL_I5100_1}, + {"HD Graphics 5000", CARD_INTEL_HD5000}, /* MacOS */ {"Haswell Mobile", CARD_INTEL_HWM}, {"Iris OpenGL Engine", CARD_INTEL_HWM}, /* MacOS */ /* Ivybridge */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index da06ba159f..4c43ad8b6c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2435,6 +2435,7 @@ enum wined3d_pci_device CARD_INTEL_IVBS = 0x015a, CARD_INTEL_HWD = 0x0412, CARD_INTEL_HWM = 0x0416, + CARD_INTEL_HD5000 = 0x0a26, CARD_INTEL_I5100_1 = 0x0a22, CARD_INTEL_I5100_2 = 0x0a2a, CARD_INTEL_I5100_3 = 0x0a2b, -- 2.14.3 (Apple Git-98)

2 1

[PATCH 1/2] msvcp: Use int64 for byval _Thrd_t parameters.
by Stefan Dösinger 06 Dec '17

06 Dec '17

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/msvcp110/msvcp110.spec | 8 ++++---- dlls/msvcp120/msvcp120.spec | 8 ++++---- dlls/msvcp120_app/msvcp120_app.spec | 8 ++++---- dlls/msvcp140/msvcp140.spec | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 7cf350e0c0..001b9add3e 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3858,11 +3858,11 @@ @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) @ cdecl _Thrd_current() -@ cdecl _Thrd_detach(ptr) -@ cdecl _Thrd_equal(ptr ptr) +@ cdecl _Thrd_detach(int64) +@ cdecl _Thrd_equal(int64 int64) @ stub _Thrd_exit -@ cdecl _Thrd_join(ptr long) -@ cdecl _Thrd_lt(ptr ptr) +@ cdecl _Thrd_join(int64 long) +@ cdecl _Thrd_lt(int64 int64) @ cdecl _Thrd_sleep(ptr) @ cdecl _Thrd_start(ptr ptr ptr) @ cdecl _Thrd_yield() diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 5285adafb8..729657c24e 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3805,11 +3805,11 @@ @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) @ cdecl _Thrd_current() -@ cdecl _Thrd_detach(ptr) -@ cdecl _Thrd_equal(ptr ptr) +@ cdecl _Thrd_detach(int64) +@ cdecl _Thrd_equal(int64 int64) @ stub _Thrd_exit -@ cdecl _Thrd_join(ptr long) -@ cdecl _Thrd_lt(ptr ptr) +@ cdecl _Thrd_join(int64 long) +@ cdecl _Thrd_lt(int64 int64) @ cdecl _Thrd_sleep(ptr) @ cdecl _Thrd_start(ptr ptr ptr) @ cdecl _Thrd_yield() diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index f33a2ec78e..62668d21f1 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3805,11 +3805,11 @@ @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) msvcp120._Thrd_create @ cdecl _Thrd_current() msvcp120._Thrd_current -@ cdecl _Thrd_detach(ptr) msvcp120._Thrd_detach -@ cdecl _Thrd_equal(ptr ptr) msvcp120._Thrd_equal +@ cdecl _Thrd_detach(int64) msvcp120._Thrd_detach +@ cdecl _Thrd_equal(int64 int64) msvcp120._Thrd_equal @ stub _Thrd_exit -@ cdecl _Thrd_join(ptr long) msvcp120._Thrd_join -@ cdecl _Thrd_lt(ptr ptr) msvcp120._Thrd_lt +@ cdecl _Thrd_join(int64 long) msvcp120._Thrd_join +@ cdecl _Thrd_lt(int64 int64) msvcp120._Thrd_lt @ cdecl _Thrd_sleep(ptr) msvcp120._Thrd_sleep @ cdecl _Thrd_start(ptr ptr ptr) msvcp120._Thrd_start @ cdecl _Thrd_yield() msvcp120._Thrd_yield diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 1f61afb550..5d5518115b 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3722,12 +3722,12 @@ @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) _Thrd_create @ cdecl _Thrd_current() _Thrd_current -@ cdecl _Thrd_detach(ptr) _Thrd_detach -@ cdecl _Thrd_equal(ptr ptr) _Thrd_equal +@ cdecl _Thrd_detach(int64) _Thrd_detach +@ cdecl _Thrd_equal(int64 int64) _Thrd_equal @ stub _Thrd_exit @ cdecl _Thrd_hardware_concurrency() _Thrd_hardware_concurrency @ cdecl _Thrd_id() _Thrd_id -@ cdecl _Thrd_join(ptr long) _Thrd_join +@ cdecl _Thrd_join(int64 long) _Thrd_join @ cdecl _Thrd_sleep(ptr) _Thrd_sleep @ cdecl _Thrd_start(ptr ptr ptr) _Thrd_start @ cdecl _Thrd_yield() _Thrd_yield -- 2.13.6

2 3

[PATCH] winegstreamer: Remove redundant check
by Alistair Leslie-Hughes 06 Dec '17

06 Dec '17

ret is already checked above and never assigned again. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/winegstreamer/gstdemux.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 3ef2324..95a1630 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1158,10 +1158,7 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI WaitForSingleObject(This->event, -1); gst_element_get_state(This->container, NULL, NULL, -1); - if (ret < 0) { - WARN("Ret: %i\n", ret); - hr = E_FAIL; - } else if (!This->cStreams) { + if (!This->cStreams) { FIXME("GStreamer could not find any streams\n"); hr = E_FAIL; } else { -- 1.9.1

2 1

[PATCH] [d3dx9]: Add D3DXComputeTangentFrame implementation
by Vijay Kiran Kamuju 06 Dec '17

06 Dec '17

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_25/d3dx9_25.spec | 2 +- dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_29/d3dx9_29.spec | 2 +- dlls/d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_31/d3dx9_31.spec | 2 +- dlls/d3dx9_32/d3dx9_32.spec | 2 +- dlls/d3dx9_33/d3dx9_33.spec | 2 +- dlls/d3dx9_34/d3dx9_34.spec | 2 +- dlls/d3dx9_35/d3dx9_35.spec | 2 +- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 13 +++++++++++++ dlls/d3dx9_37/d3dx9_37.spec | 2 +- dlls/d3dx9_38/d3dx9_38.spec | 2 +- dlls/d3dx9_39/d3dx9_39.spec | 2 +- dlls/d3dx9_40/d3dx9_40.spec | 2 +- dlls/d3dx9_41/d3dx9_41.spec | 2 +- dlls/d3dx9_42/d3dx9_42.spec | 2 +- dlls/d3dx9_43/d3dx9_43.spec | 2 +- 21 files changed, 33 insertions(+), 20 deletions(-) diff --git a/dlls/d3dx9_24/d3dx9_24.spec b/dlls/d3dx9_24/d3dx9_24.spec index 0ca8777efe..98aafabf10 100644 --- a/dlls/d3dx9_24/d3dx9_24.spec +++ b/dlls/d3dx9_24/d3dx9_24.spec @@ -21,7 +21,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_25/d3dx9_25.spec b/dlls/d3dx9_25/d3dx9_25.spec index a5449810a4..dc3b7c9780 100644 --- a/dlls/d3dx9_25/d3dx9_25.spec +++ b/dlls/d3dx9_25/d3dx9_25.spec @@ -21,7 +21,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_26/d3dx9_26.spec b/dlls/d3dx9_26/d3dx9_26.spec index 9e1200442f..d37ee77b3c 100644 --- a/dlls/d3dx9_26/d3dx9_26.spec +++ b/dlls/d3dx9_26/d3dx9_26.spec @@ -25,7 +25,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_27/d3dx9_27.spec b/dlls/d3dx9_27/d3dx9_27.spec index 9e1200442f..d37ee77b3c 100644 --- a/dlls/d3dx9_27/d3dx9_27.spec +++ b/dlls/d3dx9_27/d3dx9_27.spec @@ -25,7 +25,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_28/d3dx9_28.spec b/dlls/d3dx9_28/d3dx9_28.spec index b316a23baf..ee0192e6c7 100644 --- a/dlls/d3dx9_28/d3dx9_28.spec +++ b/dlls/d3dx9_28/d3dx9_28.spec @@ -25,7 +25,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_29/d3dx9_29.spec b/dlls/d3dx9_29/d3dx9_29.spec index b316a23baf..ee0192e6c7 100644 --- a/dlls/d3dx9_29/d3dx9_29.spec +++ b/dlls/d3dx9_29/d3dx9_29.spec @@ -25,7 +25,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_30/d3dx9_30.spec b/dlls/d3dx9_30/d3dx9_30.spec index e00fa54786..cf08ae1fb3 100644 --- a/dlls/d3dx9_30/d3dx9_30.spec +++ b/dlls/d3dx9_30/d3dx9_30.spec @@ -25,7 +25,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_31/d3dx9_31.spec b/dlls/d3dx9_31/d3dx9_31.spec index d308939ef6..6db192eab2 100644 --- a/dlls/d3dx9_31/d3dx9_31.spec +++ b/dlls/d3dx9_31/d3dx9_31.spec @@ -25,7 +25,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_32/d3dx9_32.spec b/dlls/d3dx9_32/d3dx9_32.spec index c2292dff39..ea9b99db31 100644 --- a/dlls/d3dx9_32/d3dx9_32.spec +++ b/dlls/d3dx9_32/d3dx9_32.spec @@ -25,7 +25,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_33/d3dx9_33.spec b/dlls/d3dx9_33/d3dx9_33.spec index c2292dff39..ea9b99db31 100644 --- a/dlls/d3dx9_33/d3dx9_33.spec +++ b/dlls/d3dx9_33/d3dx9_33.spec @@ -25,7 +25,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_34/d3dx9_34.spec b/dlls/d3dx9_34/d3dx9_34.spec index c2292dff39..ea9b99db31 100644 --- a/dlls/d3dx9_34/d3dx9_34.spec +++ b/dlls/d3dx9_34/d3dx9_34.spec @@ -25,7 +25,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_35/d3dx9_35.spec b/dlls/d3dx9_35/d3dx9_35.spec index c2292dff39..ea9b99db31 100644 --- a/dlls/d3dx9_35/d3dx9_35.spec +++ b/dlls/d3dx9_35/d3dx9_35.spec @@ -25,7 +25,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 0fdf4e135e..1bad3e77ec 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -25,7 +25,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 6294ce624f..09a928fcb6 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -7507,6 +7507,19 @@ done: return hr; } +/************************************************************************* + * D3DXComputeTangentFrame (D3DX9_36.@) + */ +HRESULT WINAPI D3DXComputeTangentFrame(ID3DXMesh *mesh, DWORD options) +{ + TRACE("mesh %p, options %#x\n", mesh, options); + + return D3DXComputeTangentFrameEx(mesh, D3DDECLUSAGE_TEXCOORD, 0, + D3DDECLUSAGE_BINORMAL, 0, D3DDECLUSAGE_TANGENT, 0, D3DDECLUSAGE_NORMAL, 0, + options | D3DXTANGENT_GENERATE_IN_PLACE, + NULL, 0.01f, 0.25f, 0.01f, NULL, NULL); +} + /************************************************************************* * D3DXComputeNormals (D3DX9_36.@) */ diff --git a/dlls/d3dx9_37/d3dx9_37.spec b/dlls/d3dx9_37/d3dx9_37.spec index 0fdf4e135e..1bad3e77ec 100644 --- a/dlls/d3dx9_37/d3dx9_37.spec +++ b/dlls/d3dx9_37/d3dx9_37.spec @@ -25,7 +25,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_38/d3dx9_38.spec b/dlls/d3dx9_38/d3dx9_38.spec index 0fdf4e135e..1bad3e77ec 100644 --- a/dlls/d3dx9_38/d3dx9_38.spec +++ b/dlls/d3dx9_38/d3dx9_38.spec @@ -25,7 +25,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_39/d3dx9_39.spec b/dlls/d3dx9_39/d3dx9_39.spec index 0fdf4e135e..1bad3e77ec 100644 --- a/dlls/d3dx9_39/d3dx9_39.spec +++ b/dlls/d3dx9_39/d3dx9_39.spec @@ -25,7 +25,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_40/d3dx9_40.spec b/dlls/d3dx9_40/d3dx9_40.spec index 0fdf4e135e..1bad3e77ec 100644 --- a/dlls/d3dx9_40/d3dx9_40.spec +++ b/dlls/d3dx9_40/d3dx9_40.spec @@ -25,7 +25,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_41/d3dx9_41.spec b/dlls/d3dx9_41/d3dx9_41.spec index 0fdf4e135e..1bad3e77ec 100644 --- a/dlls/d3dx9_41/d3dx9_41.spec +++ b/dlls/d3dx9_41/d3dx9_41.spec @@ -25,7 +25,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_42/d3dx9_42.spec b/dlls/d3dx9_42/d3dx9_42.spec index 2f2ac5fd61..8c5ab4e18a 100644 --- a/dlls/d3dx9_42/d3dx9_42.spec +++ b/dlls/d3dx9_42/d3dx9_42.spec @@ -25,7 +25,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_43/d3dx9_43.spec b/dlls/d3dx9_43/d3dx9_43.spec index 2f2ac5fd61..8c5ab4e18a 100644 --- a/dlls/d3dx9_43/d3dx9_43.spec +++ b/dlls/d3dx9_43/d3dx9_43.spec @@ -25,7 +25,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) -- 2.15.1

2 3

[PATCH] user32/tests: Remove runtime check for EndMenu()
by Nikolay Sivov 06 Dec '17

06 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- It's already used directly in msg.c. dlls/user32/tests/edit.c | 12 +++--------- dlls/user32/tests/menu.c | 9 ++------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 9372c484af..79c0010e4e 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -38,14 +38,12 @@ struct edit_notify { static struct edit_notify notifications; -static BOOL (WINAPI *pEndMenu) (void); static BOOL (WINAPI *pGetMenuBarInfo)(HWND,LONG,LONG,PMENUBARINFO); static void init_function_pointers(void) { HMODULE hdll = GetModuleHandleA("user32"); - pEndMenu = (void*)GetProcAddress(hdll, "EndMenu"); pGetMenuBarInfo = (void*)GetProcAddress(hdll, "GetMenuBarInfo"); } @@ -2294,7 +2292,7 @@ static LRESULT CALLBACK edit4_wnd_procA(HWND hWnd, UINT msg, WPARAM wParam, LPAR if (hWnd != (HWND)lParam) { got_wm_capturechanged = TRUE; - pEndMenu(); + EndMenu(); } break; } @@ -2337,7 +2335,7 @@ static LRESULT CALLBACK edit_proc_proxy(HWND hWnd, UINT msg, WPARAM wParam, LPAR ok(!mbi.fFocused, "mbi.fFocused = TRUE\n"); } - pEndMenu(); + EndMenu(); break; } } @@ -2985,11 +2983,7 @@ START_TEST(edit) test_child_edit_wmkeydown(); test_fontsize(); test_dialogmode(); - if (pEndMenu) - test_contextmenu(); - else - win_skip("EndMenu is not available\n"); - + test_contextmenu(); test_EM_GETHANDLE(); test_paste(); diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 03454fedfd..f99cd946b4 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -41,7 +41,6 @@ static BOOL (WINAPI *pGetMenuInfo)(HMENU,LPCMENUINFO); static BOOL (WINAPI *pGetMenuBarInfo)(HWND,LONG,LONG,PMENUBARINFO); static UINT (WINAPI *pSendInput)(UINT, INPUT*, size_t); static BOOL (WINAPI *pSetMenuInfo)(HMENU,LPCMENUINFO); -static BOOL (WINAPI *pEndMenu) (void); static void init_function_pointers(void) { @@ -56,7 +55,6 @@ static void init_function_pointers(void) GET_PROC(GetMenuBarInfo) GET_PROC(SendInput) GET_PROC(SetMenuInfo) - GET_PROC(EndMenu) #undef GET_PROC } @@ -3518,7 +3516,7 @@ static LRESULT WINAPI menu_cancelmode_wnd_proc(HWND hwnd, UINT msg, PostMessageA( hwnd, WM_MOUSEMOVE, 0, 0); return SendMessageA( g_hwndtosend, WM_CANCELMODE, 0, 0); } - pEndMenu(); + EndMenu(); return TRUE; } } @@ -3531,10 +3529,7 @@ static void test_menu_cancelmode(void) HWND hwnd, hwndchild; HMENU menu, menubar; MSG msg; - if( !pEndMenu) { /* win95 */ - win_skip( "EndMenu is not available\n"); - return; - } + hwnd = CreateWindowExA( 0, (LPCSTR)MAKEINTATOM(atomMenuCheckClass), NULL, WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, 200, 200, NULL, NULL, NULL, NULL); -- 2.15.0

1 0

[PATCH 1/7] wined3d: Implement SV_ClipDistance.
by Józef Kucia 05 Dec '17

05 Dec '17

In D3D10+ all clip distances declared in a shader are always enabled. In other words, enablement of clip distances is a property of a shader. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- >From wined3d API standpoint, the RS_CLIPPLANEENABLE state is ignored when SM4+ shaders are active. We shouldn't touch the RS_CLIPPLANEENABLE state when SM4+ shaders are in use. Fixes https://bugs.winehq.org/show_bug.cgi?id=43932 --- dlls/wined3d/glsl_shader.c | 63 ++++++++++++++++++++++++++++++++++-------- dlls/wined3d/shader.c | 36 +++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 43 ++++++++++++++-------------- 3 files changed, 109 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5d08c00175eb..b89b7aa3d53c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -241,7 +241,10 @@ struct glsl_shader_prog_link struct glsl_cs_program cs; GLuint id; DWORD constant_update_mask; - UINT constant_version; + unsigned int constant_version; + DWORD shader_controlled_clip_distances : 1; + DWORD clip_distance_mask : 8; /* MAX_CLIP_DISTANCES, 8 */ + DWORD padding : 23; }; struct glsl_program_key @@ -6923,6 +6926,26 @@ static void shader_glsl_setup_sm4_shader_output(struct shader_glsl_priv *priv, } } +static void shader_glsl_generate_clip_or_cull_distances(struct wined3d_string_buffer *buffer, + const struct wined3d_shader_signature_element *element, DWORD clip_or_cull_distance_mask) +{ + unsigned int i, clip_or_cull_index; + char reg_mask[6]; + + /* Assign consecutive indices starting from 0. */ + clip_or_cull_index = element->semantic_idx ? wined3d_popcount(clip_or_cull_distance_mask & 0xf) : 0; + for (i = 0; i < 4; ++i) + { + if (!(element->mask & (WINED3DSP_WRITEMASK_0 << i))) + continue; + + shader_glsl_write_mask_to_str(WINED3DSP_WRITEMASK_0 << i, reg_mask); + shader_addline(buffer, "gl_ClipDistance[%u] = outputs[%u]%s;\n", + clip_or_cull_index, element->register_idx, reg_mask); + ++clip_or_cull_index; + } +} + static void shader_glsl_setup_sm3_rasterizer_input(struct shader_glsl_priv *priv, const struct wined3d_gl_info *gl_info, const DWORD *map, const struct wined3d_shader_signature *input_signature, @@ -6932,7 +6955,7 @@ static void shader_glsl_setup_sm3_rasterizer_input(struct shader_glsl_priv *priv { struct wined3d_string_buffer *buffer = &priv->shader_buffer; const char *semantic_name; - UINT semantic_idx; + unsigned int semantic_idx; char reg_mask[6]; unsigned int i; @@ -6966,6 +6989,10 @@ static void shader_glsl_setup_sm3_rasterizer_input(struct shader_glsl_priv *priv shader_addline(buffer, "gl_Layer = floatBitsToInt(outputs[%u])%s;\n", output->register_idx, reg_mask); } + else if (output->sysval_semantic == WINED3D_SV_CLIP_DISTANCE) + { + shader_glsl_generate_clip_or_cull_distances(buffer, output, reg_maps_out->clip_distance_mask); + } else if (output->sysval_semantic) { FIXME("Unhandled sysval semantic %#x.\n", output->sysval_semantic); @@ -9852,6 +9879,7 @@ static HRESULT shader_glsl_compile_compute_shader(struct shader_glsl_priv *priv, entry->ps.id = 0; entry->cs.id = shader_id; entry->constant_version = 0; + entry->shader_controlled_clip_distances = 0; entry->ps.np2_fixup_info = NULL; add_glsl_program_entry(priv, entry); @@ -9926,11 +9954,12 @@ static void set_glsl_compute_shader_program(const struct wined3d_context *contex static void set_glsl_shader_program(const struct wined3d_context *context, const struct wined3d_state *state, struct shader_glsl_priv *priv, struct glsl_context_data *ctx_data) { - const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_d3d_info *d3d_info = context->d3d_info; + const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_shader *pre_rasterization_shader; const struct ps_np2fixup_info *np2fixup_info = NULL; - struct glsl_shader_prog_link *entry = NULL; struct wined3d_shader *hshader, *dshader, *gshader; + struct glsl_shader_prog_link *entry = NULL; struct wined3d_shader *vshader = NULL; struct wined3d_shader *pshader = NULL; GLuint reorder_shader_id = 0; @@ -10068,6 +10097,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const entry->ps.id = ps_id; entry->cs.id = 0; entry->constant_version = 0; + entry->shader_controlled_clip_distances = 0; entry->ps.np2_fixup_info = np2fixup_info; /* Add the hash table entry */ add_glsl_program_entry(priv, entry); @@ -10194,7 +10224,15 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const shader_glsl_init_gs_uniform_locations(gl_info, priv, program_id, &entry->gs); shader_glsl_init_ps_uniform_locations(gl_info, priv, program_id, &entry->ps, pshader ? pshader->limits->constant_float : 0); - checkGLcall("Find glsl program uniform locations"); + checkGLcall("find glsl program uniform locations"); + + pre_rasterization_shader = gshader ? gshader : dshader ? dshader : vshader; + if (pre_rasterization_shader && pre_rasterization_shader->reg_maps.shader_version.major >= 4) + { + unsigned int clip_distance_count = wined3d_popcount(pre_rasterization_shader->reg_maps.clip_distance_mask); + entry->shader_controlled_clip_distances = 1; + entry->clip_distance_mask = (1u << clip_distance_count) - 1; + } if (needs_legacy_glsl_syntax(gl_info)) { @@ -10350,6 +10388,7 @@ static void shader_glsl_select(void *shader_priv, struct wined3d_context *contex struct glsl_context_data *ctx_data = context->shader_backend_data; const struct wined3d_gl_info *gl_info = context->gl_info; struct shader_glsl_priv *priv = shader_priv; + struct glsl_shader_prog_link *glsl_program; GLenum current_vertex_color_clamp; GLuint program_id, prev_id; @@ -10357,13 +10396,15 @@ static void shader_glsl_select(void *shader_priv, struct wined3d_context *contex priv->fragment_pipe->enable_extension(gl_info, !use_ps(state)); prev_id = ctx_data->glsl_program ? ctx_data->glsl_program->id : 0; - set_glsl_shader_program(context, state, priv, ctx_data); + glsl_program = ctx_data->glsl_program; - if (ctx_data->glsl_program) + if (glsl_program) { - program_id = ctx_data->glsl_program->id; - current_vertex_color_clamp = ctx_data->glsl_program->vs.vertex_color_clamp; + program_id = glsl_program->id; + current_vertex_color_clamp = glsl_program->vs.vertex_color_clamp; + if (glsl_program->shader_controlled_clip_distances) + context_enable_clip_distances(context, glsl_program->clip_distance_mask); } else { @@ -10392,8 +10433,8 @@ static void shader_glsl_select(void *shader_priv, struct wined3d_context *contex GL_EXTCALL(glUseProgram(program_id)); checkGLcall("glUseProgram"); - if (program_id) - context->constant_update_mask |= ctx_data->glsl_program->constant_update_mask; + if (glsl_program) + context->constant_update_mask |= glsl_program->constant_update_mask; } context->shader_update_mask |= (1u << WINED3D_SHADER_TYPE_COMPUTE); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index c4eed76d78f0..7d59f8b9a042 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -952,6 +952,31 @@ static HRESULT shader_record_shader_phase(struct wined3d_shader *shader, return WINED3D_OK; } +static HRESULT shader_calculate_clip_or_cull_distance_mask( + const struct wined3d_shader_signature_element *e, DWORD *mask) +{ + unsigned int i; + + *mask = 0; + + /* Cull and clip distances are packed in 4 component registers. 0 and 1 are + * the only allowed semantic indices. + */ + if (e->semantic_idx >= MAX_CLIP_DISTANCES / 4) + { + WARN("Invalid clip/cull distance index %u.\n", e->semantic_idx); + return WINED3DERR_INVALIDCALL; + } + + for (i = 0; i < 4; ++i) + { + if (e->mask & (WINED3DSP_WRITEMASK_0 << i)) + *mask |= 1u << (4 * e->semantic_idx + i); + } + + return WINED3D_OK; +} + static void wined3d_insert_interpolation_mode(DWORD *packed_interpolation_mode, unsigned int register_idx, enum wined3d_shader_interpolation_mode mode) { @@ -1754,7 +1779,16 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st { for (i = 0; i < output_signature->element_count; ++i) { - reg_maps->output_registers |= 1u << output_signature->elements[i].register_idx; + const struct wined3d_shader_signature_element *e = &output_signature->elements[i]; + DWORD mask; + + reg_maps->output_registers |= 1u << e->register_idx; + if (e->sysval_semantic == WINED3D_SV_CLIP_DISTANCE) + { + if (FAILED(hr = shader_calculate_clip_or_cull_distance_mask(e, &mask))) + return hr; + reg_maps->clip_distance_mask |= mask; + } } } else if (reg_maps->output_registers) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index da06ba159f79..b8f0b4d194e0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1006,31 +1006,32 @@ struct wined3d_shader_reg_maps BYTE bumpmat; /* MAX_TEXTURES, 8 */ BYTE luminanceparams; /* MAX_TEXTURES, 8 */ struct wined3d_shader_resource_info uav_resource_info[MAX_UNORDERED_ACCESS_VIEWS]; - DWORD uav_read_mask; /* MAX_UNORDERED_ACCESS_VIEWS, 8 */ - DWORD uav_counter_mask; /* MAX_UNORDERED_ACCESS_VIEWS, 8 */ - - WORD usesnrm : 1; - WORD vpos : 1; - WORD usesdsx : 1; - WORD usesdsy : 1; - WORD usestexldd : 1; - WORD usesmova : 1; - WORD usesfacing : 1; - WORD usesrelconstF : 1; - WORD fog : 1; - WORD usestexldl : 1; - WORD usesifc : 1; - WORD usescall : 1; - WORD usespow : 1; - WORD point_size : 1; - WORD vocp : 1; - WORD padding : 1; + DWORD uav_read_mask : 8; /* MAX_UNORDERED_ACCESS_VIEWS, 8 */ + DWORD uav_counter_mask : 8; /* MAX_UNORDERED_ACCESS_VIEWS, 8 */ + + DWORD clip_distance_mask : 8; /* MAX_CLIP_DISTANCES, 8 */ + DWORD usesnrm : 1; + DWORD vpos : 1; + DWORD usesdsx : 1; + DWORD usesdsy : 1; + DWORD usestexldd : 1; + DWORD usesmova : 1; + DWORD usesfacing : 1; + DWORD usesrelconstF : 1; + DWORD fog : 1; + DWORD usestexldl : 1; + DWORD usesifc : 1; + DWORD usescall : 1; + DWORD usespow : 1; + DWORD point_size : 1; + DWORD vocp : 1; + DWORD padding : 25; DWORD rt_mask; /* Used render targets, 32 max. */ /* Whether or not loops are used in this shader, and nesting depth */ - unsigned loop_depth; - UINT min_rel_offset, max_rel_offset; + unsigned int loop_depth; + unsigned int min_rel_offset, max_rel_offset; struct wined3d_shader_tgsm *tgsm; SIZE_T tgsm_capacity; -- 2.13.6

5 16

[PATCH v3 1/3] ntdll: Report NtReadFileScatter results asynchronously
by Andrew Eikum 05 Dec '17

05 Dec '17

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v3: Always SetLastError before checking GLE return. dlls/kernel32/tests/file.c | 58 +++++++++++++++++++++++++++++++++++++++------- dlls/ntdll/file.c | 2 +- 2 files changed, 51 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 0b8cef23f8..a8d229c887 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4353,7 +4353,8 @@ static void test_WriteFileGather(void) FILE_SEGMENT_ELEMENT fse[2]; OVERLAPPED ovl, *povl = NULL; SYSTEM_INFO si; - LPVOID buf = NULL; + LPVOID wbuf = NULL, rbuf1; + BOOL br; ret = GetTempPathA( MAX_PATH, temp_path ); ok( ret != 0, "GetTempPathA error %d\n", GetLastError() ); @@ -4371,12 +4372,17 @@ static void test_WriteFileGather(void) ok( hiocp2 != 0, "CreateIoCompletionPort failed err %u\n", GetLastError() ); GetSystemInfo( &si ); - buf = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); - ok( buf != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + wbuf = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); + ok( wbuf != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + + rbuf1 = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); + ok( rbuf1 != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); memset( &ovl, 0, sizeof(ovl) ); memset( fse, 0, sizeof(fse) ); - fse[0].Buffer = buf; + memset( wbuf, 0x42, si.dwPageSize ); + fse[0].Buffer = wbuf; + SetLastError(0xdeadbeef); if (!WriteFileGather( hfile, fse, si.dwPageSize, NULL, &ovl )) ok( GetLastError() == ERROR_IO_PENDING, "WriteFileGather failed err %u\n", GetLastError() ); @@ -4384,20 +4390,56 @@ static void test_WriteFileGather(void) ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError()); ok( povl == &ovl, "wrong ovl %p\n", povl ); + /* read exact size */ memset( &ovl, 0, sizeof(ovl) ); memset( fse, 0, sizeof(fse) ); - fse[0].Buffer = buf; - if (!ReadFileScatter( hfile, fse, si.dwPageSize, NULL, &ovl )) - ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); + fse[0].Buffer = rbuf1; + memset( rbuf1, 0, si.dwPageSize ); + SetLastError(0xdeadbeef); + br = ReadFileScatter( hfile, fse, si.dwPageSize, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should be asynchronous\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError()); ok( povl == &ovl, "wrong ovl %p\n", povl ); + ok( memcmp( rbuf1, wbuf, si.dwPageSize ) == 0, + "data was not read into buffer\n" ); + + /* start read at EOF */ + memset( &ovl, 0, sizeof(ovl) ); + S(U(ovl)).OffsetHigh = 0; + S(U(ovl)).Offset = si.dwPageSize; + memset( fse, 0, sizeof(fse) ); + fse[0].Buffer = rbuf1; + SetLastError(0xdeadbeef); + br = ReadFileScatter( hfile, fse, si.dwPageSize, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should have failed\n" ); + ok( GetLastError() == ERROR_HANDLE_EOF || + GetLastError() == ERROR_IO_PENDING, "ReadFileScatter gave wrong error %u\n", GetLastError() ); + if (GetLastError() == ERROR_IO_PENDING) + { + SetLastError(0xdeadbeef); + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); + ok( !ret, "GetQueuedCompletionStatus should have returned failure\n" ); + ok( GetLastError() == ERROR_HANDLE_EOF, "Got wrong error: %u\n", GetLastError() ); + ok( povl == &ovl, "wrong ovl %p\n", povl ); + } + else + { + SetLastError(0xdeadbeef); + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 100 ); + ok( !ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError() ); + ok( GetLastError() == WAIT_TIMEOUT, "GetQueuedCompletionStatus gave wrong error %u\n", GetLastError() ); + ok( povl == NULL, "wrong ovl %p\n", povl ); + } + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); - VirtualFree( buf, 0, MEM_RELEASE ); + VirtualFree( wbuf, 0, MEM_RELEASE ); + VirtualFree( rbuf1, 0, MEM_RELEASE ); DeleteFileA( filename ); } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index ca2afa0e89..12b1d0f6c5 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1105,7 +1105,7 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap if (send_completion) NTDLL_AddCompletion( file, cvalue, status, total ); - return status; + return STATUS_PENDING; } -- 2.15.1

2 2

[PATCH 4/4] d2d1: Introduce a registry key to limit the maximum supported factory version.
by Henri Verbeet 05 Dec '17

05 Dec '17

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/Makefile.in | 2 +- dlls/d2d1/d2d1_private.h | 6 ++++ dlls/d2d1/factory.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 82 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in index 51b9627..20d3f26 100644 --- a/dlls/d2d1/Makefile.in +++ b/dlls/d2d1/Makefile.in @@ -1,6 +1,6 @@ MODULE = d2d1.dll IMPORTLIB = d2d1 -IMPORTS = d3d10_1 dxguid uuid gdi32 user32 +IMPORTS = d3d10_1 dxguid uuid gdi32 user32 advapi32 DELAYIMPORTS = dwrite C_SRCS = \ diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 3b21bc1..f876cbf 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -52,6 +52,12 @@ enum d2d_shape_type D2D_SHAPE_TYPE_COUNT, }; +struct d2d_settings +{ + unsigned int max_version_factory; +}; +extern struct d2d_settings d2d_settings DECLSPEC_HIDDEN; + struct d2d_clip_stack { D2D1_RECT_F *stack; diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index da2b892..f202332 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -22,8 +22,14 @@ #define D2D1_INIT_GUID #include "d2d1_private.h" +WINE_DECLARE_DEBUG_CHANNEL(winediag); WINE_DEFAULT_DEBUG_CHANNEL(d2d); +struct d2d_settings d2d_settings = +{ + ~0u, /* No ID2D1Factory version limit by default. */ +}; + struct d2d_factory { ID2D1Factory1 ID2D1Factory1_iface; @@ -62,7 +68,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_QueryInterface(ID2D1Factory1 *iface { TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); - if (IsEqualGUID(iid, &IID_ID2D1Factory1) + if ((IsEqualGUID(iid, &IID_ID2D1Factory1) && d2d_settings.max_version_factory >= 1) || IsEqualGUID(iid, &IID_ID2D1Factory) || IsEqualGUID(iid, &IID_IUnknown)) { @@ -537,3 +543,71 @@ void WINAPI D2D1MakeRotateMatrix(float angle, D2D1_POINT_2F center, D2D1_MATRIX_ matrix->_31 = center.x - center.x * cos_theta + center.y * sin_theta; matrix->_32 = center.y - center.x * sin_theta - center.y * cos_theta; } + +static BOOL get_config_key_dword(HKEY default_key, HKEY application_key, const char *name, DWORD *value) +{ + DWORD type, data, size; + + size = sizeof(data); + if (application_key && !RegQueryValueExA(application_key, + name, 0, &type, (BYTE *)&data, &size) && type == REG_DWORD) + goto success; + + size = sizeof(data); + if (default_key && !RegQueryValueExA(default_key, + name, 0, &type, (BYTE *)&data, &size) && type == REG_DWORD) + goto success; + + return FALSE; + +success: + *value = data; + return TRUE; +} + +static void d2d_settings_init(void) +{ + HKEY default_key, tmp_key, application_key = NULL; + char buffer[MAX_PATH + 10]; + DWORD len; + + if (RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Direct2D", &default_key)) + default_key = NULL; + + len = GetModuleFileNameA(0, buffer, MAX_PATH); + if (len && len < MAX_PATH) + { + char *p, *appname = buffer; + + if ((p = strrchr(appname, '/'))) + appname = p + 1; + if ((p = strrchr(appname, '\\'))) + appname = p + 1; + strcat(appname, "\\Direct2D"); + + if (!RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\AppDefaults", &tmp_key)) + { + if (RegOpenKeyA(tmp_key, appname, &application_key)) + application_key = NULL; + RegCloseKey(tmp_key); + } + } + + if (!default_key && !application_key) + return; + + if (get_config_key_dword(default_key, application_key, "max_version_factory", &d2d_settings.max_version_factory)) + ERR_(winediag)("Limiting maximum Direct2D factory version to %#x.\n", d2d_settings.max_version_factory); + + if (application_key) + RegCloseKey(application_key); + if (default_key) + RegCloseKey(default_key); +} + +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) +{ + if (reason == DLL_PROCESS_ATTACH) + d2d_settings_init(); + return TRUE; +} -- 2.1.4

3 6

[PATCH] readme: Use UTF-8 consistently in all translations.
by Lauri Kenttä 05 Dec '17

05 Dec '17

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- documentation/README.hu | 274 ++++++++++++++++++++++----------------------- documentation/README.ko | 242 +++++++++++++++++++-------------------- documentation/README.pt | 210 +++++++++++++++++----------------- documentation/README.pt_br | 166 +++++++++++++-------------- 4 files changed, 446 insertions(+), 446 deletions(-) diff --git a/documentation/README.hu b/documentation/README.hu index d3fee99401..ca99d9b325 100644 --- a/documentation/README.hu +++ b/documentation/README.hu @@ -1,207 +1,207 @@ -1. BEVEZET�S +1. BEVEZETÉS -A Wine egy program amivel lehet�s�g ny�lik a Microsoft Windows -programok futtat�s�ra (bele�rtve a DOS, Windows 3.x �s Win32 -futtathat� �llom�nyokat) Unix alatt. Tartalmaz egy program bet�lt�t, -ami bet�lt �s futtat egy Microsoft Windows bin�rist, �s egy -f�ggv�nyk�nyvt�rat (nev�n Winelib), ami implement�lja a Windows -API h�v�sokat azok Unix, vagy X11 megfelel�inek haszn�lat�val. -Ez a f�ggv�nyk�nyvt�r haszn�lhat� a Win32 k�d nat�v Unix futtathat� -�llom�nny� portl�s�hoz. +A Wine egy program amivel lehetõség nyílik a Microsoft Windows +programok futtatására (beleértve a DOS, Windows 3.x és Win32 +futtatható állományokat) Unix alatt. Tartalmaz egy program betöltõt, +ami betölt és futtat egy Microsoft Windows binárist, és egy +függvénykönyvtárat (nevén Winelib), ami implementálja a Windows +API hívásokat azok Unix, vagy X11 megfelelõinek használatával. +Ez a függvénykönyvtár használható a Win32 kód natív Unix futtatható +állománnyá portlásához. -A Wine egy szabad szoftver, a GNU LGPL alatt kiadva; n�zze meg a -LICENSE f�jlt a r�szletek�rt. +A Wine egy szabad szoftver, a GNU LGPL alatt kiadva; nézze meg a +LICENSE fájlt a részletekért. -2. GYORS IND�T�S +2. GYORS INDÍTÁS -Ha �n forr�sb�l ford�totta, aj�nlott a Wine telep�t� haszn�lata a -a Wine leford�t�s�hoz �s telep�t�s�hez. A Wine forr�sk�d sz�l�- -k�nyvt�r�b�l (ami tartalmazza ezt a f�jlt), futtassa: +Ha ön forrásból fordította, ajánlott a Wine telepítõ használata a +a Wine lefordításához és telepítéséhez. A Wine forráskód szülõ- +könyvtárából (ami tartalmazza ezt a fájlt), futtassa: ./tools/wineinstall -A programok futtat�sa "wine [opci�k] program". A tov�bbi inform�ci�khoz -�s a probl�ma felvil�gos�t�shoz olvassa el ennek a f�jlnak a tov�bbi r�sz�t, -a Wine man oldal�t, �s k�l�n�sen gazdag inform�ci� tal�lhat� itt: +A programok futtatása "wine [opciók] program". A további információkhoz +és a probléma felvilágosításhoz olvassa el ennek a fájlnak a további részét, +a Wine man oldalát, és különösen gazdag információ található itt: http://www.winehq.org. -3. K�VETELM�NYEK +3. KÖVETELMÉNYEK -A Wine-nak a ford�t�s�hoz �s futtat�s�hoz �nnek sz�ks�ge lesz a k�vetkez�kb�l +A Wine-nak a fordításához és futtatásához önnek szüksége lesz a következõkbõl egynek: - Linux 2.0.36-os, vagy feletti verzi� - FreeBSD 5.3, vagy k�s�bbi - Solaris x86 2.5, vagy k�s�bbi + Linux 2.0.36-os, vagy feletti verzió + FreeBSD 5.3, vagy késõbbi + Solaris x86 2.5, vagy késõbbi NetBSD-current -Mivel a Wine-nak k�ks�ges kernelszint� fut�si sz�l t�mogat�s a futtat�shoz, csak -a fent eml�tett oper�ci�s rendszerek t�mogatottak. -M�s oper�ci�s rendszerek, amik t�mogatj�k a kernel fut�si sz�lakat, t�mogatva -lesznek a j�v�ben. - -Linux inform�ci�: - Amig a Linux 2.2.x m�k�dik, �s a Linux 2.0.x is m�k�dni fog - (a r�gebbi 2.0.x verzi�kban fut�si sz�l miatti �sszeoml�sok voltak), - az a legjobb, ha �nnek a legfrisebb kernele van, mint p�ld�ul a 2.4.x. - -FreeBSD inform�ci�: - Wine-nak le kell fordulnia a FreeBSD 4.x �s FreeBSD 5.x verzi�kon, de a - FreeBSD 5.3 el�tti verzi�kon �ltal�ban nem fog m�k�dni. - - T�bb inform�ci� tal�lhat� a FreeBSD ports f�ban itt: +Mivel a Wine-nak kükséges kernelszintû futási szál támogatás a futtatáshoz, csak +a fent említett operációs rendszerek támogatottak. +Más operációs rendszerek, amik támogatják a kernel futási szálakat, támogatva +lesznek a jövõben. + +Linux információ: + Amig a Linux 2.2.x mûködik, és a Linux 2.0.x is mûködni fog + (a régebbi 2.0.x verziókban futási szál miatti összeomlások voltak), + az a legjobb, ha önnek a legfrisebb kernele van, mint például a 2.4.x. + +FreeBSD információ: + Wine-nak le kell fordulnia a FreeBSD 4.x és FreeBSD 5.x verziókon, de a + FreeBSD 5.3 elõtti verziókon általában nem fog mûködni. + + Több információ található a FreeBSD ports fában itt: <ftp://ftp.freebsd.org/pub/FreeBSD/ports/ports/emulators/wine/>. -Solaris inform�ci�: - A Wine ford�t�s�hoz kell a GNU toolchain (gcc, gas, etc.). - Figyelem : A gas telep�t�se *nemt* biztos�t�k, hogy a gcc fogja is - haszn�lni. A gcc �jraford�t�sa a gas telep�t�se ut�n, vagy a cc - szimbolikus linkel�se, �s ld-z�se a gnu tools-hoz sz�ks�ges. +Solaris információ: + A Wine fordításához kell a GNU toolchain (gcc, gas, etc.). + Figyelem : A gas telepítése *nemt* biztosíték, hogy a gcc fogja is + használni. A gcc újrafordítása a gas telepítése után, vagy a cc + szimbolikus linkelése, és ld-zése a gnu tools-hoz szükséges. -NetBSD inform�ci�: - ellen�rizze, hogy a USER_LDT, SYSVSHM, SYSVSEM, �s SYSVMSG opci�k be vannak-e +NetBSD információ: + ellenõrizze, hogy a USER_LDT, SYSVSHM, SYSVSEM, és SYSVMSG opciók be vannak-e kapcsolva a kernelben. -T�mogatott f�jlrendszerek: - A Wine fut a legt�bb f�jlrendszeren. Hab�r a Wine nem fog elindulni, ha - umsdos-t haszn�lunk a /tmp k�nyvt�rban. N�h�ny kompatibilit�si gondot - is bejelentettek a Samb�n kereszt�l el�rt f�jlok eset�ben. Az NTFS-t - lehet haszn�lni biztons�gban �r�sv�dett hozz�f�r�ssel, de az NTFS ellen - sz�l, hogy a Windows programoknak majdnem mindenhova �r�si jog kell. - NTFS f�jlok eset�n m�soljuk �t �ket egy �rhat� helyre. +Támogatott fájlrendszerek: + A Wine fut a legtöbb fájlrendszeren. Habár a Wine nem fog elindulni, ha + umsdos-t használunk a /tmp könyvtárban. Néhány kompatibilitási gondot + is bejelentettek a Sambán keresztül elért fájlok esetében. Az NTFS-t + lehet használni biztonságban írásvédett hozzáféréssel, de az NTFS ellen + szól, hogy a Windows programoknak majdnem mindenhova írási jog kell. + NTFS fájlok esetén másoljuk át õket egy írható helyre. -Alap k�vetelm�nyek: - �nnek fel kell telep�tenie az X11 fejleszt�i f�jlokat - (xlib6g-dev n�ven van a Debianban �s XFree86-devel n�ven a Red Hat-ben). +Alap követelmények: + Önnek fel kell telepítenie az X11 fejlesztõi fájlokat + (xlib6g-dev néven van a Debianban és XFree86-devel néven a Red Hat-ben). -Ford�t�si eszk�z k�vetelm�nyek: - x86 rendszereken gcc >= 2.7.2 sz�ks�ges. - A 2.7.2.3-n�l r�gebbi verzi�kban probl�m�k lehetnek k�l�nf�le f�jlokkal, - amik optimaliz�ci�val lettek ford�tva, gyakran a fejl�c f�jlok kezel�s�nek - probl�m�i miatt. A pgcc jelenelg nem m�k�dik s Wine-sl. A probl�ma oka +Fordítási eszköz követelmények: + x86 rendszereken gcc >= 2.7.2 szükséges. + A 2.7.2.3-nál régebbi verziókban problémák lehetnek különféle fájlokkal, + amik optimalizációval lettek fordítva, gyakran a fejléc fájlok kezelésének + problémái miatt. A pgcc jelenelg nem mûködik s Wine-sl. A probléma oka ismeretlen. - Term�szetesen kell a "make" is (legink�bb a GNU make). + Természetesen kell a "make" is (leginkább a GNU make). - Kell m�g a flex 2.5 verzi�, vagy k�s�bbi, �s a bison. + Kell még a flex 2.5 verzió, vagy késõbbi, és a bison. -Opci�n�lis t�mogat�si f�ggv�nyk�nyvt�rak: - Ha szeretne CUPS nyomtat� t�mogat�st, telep�tse fel a cups �s a cups-devel +Opciónális támogatási függvénykönyvtárak: + Ha szeretne CUPS nyomtató támogatást, telepítse fel a cups és a cups-devel csomagot. - Telep�tse fel a libxml2 csomagot, ha szeretn� hogy m�k�dj�n az msxml - implement�ci�. + Telepítse fel a libxml2 csomagot, ha szeretné hogy mûködjön az msxml + implementáció. -4. FORD�T�S +4. FORDÍTÁS -Ha �n nem haszn�lja a wineinstall-t, futtassa a k�vetkez� parancsokat s -Wine ford�t�s�hoz: +Ha ön nem használja a wineinstall-t, futtassa a következõ parancsokat s +Wine fordításához: ./configure make depend make -Ez le fogja ford�tani a "wine" programot �s sz�mos f�ggv�nyk�nyvt�rat/bin�rist. -A "wine" program be fogja t�lteni �s futtatni fogja a Windows futtathat� -�llom�nyokat. -A "libwine" f�ggv�nyk�nyvt�r ("Winelib") haszn�lhat� a Windows forr�sk�d Unix -alatt t�rt�n� ford�t�s�hoz �s linkel�s�hez. +Ez le fogja fordítani a "wine" programot és számos függvénykönyvtárat/binárist. +A "wine" program be fogja tölteni és futtatni fogja a Windows futtatható +állományokat. +A "libwine" függvénykönyvtár ("Winelib") használható a Windows forráskód Unix +alatt történõ fordításához és linkeléséhez. -A ford�t�si konfigur�ci�s opci�k megtekin�t�s�hez n�zze haszn�lja a ./configure --help +A fordítási konfigurációs opciók megtekinétéséhez nézze használja a ./configure --help parancsot. -�j kiad�sra friss�t�skor patch f�jl haszn�lat�val el�sz�r v�ltos a kiad�s legfels� -k�nyvt�rszintj�re (ahol a README f�jl megtal�lhat�). -Azut�n haszn�lja a "make clean" parancsot, �s foltozza meg a kiad�st ezzel: +Új kiadásra frissítéskor patch fájl használatával elõször váltos a kiadás legfelsõ +könyvtárszintjére (ahol a README fájl megtalálható). +Azután használja a "make clean" parancsot, és foltozza meg a kiadást ezzel: - gunzip -c patch-f�jl | patch -p1 + gunzip -c patch-fájl | patch -p1 -ahol a "patch-f�jl" a jav�t�folt f�jl f�jlneve (valami ilyesmi: -Wine-yymmdd.diff.gz). �jrafuttathatja a "./configure", �s azut�n +ahol a "patch-fájl" a javítófolt fájl fájlneve (valami ilyesmi: +Wine-yymmdd.diff.gz). Újrafuttathatja a "./configure", és azután a "make depend && make" parancsokat. -5. TELEP�T�S +5. TELEPÍTÉS -Ha a Wine egyszer helyesen lefordult, haszn�lhatja a "make install" -parancsot; ez telep�teni fogja a wine futtathat� f�jlt, a Wine man -oldal�t, �s n�h�ny egy�b sz�ks�ges f�jlt. +Ha a Wine egyszer helyesen lefordult, használhatja a "make install" +parancsot; ez telepíteni fogja a wine futtatható fájlt, a Wine man +oldalát, és néhány egyéb szükséges fájlt. -El�sz�r ne felejtse elt�vol�tani b�rmely el�z� Wine telep�t�st. -Pr�b�lja ki a "dpkg -r wine", �s az "rpm -e wine", vagy a "make uninstall" -parancsot telep�t�s el�tt. +Elõször ne felejtse eltávolítani bármely elõzõ Wine telepítést. +Próbálja ki a "dpkg -r wine", és az "rpm -e wine", vagy a "make uninstall" +parancsot telepítés elõtt. -L�togassa meg a t�mogat�si oldalt itt: http://www.winehq.org/ a konfigur�ci�s +Látogassa meg a támogatási oldalt itt: http://www.winehq.org/ a konfigurációs tippekhez. -F�ggv�nyk�nyvt�r bet�lt�si hib�k eset�n -(pl. "Error while loading shared libraries: libntdll.so"), ellen�rizze az -f�ggv�nyk�nyvt�r �tvonalt, hogy benne van-e az /etc/ld.so.conf �s futtassa az -ldconfig-ot root-k�nt. +Függvénykönyvtár betöltési hibák esetén +(pl. "Error while loading shared libraries: libntdll.so"), ellenõrizze az +függvénykönyvtár útvonalt, hogy benne van-e az /etc/ld.so.conf és futtassa az +ldconfig-ot root-ként. -6. PROGRAMOK FUTTAT�SA +6. PROGRAMOK FUTTATÁSA -Ha seg�ts�g�l h�vja a Wine-t, megadhatja a teljes �tvonal�t a futtathat� -�llom�nynak, vagy csak a f�jlnevet. +Ha segítségül hívja a Wine-t, megadhatja a teljes útvonalát a futtatható +állománynak, vagy csak a fájlnevet. -P�ld�ul: a Paszi�nsz ind�t�sa: +Például: a Pasziánsz indítása: - wine sol (a konfigf�jlban megadott keres�si �tvonal - wine sol.exe haszn�lat�val keress�k meg a f�jlt) + wine sol (a konfigfájlban megadott keresési útvonal + wine sol.exe használatával keressük meg a fájlt) - wine c:\\windows\\sol.exe (a DOS f�jln�v szintaxis haszn�lat�val) + wine c:\\windows\\sol.exe (a DOS fájlnév szintaxis használatával) - wine /usr/windows/sol.exe (a Unix-os f�jln�v szintaxis haszn�lat�val) + wine /usr/windows/sol.exe (a Unix-os fájlnév szintaxis használatával) - wine sol.exe /param�ter1 -param�ter2 param�ter3 - (program h�v�sa param�terekkel) + wine sol.exe /paraméter1 -paraméter2 paraméter3 + (program hívása paraméterekkel) -Felh�v�s: a f�jl el�s�i �tja is hozz� lesz adva a path-hez, ha a teljes n�v +Felhívás: a fájl eléséi útja is hozzá lesz adva a path-hez, ha a teljes név meg lett adva a parancssorban. -A Wine m�g nem teljes, �gy n�h�ny program �sszeomlik. Ha helyesen be�ll�tja a -winedbg-ot a documentation/debugger.sgml-nek megfelel�en, �n be lesz l�ptetve -egy hibakeres�be, ahol ut�naj�rhat, �s kijav�thatja a probl�m�t. -A tov�bbi infom�ci�hoz, hogy hogy kell ezt megcsin�lni, k�rem olvassa el a -documentation/debugging.sgml f�jlt. - -Jobb ha biztons�gba helyezi a fontos f�jlokat, miel�tt hozz�f�r�st a Wine-nak, -vagy haszn�ljon egy speci�lis Wine m�solatot bel�l�k, mert n�h�ny esetben a -felhaszn�l�k f�jls�r�l�st jeleztek. NE futtassa az Explorer-t, p�ld�ul, -ha �nnek nincs helyes biztons�gi ment�se, mert n�ha �tnevez/t�nkretesz -n�h�ny k�nyvt�rat. Nem csak m�s MS alkalmaz�s mint p�ld�ul a Messenger bizton�sgos, -de valahogy az Explorer futtat�sa is. Ez a bizonyos s�r�l�s (!$!$!$!$.pfr) -r�szlegesen jav�that� ennek a haszn�lat�val: +A Wine még nem teljes, így néhány program összeomlik. Ha helyesen beállítja a +winedbg-ot a documentation/debugger.sgml-nek megfelelõen, ön be lesz léptetve +egy hibakeresõbe, ahol utánajárhat, és kijavíthatja a problémát. +A további infomációhoz, hogy hogy kell ezt megcsinálni, kérem olvassa el a +documentation/debugging.sgml fájlt. + +Jobb ha biztonságba helyezi a fontos fájlokat, mielõtt hozzáférést a Wine-nak, +vagy használjon egy speciális Wine másolatot belõlük, mert néhány esetben a +felhasználók fájlsérülést jeleztek. NE futtassa az Explorer-t, például, +ha önnek nincs helyes biztonsági mentése, mert néha átnevez/tönkretesz +néhány könyvtárat. Nem csak más MS alkalmazás mint példéul a Messenger biztonásgos, +de valahogy az Explorer futtatása is. Ez a bizonyos sérülés (!$!$!$!$.pfr) +részlegesen javítható ennek a használatával: http://home.nexgo.de/andi.mohr/download/decorrupt_explorer -7. T�BB INFORM�CI� BESZERZ�SE +7. TÖBB INFORMÁCIÓ BESZERZÉSE -WWW: A Wine-r�l hatalmas mennyis�g� inform�ci� �rhet� el a WineHQ-n ezen - a c�men: http://www.winehq.org/ : k�l�nb�z� Wine �tmutat�k, - alkalmaz�s adatb�zis, �s hibak�vet�s. - Ez tal�n a legjobb kiindul�si pont. +WWW: A Wine-ról hatalmas mennyiségû információ érhetõ el a WineHQ-n ezen + a címen: http://www.winehq.org/ : különbözõ Wine útmutatók, + alkalmazás adatbázis, és hibakövetés. + Ez talán a legjobb kiindulási pont. -GYIK: A Wine GYIK itt tal�lhat�: http://www.winehq.org/FAQ +GYIK: A Wine GYIK itt található: http://www.winehq.org/FAQ -Usenet: T�rsaloghat a Wine-hoz kapcsol�d� t�m�kban, �s seg�ts�get k�rhet itt: +Usenet: Társaloghat a Wine-hoz kapcsolódó témákban, és segítséget kérhet itt: comp.emulators.ms-windows.wine. -Hib�k: Wine hibabejelent�s a Bugzilla-n kereszt�l itt: http://bugs.winehq.org - K�rem hibabejelent�s k�ld�se el�tt ellen�rizze, hogy az �n probl�m�ja - m�r megtal�lhat�-e az adatb�zisban. K�ldhet hibabejelent�seket a - comp.emulators.ms-windows.wine c�mre is. +Hibák: Wine hibabejelentés a Bugzilla-n keresztül itt: http://bugs.winehq.org + Kérem hibabejelentés küldése elõtt ellenõrizze, hogy az ön problémája + már megtalálható-e az adatbázisban. Küldhet hibabejelentéseket a + comp.emulators.ms-windows.wine címre is. -IRC: Azonnali seg�ts�g el�rhet� a #WineHQ csatorn�n a irc.freenode.net-en. +IRC: Azonnali segítség elérhetõ a #WineHQ csatornán a irc.freenode.net-en. -Git: A jelenlegi Wine fejleszt�i fa el�rhet� Git-en kereszt�l. - L�togasson el ide a tov�bbi inform�ci�hoz: http://www.winehq.org/git +Git: A jelenlegi Wine fejlesztõi fa elérhetõ Git-en keresztül. + Látogasson el ide a további információhoz: http://www.winehq.org/git -Levelez�list�k: - El�rhet� n�h�ny levelez�lista a Wine fejleszt�k sz�m�ra; n�zze meg a - http://www.winehq.org/forums c�met a tov�bbi inform�ci�hoz. +Levelezõlisták: + Elérhetõ néhány levelezõlista a Wine fejlesztõk számára; nézze meg a + http://www.winehq.org/forums címet a további információhoz. -Ha valamit hozz�ad, vagy hib�t jav�t, k�rem k�ldj�n jav�t�foltot ('diff -u' -form�tumban) a wine-devel(a)winehq.org levelez�lista c�mre, hogy beletehess�k a -k�vetkez� kiad�sba. +Ha valamit hozzáad, vagy hibát javít, kérem küldjön javítófoltot ('diff -u' +formátumban) a wine-devel(a)winehq.org levelezõlista címre, hogy beletehessük a +következõ kiadásba. -- Alexandre Julliard diff --git a/documentation/README.ko b/documentation/README.ko index 4686ad8eee..a0fdcb045e 100644 --- a/documentation/README.ko +++ b/documentation/README.ko @@ -1,191 +1,191 @@ -1. �Ұ� +1. 소개 -Wine�� Microsoft Windows ��α׷�(DOS, Windows 3.x, Win32 �� -��)�� н� �󿡼� �� ְ� �� ִ� ��α׷��Դϴ�. Wine�� -Microsoft Windows ��̳ʸ�� ε��ϰ� ��ϴ� ��α׷� �δ�� -Unix�� X11 API�� Ἥ Windows API�� ̺귯��(Winelib)�� -�̷�� ֽ��ϴ�. �� ̺귯�� Win32 �ڵ带 ��н� �� Ϸ� -�̽��ϴ� �뵵�ε� �� ֽ��ϴ�. +Wine은 Microsoft Windows 프로그램(DOS, Windows 3.x, Win32 실행 파일 +포함)을 유닉스 상에서 실행할 수 있게 해 주는 프로그램입니다. Wine은 +Microsoft Windows 바이너리를 로드하고 실행하는 프로그램 로더와 +Unix와 X11 API를 써서 Windows API를 구현한 라이브러리(Winelib)로 +이루어져 있습니다. 이 라이브러리는 Win32 코드를 유닉스 실행 파일로 +이식하는 용도로도 사용할 수 있습니다. -Wine�� Ʈ��̸� GNU LGPL �Ͽ� ��˴ϴ�. �ڼ�� -LICENSE �� Ͻʽÿ�. +Wine은 자유 소프트웨어이며 GNU LGPL 하에 배포됩니다. 자세한 내용은 +LICENSE 파일을 참조하십시오. -2. �� ġ �� +2. 간편 설치 및 실행 -�ҽ�� ޾� ��ϴ� �� Wine Installer�� ̿��ϴ� �� ϴ�. - Wine �ҽ�� ֻ�� 丮�� մϴ�: +소스를 받아 컴파일하는 경우 Wine Installer를 이용하는 것이 좋습니다. + Wine 소스의 최상위 디렉토리에서 다음 명령을 실행합니다: ./tools/wineinstall -��α׷�� "wine ��α׷��"ó�� մϴ�. �� ڼ�� -�� ذ� �� κа� Wine �� Ͻʽÿ�. -Ư�� http://www.winehq.org ��Ʈ�� Ǿ� �ֽ��ϴ�. +프로그램을 실행할 때는 "wine 프로그램명"처럼 합니다. 더 자세한 정보 +및 문제 해결 방법은 이 파일의 나머지 부분과 Wine 맨페이지를 참조하십시오. +특히 http://www.winehq.org 사이트에 방대한 정보가 집약되어 있습니다. -3. ��忡 �ʿ�� +3. 빌드에 필요한 조건 -Wine�� ϰ� ��Ϸ�� ϳ�� ʿ��մϴ�: +Wine을 컴파일하고 실행하려면 다음 중 하나가 필요합니다: - �� 2.0.36 �Ǵ� �� ̻� - FreeBSD 5.3 �Ǵ� �� ̻� - Solaris x86 2.5 �Ǵ� �� ̻� + 리눅스 2.0.36 또는 그 이상 + FreeBSD 5.3 또는 그 이상 + Solaris x86 2.5 또는 그 이상 NetBSD-current - Mac OS X 10.5 �Ǵ� �� ̻� + Mac OS X 10.5 또는 그 이상 -Wine�� Ϸ�� Ŀ�� ʿ��ϱ� �� -��  ü�� մϴ�. -Ŀ�� 带 ��ϴ� ��Ÿ �ٸ� � ü�� Դϴ�. +Wine을 실행하려면 커널 차원의 스레드 지원이 필요하기 때문에 현재는 여기 +나열한 운영 체제만 지원합니다. +커널 스레드를 지원하는 기타 다른 운영 체제는 향후 지원할 예정입니다. -�� : - �� 2.2.x�� 2.0.x�� - �ְ� �׷�� ֽ��ϴ�(�ʱ� 2.0.x �� - ��α׷�� ). �� 2.4.x�� 2.6.x �� ֱ� Ŀ�� ϱ� - �ٶ��ϴ�. +리눅스 정보: + 리눅스 2.2.x에서는 잘 실행될 것이지만 리눅스 2.0.x에서는 실행될 수도 + 있고 그렇지 않을 수도 있습니다(초기 2.0.x 버전에서는 스레드 관련 문제로 + 프로그램이 죽음). 가급적 2.4.x와 2.6.x 같은 최근 커널을 사용하기 + 바랍니다. -FreeBSD ��: - FreeBSD 4.x �� 5.x�� FreeBSD 5.3 �� - �� ʽ��ϴ�. +FreeBSD 정보: + FreeBSD 4.x 및 5.x에서 빌드되지만 FreeBSD 5.3 이전 버전에선 제대로 + 동작하지 않습니다. - �� ڼ�� + 더 자세한 정보는 <ftp://ftp.freebsd.org/pub/FreeBSD/ports/ports/emulators/wine/> - �� ִ� FreeBSD ports �� Ͻʽÿ�. + 에 있는 FreeBSD ports 페이지를 참조하십시오. -Solaris ��: - �� κ�� Wine�� Ϸ�� GNU ��ü��(gcc, gas ��)�� ؾ� - �մϴ�. ��: gas�� ܼ�� ġ�ϱ⸸ �ϸ� gcc�� - �ֽ��ϴ�. gas�� ġ�� gcc�� ϰų� cc, as, ld �� - GNU ��̳ʸ�� ɺ� ��ũ�� ɾ� �ִ� �� ʿ��ϴٰ� �մϴ�. +Solaris 정보: + 거의 대부분의 경우 Wine을 빌드하려면 GNU 툴체인(gcc, gas 등)을 사용해야 + 합니다. 경고: gas를 단순히 설치하기만 하면 gcc에서 사용되지 않을 수도 + 있습니다. gas를 설치한 다음 gcc를 재컴파일하거나 cc, as, ld 명령을 + GNU 바이너리로 심볼 링크를 걸어 주는 일이 필요하다고 합니다. -NetBSD ��: - USER_LDT, SYSVSHM, SYSVSEM, SYSVMSG �ɼ�� Ŀ�ο� ��ԵǾ� �־�� մϴ�. +NetBSD 정보: + USER_LDT, SYSVSHM, SYSVSEM, SYSVMSG 옵션이 커널에 포함되어 있어야 합니다. -Mac OS X ��: - x86 �ӽſ�� Ϸ�� Xcode 2.4 �Ǵ� �� ̻�� ʿ��մϴ�. +Mac OS X 정보: + x86 머신에서 빌드하려면 Xcode 2.4 또는 그 이상이 필요합니다. -��Ǵ� �� ý��: - Wine�� κ�� ý��ۿ�� ˴ϴ�. �׷�� /tmp - ��丮�� umsdos Ÿ�� Ʈ�� 쿡�� α׷�� - �ʽ��ϴ�. Samba�� ̿��ؼ� �� ׼��ϴ� �� ȣȯ�� - �� Ǳ⵵ �߽��ϴ�. �� NTFS�� ũ ��Ͻ� �� - ��Ǿ� �� ʽ��ϴ�. Windows ��α׷�� κ� ��ũ ��򰡿� - ��͸� ��ϹǷ� NTFS�� ʴ� �� ϴ�. NTFS - �� ġ�� Ͻñ� �ٶ��ϴ�. - -�ʼ� �� : - X11 ��߿� �� ġ�Ǿ� �־�� մϴ�(��ȿ�� xlib6g-dev, - ��޿�� XFree86-devel�̶� ��Ű�� Ǿ� ��). +지원되는 파일 시스템: + Wine은 대부분의 파일 시스템에서 문제없이 실행됩니다. 그렇지만 /tmp + 디렉토리가 umsdos 타입으로 마운트된 경우에는 프로그램이 실행되지 + 않습니다. Samba를 이용해서 파일을 액세스하는 경우 몇 가지 호환성 + 문제가 보고되기도 했습니다. 또한 NTFS는 현재 디스크 기록시 안정성이 + 보장되어 있지 않습니다. Windows 프로그램은 대부분 디스크 어딘가에 + 데이터를 기록하므로 NTFS는 가급적 사용하지 않는 것이 좋습니다. NTFS + 파일의 경우 쓰기 가능한 위치로 복사한 다음 사용하시기 바랍니다. -�ʼ� �� : - x86 �ý��ۿ�� gcc 2.7.2 �̻�� ʿ��մϴ�. - 2.7.2.3 �� ȭ �ɼ�� Ѱ� ��ϸ� �� Ͽ�� - �߻�� ִµ�, ��κ� �� õ� �� ͵��Դϴ�. +필수 구성 요소: + X11 개발용 헤더 파일이 설치되어 있어야 합니다(데비안에서는 xlib6g-dev, + 레드햇에서는 XFree86-devel이란 패키지명으로 되어 있음). - "make" ��α׷�� 翬�� ʼ��Դϴ�(�� κ� GNU make ��). +필수 빌드 도구: + x86 시스템에서는 gcc 2.7.2 이상이 필요합니다. + 2.7.2.3 이전 버전은 최적화 옵션을 켜고 컴파일하면 몇몇 파일에서 문제가 + 발생할 수 있는데, 대부분 헤더 파일 관리와 관련된 문제로 인한 것들입니다. - flex �� 2.5 �̻�� bison�� ʿ��մϴ�. + "make" 프로그램은 당연히 필수입니다(거의 대부분 GNU make 사용). -�� ̺귯��: - �� ̺귯�� ./configure --verbose �� - Ȯ�� ֽ��ϴ�. + flex 버전 2.5 이상과 bison이 필요합니다. +선택적 라이브러리: + 포함 여부의 선택이 가능한 라이브러리는 ./configure --verbose 명령으로 + 확인할 수 있습니다. -4. ��ϱ� -wineinstall�� ʴ� �� Ἥ Wine�� մϴ�: +4. 컴파일하기 + +wineinstall을 사용하지 않는 경우 다음 명령을 써서 Wine을 빌드합니다: ./configure make depend make -�̷�� ϸ� "wine" ��α׷�� ټ�� ̺귯��/��̳ʸ�� ˴ϴ�. -"wine" ��α׷�� Windows �� ε��ϰ� ��ϴ� �� ˴ϴ�. -"libwine" ��̺귯��("Winelib")�� Windows �ҽ� �ڵ带 ��н� �󿡼� -��ϰ� ��ũ�ϴ� �뵵�� ֽ��ϴ�. +이렇게 하면 "wine" 프로그램과 다수의 라이브러리/바이너리가 빌드됩니다. +"wine" 프로그램은 Windows 실행 파일을 로드하고 실행하는 데 사용됩니다. +"libwine" 라이브러리("Winelib")는 Windows 소스 코드를 유닉스 상에서 +컴파일하고 링크하는 용도로 사용할 수 있습니다. -�� ɼ�� ./configure --help �� մϴ�. +컴파일 설정 옵션을 보려면 ./configure --help 명령을 사용합니다. -��ġ �� Ἥ �� ׷��̵��Ϸ�� ֻ�� -��丮(README �� ִ� ��丮)�� ϴ�. �׷� �� -"make clean" �� ϰ� �Ʒ� �� ҽ�� ġ�մϴ�: +패치 파일을 써서 새 릴리스로 업그레이드하려면 먼저 릴리스의 최상위 +디렉토리(README 파일이 들어 있는 디렉토리)로 갑니다. 그런 다음 +"make clean" 명령을 실행하고 아래 명령으로 소스를 패치합니다: bunzip2 -c patch-file | patch -p1 -"patch-file"�� ġ �� ̸��Դϴ�(wine-0.9.x.diff.bz2 �� ). -��ġ�� "./configure", "make depend && make"�� ʷ� -��ϸ� �˴ϴ�. +"patch-file"은 패치 파일의 이름입니다(wine-0.9.x.diff.bz2 등의 형태). +패치한 다음에는 "./configure", "make depend && make"를 차례로 +실행하면 됩니다. -5. �� +5. 설정 -Wine�� ϴ� �� "make install" �� -�� ϰ� ��, ��Ÿ �ʿ�� ý��ۿ� ��ġ�� ֽ��ϴ�. +Wine이 일단 정상적으로 빌드된 다음에는 "make install" 명령으로 +실행 파일과 맨페이지, 기타 필요한 파일을 시스템에 설치할 수 있습니다. -��ġ�ϱ� �� Wine�� ؾ� �Ѵٴ� �� ñ� -�ٶ��ϴ�. "dpkg -r wine" �Ǵ� "rpm -e wine" �Ǵ� "make uninstall" �� -�� ֽ��ϴ�. +설치하기 전 이전 버전의 Wine을 제거해야 한다는 점을 잊지 마시기 +바랍니다. "dpkg -r wine" 또는 "rpm -e wine" 또는 "make uninstall" 등의 +명령으로 이전 버전을 제거할 수 있습니다. -�� http://www.winehq.org/�� Support �� ֽ��ϴ�. +설정 관련 도움말은 http://www.winehq.org/의 Support 페이지에 있습니다. -��̺귯�� ε� ��("Error while loading shared libraries: libntdll.so")�� -�߻��ϴ� �� ̺귯�� ΰ� /etc/ld.so.conf �� ȿ� ��Ǿ� �ִ�� -Ȯ�� root �� ldconfig�� Ͻʽÿ�. +라이브러리 로딩 에러("Error while loading shared libraries: libntdll.so")가 +발생하는 경우 라이브러리 경로가 /etc/ld.so.conf 파일 안에 지정되어 있는지 +확인한 다음 root 권한으로 ldconfig를 실행하십시오. -6. ��α׷� �� +6. 프로그램 실행 -Wine�� ü ��θ� �� ְ� ��ϸ�� -�� ֽ��ϴ�. +Wine을 실행할 때 실행 파일의 전체 경로를 지정할 수도 있고 파일명만 지정할 +수도 있습니다. -�� ī��̸� ��Ϸ��: +예를 들어 카드놀이를 실행하려면: - wine sol (�� ã�� Ͽ� �� - wine sol.exe �˻� ��θ� �̿�) + wine sol (파일을 찾기 위해 설정 파일에 지정된 + wine sol.exe 검색 경로를 이용) - wine c:\\windows\\sol.exe (DOS ��ϸ� �� ̿�) + wine c:\\windows\\sol.exe (DOS 파일명 문법을 이용) - wine /usr/windows/sol.exe (��н� ��ϸ� �� ̿�) + wine /usr/windows/sol.exe (유닉스 파일명 문법을 이용) wine sol.exe /parameter1 -parameter2 parameter3 - (��α׷�� ȣ�� Ķ��͸� �Ѱ��) + (프로그램을 호출할 때 파라미터를 넘겨줌) -Wine�� ϼ� �ܰ迡 �� ߱� �� α׷�� -�� ֽ��ϴ�. ��α׷�� ״� �� м��ϰ� �� ֵ�� -�� ڵ� ��Ե˴ϴ�. �ڼ�� Wine �� ̵�� -�� Ͻñ� �ٶ��ϴ�. +Wine은 아직 완성 단계에 도달하지 못했기 때문에 프로그램이 제대로 실행되지 +않을 수 있습니다. 프로그램이 죽는 경우 문제를 분석하고 수정할 수 있도록 +디버그 모드로 자동 진입됩니다. 자세한 디버깅 방법은 Wine 개발자 가이드의 +디버깅 섹션을 참조하시기 바랍니다. -7. �� ڼ�� +7. 더 자세한 정보 -WWW: �� Wine ��̵�, ��ø��̼� ��ͺ��̽�, �� - http://www.winehq.org/ �� ִ� WineHQ ��Ʈ�� - �� ֽ��ϴ�. �� ã�� 밳 �� Ʈ�� ˴ϴ�. +WWW: 여러 종류의 Wine 가이드, 애플리케이션 데이터베이스, 버그 추적 등 + http://www.winehq.org/ 에 있는 WineHQ 사이트에 가면 많은 정보를 얻을 + 수 있습니다. 정보를 찾을 때 대개 이 사이트가 출발점이 됩니다. -FAQ: Wine FAQ�� http://www.winehq.org/FAQ �� ֽ��ϴ�. +FAQ: Wine FAQ은 http://www.winehq.org/FAQ 에 있습니다. -Usenet: Wine �� ϰų� �� comp.emulators.ms-windows.wine - �׷�� ̿��ϱ� �ٶ��ϴ�. +Usenet: Wine 관련 주제를 논의하거나 도움을 받으려면 comp.emulators.ms-windows.wine + 그룹을 이용하기 바랍니다. -Bugs: http://bugs.winehq.org �� Wine Bugzilla�� ׸� ��Ͻʽÿ�. - �� ϱ� �� ̹� �� ִ�� - ��ͺ��̽� �˻�� Ȯ��ϱ� �ٶ��ϴ�. - comp.emulators.ms-windows.wine �׷쿡 �� ÷�� ˴ϴ�. +Bugs: http://bugs.winehq.org 의 Wine Bugzilla에 버그를 보고하십시오. + 버그 보고서를 제출하기 전 같은 문제가 이미 제출된 적이 있는지 + 데이터베이스 검색을 통해 확인하기 바랍니다. + comp.emulators.ms-windows.wine 그룹에 버그 보고서를 올려도 됩니다. -IRC: irc.freenode.net �� #WineHQ ä�ο�� ֽ��ϴ�. +IRC: irc.freenode.net 의 #WineHQ 채널에서 도움을 받을 수 있습니다. -GIT: Wine �� Ʈ�� GIT�� ǰ� �ֽ��ϴ�. �� ڼ�� - http://www.winehq.org/site/git �� ϱ� �ٶ��ϴ�. +GIT: Wine 개발 트리는 현재 GIT로 관리되고 있습니다. 더 자세한 정보는 + http://www.winehq.org/site/git 를 참조하기 바랍니다. -��ϸ� ��Ʈ: - Wine ��ڿ� ��ڸ� �� ϸ� ��Ʈ�� �ǰ� �ֽ��ϴ�. - �� ڼ�� http://www.winehq.org/forums �� ϱ� �ٶ��ϴ�. +메일링 리스트: + Wine 사용자와 개발자를 위해 메일링 리스트가 운영되고 있습니다. + 더 자세한 정보는 http://www.winehq.org/forums 를 참조하기 바랍니다. -��Ű: Wine ��Ű�� http://wiki.winehq.org �� ֽ��ϴ�. +위키: Wine 위키는 http://wiki.winehq.org 에 있습니다. -�߰�� ̳� �� װ� �ִٸ� �� Ե� �� ֵ�� -wine-devel(a)winehq.org ��ϸ� ��Ʈ�� ġ('diff -u' �� )�� -�ֽñ� �ٶ��ϴ�. +추가할 내용이나 수정할 버그가 있다면 다음번 릴리스에 포함될 수 있도록 +wine-devel(a)winehq.org 메일링 리스트로 패치('diff -u' 형식으로 된)를 보내 +주시기 바랍니다. -- Alexandre Julliard diff --git a/documentation/README.pt b/documentation/README.pt index b0914f2098..3f3ff2cc5e 100644 --- a/documentation/README.pt +++ b/documentation/README.pt @@ -1,26 +1,26 @@ -1. INTRODU��O +1. INTRODUÇÃO -Wine � um programa que permite correr programas Microsoft Windows -(incluindo DOS, Windows 3.x e Win32 execut�veis) em Unix. -Consiste num carregador (loader), que carrega e executa um bin�rio -Microsoft Windows, e uma livraria (chamada Winelib) que implementa -Windows API calls usando o Unix ou X11 equivalentes. A livraria tamb�m -pode ser usada para "porting" Win32 c�digo para execut�veis do nativo Unix . +Wine é um programa que permite correr programas Microsoft Windows +(incluindo DOS, Windows 3.x e Win32 executáveis) em Unix. +Consiste num carregador (loader), que carrega e executa um binário +Microsoft Windows, e uma livraria (chamada Winelib) que implementa +Windows API calls usando o Unix ou X11 equivalentes. A livraria também +pode ser usada para "porting" Win32 código para executáveis do nativo Unix . -Wine � software gr�tis,autorizado segundo a GNU LGPL; ver o ficheiro -LICEN�A para os detalhes. +Wine é software grátis,autorizado segundo a GNU LGPL; ver o ficheiro +LICENÇA para os detalhes. -2.ARRANQUE R�PIDO +2.ARRANQUE RÁPIDO -Sempre que se compila da source, � recomendado que se use o Wine -Installer para construir e instalar o Wine. Desde a primeira directoria -do Wine source (que cont�m este ficheiro),corre: +Sempre que se compila da source, é recomendado que se use o Wine +Installer para construir e instalar o Wine. Desde a primeira directoria +do Wine source (que contém este ficheiro),corre: ./tools/wineinstall -Corre os programas conforme as "wine [options] program". Para mais -informa��es e reso�u��o de problemas. L� o resto deste ficheiro, a Wine -man page, e especialmente a abund�ncia de informa��o encontrada em +Corre os programas conforme as "wine [options] program". Para mais +informações e resoçução de problemas. Lê o resto deste ficheiro, a Wine +man page, e especialmente a abundância de informação encontrada em http://www.winehq.org. 3.REQUERIMENTOS @@ -32,128 +32,128 @@ Para compilar e correr o Wine, deves ter o seguinte: Solaris x86 2.5 ou seguinte NetBSD-current -Como o Wine requer sequ�ncias kernel-level para poder correr, apenas -os sistemas operativos acima mencionados s�o suportados. -Outros sistemas operativos que suportam sequ�ncias kernel, talvez +Como o Wine requer sequências kernel-level para poder correr, apenas +os sistemas operativos acima mencionados são suportados. +Outros sistemas operativos que suportam sequências kernel, talvez venham a ser suportados no futuro. Linux info: -Enquanto o Linux 2.2.x ir� sobretudo trabalhar e Linux 2.0.x poder� -ir� contudo trabalhar (vers�es 2.0.x antigas tem mal funcionamento -relacionados a tarefas), ser� muito melhor teres um kernel atualizado +Enquanto o Linux 2.2.x irá sobretudo trabalhar e Linux 2.0.x poderá +irá contudo trabalhar (versões 2.0.x antigas tem mal funcionamento +relacionados a tarefas), será muito melhor teres um kernel atualizado como 2.4.x. FreeBSD info: -Wine dever� construir no FreeBSD 4.x e FreeBSD 5.x, mas vers�es anteriores -a FreeBSD 5.3 geralmente n�o trabalham corretamente. +Wine deverá construir no FreeBSD 4.x e FreeBSD 5.x, mas versões anteriores +a FreeBSD 5.3 geralmente não trabalham corretamente. -Mais informa��es encontra-se em: +Mais informações encontra-se em: ftp://ftp.freebsd.org/pub/FreeBSD/ports/ports/emulators/wine/ Solaris info: -Tu ir�s provavelmente ter que construir o Wine com as ferramentas GNU -(gcc, gas, etc.). Aviso: ao instalar gas *n�o* assegura que ser� usado -pelo gcc. Recompilar o gcc depois de instalar o gas ou symking cc, as e -ld para as ferramentas gnu � dito que � necess�rio. +Tu irás provavelmente ter que construir o Wine com as ferramentas GNU +(gcc, gas, etc.). Aviso: ao instalar gas *não* assegura que será usado +pelo gcc. Recompilar o gcc depois de instalar o gas ou symking cc, as e +ld para as ferramentas gnu é dito que é necessário. NetBSD info: -Certifica-te que tens as op��es USER_LDT, SYSVSHM, SYSVSEM, e SYSVMSG +Certifica-te que tens as opções USER_LDT, SYSVSHM, SYSVSEM, e SYSVMSG ligadas ao teu kernel. File systems info: -O Wine dever� correr na maioria dos file systems. Contudo, o Wine falha -no aranque se umsdos � usado para a directoria /tmp. Alguns problemas de -compatibilidades foram relatados estando a usar ficheiros acessados -atrav�s do Samba. Tamb�m, como o NTFS apenas pode ser usado com -seguran�a com acesso readonly por agora, n�s n�o recomendamos o uso de +O Wine deverá correr na maioria dos file systems. Contudo, o Wine falha +no aranque se umsdos é usado para a directoria /tmp. Alguns problemas de +compatibilidades foram relatados estando a usar ficheiros acessados +através do Samba. Também, como o NTFS apenas pode ser usado com +segurança com acesso readonly por agora, nós não recomendamos o uso de NTFS. Como os programas de Windows precisam de acesso write em quase tudo. -No caso de NTFS files, copia por cima para uma localiza��o em que se +No caso de NTFS files, copia por cima para uma localização em que se possa escrever. -Requisitos b�sicos: +Requisitos básicos: Tu precisas de ter instalados os fucheiros de include do X11 development (chamados xlib6g-dev em Debian e Xfree86-devel no RedHat). -Requisitos para as ferramentas de constru��o: -Em sistemas x86 o gcc >= 2.7.2 � requerido. -Vers�es anteriores � 2.7.2.3 poder�o ter problemas quando certos -ficheiros s�o compilados com optimiza��o, frequentemente devido a -problemas relacionados com as gest�es dos cabe�alhos dos ficheiros. -Actualmente o pgcc n�o trabalha com o Wine. A causa deste problema � +Requisitos para as ferramentas de construção: +Em sistemas x86 o gcc >= 2.7.2 é requerido. +Versões anteriores à 2.7.2.3 poderão ter problemas quando certos +ficheiros são compilados com optimização, frequentemente devido a +problemas relacionados com as gestôes dos cabeçalhos dos ficheiros. +Actualmente o pgcc não trabalha com o Wine. A causa deste problema é desconhecida. -Claro que tamb�m precisas fazer "make" (geralmente como o GNU make). +Claro que também precisas fazer "make" (geralmente como o GNU make). -Tu tamb�m necessitas do flex versao 2.5 ou superior e o bison. +Tu também necessitas do flex versao 2.5 ou superior e o bison. Se estiveres a usar RedHat ou Debian, instala os pacotes do flex e do bison. Bibliotecas de suporte opcionais: -Se desejares suporte de impress�o do CUPS, por favor instala os pacotes +Se desejares suporte de impressão do CUPS, por favor instala os pacotes cups e cups-devel. -4.COMPILA��O +4.COMPILAÇÃO -No caso de escolheres n�o usar wineinstall, corre os seguintes comandos +No caso de escolheres não usar wineinstall, corre os seguintes comandos para contruir o Wine: ./configure make depend make -Isto ir� contruir o programa "wine" e numerosos suportes livraris/binarios. -O programa "wine" ir� carregar e correr executaveis do Windows. -A livraria "libwine" ("winelib") pode ser usada para compilar e ligar +Isto irá contruir o programa "wine" e numerosos suportes livraris/binarios. +O programa "wine" irá carregar e correr executaveis do Windows. +A livraria "libwine" ("winelib") pode ser usada para compilar e ligar Windows source code sob o Unix. -Para ver as op��es de compila��o da configura��o, faz ./configure -help. +Para ver as opções de compilação da configuração, faz ./configure -help. -Para fazeres o upgrade de uma nova vers�o atravez de um ficheiro patch, -primeiro cd para a directoria top da distribui��o (a que contem este -ficheiro README). A seguir faz um "make clean", e faz o patch da -distribui��o com: +Para fazeres o upgrade de uma nova versão atravez de um ficheiro patch, +primeiro cd para a directoria top da distribuição (a que contem este +ficheiro README). A seguir faz um "make clean", e faz o patch da +distribuição com: gunzip -c patch-file | patch -p1 -onde "patch-file" � o nome do ficheiro patch ( qualquer coisa como -Wine.yymmdd.diff.gz). Tu podes entao correr fazendo "./configure", e +onde "patch-file" é o nome do ficheiro patch ( qualquer coisa como +Wine.yymmdd.diff.gz). Tu podes entao correr fazendo "./configure", e depois corre "make depend && make" 5.SETUP -Uma vez o Wine contruido correctamente, tu podes entao fazer o "make -install"; isto ir� instalar o wine executavel, o Wine man page, e alguns -outros ficheiros necess�rios. +Uma vez o Wine contruido correctamente, tu podes entao fazer o "make +install"; isto irá instalar o wine executavel, o Wine man page, e alguns +outros ficheiros necessários. -N�o esquecer de primeiro desinstalar qualquer previo conflito relativo a -instala��o do Wine. -Tenta outro "dpkg -r wine" ou "rpm -e wine" ou "make uninstall" antes de +Não esquecer de primeiro desinstalar qualquer previo conflito relativo a +instalação do Wine. +Tenta outro "dpkg -r wine" ou "rpm -e wine" ou "make uninstall" antes de installar. -Ver http://www.winehq.org/support/ para informa��o sobre a -configura�ao. +Ver http://www.winehq.org/support/ para informação sobre a +configuraçao. -No caso da livraria carregar erros (e.g. "Error while loading shared -libraries: libntdll.so"), tem a certeza de adicionar o caminho da +No caso da livraria carregar erros (e.g. "Error while loading shared +libraries: libntdll.so"), tem a certeza de adicionar o caminho da livraria para /etc/ld.so.conf e correr ldconfig como root. -Para verificar a correc��o do ambiente, tu precisas para que o Wine +Para verificar a correcção do ambiente, tu precisas para que o Wine corra com sucesso, tu podes correr "./tools/winecheck | less". -Tu ir�s obter uma percentagem do resultado indicando "Wine configuration +Tu irás obter uma percentagem do resultado indicando "Wine configuration correctness". -Como este programa � alpha, ainda n�o correu um verdadeiro e exaustivo -teste, onde, ent�o deve ser levado apenas como um primeiro passo de -verifica��o. +Como este programa é alpha, ainda não correu um verdadeiro e exaustivo +teste, onde, então deve ser levado apenas como um primeiro passo de +verificação. -Ver wine.confman page, como se muda apenas para o suporte em modo texto +Ver wine.confman page, como se muda apenas para o suporte em modo texto se desejado. 6.CORRER PROGRAMAS -Quando e invoca o Wine, tens que especificar o caminho (patch) complecto +Quando e invoca o Wine, tens que especificar o caminho (patch) complecto do executavel, ou apenas o nome do ficheiro. -Por exemplo: para correr o Solit�rio: +Por exemplo: para correr o Solitário: wine sol (usando o searchpatch para lozalizar o ficheiro) wine sol.exe @@ -161,49 +161,49 @@ Por exemplo: para correr o Solit wine /usr/windows/sol.exe (usando um nome de ficheiro Unix) -Nota: o caminho do ficheiro tamb�m ir� ser adicionado ao caminho(patch) -quando um nome complecto � fornecido na linha de comando. +Nota: o caminho do ficheiro também irá ser adicionado ao caminho(patch) +quando um nome complecto é fornecido na linha de comando. -O Wine ainda n�o est� complecto.ent�o poder�o v�rios programas -quebrar(crash). Providenciamos-te bem para que o winedbg esteja -correctamente e de acordo com a documentation/debugger.sgml, sera-te -dado um detector de erros (debugger) para que possas investigar e +O Wine ainda não está complecto.então poderão vários programas +quebrar(crash). Providenciamos-te bem para que o winedbg esteja +correctamente e de acordo com a documentation/debugger.sgml, sera-te +dado um detector de erros (debugger) para que possas investigar e corrigir os problemas. -Para mais informa��o como em fazer isto ou aquilo, por favor l� o +Para mais informação como em fazer isto ou aquilo, por favor lê o ficheiro documentation/debugging.sgml. -Tu deves fazer um backup de todos os teus ficheiros importantes em que -destes acesso ao Wine, ou usa uma especial c�pia deles.tem havido casos -de certos users que t�m feito relatos de ficheiros corronpidos. N�o -corrar o Explorer, por exemplo, se n�o tiveres um backup pr�prio, que -por vezes renomeia e estraga algumas directorias. Nem todos os MS apps -como o e.g. Messenger s�o seguros, ao correrem o Explorer de alguma -maneira. Este caso particular de corrupe�ao (!$!$!$!$.pfr) podem ao +Tu deves fazer um backup de todos os teus ficheiros importantes em que +destes acesso ao Wine, ou usa uma especial cópia deles.tem havido casos +de certos users que têm feito relatos de ficheiros corronpidos. Não +corrar o Explorer, por exemplo, se não tiveres um backup próprio, que +por vezes renomeia e estraga algumas directorias. Nem todos os MS apps +como o e.g. Messenger são seguros, ao correrem o Explorer de alguma +maneira. Este caso particular de corrupeçao (!$!$!$!$.pfr) podem ao menos parcialmente podem ser corrigidos usando http://home.nexgo.de/andi.mohr/download/decorrupt_explorer -7.ARRANJAR MAIS INFORMA��O +7.ARRANJAR MAIS INFORMAÇÃO -www: Uma grande quantidade de informa��o acerca do Wine est� disponivel - pelo WineHQ em http://www.winehq.org/ : varios guias Wine, base de - dados de aplica��es, localiza�ao de erros. Isto � provavelmente o - melhor ponto de come�o. +www: Uma grande quantidade de informação acerca do Wine está disponivel + pelo WineHQ em http://www.winehq.org/ : varios guias Wine, base de + dados de aplicações, localizaçao de erros. Isto é provavelmente o + melhor ponto de começo. -FAQ: A Wine FAQ est� localizada em http://www.winehq.org/FAQ +FAQ: A Wine FAQ está localizada em http://www.winehq.org/FAQ -Usenet: Tu podes discutor t�picos relacionados de Wine e obter ajuda em +Usenet: Tu podes discutor tópicos relacionados de Wine e obter ajuda em comp.emulators.ms-windows.wine. -IRC: Ajuda online est� disponivel em #WineHQ on irc.freenode.net. +IRC: Ajuda online está disponivel em #WineHQ on irc.freenode.net. -Git: O currente desenvolvimento do Wine est� disponivel por Git. - Vai a http://www.winehq.org/git para mais informa��o. +Git: O currente desenvolvimento do Wine está disponivel por Git. + Vai a http://www.winehq.org/git para mais informação. Mailing Lists: - H� algumas mailing list para responsaveis pelo desenvolvimento Wine; ver em - http://www.winehq.org/forums para mais informa��o. + Há algumas mailing list para responsaveis pelo desenvolvimento Wine; ver em + http://www.winehq.org/forums para mais informação. -Se tu acrescentaste algo,ou corrigiste um bug, por favor envia um patch -(em 'diff -u' format) para wine-devel(a)winehq.org lista para inclus�o -no pr�ximo lan�amento. +Se tu acrescentaste algo,ou corrigiste um bug, por favor envia um patch +(em 'diff -u' format) para wine-devel(a)winehq.org lista para inclusão +no próximo lançamento. diff --git a/documentation/README.pt_br b/documentation/README.pt_br index a2cccac88e..01e0be773a 100644 --- a/documentation/README.pt_br +++ b/documentation/README.pt_br @@ -1,125 +1,125 @@ -1. INTRODU��O +1. INTRODUÇÃO -Wine � um programa que permite executar programas Microsoft Windows -(incluindo execut�veis DOS, Windows 3.x, Win32 e Win64) no Unix. -Constitu�do de um programa carregador (loader) que carrega e executa -um bin�rio Microsoft Windows, e uma biblioteca (chamada Winelib) que +Wine é um programa que permite executar programas Microsoft Windows +(incluindo executáveis DOS, Windows 3.x, Win32 e Win64) no Unix. +Constituído de um programa carregador (loader) que carrega e executa +um binário Microsoft Windows, e uma biblioteca (chamada Winelib) que implementa chamadas da API do Windows usando os equivalentes do Unix -ou do X11. A biblioteca tamb�m pode ser usada para portar c�digo -Win32 em execut�veis nativos Unix. +ou do X11. A biblioteca também pode ser usada para portar código +Win32 em executáveis nativos Unix. -Wine � software livre, liberado segundo a GNU LGPL; veja o arquivo +Wine é software livre, liberado segundo a GNU LGPL; veja o arquivo LICENSE para detalhes. -2. IN�CIO R�PIDO +2. INÍCIO RÁPIDO -Sempre que se compilam os fontes, � recomendado usar o Wine Installer -para construir e instalar o Wine. Estando no diret�rio de mais alto -n�vel do c�digo fonte do Wine, execute: +Sempre que se compilam os fontes, é recomendado usar o Wine Installer +para construir e instalar o Wine. Estando no diretório de mais alto +nível do código fonte do Wine, execute: ./tools/wineinstall -Execute programas conforme "wine programa". Para maiores informa��es -e resolu��o de problemas, leia o restante deste arquivo, a p�gina -"man" do Wine (man wine), e especialmente a abund�ncia de informa��o +Execute programas conforme "wine programa". Para maiores informações +e resolução de problemas, leia o restante deste arquivo, a página +"man" do Wine (man wine), e especialmente a abundância de informação encontrada em http://www.winehq.org. 3. REQUERIMENTOS -Para compilar e executar o Wine, voc� deve ter o seguinte: +Para compilar e executar o Wine, você deve ter o seguinte: - Linux vers�o 2.0.36 ou posterior + Linux versão 2.0.36 ou posterior FreeBSD 8.0 ou posterior Solaris x86 9 ou posterior NetBSD-atual Mac OS X 10.5 ou posterior -Como o Wine requer suporte a tarefas no n�vel de kernel para executar, -somente os sistemas operacionais acima mencionados s�o suportados. -Outros sistemas operacionais que suportarem tarefas do kernel poder�o +Como o Wine requer suporte a tarefas no nível de kernel para executar, +somente os sistemas operacionais acima mencionados são suportados. +Outros sistemas operacionais que suportarem tarefas do kernel poderão ter suporte no futuro. -Informa��es para o FreeBSD: - O Wine em geral n�o deve funcionar corretamente em vers�es antes da 8.0. - Veja http://wiki.freebsd.org/Wine para mais informa��es. +Informações para o FreeBSD: + O Wine em geral não deve funcionar corretamente em versões antes da 8.0. + Veja http://wiki.freebsd.org/Wine para mais informações. -Informa��es para o Solaris: - Voc� provavelmente necessitar� construir o Wine com as ferramentas GNU - (gcc, gas, etc.). Aviso: instalar gas N�O assegura que ser� usado pelo - gcc. Recompilar o gcc depois de instalar o gas ou criar uma liga��o ao - cc, as e ld para as ferramentas gnu � dito ser necess�rio. +Informações para o Solaris: + Você provavelmente necessitará construir o Wine com as ferramentas GNU + (gcc, gas, etc.). Aviso: instalar gas NÃO assegura que será usado pelo + gcc. Recompilar o gcc depois de instalar o gas ou criar uma ligação ao + cc, as e ld para as ferramentas gnu é dito ser necessário. -Informa��es para o NetBSD: - Certifique-se de ter as op��es USER_LDT, SYSVSHM, SYSVSEM, e SYSVMSG +Informações para o NetBSD: + Certifique-se de ter as opções USER_LDT, SYSVSHM, SYSVSEM, e SYSVMSG ligadas no kernel. -Informa��es para Mac OS X: - Ser� necess�rio o Xcode 2.4 ou superior para compilar corretamente no x86. - O driver gr�fico Mac requer OS X 10.6 ou superior e n�o ser� usado no 10.5. +Informações para Mac OS X: + Será necessário o Xcode 2.4 ou superior para compilar corretamente no x86. + O driver gráfico Mac requer OS X 10.6 ou superior e não será usado no 10.5. Sistemas de arquivo suportados: O Wine deve rodar na maioria dos sistemas de arquivos. Alguns problemas de - compatibilidade foram reportados quando usado via Samba. Al�m disso, o NTFS - n�o prov� todas as funcionalidades necess�rias para alguns aplicativos. - Usar uma parti��o nativa Unix � recomendado. + compatibilidade foram reportados quando usado via Samba. Além disso, o NTFS + não provê todas as funcionalidades necessárias para alguns aplicativos. + Usar uma partição nativa Unix é recomendado. -Requisitos b�sicos: - Voc� necessita ter instalados os arquivos de inclus�o para desenvolvimento +Requisitos básicos: + Você necessita ter instalados os arquivos de inclusão para desenvolvimento do X11 (chamados de xlib6g-dev no Debian e XFree86-devel no RedHat). - Obviamente voc� tamb�m ir� precisar do "make" (comumente o GNU make). + Obviamente você também irá precisar do "make" (comumente o GNU make). - Tamb�m ser� necess�rio o flex vers�o 2.5.33 ou superior e o bison. + Também será necessário o flex versão 2.5.33 ou superior e o bison. Bibliotecas de suporte opcionais: - O script configure ir� mostrar diversas mensagens quando bibliotecas - opcionais n�o forem encontradas no seu sistema. + O script configure irá mostrar diversas mensagens quando bibliotecas + opcionais não forem encontradas no seu sistema. Veja http://wiki.winehq.org/Recommended_Packages para dicas sobre - pacotes que voc� pode instalar. + pacotes que você pode instalar. - Em plataformas de 64 bits, se compilar Wine como 32 bits (padr�o), voc� - precisa assegurar que as vers�es 32 bits das bibliotecas est�o instaladas, + Em plataformas de 64 bits, se compilar Wine como 32 bits (padrão), você + precisa assegurar que as versões 32 bits das bibliotecas estão instaladas, veja http://wiki.winehq.org/WineOn64bit para mais detalhes. - Se voc� quer um verdadeiro Wine de 64 bits (ou uma configura��o mista de + Se você quer um verdadeiro Wine de 64 bits (ou uma configuração mista de 32 e 64 bits) veja http://wiki.winehq.org/Wine64 para mais detalhes. -4. COMPILA��O +4. COMPILAÇÃO -No caso de escolher n�o usar o wineinstall, execute os comandos a seguir +No caso de escolher não usar o wineinstall, execute os comandos a seguir para construir o Wine: ./configure make -Isto construir� o programa "wine" e v�rios bin�rios/bibliotecas de suporte. -O programa "wine" carregar� e executar� execut�veis do Windows. +Isto construirá o programa "wine" e vários binários/bibliotecas de suporte. +O programa "wine" carregará e executará executáveis do Windows. A biblioteca "libwine" ("Winelib") pode ser usada para compilar e ligar -c�digo-fonte do Windows sob o Unix. +código-fonte do Windows sob o Unix. -Para ver as op��es de compila��o da configura��o, rode ./configure --help. +Para ver as opções de compilação da configuração, rode ./configure --help. -5. CONFIGURA��O +5. CONFIGURAÇÃO -Uma vez que o Wine esteja constru�do corretamente, voc� pode executar -"make install"; assim ir� instalar o execut�vel do wine, as p�ginas -"man" do Wine, e outros arquivos necess�rios. +Uma vez que o Wine esteja construído corretamente, você pode executar +"make install"; assim irá instalar o executável do wine, as páginas +"man" do Wine, e outros arquivos necessários. -N�o esque�a de desinstalar primeiramente qualquer instala��o pr�via do +Não esqueça de desinstalar primeiramente qualquer instalação prévia do Wine que possa ser conflitante. Tente tanto "dpkg -r wine", "rpm -e wine" ou "make uninstall" antes de instalar. -Depois de instalado, pode-se executar o programa de configura��o "winecfg". -Veja a �rea de suporte em http://www.winehq.org/ para dicas de configura��o. +Depois de instalado, pode-se executar o programa de configuração "winecfg". +Veja a área de suporte em http://www.winehq.org/ para dicas de configuração. 6. EXECUTANDO PROGRAMAS -Ao invocar o Wine, voc� pode especificar o caminho completo do execut�vel, +Ao invocar o Wine, você pode especificar o caminho completo do executável, ou somente um nome de arquivo. Por exemplo, para executar o bloco de notas: @@ -132,42 +132,42 @@ Por exemplo, para executar o bloco de notas: wine ~/.wine/drive_c/windows/notepad.exe (usando um nome de arquivo Unix) - wine notepad.exe leiame.txt (chamando o programa com par�metros) + wine notepad.exe leiame.txt (chamando o programa com parâmetros) -O Wine n�o � perfeito, ent�o alguns programas podem travar. Se isso -acontecer voc� ver� um registro do travamento (crash log) que voc� -poder� anexar ao bug que for criar. +O Wine não é perfeito, então alguns programas podem travar. Se isso +acontecer você verá um registro do travamento (crash log) que você +poderá anexar ao bug que for criar. -7. OBTENDO MAIS INFORMA��O +7. OBTENDO MAIS INFORMAÇÃO -WWW: Uma grande quantidade de informa��o sobre o Wine est� dispon�vel - no WineHQ em http://www.winehq.org/ : v�rios guias do Wine, base - de dados de aplica��es, rastreamento de erros. Este � provavelmente - o melhor ponto para come�ar. +WWW: Uma grande quantidade de informação sobre o Wine está disponível + no WineHQ em http://www.winehq.org/ : vários guias do Wine, base + de dados de aplicações, rastreamento de erros. Este é provavelmente + o melhor ponto para começar. -FAQ: O FAQ (perguntas frequentes) do Wine est� em http://www.winehq.org/FAQ +FAQ: O FAQ (perguntas frequentes) do Wine está em http://www.winehq.org/FAQ -Wiki: O wiki do Wine est� dispon�vel em http://wiki.winehq.org +Wiki: O wiki do Wine está disponível em http://wiki.winehq.org -Listas de discuss�o: - H� diversas listas de mensagens para usu�rios e colaboradores no +Listas de discussão: + Há diversas listas de mensagens para usuários e colaboradores no desenvolvimento do Wine; veja http://www.winehq.org/forums para - mais informa��o. + mais informação. Bugs: Relate erros ao Bugzilla do Wine em http://bugs.winehq.org Por favor, pesquise a base de dados do bugzilla para verificar - se seu problema j� foi encontrado ou resolvido antes de enviar - um relat�rio do erro. + se seu problema já foi encontrado ou resolvido antes de enviar + um relatório do erro. -IRC: A ajuda online est� dispon�vel em #WineHQ em irc.freenode.net. +IRC: A ajuda online está disponível em #WineHQ em irc.freenode.net. -Git: A �rvore de desenvolvimento atual do Wine est� dispon�vel por Git. - Visite http://www.winehq.org/git para mais informa��o. +Git: A árvore de desenvolvimento atual do Wine está disponível por Git. + Visite http://www.winehq.org/git para mais informação. -Se voc� alterar algo ou reparar um erro, envie, por favor, um patch -(preferencialmente usando git-format-patch) � lista wine-devel(a)winehq.org -para inclus�o na pr�xima distribui��o. +Se você alterar algo ou reparar um erro, envie, por favor, um patch +(preferencialmente usando git-format-patch) à lista wine-devel(a)winehq.org +para inclusão na próxima distribuição. -- Arquivo original escrito por: @@ -175,7 +175,7 @@ Alexandre Julliard julliard(a)winehq.org -- -Tradu��o para Portugu�s do Brasil: +Tradução para Português do Brasil: Marcelo Duarte wine-devel(a)bol.com.br -- 2.15.1

1 0

[PATCH 3/4] d2d1: Implement ID2D1Factory1.
by Henri Verbeet 05 Dec '17

05 Dec '17

From: Lucian Poston <lucian.poston(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/factory.c | 182 ++++++++++++++++++++++++++++++++++++----------- dlls/uuid/d2d.c | 2 +- include/d2d1_1.idl | 136 +++++++++++++++++++++++++++++++++++ 4 files changed, 278 insertions(+), 44 deletions(-) create mode 100644 include/d2d1_1.idl diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 98298f8..3b21bc1 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -24,7 +24,7 @@ #include <assert.h> #include <limits.h> #define COBJMACROS -#include "d2d1.h" +#include "d2d1_1.h" #ifdef D2D1_INIT_GUID #include "initguid.h" #endif diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 4b9315f..da2b892 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); struct d2d_factory { - ID2D1Factory ID2D1Factory_iface; + ID2D1Factory1 ID2D1Factory1_iface; LONG refcount; ID3D10Device1 *device; @@ -35,9 +35,9 @@ struct d2d_factory float dpi_y; }; -static inline struct d2d_factory *impl_from_ID2D1Factory(ID2D1Factory *iface) +static inline struct d2d_factory *impl_from_ID2D1Factory1(ID2D1Factory1 *iface) { - return CONTAINING_RECORD(iface, struct d2d_factory, ID2D1Factory_iface); + return CONTAINING_RECORD(iface, struct d2d_factory, ID2D1Factory1_iface); } static HRESULT d2d_factory_reload_sysmetrics(struct d2d_factory *factory) @@ -58,14 +58,15 @@ static HRESULT d2d_factory_reload_sysmetrics(struct d2d_factory *factory) return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_QueryInterface(ID2D1Factory *iface, REFIID iid, void **out) +static HRESULT STDMETHODCALLTYPE d2d_factory_QueryInterface(ID2D1Factory1 *iface, REFIID iid, void **out) { TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); - if (IsEqualGUID(iid, &IID_ID2D1Factory) + if (IsEqualGUID(iid, &IID_ID2D1Factory1) + || IsEqualGUID(iid, &IID_ID2D1Factory) || IsEqualGUID(iid, &IID_IUnknown)) { - ID2D1Factory_AddRef(iface); + ID2D1Factory1_AddRef(iface); *out = iface; return S_OK; } @@ -76,9 +77,9 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_QueryInterface(ID2D1Factory *iface, return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE d2d_factory_AddRef(ID2D1Factory *iface) +static ULONG STDMETHODCALLTYPE d2d_factory_AddRef(ID2D1Factory1 *iface) { - struct d2d_factory *factory = impl_from_ID2D1Factory(iface); + struct d2d_factory *factory = impl_from_ID2D1Factory1(iface); ULONG refcount = InterlockedIncrement(&factory->refcount); TRACE("%p increasing refcount to %u.\n", iface, refcount); @@ -86,9 +87,9 @@ static ULONG STDMETHODCALLTYPE d2d_factory_AddRef(ID2D1Factory *iface) return refcount; } -static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory *iface) +static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory1 *iface) { - struct d2d_factory *factory = impl_from_ID2D1Factory(iface); + struct d2d_factory *factory = impl_from_ID2D1Factory1(iface); ULONG refcount = InterlockedDecrement(&factory->refcount); TRACE("%p decreasing refcount to %u.\n", iface, refcount); @@ -103,18 +104,18 @@ static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory *iface) return refcount; } -static HRESULT STDMETHODCALLTYPE d2d_factory_ReloadSystemMetrics(ID2D1Factory *iface) +static HRESULT STDMETHODCALLTYPE d2d_factory_ReloadSystemMetrics(ID2D1Factory1 *iface) { - struct d2d_factory *factory = impl_from_ID2D1Factory(iface); + struct d2d_factory *factory = impl_from_ID2D1Factory1(iface); TRACE("iface %p.\n", iface); return d2d_factory_reload_sysmetrics(factory); } -static void STDMETHODCALLTYPE d2d_factory_GetDesktopDpi(ID2D1Factory *iface, float *dpi_x, float *dpi_y) +static void STDMETHODCALLTYPE d2d_factory_GetDesktopDpi(ID2D1Factory1 *iface, float *dpi_x, float *dpi_y) { - struct d2d_factory *factory = impl_from_ID2D1Factory(iface); + struct d2d_factory *factory = impl_from_ID2D1Factory1(iface); TRACE("iface %p, dpi_x %p, dpi_y %p.\n", iface, dpi_x, dpi_y); @@ -122,7 +123,7 @@ static void STDMETHODCALLTYPE d2d_factory_GetDesktopDpi(ID2D1Factory *iface, flo *dpi_y = factory->dpi_y; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRectangleGeometry(ID2D1Factory *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRectangleGeometry(ID2D1Factory1 *iface, const D2D1_RECT_F *rect, ID2D1RectangleGeometry **geometry) { struct d2d_geometry *object; @@ -133,7 +134,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRectangleGeometry(ID2D1Factor if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d2d_rectangle_geometry_init(object, iface, rect))) + if (FAILED(hr = d2d_rectangle_geometry_init(object, (ID2D1Factory *)iface, rect))) { WARN("Failed to initialize rectangle geometry, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -146,7 +147,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRectangleGeometry(ID2D1Factor return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRoundedRectangleGeometry(ID2D1Factory *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRoundedRectangleGeometry(ID2D1Factory1 *iface, const D2D1_ROUNDED_RECT *rect, ID2D1RoundedRectangleGeometry **geometry) { FIXME("iface %p, rect %p, geometry %p stub!\n", iface, rect, geometry); @@ -154,7 +155,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRoundedRectangleGeometry(ID2D return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateEllipseGeometry(ID2D1Factory *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateEllipseGeometry(ID2D1Factory1 *iface, const D2D1_ELLIPSE *ellipse, ID2D1EllipseGeometry **geometry) { FIXME("iface %p, ellipse %p, geometry %p stub!\n", iface, ellipse, geometry); @@ -162,7 +163,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateEllipseGeometry(ID2D1Factory return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGeometryGroup(ID2D1Factory *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGeometryGroup(ID2D1Factory1 *iface, D2D1_FILL_MODE fill_mode, ID2D1Geometry **geometries, UINT32 geometry_count, ID2D1GeometryGroup **group) { FIXME("iface %p, fill_mode %#x, geometries %p, geometry_count %u, group %p stub!\n", @@ -171,7 +172,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGeometryGroup(ID2D1Factory *i return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateTransformedGeometry(ID2D1Factory *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateTransformedGeometry(ID2D1Factory1 *iface, ID2D1Geometry *src_geometry, const D2D1_MATRIX_3X2_F *transform, ID2D1TransformedGeometry **transformed_geometry) { @@ -183,7 +184,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateTransformedGeometry(ID2D1Fact if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - d2d_transformed_geometry_init(object, iface, src_geometry, transform); + d2d_transformed_geometry_init(object, (ID2D1Factory *)iface, src_geometry, transform); TRACE("Created transformed geometry %p.\n", object); *transformed_geometry = (ID2D1TransformedGeometry *)&object->ID2D1Geometry_iface; @@ -191,7 +192,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateTransformedGeometry(ID2D1Fact return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry(ID2D1Factory *iface, ID2D1PathGeometry **geometry) +static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry(ID2D1Factory1 *iface, ID2D1PathGeometry **geometry) { struct d2d_geometry *object; @@ -200,7 +201,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry(ID2D1Factory *if if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - d2d_path_geometry_init(object, iface); + d2d_path_geometry_init(object, (ID2D1Factory *)iface); TRACE("Created path geometry %p.\n", object); *geometry = (ID2D1PathGeometry *)&object->ID2D1Geometry_iface; @@ -208,7 +209,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry(ID2D1Factory *if return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory1 *iface, const D2D1_STROKE_STYLE_PROPERTIES *desc, const float *dashes, UINT32 dash_count, ID2D1StrokeStyle **stroke_style) { @@ -221,7 +222,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory *ifa if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d2d_stroke_style_init(object, iface, desc, dashes, dash_count))) + if (FAILED(hr = d2d_stroke_style_init(object, (ID2D1Factory *)iface, desc, dashes, dash_count))) { WARN("Failed to initialize stroke style, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -234,7 +235,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory *ifa return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock(ID2D1Factory *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock(ID2D1Factory1 *iface, const D2D1_DRAWING_STATE_DESCRIPTION *desc, IDWriteRenderingParams *text_rendering_params, ID2D1DrawingStateBlock **state_block) { @@ -246,7 +247,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock(ID2D1Factor if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - d2d_state_block_init(object, iface, desc, text_rendering_params); + d2d_state_block_init(object, (ID2D1Factory *)iface, desc, text_rendering_params); TRACE("Created state block %p.\n", object); *state_block = &object->ID2D1DrawingStateBlock_iface; @@ -266,10 +267,10 @@ static HRESULT d2d_factory_get_device(struct d2d_factory *factory, ID3D10Device1 return hr; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Factory *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Factory1 *iface, IWICBitmap *target, const D2D1_RENDER_TARGET_PROPERTIES *desc, ID2D1RenderTarget **render_target) { - struct d2d_factory *factory = impl_from_ID2D1Factory(iface); + struct d2d_factory *factory = impl_from_ID2D1Factory1(iface); struct d2d_wic_render_target *object; ID3D10Device1 *device; HRESULT hr; @@ -285,7 +286,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Fa return hr; } - if (FAILED(hr = d2d_wic_render_target_init(object, iface, device, target, desc))) + if (FAILED(hr = d2d_wic_render_target_init(object, (ID2D1Factory *)iface, device, target, desc))) { WARN("Failed to initialize render target, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -298,11 +299,11 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Fa return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateHwndRenderTarget(ID2D1Factory *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateHwndRenderTarget(ID2D1Factory1 *iface, const D2D1_RENDER_TARGET_PROPERTIES *desc, const D2D1_HWND_RENDER_TARGET_PROPERTIES *hwnd_rt_desc, ID2D1HwndRenderTarget **render_target) { - struct d2d_factory *factory = impl_from_ID2D1Factory(iface); + struct d2d_factory *factory = impl_from_ID2D1Factory1(iface); struct d2d_hwnd_render_target *object; ID3D10Device1 *device; HRESULT hr; @@ -315,7 +316,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateHwndRenderTarget(ID2D1Factory if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d2d_hwnd_render_target_init(object, iface, device, desc, hwnd_rt_desc))) + if (FAILED(hr = d2d_hwnd_render_target_init(object, (ID2D1Factory *)iface, device, desc, hwnd_rt_desc))) { WARN("Failed to initialize render target, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -328,18 +329,18 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateHwndRenderTarget(ID2D1Factory return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDxgiSurfaceRenderTarget(ID2D1Factory *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDxgiSurfaceRenderTarget(ID2D1Factory1 *iface, IDXGISurface *surface, const D2D1_RENDER_TARGET_PROPERTIES *desc, ID2D1RenderTarget **render_target) { TRACE("iface %p, surface %p, desc %p, render_target %p.\n", iface, surface, desc, render_target); - return d2d_d3d_create_render_target(iface, surface, NULL, desc, render_target); + return d2d_d3d_create_render_target((ID2D1Factory *)iface, surface, NULL, desc, render_target); } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory1 *iface, const D2D1_RENDER_TARGET_PROPERTIES *desc, ID2D1DCRenderTarget **render_target) { - struct d2d_factory *factory = impl_from_ID2D1Factory(iface); + struct d2d_factory *factory = impl_from_ID2D1Factory1(iface); struct d2d_dc_render_target *object; ID3D10Device1 *device; HRESULT hr; @@ -352,7 +353,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory * if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d2d_dc_render_target_init(object, iface, device, desc))) + if (FAILED(hr = d2d_dc_render_target_init(object, (ID2D1Factory *)iface, device, desc))) { WARN("Failed to initialize render target, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -365,7 +366,94 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory * return S_OK; } -static const struct ID2D1FactoryVtbl d2d_factory_vtbl = +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDevice(ID2D1Factory1 *iface, + IDXGIDevice *dxgi_device, ID2D1Device **device) +{ + FIXME("iface %p, dxgi_device %p, device %p stub!\n", iface, dxgi_device, device); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle1(ID2D1Factory1 *iface, + const D2D1_STROKE_STYLE_PROPERTIES1 *desc, const float *dashes, UINT32 dash_count, + ID2D1StrokeStyle1 **stroke_style) +{ + FIXME("iface %p, desc %p, dashes %p, dash_count %u, stroke_style %p stub!\n", + iface, desc, dashes, dash_count, stroke_style); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry1(ID2D1Factory1 *iface, ID2D1PathGeometry1 **geometry) +{ + FIXME("iface %p, geometry %p stub!\n", iface, geometry); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock1(ID2D1Factory1 *iface, + const D2D1_DRAWING_STATE_DESCRIPTION1 *desc, IDWriteRenderingParams *text_rendering_params, + ID2D1DrawingStateBlock1 **state_block) +{ + FIXME("iface %p, desc %p, text_rendering_params %p, state_block %p stub!\n", + iface, desc, text_rendering_params, state_block); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGdiMetafile(ID2D1Factory1 *iface, + IStream *stream, ID2D1GdiMetafile **metafile) +{ + FIXME("iface %p, stream %p, metafile %p stub!\n", iface, stream, metafile); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromStream(ID2D1Factory1 *iface, + REFCLSID effect_id, IStream *property_xml, const D2D1_PROPERTY_BINDING *bindings, + UINT32 binding_count, PD2D1_EFFECT_FACTORY effect_factory) +{ + FIXME("iface %p, effect_id %s, property_xml %p, bindings %p, binding_count %u, effect_factory %p stub!\n", + iface, debugstr_guid(effect_id), property_xml, bindings, binding_count, effect_factory); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromString(ID2D1Factory1 *iface, + REFCLSID effect_id, const WCHAR *property_xml, const D2D1_PROPERTY_BINDING *bindings, + UINT32 binding_count, PD2D1_EFFECT_FACTORY effect_factory) +{ + FIXME("iface %p, effect_id %s, property_xml %s, bindings %p, binding_count %u, effect_factory %p stub!\n", + iface, debugstr_guid(effect_id), debugstr_w(property_xml), bindings, binding_count, effect_factory); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_factory_UnregisterEffect(ID2D1Factory1 *iface, REFCLSID effect_id) +{ + FIXME("iface %p, effect_id %s stub!\n", iface, debugstr_guid(effect_id)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_factory_GetRegisteredEffects(ID2D1Factory1 *iface, + CLSID *effects, UINT32 effect_count, UINT32 *returned, UINT32 *registered) +{ + FIXME("iface %p, effects %p, effect_count %u, returned %p, registered %p stub!\n", + iface, effects, effect_count, returned, registered); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_factory_GetEffectProperties(ID2D1Factory1 *iface, + REFCLSID effect_id, ID2D1Properties **props) +{ + FIXME("iface %p, effect_id %s, props %p stub!\n", iface, debugstr_guid(effect_id), props); + + return E_NOTIMPL; +} + +static const struct ID2D1Factory1Vtbl d2d_factory_vtbl = { d2d_factory_QueryInterface, d2d_factory_AddRef, @@ -384,6 +472,16 @@ static const struct ID2D1FactoryVtbl d2d_factory_vtbl = d2d_factory_CreateHwndRenderTarget, d2d_factory_CreateDxgiSurfaceRenderTarget, d2d_factory_CreateDCRenderTarget, + d2d_factory_CreateDevice, + d2d_factory_CreateStrokeStyle1, + d2d_factory_CreatePathGeometry1, + d2d_factory_CreateDrawingStateBlock1, + d2d_factory_CreateGdiMetafile, + d2d_factory_RegisterEffectFromStream, + d2d_factory_RegisterEffectFromString, + d2d_factory_UnregisterEffect, + d2d_factory_GetRegisteredEffects, + d2d_factory_GetEffectProperties, }; static void d2d_factory_init(struct d2d_factory *factory, D2D1_FACTORY_TYPE factory_type, @@ -394,7 +492,7 @@ static void d2d_factory_init(struct d2d_factory *factory, D2D1_FACTORY_TYPE fact if (factory_options && factory_options->debugLevel != D2D1_DEBUG_LEVEL_NONE) WARN("Ignoring debug level %#x.\n", factory_options->debugLevel); - factory->ID2D1Factory_iface.lpVtbl = &d2d_factory_vtbl; + factory->ID2D1Factory1_iface.lpVtbl = &d2d_factory_vtbl; factory->refcount = 1; d2d_factory_reload_sysmetrics(factory); } @@ -415,8 +513,8 @@ HRESULT WINAPI D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, TRACE("Created factory %p.\n", object); - hr = ID2D1Factory_QueryInterface(&object->ID2D1Factory_iface, iid, factory); - ID2D1Factory_Release(&object->ID2D1Factory_iface); + hr = ID2D1Factory1_QueryInterface(&object->ID2D1Factory1_iface, iid, factory); + ID2D1Factory1_Release(&object->ID2D1Factory1_iface); return hr; } diff --git a/dlls/uuid/d2d.c b/dlls/uuid/d2d.c index dbe143e..d2cf6db 100644 --- a/dlls/uuid/d2d.c +++ b/dlls/uuid/d2d.c @@ -18,4 +18,4 @@ #include "d3d10_1.h" #include "initguid.h" -#include "d2d1.h" +#include "d2d1_1.h" diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl new file mode 100644 index 0000000..1fbbb30 --- /dev/null +++ b/include/d2d1_1.idl @@ -0,0 +1,136 @@ +/* + * Copyright 2017 Lucian Poston + * + * 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 + */ + +import "d2d1.idl"; + +interface ID2D1Device; +interface ID2D1StrokeStyle1; +interface ID2D1PathGeometry1; +interface ID2D1DrawingStateBlock1; +interface ID2D1GdiMetafile; +interface ID2D1Properties; + +typedef enum D2D1_STROKE_TRANSFORM_TYPE +{ + D2D1_STROKE_TRANSFORM_TYPE_NORMAL = 0x0, + D2D1_STROKE_TRANSFORM_TYPE_FIXED = 0x1, + D2D1_STROKE_TRANSFORM_TYPE_HAIRLINE = 0x2, + D2D1_STROKE_TRANSFORM_TYPE_FORCE_DWORD = 0xffffffff, +} D2D1_STROKE_TRANSFORM_TYPE; + +typedef enum D2D1_PRIMITIVE_BLEND +{ + D2D1_PRIMITIVE_BLEND_SOURCE_OVER = 0x0, + D2D1_PRIMITIVE_BLEND_COPY = 0x1, + D2D1_PRIMITIVE_BLEND_MIN = 0x2, + D2D1_PRIMITIVE_BLEND_ADD = 0x3, + D2D1_PRIMITIVE_BLEND_MAX = 0x4, + D2D1_PRIMITIVE_BLEND_FORCE_DWORD = 0xffffffff, +} D2D1_PRIMITIVE_BLEND; + +typedef enum D2D1_UNIT_MODE +{ + D2D1_UNIT_MODE_DIPS = 0x0, + D2D1_UNIT_MODE_PIXELS = 0x1, + D2D1_UNIT_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_UNIT_MODE; + +typedef struct D2D1_PROPERTY_BINDING D2D1_PROPERTY_BINDING; + +typedef struct D2D1_STROKE_STYLE_PROPERTIES1 +{ + D2D1_CAP_STYLE startCap; + D2D1_CAP_STYLE endCap; + D2D1_CAP_STYLE dashCap; + D2D1_LINE_JOIN lineJoin; + float miterLimit; + D2D1_DASH_STYLE dashStyle; + float dashOffset; + D2D1_STROKE_TRANSFORM_TYPE transformType; +} D2D1_STROKE_STYLE_PROPERTIES1; + +typedef struct D2D1_DRAWING_STATE_DESCRIPTION1 +{ + D2D1_ANTIALIAS_MODE antialiasMode; + D2D1_TEXT_ANTIALIAS_MODE textAntialiasMode; + D2D1_TAG tag1; + D2D1_TAG tag2; + D2D1_MATRIX_3X2_F transform; + D2D1_PRIMITIVE_BLEND primitiveBlend; + D2D1_UNIT_MODE unitMode; +} D2D1_DRAWING_STATE_DESCRIPTION1; + +typedef HRESULT (__stdcall *PD2D1_EFFECT_FACTORY)(IUnknown **effect); + +[ + object, + uuid(bb12d362-daee-4b9a-aa1d-14ba401cfa1f), + local, +] +interface ID2D1Factory1 : ID2D1Factory +{ + HRESULT CreateDevice( + [in] IDXGIDevice *dxgi_device, + [out] ID2D1Device **device + ); + HRESULT CreateStrokeStyle( + [in] const D2D1_STROKE_STYLE_PROPERTIES1 *desc, + [in, size_is(dash_count)] const float *dashes, + [in] UINT32 dash_count, + [out] ID2D1StrokeStyle1 **stroke_style + ); + HRESULT CreatePathGeometry( + [out] ID2D1PathGeometry1 **geometry + ); + HRESULT CreateDrawingStateBlock( + [in] const D2D1_DRAWING_STATE_DESCRIPTION1 *desc, + [in] IDWriteRenderingParams *text_rendering_params, + [out] ID2D1DrawingStateBlock1 **state_block + ); + HRESULT CreateGdiMetafile( + [in] IStream *stream, + [out] ID2D1GdiMetafile **metafile + ); + HRESULT RegisterEffectFromStream( + [in] REFCLSID effect_id, + [in] IStream *property_xml, + [in, size_is(binding_count)] const D2D1_PROPERTY_BINDING *bindings, + [in] UINT32 binding_count, + [in] PD2D1_EFFECT_FACTORY effect_factory + ); + HRESULT RegisterEffectFromString( + [in] REFCLSID effect_id, + [in] const WCHAR *property_xml, + [in, size_is(binding_count)] const D2D1_PROPERTY_BINDING *bindings, + [in] UINT32 binding_count, + [in] PD2D1_EFFECT_FACTORY effect_factory + ); + HRESULT UnregisterEffect( + [in] REFCLSID effect_id + ); + HRESULT GetRegisteredEffects( + [out, size_is(effect_count)] CLSID *effects, + [in] UINT32 effect_count, + [out] UINT32 *returned, + [out] UINT32 *registered + ); + HRESULT GetEffectProperties( + [in] REFCLSID effect_id, + [out] ID2D1Properties **props + ); +} -- 2.1.4

1 0

[PATCH 2/4] ddraw/tests: Redundant mode sets are broken on Windows 10.
by Henri Verbeet 05 Dec '17

05 Dec '17

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 8 +++++--- dlls/ddraw/tests/ddraw2.c | 8 +++++--- dlls/ddraw/tests/ddraw4.c | 8 +++++--- dlls/ddraw/tests/ddraw7.c | 8 +++++--- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 5ab1c80..c306c4d 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2281,9 +2281,9 @@ static void test_redundant_mode_set(void) { DDSURFACEDESC surface_desc = {0}; IDirectDraw *ddraw; + RECT q, r, s; HWND window; HRESULT hr; - RECT r, s; ULONG ref; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, @@ -2302,7 +2302,8 @@ static void test_redundant_mode_set(void) U1(surface_desc.ddpfPixelFormat).dwRGBBitCount); ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr); - GetWindowRect(window, &r); + GetWindowRect(window, &q); + r = q; r.right /= 2; r.bottom /= 2; SetWindowPos(window, HWND_TOP, r.left, r.top, r.right, r.bottom, 0); @@ -2314,7 +2315,8 @@ static void test_redundant_mode_set(void) ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr); GetWindowRect(window, &s); - ok(EqualRect(&r, &s), "Expected %s, got %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&s)); + ok(EqualRect(&r, &s) || broken(EqualRect(&q, &s) /* Windows 10 */), + "Expected %s, got %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&s)); ref = IDirectDraw_Release(ddraw); ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index ca349be..8a7801e 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2414,9 +2414,9 @@ static void test_redundant_mode_set(void) { DDSURFACEDESC surface_desc = {0}; IDirectDraw2 *ddraw; + RECT q, r, s; HWND window; HRESULT hr; - RECT r, s; ULONG ref; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, @@ -2435,7 +2435,8 @@ static void test_redundant_mode_set(void) U1(surface_desc.ddpfPixelFormat).dwRGBBitCount, 0, 0); ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr); - GetWindowRect(window, &r); + GetWindowRect(window, &q); + r = q; r.right /= 2; r.bottom /= 2; SetWindowPos(window, HWND_TOP, r.left, r.top, r.right, r.bottom, 0); @@ -2447,7 +2448,8 @@ static void test_redundant_mode_set(void) ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr); GetWindowRect(window, &s); - ok(EqualRect(&r, &s), "Expected %s, got %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&s)); + ok(EqualRect(&r, &s) || broken(EqualRect(&q, &s) /* Windows 10 */), + "Expected %s, got %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&s)); ref = IDirectDraw2_Release(ddraw); ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index bad06ea..048331d 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2552,9 +2552,9 @@ static void test_redundant_mode_set(void) { DDSURFACEDESC2 surface_desc = {0}; IDirectDraw4 *ddraw; + RECT q, r, s; HWND window; HRESULT hr; - RECT r, s; ULONG ref; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, @@ -2573,7 +2573,8 @@ static void test_redundant_mode_set(void) U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount, 0, 0); ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr); - GetWindowRect(window, &r); + GetWindowRect(window, &q); + r = q; r.right /= 2; r.bottom /= 2; SetWindowPos(window, HWND_TOP, r.left, r.top, r.right, r.bottom, 0); @@ -2585,7 +2586,8 @@ static void test_redundant_mode_set(void) ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr); GetWindowRect(window, &s); - ok(EqualRect(&r, &s), "Expected %s, got %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&s)); + ok(EqualRect(&r, &s) || broken(EqualRect(&q, &s) /* Windows 10 */), + "Expected %s, got %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&s)); ref = IDirectDraw4_Release(ddraw); ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 5e176c7..d1ff85d 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2279,9 +2279,9 @@ static void test_redundant_mode_set(void) { DDSURFACEDESC2 surface_desc = {0}; IDirectDraw7 *ddraw; + RECT q, r, s; HWND window; HRESULT hr; - RECT r, s; ULONG ref; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, @@ -2299,7 +2299,8 @@ static void test_redundant_mode_set(void) U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount, 0, 0); ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr); - GetWindowRect(window, &r); + GetWindowRect(window, &q); + r = q; r.right /= 2; r.bottom /= 2; SetWindowPos(window, HWND_TOP, r.left, r.top, r.right, r.bottom, 0); @@ -2311,7 +2312,8 @@ static void test_redundant_mode_set(void) ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr); GetWindowRect(window, &s); - ok(EqualRect(&r, &s), "Expected %s, got %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&s)); + ok(EqualRect(&r, &s) || broken(EqualRect(&q, &s) /* Windows 10 */), + "Expected %s, got %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&s)); ref = IDirectDraw7_Release(ddraw); ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); -- 2.1.4

1 0

[PATCH 1/4] d3d10core/tests: Introduce a format compatibility test.
by Henri Verbeet 05 Dec '17

05 Dec '17

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10core/tests/device.c | 136 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 4228773..cdac5ec 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -13021,6 +13021,141 @@ static void test_stream_output_resume(void) release_test_context(&test_context); } +static void test_format_compatibility(void) +{ + ID3D10Texture2D *dst_texture, *src_texture; + D3D10_SUBRESOURCE_DATA resource_data; + D3D10_TEXTURE2D_DESC texture_desc; + struct resource_readback rb; + DWORD colour, expected; + ID3D10Device *device; + unsigned int i, j; + ULONG refcount; + HRESULT hr; + + static const struct + { + DXGI_FORMAT src_format; + DXGI_FORMAT dst_format; + size_t texel_size; + BOOL success; + } + test_data[] = + { + {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UINT, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UINT, DXGI_FORMAT_R8G8B8A8_SNORM, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_SNORM, DXGI_FORMAT_R8G8B8A8_SINT, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_SINT, DXGI_FORMAT_R8G8B8A8_TYPELESS, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_B8G8R8A8_UNORM, 4, FALSE}, + {DXGI_FORMAT_R8G8B8A8_UINT, DXGI_FORMAT_R16G16_UINT, 4, FALSE}, + {DXGI_FORMAT_R16G16_TYPELESS, DXGI_FORMAT_R16G16_FLOAT, 4, TRUE}, + {DXGI_FORMAT_R16G16_FLOAT, DXGI_FORMAT_R16G16_UNORM, 4, TRUE}, + {DXGI_FORMAT_R16G16_UNORM, DXGI_FORMAT_R16G16_UINT, 4, TRUE}, + {DXGI_FORMAT_R16G16_UINT, DXGI_FORMAT_R16G16_SNORM, 4, TRUE}, + {DXGI_FORMAT_R16G16_SNORM, DXGI_FORMAT_R16G16_SINT, 4, TRUE}, + {DXGI_FORMAT_R16G16_SINT, DXGI_FORMAT_R16G16_TYPELESS, 4, TRUE}, + {DXGI_FORMAT_R16G16_TYPELESS, DXGI_FORMAT_R32_TYPELESS, 4, FALSE}, + {DXGI_FORMAT_R32G32_TYPELESS, DXGI_FORMAT_R32G32_FLOAT, 8, TRUE}, + {DXGI_FORMAT_R32G32_FLOAT, DXGI_FORMAT_R32G32_UINT, 8, TRUE}, + {DXGI_FORMAT_R32G32_UINT, DXGI_FORMAT_R32G32_SINT, 8, TRUE}, + {DXGI_FORMAT_R32G32_SINT, DXGI_FORMAT_R32G32_TYPELESS, 8, TRUE}, + }; + static const DWORD initial_data[16] = {0}; + static const DWORD bitmap_data[] = + { + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + }; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + texture_desc.Height = 4; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + for (i = 0; i < ARRAY_SIZE(test_data); ++i) + { + unsigned int x, y, texel_dwords; + D3D10_BOX box; + + texture_desc.Width = sizeof(bitmap_data) / (texture_desc.Height * test_data[i].texel_size); + texture_desc.Format = test_data[i].src_format; + texture_desc.Usage = D3D10_USAGE_IMMUTABLE; + + resource_data.pSysMem = bitmap_data; + resource_data.SysMemPitch = texture_desc.Width * test_data[i].texel_size; + resource_data.SysMemSlicePitch = 0; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, &resource_data, &src_texture); + ok(SUCCEEDED(hr), "Failed to create source texture, hr %#x.\n", hr); + + texture_desc.Format = test_data[i].dst_format; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + + resource_data.pSysMem = initial_data; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, &resource_data, &dst_texture); + if (FAILED(hr) && test_data[i].dst_format == DXGI_FORMAT_B8G8R8A8_UNORM) + { + skip("B8G8R8A8_UNORM not supported, skipping test.\n"); + ID3D10Texture2D_Release(src_texture); + continue; + } + ok(SUCCEEDED(hr), "Failed to create destination texture, hr %#x.\n", hr); + + set_box(&box, 0, 0, 0, texture_desc.Width - 1, texture_desc.Height - 1, 1); + ID3D10Device_CopySubresourceRegion(device, (ID3D10Resource *)dst_texture, 0, 1, 1, 0, + (ID3D10Resource *)src_texture, 0, &box); + + texel_dwords = test_data[i].texel_size / sizeof(DWORD); + get_texture_readback(dst_texture, 0, &rb); + for (j = 0; j < ARRAY_SIZE(bitmap_data); ++j) + { + x = j % 4; + y = j / 4; + colour = get_readback_color(&rb, x, y); + expected = test_data[i].success && x >= texel_dwords && y + ? bitmap_data[j - (4 + texel_dwords)] : initial_data[j]; + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); + } + release_resource_readback(&rb); + + ID3D10Device_CopyResource(device, (ID3D10Resource *)dst_texture, (ID3D10Resource *)src_texture); + + get_texture_readback(dst_texture, 0, &rb); + for (j = 0; j < ARRAY_SIZE(bitmap_data); ++j) + { + x = j % 4; + y = j / 4; + colour = get_readback_color(&rb, x, y); + expected = test_data[i].success ? bitmap_data[j] : initial_data[j]; + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); + } + release_resource_readback(&rb); + + ID3D10Texture2D_Release(dst_texture); + ID3D10Texture2D_Release(src_texture); + } + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(device) { test_feature_level(); @@ -13094,4 +13229,5 @@ START_TEST(device) test_geometry_shader(); test_stream_output(); test_stream_output_resume(); + test_format_compatibility(); } -- 2.1.4

1 0

[PATCH 2/2] mshtml: Added IDOMEvent::get_timeStamp implementation.
by Jacek Caban 05 Dec '17

05 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/dispex.c | 3 ++- dlls/mshtml/htmlevent.c | 16 ++++++++++++++-- dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/tests/events.js | 41 ++++++++++++++++++++++++++++++++++++++++- 4 files changed, 57 insertions(+), 4 deletions(-)

1 0

[PATCH 1/2] jscript: Support VT_UI8 in variant_to_jsval.
by Jacek Caban 05 Dec '17

05 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/jsutils.c | 7 +++++++ 1 file changed, 7 insertions(+)

1 0

[PATCH 1/6] d3d11: Validate MiscFlags for 3D textures.
by Matteo Bruni 05 Dec '17

05 Dec '17

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3d11/texture.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 12186dcf37..e8870d5d9a 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -942,6 +942,14 @@ static HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_devi unsigned int levels; HRESULT hr; + if (desc->MiscFlags & D3D11_RESOURCE_MISC_GENERATE_MIPS + && (~desc->BindFlags & (D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE))) + { + WARN("D3D11_RESOURCE_MISC_GENERATE_MIPS used without D3D11_BIND_RENDER_TARGET " + "and D3D11_BIND_SHADER_RESOURCE.\n"); + return E_INVALIDARG; + } + texture->ID3D11Texture3D_iface.lpVtbl = &d3d11_texture3d_vtbl; texture->ID3D10Texture3D_iface.lpVtbl = &d3d10_texture3d_vtbl; texture->refcount = 1; -- 2.13.6

3 14

[PATCH v3 3/3] ntdll: Don't require full-page reads in NtReadFileScatter
by Andrew Eikum 05 Dec '17

05 Dec '17

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v3: Always SetLastError before checking GLE return. dlls/kernel32/tests/file.c | 22 +++++++++++++++++++++- dlls/ntdll/file.c | 5 ++--- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 28d11a4fd3..ead3d2c297 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4353,7 +4353,7 @@ static void test_WriteFileGather(void) FILE_SEGMENT_ELEMENT fse[2]; OVERLAPPED ovl, *povl = NULL; SYSTEM_INFO si; - LPVOID wbuf = NULL, rbuf1, rbuf2; + char *wbuf = NULL, *rbuf1, *rbuf2; BOOL br; ret = GetTempPathA( MAX_PATH, temp_path ); @@ -4460,6 +4460,26 @@ static void test_WriteFileGather(void) ok( memcmp( rbuf2, rbuf1, si.dwPageSize ) == 0, "data should not have been read into buffer\n" ); + /* partial page read */ + memset( &ovl, 0, sizeof(ovl) ); + memset( fse, 0, sizeof(fse) ); + fse[0].Buffer = rbuf1; + memset( rbuf1, 0, si.dwPageSize ); + SetLastError(0xdeadbeef); + br = ReadFileScatter( hfile, fse, si.dwPageSize / 2, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should be asynchronous\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); + + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); + ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError() ); + ok( povl == &ovl, "wrong ovl %p\n", povl ); + + ok( memcmp( rbuf1, wbuf, si.dwPageSize / 2 ) == 0, + "invalid data was read into buffer\n" ); + memset( rbuf2, 0, si.dwPageSize ); + ok( memcmp( rbuf1 + si.dwPageSize / 2, rbuf2, si.dwPageSize - si.dwPageSize / 2 ) == 0, + "invalid data was read into buffer\n" ); + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 6c3b571638..db45a5bcf3 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1041,7 +1041,6 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap TRACE( "(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p),partial stub!\n", file, event, apc, apc_user, io_status, segments, length, offset, key); - if (length % page_size) return STATUS_INVALID_PARAMETER; if (!io_status) return STATUS_ACCESS_VIOLATION; status = server_get_unix_fd( file, FILE_READ_DATA, &unix_handle, @@ -1060,9 +1059,9 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap { if (offset && offset->QuadPart != FILE_USE_FILE_POINTER_POSITION) result = pread( unix_handle, (char *)segments->Buffer + pos, - page_size - pos, offset->QuadPart + total ); + min( length - pos, page_size - pos ), offset->QuadPart + total ); else - result = read( unix_handle, (char *)segments->Buffer + pos, page_size - pos ); + result = read( unix_handle, (char *)segments->Buffer + pos, min( length - pos, page_size - pos ) ); if (result == -1) { -- 2.15.1

1 0

[PATCH v3 2/3] ntdll: Don't return an error when reading past EOF in NtReadFileScatter
by Andrew Eikum 05 Dec '17

05 Dec '17

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v3: Always SetLastError before checking GLE return. dlls/kernel32/tests/file.c | 28 +++++++++++++++++++++++++++- dlls/ntdll/file.c | 8 +++----- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index a8d229c887..28d11a4fd3 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4353,7 +4353,7 @@ static void test_WriteFileGather(void) FILE_SEGMENT_ELEMENT fse[2]; OVERLAPPED ovl, *povl = NULL; SYSTEM_INFO si; - LPVOID wbuf = NULL, rbuf1; + LPVOID wbuf = NULL, rbuf1, rbuf2; BOOL br; ret = GetTempPathA( MAX_PATH, temp_path ); @@ -4378,6 +4378,9 @@ static void test_WriteFileGather(void) rbuf1 = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); ok( rbuf1 != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + rbuf2 = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); + ok( rbuf2 != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + memset( &ovl, 0, sizeof(ovl) ); memset( fse, 0, sizeof(fse) ); memset( wbuf, 0x42, si.dwPageSize ); @@ -4435,11 +4438,34 @@ static void test_WriteFileGather(void) ok( povl == NULL, "wrong ovl %p\n", povl ); } + /* read past EOF */ + memset( &ovl, 0, sizeof(ovl) ); + memset( fse, 0, sizeof(fse) ); + fse[0].Buffer = rbuf1; + fse[1].Buffer = rbuf2; + memset( rbuf1, 0, si.dwPageSize ); + memset( rbuf2, 0x17, si.dwPageSize ); + SetLastError(0xdeadbeef); + br = ReadFileScatter( hfile, fse, si.dwPageSize * 2, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should be asynchronous\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); + + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); + ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError() ); + ok( povl == &ovl, "wrong ovl %p\n", povl ); + + ok( memcmp( rbuf1, wbuf, si.dwPageSize ) == 0, + "data was not read into buffer\n" ); + memset( rbuf1, 0x17, si.dwPageSize ); + ok( memcmp( rbuf2, rbuf1, si.dwPageSize ) == 0, + "data should not have been read into buffer\n" ); + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); VirtualFree( wbuf, 0, MEM_RELEASE ); VirtualFree( rbuf1, 0, MEM_RELEASE ); + VirtualFree( rbuf2, 0, MEM_RELEASE ); DeleteFileA( filename ); } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 12b1d0f6c5..6c3b571638 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1070,11 +1070,7 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap status = FILE_GetNtStatus(); break; } - if (!result) - { - status = STATUS_END_OF_FILE; - break; - } + if (!result) break; total += result; length -= result; if ((pos += result) == page_size) @@ -1084,6 +1080,8 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap } } + if (total == 0) status = STATUS_END_OF_FILE; + send_completion = cvalue != 0; error: -- 2.15.1

1 0

[PATCH] readme: Move WineHQ URLs to https in translations.
by Lauri Kenttä 05 Dec '17

05 Dec '17

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- documentation/README.de | 24 ++++++++++++------------ documentation/README.es | 22 +++++++++++----------- documentation/README.fi | 20 ++++++++++---------- documentation/README.fr | 24 ++++++++++++------------ documentation/README.hu | 14 +++++++------- documentation/README.it | 24 ++++++++++++------------ documentation/README.ja | 20 ++++++++++---------- documentation/README.ko | 16 ++++++++-------- documentation/README.no | 24 ++++++++++++------------ documentation/README.pt | 12 ++++++------ documentation/README.pt_br | 24 ++++++++++++------------ documentation/README.ru | 20 ++++++++++---------- documentation/README.tr | 22 +++++++++++----------- documentation/README.uk | 24 ++++++++++++------------ documentation/README.zh_cn | 24 ++++++++++++------------ 15 files changed, 157 insertions(+), 157 deletions(-) diff --git a/documentation/README.de b/documentation/README.de index 5f450d12aa..2066bdfd04 100644 --- a/documentation/README.de +++ b/documentation/README.de @@ -24,7 +24,7 @@ make Starten Sie Programme mit "wine Programmname". Weitere Informationen und Problemlösungen entnehmen Sie bitte dem Rest dieser Datei, der Man-Page von Wine und insbesondere der Vielzahl an -Informationen, die Sie auf http://www.winehq.org finden. +Informationen, die Sie auf https://www.winehq.org finden. 3. VORAUSSETZUNGEN @@ -45,7 +45,7 @@ Umständen in der Zukunft unterstützt. FreeBSD-Info: Wine wird generell nicht korrekt unter FreeBSD vor 8.0 funktionieren. Für - weitere Informationen überprüfen Sie auch http://wiki.freebsd.org/Wine + weitere Informationen überprüfen Sie auch https://wiki.freebsd.org/Wine Solaris-Info: Höchstwahrscheinlich werden Sie Wine mit der GNU-Toolchain (gcc, gas etc.) @@ -81,13 +81,13 @@ Optionale Bibliotheken: Der Configure-Aufruf zeigt am Ende optionale Bibliotheken an, die von Wine benutzt werden können, aber auf Ihrem System nicht gefunden wurden. Tipps zum Installieren fehlender Pakete finden Sie unter: - http://wiki.winehq.org/Recommended_Packages + https://wiki.winehq.org/Recommended_Packages Unter 64-Bit Plattformen, falls Sie Wine als 32-Bit kompilieren (Standard), benötigen Sie die 32-Bit-Versionen dieser Bibliotheken; Details unter - http://wiki.winehq.org/WineOn64bit + https://wiki.winehq.org/WineOn64bit Für ein reines 64-Bit Wine (oder ein gemischtes 32- und 64-Bit Wine-Setup), - siehe http://wiki.winehq.org/Wine64 + siehe https://wiki.winehq.org/Wine64 4. KOMPILIEREN @@ -116,7 +116,7 @@ der neuen in Konflikt stehen könnten. Versuchen Sie entweder "dpkg -r wine", "rpm -e wine" oder "make uninstall" vor der Installation auszuführen. Nach der Installation können Sie das Tool "winecfg" starten. -Konfigurationshinweise finden Sie im Support-Bereich auf http://www.winehq.org/ +Konfigurationshinweise finden Sie im Support-Bereich auf https://www.winehq.org/ 6. AUSFÜHREN VON PROGRAMMEN @@ -143,19 +143,19 @@ wenn Sie den Fehler melden. 7. WEITERFÜHRENDE INFORMATIONEN WWW: Eine große Menge an Informationen findet sich im WineHQ unter - http://www.winehq.org/ : Verschiedene Wine Guides, + https://www.winehq.org/ : Verschiedene Wine Guides, Applikations-Datenbank, Bugtracker. Das ist vermutlich der beste Ausgangspunkt. -FAQ: Die FAQ zu Wine befindet sich unter http://www.winehq.org/FAQ +FAQ: Die FAQ zu Wine befindet sich unter https://www.winehq.org/FAQ -Wiki: Das Wine-Wiki finden Sie unter http://wiki.winehq.org +Wiki: Das Wine-Wiki finden Sie unter https://wiki.winehq.org Mailing-Listen: Es gibt mehrere Mailing-Listen für Wine-Anwender und -Entwickler; - Schauen Sie sich dazu bitte http://www.winehq.org/forums an. + Schauen Sie sich dazu bitte https://www.winehq.org/forums an. -Fehler: Melden Sie Fehler bitte an Wine-Bugzilla unter http://bugs.winehq.org +Fehler: Melden Sie Fehler bitte an Wine-Bugzilla unter https://bugs.winehq.org Schauen Sie bitte erst in der Bugzilla-Datenbank nach, ob Ihr Problem bereits bekannt ist oder sogar behoben wurde, bevor Sie eine Fehlermeldung verfassen. @@ -163,7 +163,7 @@ Fehler: Melden Sie Fehler bitte an Wine-Bugzilla unter http://bugs.winehq.org IRC: Online-Hilfe ist im IRC-Kanal #WineHQ unter irc.freenode.net verfügbar. Git: Der aktuelle Wine-Entwicklungsstand ist über Git verfügbar. - Besuchen Sie http://www.winehq.org/git für weitere Informationen. + Besuchen Sie https://www.winehq.org/git für weitere Informationen. Wenn Sie etwas hinzufügen oder einen Fehler beheben, senden Sie bitte einen Patch (vorzugsweise mit git-format-patch) an die Liste wine-devel(a)winehq.org, diff --git a/documentation/README.es b/documentation/README.es index 08169115d9..8068217ebc 100644 --- a/documentation/README.es +++ b/documentation/README.es @@ -22,7 +22,7 @@ Wine para compilar e instalar Wine. Desde el directorio base del código de Wine Ejecute aplicaciones con "wine programa". Para más información y resolución de problemas, continúe leyendo este archivo, la página man de Wine, o más específicamente, la numerosa información que puede encontrar en -http://www.winehq.org. +https://www.winehq.org. 3. REQUISITOS @@ -42,7 +42,7 @@ podrían obtener soporte en el futuro. Información sobre FreeBSD: Por lo general Wine no funcionará correctamente en versiones anteriores a - FreeBSD 8.0. Visite http://wiki.freebsd.org/Wine para más información. + FreeBSD 8.0. Visite https://wiki.freebsd.org/Wine para más información. Información sobre Solaris: Lo más probable es que necesite compilar con el conjunto de herramientas GNU @@ -77,14 +77,14 @@ Requisitos básicos: Librerías de soporte adicionales: Configure mostrará advertencias cuando las librerías opcionales no se encuentren disponibles en su sistema. - Visite http://wiki.winehq.org/Recommended_Packages para recomendaciones + Visite https://wiki.winehq.org/Recommended_Packages para recomendaciones acerca de que paquetes debe instalar. En plataformas de 64-bit, si se está compilando Wine 32-bits (es la compilación por defecto), debe estar seguro de tener instaladas las librerías - de desarrollo de 32-bits; visite http://wiki.winehq.org/WineOn64bit para más + de desarrollo de 32-bits; visite https://wiki.winehq.org/WineOn64bit para más detalles. Si usted desea un entorno Wine 64-bits puro (o una mezcla de 32-bits - y 64-bits), vaya a http://wiki.winehq.org/Wine64 para más detalles. + y 64-bits), vaya a https://wiki.winehq.org/Wine64 para más detalles. 4. COMPILACIÓN @@ -114,7 +114,7 @@ crear conflictos. Realice un "dpkg -r wine" o "rpm -e wine" o "make uninstall" antes de instalar. Una vez instalado, puede ejecutar la herramienta de configuración "winecfg". -Visite la zona de Soporte en http://www.winehq.org/ para consejos sobre la +Visite la zona de Soporte en https://www.winehq.org/ para consejos sobre la configuración. @@ -144,18 +144,18 @@ recibirá un log de error que debe adjuntar en caso de reportar un fallo. 7. OBTENIENDO MÁS INFORMACIÓN WWW: Una gran cantidad de información sobre Wine está disponible en WineHQ - en http://www.winehq.org/ : varias guías de Wine, base de datos de + en https://www.winehq.org/ : varias guías de Wine, base de datos de aplicaciones, registro de bugs. Este es probablemente el mejor punto de partida. FAQ: Las preguntas frecuentes de Wine se encuentran en - http://www.winehq.org/FAQ + https://www.winehq.org/FAQ Listas de correo: Hay varias listas de correo, tanto para usuarios como desarrolladores; - Vaya a http://www.winehq.org/forums para más información. + Vaya a https://www.winehq.org/forums para más información. -Bugs: Reporte fallos en el Bugzilla de Wine, http://bugs.winehq.org +Bugs: Reporte fallos en el Bugzilla de Wine, https://bugs.winehq.org Por favor, antes de enviar un informe de fallo busque en la base de datos de bugzilla para comprobar si su problema es un fallo conocido o existe una solución. @@ -163,7 +163,7 @@ Bugs: Reporte fallos en el Bugzilla de Wine, http://bugs.winehq.org IRC: Se puede obtener ayuda online en el canal #WineHQ de irc.freenode.net. Git: El árbol actual de desarrollo de Wine está disponible a través de Git. - Vaya a http://www.winehq.org/git para más información. + Vaya a https://www.winehq.org/git para más información. Si añade algo, o corrige algún bug, por favor envíe un parche (en formato git-format-patch) a la lista wine-devel(a)winehq.org para su inclusión diff --git a/documentation/README.fi b/documentation/README.fi index ae167ee800..30311d8280 100644 --- a/documentation/README.fi +++ b/documentation/README.fi @@ -28,7 +28,7 @@ Tai aja se käännöshakemistosta: Ohjelmat ajetaan komennolla "wine ohjelma". Lisätietoja sekä apua ongelmien ratkaisemiseen on jäljempänä tässä tiedostossa, Winen man-sivuilla sekä -ennen kaikkea Internetissä osoitteessa http://www.winehq.org/. +ennen kaikkea Internetissä osoitteessa https://www.winehq.org/. 3. JÄRJESTELMÄVAATIMUKSET @@ -47,7 +47,7 @@ muillekin käyttöjärjestelmille, joissa on tarvittava tuki säikeille. Tietoa FreeBSD:lle: Pääsääntöisesti Wine ei toimi vanhemmilla versioilla kuin FreeBSD 8.0. - Osoitteessa http://wiki.freebsd.org/Wine kerrotaan tästä lisää. + Osoitteessa https://wiki.freebsd.org/Wine kerrotaan tästä lisää. Tietoa Solarikselle: Wine täytyy luultavasti kääntää GNU-työkaluilla (gcc, gas jne.). @@ -79,7 +79,7 @@ Perusvaatimukset: Valinnaisia tukikirjastoja: configure-skripti näyttää varoituksia, kun valinnaisia kirjastoja puuttuu. - Osoitteessa http://wiki.winehq.org/Recommended_Packages on tietoa, mitkä + Osoitteessa https://wiki.winehq.org/Recommended_Packages on tietoa, mitkä paketit ovat hyödyksi. 64-bittisissä järjestelmissä täytyy varmistaa, että kirjastoista on asennettu 32-bittiset versiot. @@ -111,7 +111,7 @@ Ennen asennusta pitää muistaa poistaa aiemmat Winen versiot. Poistamista voi yrittää komennolla "dpkg -r wine", "rpm -e wine" tai "make uninstall". Kun Wine on asennettu, voidaan ajaa asetusohjelma "winecfg". Sivustolla -http://www.winehq.org/ kohdassa Support on englanninkielisiä lisäohjeita. +https://www.winehq.org/ kohdassa Support on englanninkielisiä lisäohjeita. 6. OHJELMIEN AJAMINEN @@ -136,28 +136,28 @@ mukaan, jos raportoi virheestä. 7. LISÄTIETOJA -WWW: Winestä on paljon tietoa WineHQ:ssa, http://www.winehq.org/. +WWW: Winestä on paljon tietoa WineHQ:ssa, https://www.winehq.org/. Oppaita, ohjelmatietokanta sekä Bugzilla vikojen listaamiseen. Täältä kannattaa yleensä aloittaa. Kysymyksiä: - Sivulle http://www.winehq.org/FAQ on koottu kysymyksiä ja vastauksia. + Sivulle https://www.winehq.org/FAQ on koottu kysymyksiä ja vastauksia. -Wiki: Wine Wiki on osoitteessa http://wiki.winehq.org/. +Wiki: Wine Wiki on osoitteessa https://wiki.winehq.org/. Postituslistat: Winen käyttäjille ja kehittäjille on joitakin postituslistoja, - sivulla http://www.winehq.org/forums kerrotaan niistä lisää. + sivulla https://www.winehq.org/forums kerrotaan niistä lisää. Virheet: - Ilmoita virheistä Winen Bugzillaan, http://bugs.winehq.org/. + Ilmoita virheistä Winen Bugzillaan, https://bugs.winehq.org/. Katso kuitenkin ensin Bugzilla-tietokannasta, onko samasta asiasta ilmoitettu jo aiemmin. IRC: Online-apua voi saada kanavalta #WineHQ palvelimella irc.freenode.net. Git: Winen tämänhetkinen kehitysversio on jaossa Git-järjestelmän kautta. - Sivulla http://www.winehq.org/git kerrotaan tästä lisää. + Sivulla https://www.winehq.org/git kerrotaan tästä lisää. Jos lisäät jotain tai korjaat jonkin virheen, lähetä toki muutoksesi diff --git a/documentation/README.fr b/documentation/README.fr index d42d20a02c..28729a5b41 100644 --- a/documentation/README.fr +++ b/documentation/README.fr @@ -23,7 +23,7 @@ make Pour exécuter un programme, tapez « wine programme ». Pour des informations complémentaires et la résolutions de problèmes, lisez la suite de ce fichier, les pages de manuel de Wine, et surtout les nombreuses -informations que vous trouverez sur http://www.winehq.org. +informations que vous trouverez sur https://www.winehq.org. 3. CONFIGURATION NÉCESSAIRE @@ -45,7 +45,7 @@ futur. Informations FreeBSD : Wine ne fonctionnera généralement pas bien avec les versions FreeBSD - antérieures à 8.0. Voyez http://wiki.freebsd.org/Wine pour plus + antérieures à 8.0. Voyez https://wiki.freebsd.org/Wine pour plus d'informations. Informations Solaris : @@ -85,14 +85,14 @@ Configuration de base requise : Bibliothèques optionnelles : « configure » affiche des messages quand des bibliothèques optionnelles ne sont pas détectées sur votre système. - Consultez http://wiki.winehq.org/Recommended_Packages (en anglais) pour + Consultez https://wiki.winehq.org/Recommended_Packages (en anglais) pour des indications sur les paquets logiciels que vous devriez installer. Sur les plates-formes 64 bits, si vous compilez Wine pour le mode 32 bits (mode par défaut), les versions 32 bits de ces bibliothèques doivent être - installées. Voyez http://wiki.winehq.org/WineOn64bit pour les détails. + installées. Voyez https://wiki.winehq.org/WineOn64bit pour les détails. Si vous désirez un Wine 64 bits pur (ou une configuration mixte - 32/64 bits), consultez http://wiki.winehq.org/Wine64. + 32/64 bits), consultez https://wiki.winehq.org/Wine64. 4. COMPILATION @@ -125,7 +125,7 @@ d'installer une nouvelle version. Une fois l'installation terminée, vous pouvez lancer l'outil de configuration « winecfg ». Consultez la section Support de -http://www.winehq.org/ pour obtenir des astuces de configuration. +https://www.winehq.org/ pour obtenir des astuces de configuration. 6. EXÉCUTER DES PROGRAMMES @@ -156,22 +156,22 @@ d'attacher à un éventuel rapport de bogue. 7. SOURCES D'INFORMATIONS COMPLÉMENTAIRES WWW : Beaucoup d'informations à propos de Wine sont disponibles sur - WineHQ (http://www.winehq.org) : divers guides, base de données + WineHQ (https://www.winehq.org) : divers guides, base de données d'applications, suivi de bogues. C'est probablement le meilleur point de départ. FAQ : La Foire aux Questions de Wine se trouve sur - http://www.winehq.org/FAQ + https://www.winehq.org/FAQ -Wiki : Le wiki Wine est situé sur http://wiki.winehq.org +Wiki : Le wiki Wine est situé sur https://wiki.winehq.org Listes de diffusion : Il existe plusieurs listes de diffusion pour les utilisateurs et - les développeurs Wine ; voyez http://www.winehq.org/forums pour de + les développeurs Wine ; voyez https://www.winehq.org/forums pour de plus amples informations. Bogues : - Signalez les bogues sur le Bugzilla Wine à http://bugs.winehq.org + Signalez les bogues sur le Bugzilla Wine à https://bugs.winehq.org Merci de vérifier au préalable dans la base de données de bugzilla que le problème n'est pas déjà connu, ou corrigé. @@ -179,7 +179,7 @@ IRC : L'aide en ligne est disponible via le canal #WineHQ sur irc.freenode.net. Git : L'arbre de développement actuel de Wine est disponible via Git. - Voyez http://www.winehq.org/git pour plus d'informations. + Voyez https://www.winehq.org/git pour plus d'informations. Si vous ajoutez quelque chose ou corrigez un bogue, merci d'envoyer un correctif (de préférence en utilisant git-format-patch) à la liste de diff --git a/documentation/README.hu b/documentation/README.hu index d3fee99401..bee730d79d 100644 --- a/documentation/README.hu +++ b/documentation/README.hu @@ -23,7 +23,7 @@ k A programok futtat�sa "wine [opci�k] program". A tov�bbi inform�ci�khoz �s a probl�ma felvil�gos�t�shoz olvassa el ennek a f�jlnak a tov�bbi r�sz�t, a Wine man oldal�t, �s k�l�n�sen gazdag inform�ci� tal�lhat� itt: -http://www.winehq.org. +https://www.winehq.org. 3. K�VETELM�NYEK @@ -130,7 +130,7 @@ El Pr�b�lja ki a "dpkg -r wine", �s az "rpm -e wine", vagy a "make uninstall" parancsot telep�t�s el�tt. -L�togassa meg a t�mogat�si oldalt itt: http://www.winehq.org/ a konfigur�ci�s +L�togassa meg a t�mogat�si oldalt itt: https://www.winehq.org/ a konfigur�ci�s tippekhez. F�ggv�nyk�nyvt�r bet�lt�si hib�k eset�n @@ -176,16 +176,16 @@ http://home.nexgo.de/andi.mohr/download/decorrupt_explorer 7. T�BB INFORM�CI� BESZERZ�SE WWW: A Wine-r�l hatalmas mennyis�g� inform�ci� �rhet� el a WineHQ-n ezen - a c�men: http://www.winehq.org/ : k�l�nb�z� Wine �tmutat�k, + a c�men: https://www.winehq.org/ : k�l�nb�z� Wine �tmutat�k, alkalmaz�s adatb�zis, �s hibak�vet�s. Ez tal�n a legjobb kiindul�si pont. -GYIK: A Wine GYIK itt tal�lhat�: http://www.winehq.org/FAQ +GYIK: A Wine GYIK itt tal�lhat�: https://www.winehq.org/FAQ Usenet: T�rsaloghat a Wine-hoz kapcsol�d� t�m�kban, �s seg�ts�get k�rhet itt: comp.emulators.ms-windows.wine. -Hib�k: Wine hibabejelent�s a Bugzilla-n kereszt�l itt: http://bugs.winehq.org +Hib�k: Wine hibabejelent�s a Bugzilla-n kereszt�l itt: https://bugs.winehq.org K�rem hibabejelent�s k�ld�se el�tt ellen�rizze, hogy az �n probl�m�ja m�r megtal�lhat�-e az adatb�zisban. K�ldhet hibabejelent�seket a comp.emulators.ms-windows.wine c�mre is. @@ -193,11 +193,11 @@ Hib IRC: Azonnali seg�ts�g el�rhet� a #WineHQ csatorn�n a irc.freenode.net-en. Git: A jelenlegi Wine fejleszt�i fa el�rhet� Git-en kereszt�l. - L�togasson el ide a tov�bbi inform�ci�hoz: http://www.winehq.org/git + L�togasson el ide a tov�bbi inform�ci�hoz: https://www.winehq.org/git Levelez�list�k: El�rhet� n�h�ny levelez�lista a Wine fejleszt�k sz�m�ra; n�zze meg a - http://www.winehq.org/forums c�met a tov�bbi inform�ci�hoz. + https://www.winehq.org/forums c�met a tov�bbi inform�ci�hoz. Ha valamit hozz�ad, vagy hib�t jav�t, k�rem k�ldj�n jav�t�foltot ('diff -u' form�tumban) a wine-devel(a)winehq.org levelez�lista c�mre, hogy beletehess�k a diff --git a/documentation/README.it b/documentation/README.it index 0c2bcd8511..ecb4aed75e 100644 --- a/documentation/README.it +++ b/documentation/README.it @@ -23,7 +23,7 @@ Wine, eseguire: Eseguire i programmi com "wine programma". Per maggiori informazioni e risoluzioni di problemi, leggere il resto di questo file, la pagina man di Wine, ed in modo particolare la notevole quantità di informazioni che -si trova all'indirizzo http://www.winehq.org. +si trova all'indirizzo https://www.winehq.org. 3. REQUISITI @@ -43,7 +43,7 @@ che forniscono kernel threads potrebbero essere supportati in futuro. Informazioni per FreeBSD: In generale Wine non funzionerà correttamente con versioni precedenti a FreeBSD 8.0. - Leggere http://wiki.freebsd.org/Wine per maggiori informazioni. + Leggere https://wiki.freebsd.org/Wine per maggiori informazioni. Informazioni per Solaris: Sarà molto probabilmente necessario compilare Wine con i tool GNU @@ -76,14 +76,14 @@ Requisiti basilari: Librerie opzionali di supporto: Configure notificherà a video quando le librerie opzionali non sono - trovate sul sistema. Leggere http://wiki.winehq.org/Recommended_Packages + trovate sul sistema. Leggere https://wiki.winehq.org/Recommended_Packages per suggerimenti sui pacchetti da installare. Su piattaforme a 64-bit, per compilare Wine a 32-bit (predefinito), assicurarsi di installare la versione a 32-bit di queste librerie; - leggere http://wiki.winehq.org/WineOn64bit per i dettagli. Per avere + leggere https://wiki.winehq.org/WineOn64bit per i dettagli. Per avere Wine solo 64-bit (o un setup di Wine misto tra 32-bit e 64-bit), - leggere http://wiki.winehq.org/Wine64 per maggiori informazioni. + leggere https://wiki.winehq.org/Wine64 per maggiori informazioni. 4. COMPILAZIONE @@ -114,7 +114,7 @@ di Wine in conflitto. Prova sia "dpkg -r wine" o "rpm -e wine" o "make uninstall" prima di installare. Una volta installato, esegui lo strumento di configurazione "winecfg". -Leggi l'area Support su http://www.winehq.org/ per suggerimenti sulla +Leggi l'area Support su https://www.winehq.org/ per suggerimenti sulla configurazione. @@ -142,19 +142,19 @@ di segnalazione del problema. 7. PER OTTENERE PIÙ INFORMAZIONI WWW: Un gran quantitativo di informazioni su Wine è disponibile al - WineHQ, http://www.winehq.org/: varie guide su Wine, database + WineHQ, https://www.winehq.org/: varie guide su Wine, database delle applicazioni, rintracciamento di bug. Questo è probabilmente il miglior punto di partenza. -FAQ: Le FAQ di Wine si trovano all'indirizzo http://www.winehq.org/FAQ +FAQ: Le FAQ di Wine si trovano all'indirizzo https://www.winehq.org/FAQ -Wiki: Il Wiki di Wine si trova all'indirizzo http://wiki.winehq.org +Wiki: Il Wiki di Wine si trova all'indirizzo https://wiki.winehq.org Mailing list: Esistono diverse mailing list per utenti e sviluppatori di Wine; - visitare http://www.winehq.org/forums per ulteriori informazioni. + visitare https://www.winehq.org/forums per ulteriori informazioni. -Bugs: Segnalare i bug su Wine Bugzilla all'indirizzo http://bugs.winehq.org +Bugs: Segnalare i bug su Wine Bugzilla all'indirizzo https://bugs.winehq.org Si prega di controllare il database di Bugzilla per verificare che il problema non sia già conosciuto o risolto prima di creare un rapporto su di esso. @@ -162,7 +162,7 @@ Bugs: Segnalare i bug su Wine Bugzilla all'indirizzo http://bugs.winehq.org IRC: Aiuto online disponibile nel canale #WineHQ su irc.freenode.net. Git: L'albero attuale di sviluppo di Wine è disponibile attraverso Git. - Vedere http://www.winehq.org/git per maggiori informazioni. + Vedere https://www.winehq.org/git per maggiori informazioni. Se aggiungi qualcosa, o correggi un bug, si prega di mandare una patch (preferibilmente usando git-format-patch) alla mailing list diff --git a/documentation/README.ja b/documentation/README.ja index ae21f73dcd..9b44353306 100644 --- a/documentation/README.ja +++ b/documentation/README.ja @@ -21,7 +21,7 @@ make "wine program"のようにプログラムを実行してください。更なる情報や問題解決については、このファイルの残りの部分、Wineのmanページや、 -特にhttp://www.winehq.orgで見つかる豊富な情報を読んでください。 +特にhttps://www.winehq.orgで見つかる豊富な情報を読んでください。 3. 要件 @@ -41,7 +41,7 @@ Wineをコンパイルし実行するには、以下のうち一つを持って FreeBSD情報: Wineは一般的にFreeBSD 8.0より前のバージョン上で正しく動作しないでしょう。 - 詳細については http://wiki.freebsd.org/Wine を参照してください。 + 詳細については https://wiki.freebsd.org/Wine を参照してください。 Solaris情報: GNUツールチェーン（gcc、gasなど）でWineをビルドする必要がある可能性が @@ -77,7 +77,7 @@ Mac OS X情報: オプションのサポートライブラリ: configureはオプションのライブラリがシステム上に見つからなかったときに通知を表示します。インストールすべきパッケージについてのヒントについては - http://wiki.winehq.org/Recommended_Packagesを参照してください。64ビットプ + https://wiki.winehq.org/Recommended_Packagesを参照してください。64ビットプラットフォームでは、これらライブラリの32ビットバージョンをインストールしたことをよく確認してください。 @@ -110,7 +110,7 @@ make または"make uninstall"を試してください。いったんインストールされると、"winecfg"設定ツールを実行できます。 -設定のヒントについてはhttp://www.winehq.org/におけるサポート領域を +設定のヒントについてはhttps://www.winehq.org/におけるサポート領域を参照してください。 @@ -137,26 +137,26 @@ Wineは完璧ではないので、いくつかのプログラムはクラッシ 7. 更なる情報の取得 -WWW: Wineについてのたくさんの情報がhttp://www.winehq.org/にある +WWW: Wineについてのたくさんの情報がhttps://www.winehq.org/にある WineHQから入手できます。多様なWineガイド、アプリケーションデータベース、バグ追跡。これはおそらく最良の出発点です。 -FAQ: Wine FAQはhttp://www.winehq.org/FAQにあります +FAQ: Wine FAQはhttps://www.winehq.org/FAQにあります -Wiki: Wine Wikiはhttp://wiki.winehq.orgにあります +Wiki: Wine Wikiはhttps://wiki.winehq.orgにありますメーリングリスト: Wineユーザと開発者のためのいくつかのメーリングリストがあります。 - 詳細についてはhttp://www.winehq.org/forumsを参照してください。 + 詳細についてはhttps://www.winehq.org/forumsを参照してください。 -バグ: http://bugs.winehq.orgにあるWine Bugzillaでバグを報告してください。 +バグ: https://bugs.winehq.orgにあるWine Bugzillaでバグを報告してください。バグ報告を投稿する前に問題が既知や修正済みかどうかを調べるために bugzillaデータベースを検索してください。 IRC: irc.freenode.net上のチャンネル#WineHQでオンラインヘルプを利用できます。 Git: 現在のWine開発ツリーはGitを通して入手できます。 - 詳細についてはhttp://www.winehq.org/gitに行ってください。 + 詳細についてはhttps://www.winehq.org/gitに行ってください。何かを追加するか、バグを修正するならば、次のリリースに含めるためにパッチ（git-format-patchをなるべく使用）をwine-devel(a)winehq.xn--org-eb4bpa2au41dheqot743g diff --git a/documentation/README.ko b/documentation/README.ko index 4686ad8eee..59debaa9ed 100644 --- a/documentation/README.ko +++ b/documentation/README.ko @@ -20,7 +20,7 @@ LICENSE ��α׷�� "wine ��α׷��"ó�� մϴ�. �� ڼ�� ذ� �� κа� Wine �� Ͻʽÿ�. -Ư�� http://www.winehq.org ��Ʈ�� Ǿ� �ֽ��ϴ�. +Ư�� https://www.winehq.org ��Ʈ�� Ǿ� �ֽ��ϴ�. 3. ��忡 �ʿ�� @@ -126,7 +126,7 @@ Wine �ٶ��ϴ�. "dpkg -r wine" �Ǵ� "rpm -e wine" �Ǵ� "make uninstall" �� ֽ��ϴ�. -�� http://www.winehq.org/�� Support �� ֽ��ϴ�. +�� https://www.winehq.org/�� Support �� ֽ��ϴ�. ��̺귯�� ε� ��("Error while loading shared libraries: libntdll.so")�� ߻��ϴ� �� ̺귯�� ΰ� /etc/ld.so.conf �� ȿ� ��Ǿ� �ִ�� @@ -159,15 +159,15 @@ Wine 7. �� ڼ�� WWW: �� Wine ��̵�, ��ø��̼� ��ͺ��̽�, �� - http://www.winehq.org/ �� ִ� WineHQ ��Ʈ�� + https://www.winehq.org/ �� ִ� WineHQ ��Ʈ�� ֽ��ϴ�. �� ã�� 밳 �� Ʈ�� ˴ϴ�. -FAQ: Wine FAQ�� http://www.winehq.org/FAQ �� ֽ��ϴ�. +FAQ: Wine FAQ�� https://www.winehq.org/FAQ �� ֽ��ϴ�. Usenet: Wine �� ϰų� �� comp.emulators.ms-windows.wine �׷�� ̿��ϱ� �ٶ��ϴ�. -Bugs: http://bugs.winehq.org �� Wine Bugzilla�� ׸� ��Ͻʽÿ�. +Bugs: https://bugs.winehq.org �� Wine Bugzilla�� ׸� ��Ͻʽÿ�. �� ϱ� �� ̹� �� ִ�� ͺ��̽� �˻�� Ȯ��ϱ� �ٶ��ϴ�. comp.emulators.ms-windows.wine �׷쿡 �� ÷�� ˴ϴ�. @@ -175,13 +175,13 @@ Bugs: http://bugs.winehq.org IRC: irc.freenode.net �� #WineHQ ä�ο�� ֽ��ϴ�. GIT: Wine �� Ʈ�� GIT�� ǰ� �ֽ��ϴ�. �� ڼ�� - http://www.winehq.org/site/git �� ϱ� �ٶ��ϴ�. + https://www.winehq.org/site/git �� ϱ� �ٶ��ϴ�. ��ϸ� ��Ʈ: Wine ��ڿ� ��ڸ� �� ϸ� ��Ʈ�� �ǰ� �ֽ��ϴ�. - �� ڼ�� http://www.winehq.org/forums �� ϱ� �ٶ��ϴ�. + �� ڼ�� https://www.winehq.org/forums �� ϱ� �ٶ��ϴ�. -��Ű: Wine ��Ű�� http://wiki.winehq.org �� ֽ��ϴ�. +��Ű: Wine ��Ű�� https://wiki.winehq.org �� ֽ��ϴ�. �߰�� ̳� �� װ� �ִٸ� �� Ե� �� ֵ�� wine-devel(a)winehq.org ��ϸ� ��Ʈ�� ġ('diff -u' �� )�� diff --git a/documentation/README.no b/documentation/README.no index 5c42500045..443515e255 100644 --- a/documentation/README.no +++ b/documentation/README.no @@ -20,7 +20,7 @@ rotkatalogen til Wine-kildekoden ./tools/wineinstall Kjør programmer som «wine program». Se resten av denne filen, -Wines man-side og http://www.winehq.org/ for mer informasjon og +Wines man-side og https://www.winehq.org/ for mer informasjon og problemløsing. @@ -40,7 +40,7 @@ støtter kjernetråder støttes kanskje i framtiden. Informasjon for FreeBSD: Wine vil som regel ikke virke på FreeBSD-versjoner eldre enn 8.0. - Se <http://wiki.freebsd.org/Wine> for mer informasjon. + Se <https://wiki.freebsd.org/Wine> for mer informasjon. Informsjon for Solaris: Wine må antakelig bygges med GNU-verktøyene (gcc, gas etc.). @@ -72,15 +72,15 @@ Basiskrav: Valgfrie støttebiblioteker: configure-skriptet viser meldinger når valgfrie biblioteker ikke blir - funnet. Se http://wiki.winehq.org/Recommended_Packages for info om + funnet. Se https://wiki.winehq.org/Recommended_Packages for info om hvilke pakker du bør installere. På 64 bit-systemer trenger du 32 bit-versjoner av disse bibliotekene hvis du skal bygge Wine som et 32 bit-program (standard); - se http://wiki.winehq.org/WineOn64bit for flere detaljer. + se https://wiki.winehq.org/WineOn64bit for flere detaljer. Hvis du ønsker å bygge Wine som et 64 bit-program (eller et oppsett med blandet 32 bit og 64 bit) kan du lese mer på - http://wiki.winehq.org/Wine64 + https://wiki.winehq.org/Wine64 4. BYGGING @@ -105,7 +105,7 @@ Ikke glem å avinstallere tidligere Wine-versjoner først. Prøv enten «dpkg -r wine», «rpm -e wine» eller «make uninstall» før installsjonen. Når Wine er installert kan du bruke oppsettsverktøyet «winecfg». -Se støtteområdet på http://www.winehq.org/ for hint om oppsett. +Se støtteområdet på https://www.winehq.org/ for hint om oppsett. 6. KJØRING AV PROGRAMMER @@ -134,18 +134,18 @@ når du rapporterer en feil. 7. MER INFORMASJON Internett: En god del informasjon om Wine finnes hos WineHQ på - http://www.winehq.org/ : diverse veiledere, en programdatabase + https://www.winehq.org/ : diverse veiledere, en programdatabase og feilsporing. Dette er antakelig det beste stedet å begynnne. -Svar: Wines spørsmål og svar finnes på http://www.winehq.org/FAQ +Svar: Wines spørsmål og svar finnes på https://www.winehq.org/FAQ -Wiki: Wines Wiki er tilgjengelig på http://wiki.winehq.org +Wiki: Wines Wiki er tilgjengelig på https://wiki.winehq.org E-postlister: Det finnes flere e-postlister for Wine-utviklere og -brukere; - besøk http://www.winehq.org/forums for mer informasjon. + besøk https://www.winehq.org/forums for mer informasjon. -Feil: Rapporter feil til Wines Bugzilla på http://bugs.winehq.org +Feil: Rapporter feil til Wines Bugzilla på https://bugs.winehq.org Søk i Bugzilla-databasen og se om probelmet allerede er funnet før du sender en feilrapport. @@ -153,7 +153,7 @@ IRC: Nødhjelp er tilgjengelig på kanalen #WineHQ på irc.freenode.net. Git: Wines oppdaterte utvikler-versjon er tilgjengelig gjennom GIT. - Gå til http://www.winehq.org/git for mer informasjon. + Gå til https://www.winehq.org/git for mer informasjon. Hvis du legger til noe eller fikser en feil er det fint som du sender en oppdateringsfil (helst laget med git format-patch) til listen diff --git a/documentation/README.pt b/documentation/README.pt index b0914f2098..1083bda314 100644 --- a/documentation/README.pt +++ b/documentation/README.pt @@ -21,7 +21,7 @@ do Wine source (que cont Corre os programas conforme as "wine [options] program". Para mais informa��es e reso�u��o de problemas. L� o resto deste ficheiro, a Wine man page, e especialmente a abund�ncia de informa��o encontrada em -http://www.winehq.org. +https://www.winehq.org. 3.REQUERIMENTOS @@ -130,7 +130,7 @@ instala Tenta outro "dpkg -r wine" ou "rpm -e wine" ou "make uninstall" antes de installar. -Ver http://www.winehq.org/support/ para informa��o sobre a +Ver https://www.winehq.org/support/ para informa��o sobre a configura�ao. No caso da livraria carregar erros (e.g. "Error while loading shared @@ -185,11 +185,11 @@ http://home.nexgo.de/andi.mohr/download/decorrupt_explorer 7.ARRANJAR MAIS INFORMA��O www: Uma grande quantidade de informa��o acerca do Wine est� disponivel - pelo WineHQ em http://www.winehq.org/ : varios guias Wine, base de + pelo WineHQ em https://www.winehq.org/ : varios guias Wine, base de dados de aplica��es, localiza�ao de erros. Isto � provavelmente o melhor ponto de come�o. -FAQ: A Wine FAQ est� localizada em http://www.winehq.org/FAQ +FAQ: A Wine FAQ est� localizada em https://www.winehq.org/FAQ Usenet: Tu podes discutor t�picos relacionados de Wine e obter ajuda em comp.emulators.ms-windows.wine. @@ -198,11 +198,11 @@ IRC: Ajuda online est Git: O currente desenvolvimento do Wine est� disponivel por Git. - Vai a http://www.winehq.org/git para mais informa��o. + Vai a https://www.winehq.org/git para mais informa��o. Mailing Lists: H� algumas mailing list para responsaveis pelo desenvolvimento Wine; ver em - http://www.winehq.org/forums para mais informa��o. + https://www.winehq.org/forums para mais informa��o. Se tu acrescentaste algo,ou corrigiste um bug, por favor envia um patch (em 'diff -u' format) para wine-devel(a)winehq.org lista para inclus�o diff --git a/documentation/README.pt_br b/documentation/README.pt_br index a2cccac88e..3d221a5632 100644 --- a/documentation/README.pt_br +++ b/documentation/README.pt_br @@ -23,7 +23,7 @@ n Execute programas conforme "wine programa". Para maiores informa��es e resolu��o de problemas, leia o restante deste arquivo, a p�gina "man" do Wine (man wine), e especialmente a abund�ncia de informa��o -encontrada em http://www.winehq.org. +encontrada em https://www.winehq.org. 3. REQUERIMENTOS @@ -43,7 +43,7 @@ ter suporte no futuro. Informa��es para o FreeBSD: O Wine em geral n�o deve funcionar corretamente em vers�es antes da 8.0. - Veja http://wiki.freebsd.org/Wine para mais informa��es. + Veja https://wiki.freebsd.org/Wine para mais informa��es. Informa��es para o Solaris: Voc� provavelmente necessitar� construir o Wine com as ferramentas GNU @@ -77,14 +77,14 @@ Requisitos b Bibliotecas de suporte opcionais: O script configure ir� mostrar diversas mensagens quando bibliotecas opcionais n�o forem encontradas no seu sistema. - Veja http://wiki.winehq.org/Recommended_Packages para dicas sobre + Veja https://wiki.winehq.org/Recommended_Packages para dicas sobre pacotes que voc� pode instalar. Em plataformas de 64 bits, se compilar Wine como 32 bits (padr�o), voc� precisa assegurar que as vers�es 32 bits das bibliotecas est�o instaladas, - veja http://wiki.winehq.org/WineOn64bit para mais detalhes. + veja https://wiki.winehq.org/WineOn64bit para mais detalhes. Se voc� quer um verdadeiro Wine de 64 bits (ou uma configura��o mista de - 32 e 64 bits) veja http://wiki.winehq.org/Wine64 para mais detalhes. + 32 e 64 bits) veja https://wiki.winehq.org/Wine64 para mais detalhes. 4. COMPILA��O @@ -114,7 +114,7 @@ Wine que possa ser conflitante. Tente tanto "dpkg -r wine", "rpm -e wine" ou "make uninstall" antes de instalar. Depois de instalado, pode-se executar o programa de configura��o "winecfg". -Veja a �rea de suporte em http://www.winehq.org/ para dicas de configura��o. +Veja a �rea de suporte em https://www.winehq.org/ para dicas de configura��o. 6. EXECUTANDO PROGRAMAS @@ -142,20 +142,20 @@ poder 7. OBTENDO MAIS INFORMA��O WWW: Uma grande quantidade de informa��o sobre o Wine est� dispon�vel - no WineHQ em http://www.winehq.org/ : v�rios guias do Wine, base + no WineHQ em https://www.winehq.org/ : v�rios guias do Wine, base de dados de aplica��es, rastreamento de erros. Este � provavelmente o melhor ponto para come�ar. -FAQ: O FAQ (perguntas frequentes) do Wine est� em http://www.winehq.org/FAQ +FAQ: O FAQ (perguntas frequentes) do Wine est� em https://www.winehq.org/FAQ -Wiki: O wiki do Wine est� dispon�vel em http://wiki.winehq.org +Wiki: O wiki do Wine est� dispon�vel em https://wiki.winehq.org Listas de discuss�o: H� diversas listas de mensagens para usu�rios e colaboradores no - desenvolvimento do Wine; veja http://www.winehq.org/forums para + desenvolvimento do Wine; veja https://www.winehq.org/forums para mais informa��o. -Bugs: Relate erros ao Bugzilla do Wine em http://bugs.winehq.org +Bugs: Relate erros ao Bugzilla do Wine em https://bugs.winehq.org Por favor, pesquise a base de dados do bugzilla para verificar se seu problema j� foi encontrado ou resolvido antes de enviar um relat�rio do erro. @@ -163,7 +163,7 @@ Bugs: Relate erros ao Bugzilla do Wine em http://bugs.winehq.org IRC: A ajuda online est� dispon�vel em #WineHQ em irc.freenode.net. Git: A �rvore de desenvolvimento atual do Wine est� dispon�vel por Git. - Visite http://www.winehq.org/git para mais informa��o. + Visite https://www.winehq.org/git para mais informa��o. Se voc� alterar algo ou reparar um erro, envie, por favor, um patch (preferencialmente usando git-format-patch) � lista wine-devel(a)winehq.org diff --git a/documentation/README.ru b/documentation/README.ru index 5c068cc6ff..5276b99bd9 100644 --- a/documentation/README.ru +++ b/documentation/README.ru @@ -20,7 +20,7 @@ make Запустите программу с помощью команды «wine имя_программы». Источники дополнительной информации перечислены в конце этого файла. Ознакомьтесь с -руководством по Wine, а также с сайтом http://www.winehq.org. +руководством по Wine, а также с сайтом https://www.winehq.org. 3. ТРЕБОВАНИЯ @@ -40,7 +40,7 @@ make FreeBSD: Wine не будет работать как следует на версиях ниже, чем FreeBSD 8.0. - Посетите <http://wiki.freebsd.org/Wine> для дополнительной информации. + Посетите <https://wiki.freebsd.org/Wine> для дополнительной информации. Solaris: Лучше всего компоновать Wine инструментами GNU @@ -74,7 +74,7 @@ Mac OS X: Дополнительные библиотеки: Конфигурационный скрипт выведет список дополнительных библиотек, которые не были найдены в вашей системе. Ознакомьтесь с перечнем необходимых пакетов по адресу - http://wiki.winehq.org/Recommended_Packages. При работе на 64-битных платформах + https://wiki.winehq.org/Recommended_Packages. При работе на 64-битных платформах убедитесь, что у вас установлены 32-битные версии этих библиотек. 4. КОМПИЛЯЦИЯ @@ -105,7 +105,7 @@ make Попробуйте «dpkg -r wine», «rpm -e wine» или «make uninstall» до установки. После установки запустите конфигурационную программу «winecfg». Посетите -Службу поддержки на http://www.winehq.org/, если возникнут вопросы по конфигурации. +Службу поддержки на https://www.winehq.org/, если возникнут вопросы по конфигурации. 6. ЗАПУСК ПРОГРАММ @@ -132,25 +132,25 @@ Wine не идеален, поэтом некоторые программы м 7. ПОЛУЧЕНИЕ ДОПОЛНИТЕЛЬНОЙ ИНФОРМАЦИИ WWW: Много информации о Wine доступно в WineHQ на - http://www.winehq.org/: различные руководства Wine, база данных приложений, + https://www.winehq.org/: различные руководства Wine, база данных приложений, база данных ошибок. Вероятно лучше всего начать с этого сайта. -FAQ: Wine FAQ расположен на http://www.winehq.org/FAQ +FAQ: Wine FAQ расположен на https://www.winehq.org/FAQ -Wiki: Wine Wiki расположен на http://wiki.winehq.org +Wiki: Wine Wiki расположен на https://wiki.winehq.org Рассылки: Имеется несколько рассылок для пользователей и разработчиков Wine, - обратитесь по адресу http://www.winehq.org/forums за дополнительной информацией. + обратитесь по адресу https://www.winehq.org/forums за дополнительной информацией. -Ошибки: Сообщайте об ошибках в Wine Bugzilla по адресу http://bugs.winehq.org +Ошибки: Сообщайте об ошибках в Wine Bugzilla по адресу https://bugs.winehq.org Прежде чем отправлять сообщение об ошибке проверьте, может эта ошибка уже известна или исправлена в последней версии Wine. IRC: Онлайн помощь доступна на канале #WineHQ на irc.freenode.net. Git: Текущие разработки Wine доступны через Git. - Смотрите http://www.winehq.org/site/git для дополнительной информации. + Смотрите https://www.winehq.org/site/git для дополнительной информации. Если вы что-то добавили или исправили ошибку, пожалуйста отправьте патч (предпочтительно сгенерированный с помощью git-format-patch) на wine-devel(a)winehq.org diff --git a/documentation/README.tr b/documentation/README.tr index f48422d2a2..28b17b8c37 100644 --- a/documentation/README.tr +++ b/documentation/README.tr @@ -21,7 +21,7 @@ Kur'u kullanmanız önerilir. Wine kaynak kodu içerisinde en üst dizine Programları "wine [seçenekler] program" şeklinde çalıştırabilirsiniz. Daha ayrıntılı bilgi ve sorun çözümü için, bu dosyanın geri kalanını, -Wine kullanım kılavuzunu ve özellikle http://www.winehq.org sitesindeki +Wine kullanım kılavuzunu ve özellikle https://www.winehq.org sitesindeki zengin bilgi arşivini tarayabilirsiniz. 3. GEREKSİNİMLER @@ -43,7 +43,7 @@ de gelecekte desteklenebilir. FreeBSD hakkında bilgi: Wine, FreeBSD 8.0'dan önceki sürümlerde genellikle düzgün çalışmaz. - Ayrıntılı bilgi için http://wiki.freebsd.org/Wine adresini ziyaret + Ayrıntılı bilgi için https://wiki.freebsd.org/Wine adresini ziyaret ediniz. Solaris hakkında bilgi: @@ -78,13 +78,13 @@ Temel gereksinimler: Seçeneğe bağlı destek kitaplıkları: Yapılandırılırken, eğer seçeneğe bağlı paketler bulunamadıysa, bildirim alacaksınız. Yüklemeniz gereken paketler hakkında ipuçları için, - http://wiki.winehq.org/Recommended_Packages adresini ziyaret ediniz. + https://wiki.winehq.org/Recommended_Packages adresini ziyaret ediniz. 64 bit üzerinde, eğer Wine'yi 32 bit (varsayılan) olarak derleyecekseniz, bazı kitaplıklarin 32 bit sürümlerinin yüklü olduğundan emin olunuz; - ayrıntılar için http://wiki.winehq.org/WineOn64bit adresini ziyaret + ayrıntılar için https://wiki.winehq.org/WineOn64bit adresini ziyaret ediniz. Eğer gerçek bir 64 bit Wine kurulumu (veya 32-64 bit karışık) - isterseniz, bilgi için http://wiki.winehq.org/Wine64 adresini ziyaret + isterseniz, bilgi için https://wiki.winehq.org/Wine64 adresini ziyaret ediniz. 4. DERLEME @@ -113,7 +113,7 @@ kılavuzunu ve gerekli birkaç dosyayı kuracaktır. uninstall" komutlarından birini deneyiniz. Yüklemeden sonra, "winecfg" yapılandıma aracını -çalıştırabilirsiniz. Yapılandırma ipuçları için http://www.winehq.org/ +çalıştırabilirsiniz. Yapılandırma ipuçları için https://www.winehq.org/ adresinde Destek bölümüne bakınız. 6. UYGULAMALARIN ÇALIŞTIRILMASI @@ -139,16 +139,16 @@ bildirirken eklemelisiniz. 7. DAHA FAZLA BİLGİYE ERİŞİM -WWW: Wine hakkında geniş bilgiyi WineHQ sitesine http://www.winehq.org/ +WWW: Wine hakkında geniş bilgiyi WineHQ sitesine https://www.winehq.org/ adresinden ulaşarak edinebilirsiniz: çeşitli Wine kılavuzları, uygulama veritabanı, hata izleme gibi. Burası muhtemelen en iyi başlangıç noktasıdır. SSS: Wine hakkında sıkça sorulan sorulara buradan ulaşabilirsiniz: - http://www.winehq.org/FAQ + https://www.winehq.org/FAQ Hatalar: - Karşılaştığınız hataları http://bugs.winehq.org adresinden Wine + Karşılaştığınız hataları https://bugs.winehq.org adresinden Wine Bugzilla ile bildirebilirsiniz. Lütfen bir hata bildirmeden önce hatanın önceden girilip girilmediğini öğrenmek için Bugzilla'da arama yapınız. @@ -157,11 +157,11 @@ IRC: irc.freenode.net sunucusundan #WineHQ kanalı ile çevrimiçi yardım alabilirsiniz. Git: Geçerli Wine geliştirme ağacına Git üzerinden erişim sağlanabilir. - Daha fazla bilgi için http://www.winehq.org/git adresine gidiniz. + Daha fazla bilgi için https://www.winehq.org/git adresine gidiniz. E-posta listeleri: Wine geliştiricileri için birtakım e-posta listeleri bulunmaktadır. - Daha fazla bilgi için http://www.winehq.org/forums adresine gidiniz. + Daha fazla bilgi için https://www.winehq.org/forums adresine gidiniz. Eğer bir şey eklemek veya hata düzeltmek istiyorsanız, lütfen sonraki sürümde yer alabilmesii için wine-devel(a)winehq.org e-posta listesine bir diff --git a/documentation/README.uk b/documentation/README.uk index f9a4fa4853..a70e4979f1 100644 --- a/documentation/README.uk +++ b/documentation/README.uk @@ -21,7 +21,7 @@ Wine Installer для компонування і встановлення Wine. Запустіть програму як "wine program". Додаткові джерела інформації перераховані в кінці цього файлу. Ознайомтеся з посібником з Wine, -а також з сайтом http://www.winehq.org. +а також з сайтом https://www.winehq.org. 3. ВИМОГИ @@ -46,7 +46,7 @@ Linux: FreeBSD: Wine не буде працювати як слід на версіях нижче, ніж FreeBSD 6.3 чи 7.0. Для FreeBSD 6.3 є патч, що дозволяє Wine запускатися. - Відвідайте http://wiki.freebsd.org/Wine для додаткової інформації. + Відвідайте https://wiki.freebsd.org/Wine для додаткової інформації. Solaris: Найкраще збирати Wine інструментами GNU (gcc, gas, тощо). Увага: @@ -79,13 +79,13 @@ Mac OS X: Додаткові бібліотеки підтримки: Конфігураційний скрипт виведе список додаткових бібліотек, які не були знайдені у вашій системі. Ознайомтеся з переліком потрібних пакетів за - адресою http://wiki.winehq.org/Recommended_Packages. + адресою https://wiki.winehq.org/Recommended_Packages. На 64-бітних платформах ви повинні переконатися, що у вас встановлені 32-бітні версії цих бібліотек; за більш детальною інформацією зверніться - до http://wiki.winehq.org/WineOn64bit. Якщо вам потрібен 64-бітний Wine + до https://wiki.winehq.org/WineOn64bit. Якщо вам потрібен 64-бітний Wine (чи змішаний 32-бітний та 64-бітний встановлювач Wine), дивіться - http://wiki.winehq.org/Wine64 за більш детальною інформацією. + https://wiki.winehq.org/Wine64 за більш детальною інформацією. 4. ЗБИРАННЯ @@ -113,7 +113,7 @@ make перед встановленням. Після встановлення запустіть конфігураційну програму "winecfg". Відвідайте Службу -підтримки на http://www.winehq.org/, якщо виникнуть питання щодо конфігурування. +підтримки на https://www.winehq.org/, якщо виникнуть питання щодо конфігурування. 6. ЗАПУСК ПРОГРАМ @@ -140,26 +140,26 @@ Wine знаходиться в процесі розробки, тому дея 7. ОТРИМАННЯ ДОДАТКОВОЇ ІНФОРМАЦІЇ WWW: Багато інформації про Wine є в WineHQ на - http://www.winehq.org/: різні керівництва Wine, база даних додатків, + https://www.winehq.org/: різні керівництва Wine, база даних додатків, база даних помилок. Ймовірно найкраще почати з цього сайту. -FAQ: Wine FAQ розташований на http://www.winehq.org/FAQ +FAQ: Wine FAQ розташований на https://www.winehq.org/FAQ -Wiki: Wine Wiki розташована на http://wiki.winehq.org +Wiki: Wine Wiki розташована на https://wiki.winehq.org Списки розсилання: Є кілька розсилок для користувачів і розробників Wine; - дивіться http://www.winehq.org/forums для додаткової інформації. + дивіться https://www.winehq.org/forums для додаткової інформації. Помилки(баги): - Повідомляйте про помилки у Wine Bugzilla на http://bugs.winehq.org + Повідомляйте про помилки у Wine Bugzilla на https://bugs.winehq.org Перш ніж відправляти повідомлення про помилку перевірте в базі, чи ця помилка вже виявлена. IRC: Онлайн допомога доступна на каналі #WineHQ на irc.freenode.net. Git: Поточне дерево розробки Wine доступне через Git. - Дивіться http://www.winehq.org/git за детальною інформацією. + Дивіться https://www.winehq.org/git за детальною інформацією. Якщо ви щось додали або виправили помилку, надішліть патч (найкраще використавши git-format-patch) на wine-devel(a)winehq.org для його diff --git a/documentation/README.zh_cn b/documentation/README.zh_cn index ce23c99b96..936172471b 100644 --- a/documentation/README.zh_cn +++ b/documentation/README.zh_cn @@ -21,7 +21,7 @@ Wine 是自由软件，在 GNU LGPL 协议下发布；请查看 LICENSE 文件运行程序时，请使用“wine [程序名]”的语法。如需了解更多信息或解决遇到的问题，您可以继续阅读本文件的剩余部分，或阅读 Wine 的手册页。 -需特别指出的是，您可以在网站：http://www.winehq.org 上找到十分丰富 +需特别指出的是，您可以在网站：https://www.winehq.org 上找到十分丰富的信息。 @@ -40,7 +40,7 @@ Wine 是自由软件，在 GNU LGPL 协议下发布；请查看 LICENSE 文件 FreeBSD 信息： Wine 通常不会在早于 FreeBSD 8.0 的系统上正常工作。 - 请查看 http://wiki.freebsd.org/Wine 以了解更多信息。 + 请查看 https://wiki.freebsd.org/Wine 以了解更多信息。 Solaris 信息：您大部分情况下可能需要使用 GNU 工具链（gcc、gas 等）来构建 Wine。 @@ -73,13 +73,13 @@ Mac OS X 信息: 可选的支持库：当可选的函数库无法在您的系统中找到时，configure 会显示对应的提示信息。 - 请查看 http://wiki.winehq.org/Recommended_Packages 以了解您应当安装的 + 请查看 https://wiki.winehq.org/Recommended_Packages 以了解您应当安装的软件包的信息。在 64 位平台上，如果以 32 位的方式编译 Wine（这是默认情况），您必须确保 - 对应函数库的 32 位版本已被安装；请查看 http://wiki.winehq.org/WineOn64bit + 对应函数库的 32 位版本已被安装；请查看 https://wiki.winehq.org/WineOn64bit 以了解详情。如果您想安装一个真正的 64 位 Wine（或者一个混合 32 位 Wine 和 - 64 位 Wine 的版本），请参阅 http://wiki.winehq.org/Wine64 以了解具体内容。 + 64 位 Wine 的版本），请参阅 https://wiki.winehq.org/Wine64 以了解具体内容。 4. 编译 @@ -103,7 +103,7 @@ make 不要忘记事先卸载先前任何安装过的、会引起冲突的 Wine 软件集。请在安装前尝试“dpkg -r wine”、“rpm -e wine”或“make uninstall”。 -一旦安装完成，您可以运行“winecfg”配置工具。请参考 http://www.winehq.org/ +一旦安装完成，您可以运行“winecfg”配置工具。请参考 https://www.winehq.org/ 网站中的支持页面以了解配置技巧。 @@ -129,26 +129,26 @@ Wine 不是十全十美的，所以某些程序可能会崩溃。如果这样的 7. 获取更多信息 -WWW: 有关 Wine 的很多信息可以在 WineHQ 网站：http://www.winehq.org/ +WWW: 有关 Wine 的很多信息可以在 WineHQ 网站：https://www.winehq.org/ 上面找到。包括：各类 Wine 相关的向导、应用程序数据库（AppDB）、漏洞跟踪系统等等。这个网站可能是您最佳的起始之处。 -FAQ: Wine 常见问题位于 http://www.winehq.org/FAQ +FAQ: Wine 常见问题位于 https://www.winehq.org/FAQ -维基： Wine 维基位于 http://wiki.winehq.org +维基： Wine 维基位于 https://wiki.winehq.org 邮件列表：存在数个服务于 Wine 用户和开发者的邮件列表； - 请查看 http://www.winehq.org/forums 以了解更多信息。 + 请查看 https://www.winehq.org/forums 以了解更多信息。 -Bugs: 请向位于 http://bugs.winehq.org 的 Wine Bugzilla 提交 bug。 +Bugs: 请向位于 https://bugs.winehq.org 的 Wine Bugzilla 提交 bug。请在提交漏洞报告前先在 bugzilla 数据库中进行搜索，检查先前是否已有类似的已知问题以避免重复，并跟踪这些问题的修复情况。 IRC: 您可以在 irc.freenode.net 的 #WineHQ 频道获取到在线帮助。 Git: 当前 Wine 的开发树可经由 Git 获取。 - 请前往 http://www.winehq.org/git 以了解更多信息。 + 请前往 https://www.winehq.org/git 以了解更多信息。如果您在代码中添加了某些内容，或是修复了某个 bug，请向 wine-devel(a)winehq.org 这个邮件列表发送对应的补丁（建议使用 -- 2.15.1

1 0

[PATCH] user32/edit: Allow buffer access after EM_GETHANDLE
by Nikolay Sivov 05 Dec '17

05 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/edit.c | 8 ++------ dlls/user32/tests/edit.c | 21 ++++++++++++++++----- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index c8903e26f6..114d842759 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -1264,8 +1264,6 @@ static inline void text_buffer_changed(EDITSTATE *es) */ static void EDIT_LockBuffer(EDITSTATE *es) { - if (es->hlocapp) return; - if (!es->text) { if(!es->hloc32W) return; @@ -1306,8 +1304,6 @@ static void EDIT_LockBuffer(EDITSTATE *es) */ static void EDIT_UnlockBuffer(EDITSTATE *es, BOOL force) { - if (es->hlocapp) return; - /* Edit window might be already destroyed */ if(!IsWindow(es->hwndSelf)) { @@ -1323,7 +1319,6 @@ static void EDIT_UnlockBuffer(EDITSTATE *es, BOOL force) ERR("es->text == 0 ... please report\n"); return; } - if (force || (es->lock_count == 1)) { if (es->hloc32W) { UINT countA = 0; @@ -5205,7 +5200,8 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B break; } - if (IsWindow(hwnd) && es) EDIT_UnlockBuffer(es, FALSE); + if (IsWindow(hwnd) && es && msg != EM_GETHANDLE) + EDIT_UnlockBuffer(es, FALSE); TRACE("hwnd=%p msg=%x (%s) -- 0x%08lx\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), result); diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 783ced66c9..9372c484af 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -2786,12 +2786,10 @@ static void test_EM_GETHANDLE(void) /* See if WM_GETTEXTLENGTH/WM_GETTEXT still work. */ len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); -todo_wine ok(len == lstrlenA(str1), "Unexpected text length %d.\n", len); lstrcpyA(current, str0); r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); -todo_wine ok((r == lstrlenA(str1)) && !lstrcmpA(current, str1), "Unexpected retval %d and text \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1), str1); @@ -2802,15 +2800,28 @@ todo_wine LocalUnlock(hmem); len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); -todo_wine - ok(len == lstrlenA(str1), "Unexpected text length %d.\n", len); + ok(len == lstrlenA(str1_1), "Unexpected text length %d.\n", len); lstrcpyA(current, str0); r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); -todo_wine ok((r == lstrlenA(str1_1)) && !lstrcmpA(current, str1_1), "Unexpected retval %d and text \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1_1), str1_1); + /* See if WM_SETTEXT/EM_REPLACESEL work. */ + r = SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)str1); + ok(r, "Failed to set text.\n"); + + buffer = LocalLock(hmem); + ok(buffer != NULL && buffer[0] == '1', "Unexpected buffer contents\n"); + LocalUnlock(hmem); + + r = SendMessageA(hEdit, EM_REPLACESEL, 0, (LPARAM)str1_1); + ok(r, "Failed to replace selection.\n"); + + buffer = LocalLock(hmem); + ok(buffer != NULL && buffer[0] == '2', "Unexpected buffer contents\n"); + LocalUnlock(hmem); + /* use LocalAlloc first to get a different handle */ halloc = LocalAlloc(LMEM_MOVEABLE, 42); ok(halloc != NULL, "got %p (expected != NULL)\n", halloc); -- 2.15.0

1 0

[Tools v2] testbot: Run make_makefiles when a file is added or removed.
by Zebediah Figura 05 Dec '17

05 Dec '17

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: also run 'git add -A' so that new files will actually be seen by make_makefiles. testbot/bin/build/Build.pl | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 051039f..cf1f1f3 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -74,6 +74,7 @@ sub ApplyPatch($$$) { my ($PatchFile, $PatchType, $BaseName) = @_; + my $NeedMakeMakefiles = !1; my $NeedMakefile = 0; my $NeedMakeInclude = !1; my $NeedBuildDeps = !1; @@ -84,7 +85,7 @@ sub ApplyPatch($$$) { my $Line; while (defined($Line = <FH>) && - ($NeedMakefile == 0 || ! $NeedMakeInclude || ! $NeedBuildDeps || + (! $NeedMakeMakefiles || $NeedMakefile == 0 || ! $NeedMakeInclude || ! $NeedBuildDeps || ! $NeedImplib || ! $NeedAutoconf || ! $NeedConfigure)) { if ($Line =~ m=^diff.*(?:tests/Makefile\.in|Make\.vars\.in|Make\.rules\.in|Maketest\.rules\.in)$=) @@ -111,13 +112,18 @@ sub ApplyPatch($$$) { $NeedConfigure = 1; } + elsif ($Line =~ m=^new file= || $Line =~ m=^deleted file= || $Line =~ m=^rename=) + { + $NeedMakeMakefiles = 1; + } } close FH; } InfoMsg "Applying patch\n"; system("( cd $DataDir/wine && set -x && " . - " git apply --verbose $PatchFile " . + " git apply --verbose $PatchFile && " . + " git add -A " . ") >> $LogDir/Build.log 2>&1"); if ($? != 0) { @@ -125,6 +131,20 @@ sub ApplyPatch($$$) return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure); } + if ($NeedMakeMakefiles) + { + InfoMsg "Running make_makefiles\n"; + system("( cd $DataDir/wine && set -x && " . + " ./tools/make_makefiles " . + ") >> $LogDir/Build.log 2>&1"); + if ($? != 0) + { + LogMsg "make_makefiles failed\n"; + return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure); + } + $NeedConfigure = 1; + } + if ($NeedAutoconf && ! $NeedConfigure) { InfoMsg "Running autoconf\n"; -- 2.7.4

2 1

[PATCH] msi: Complain louder if we can't find a custom action DLL or EXE.
by Zebediah Figura 05 Dec '17

05 Dec '17

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Cursory testing also seems to show that we shouldn't be returning success in the case that we fail to load a DLL, but more thorough testing will be needed in order not to trigger bug #26162. dlls/msi/custom.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 02c3440..2570fe2 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -263,7 +263,7 @@ static MSIBINARY *create_temp_binary( MSIPACKAGE *package, LPCWSTR source, BOOL /* keep a reference to prevent the dll from being unloaded */ if (dll && !(binary->module = LoadLibraryW( tmpfile ))) { - WARN( "failed to load dll %s (%u)\n", debugstr_w( tmpfile ), GetLastError() ); + ERR( "failed to load dll %s (%u)\n", debugstr_w( tmpfile ), GetLastError() ); } binary->source = strdupW( source ); binary->tmpfile = tmpfile; @@ -567,7 +567,7 @@ static DWORD ACTION_CallDllFunction( const GUID *guid ) hModule = LoadLibraryW( dll ); if (!hModule) { - WARN( "failed to load dll %s (%u)\n", debugstr_w( dll ), GetLastError() ); + ERR( "failed to load dll %s (%u)\n", debugstr_w( dll ), GetLastError() ); return ERROR_SUCCESS; } @@ -700,7 +700,7 @@ static HANDLE execute_command( const WCHAR *app, WCHAR *arg, const WCHAR *dir ) } if (!len_exe) { - WARN("can't find executable %u\n", GetLastError()); + ERR("can't find executable %u\n", GetLastError()); msi_free( exe ); return INVALID_HANDLE_VALUE; } @@ -738,7 +738,7 @@ static HANDLE execute_command( const WCHAR *app, WCHAR *arg, const WCHAR *dir ) msi_free( exe ); if (!ret) { - WARN("unable to execute command %u\n", GetLastError()); + ERR("unable to execute command %u\n", GetLastError()); return INVALID_HANDLE_VALUE; } CloseHandle( info.hThread ); -- 2.7.4

2 1

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 05 Dec '17

05 Dec '17

1 0

[PATCH] po: Update Russian translation
by Nikolay Sivov 05 Dec '17

05 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- po/ru.po | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/po/ru.po b/po/ru.po index f3e2baf3e1..3b070da543 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-11-18 12:12+0300\n" +"PO-Revision-Date: 2017-12-05 09:18+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -12015,17 +12015,6 @@ msgid "Icons (*.ico)" msgstr "Значки (*.ico)" #: reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | IMPORT | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -12041,7 +12030,7 @@ msgstr "" " REG [операция] [параметры]\n" "\n" "Поддерживаемые операции:\n" -" ADD | DELETE | IMPORT | QUERY\n" +" ADD | DELETE | IMPORT | EXPORT | QUERY\n" "\n" "Для получения справки по конкретной операции используйте:\n" " REG [операция] /?\n" @@ -12184,22 +12173,16 @@ msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: неизвестная управляющая последовательность [\\%1!c!]\n" #: reg.rc:70 -#, fuzzy -#| msgid "REG IMPORT file.reg\n" msgid "REG EXPORT key_name file.reg [/y]\n" -msgstr "REG IMPORT file.reg\n" +msgstr "REG EXPORT имя_ключа file.reg [/y]\n" #: reg.rc:71 -#, fuzzy -#| msgid "regedit: Invalid system key [%1]\n" msgid "reg: Invalid system key [%1]\n" -msgstr "regedit: неверный системный ключ [%1]\n" +msgstr "reg: неверный системный ключ [%1]\n" #: reg.rc:72 -#, fuzzy -#| msgid "The registry value '%1' already exists. Do you want to overwrite it?" msgid "The file '%1' already exists. Do you want to overwrite it?" -msgstr "Значение «%1» уже существует. Вы хотите заменить его?" +msgstr "Файл «%1» уже существует. Вы хотите заменить его?" #: regedit.rc:34 msgid "&Registry" -- 2.15.0

1 0

Wine Staging (was: WineConf action items)
by Gerald Pfeifer 04 Dec '17

04 Dec '17

Vincent Povirk wrote: > I've decided to spend some time researching staging patches and > bringing them to the attention of maintainers or others who may be > able to put in the extra work required to get them in. This is based > on a discussion we had where some people complained about the number > of patches in staging that aren't being merged. That's a great initiative, thanks for doing that, Vincent. On a related note, recently the release of a Wine staging patchset has been trailing the corresponding release of Wine 2.2x for more than a week (for example, it's still not available for Wine 2.22). What's the outlook there? Any chance that patchset can be made available a day or two after Wine goes out (or, ideally, more or less at the same time)? Gerald

2 1

_Cnd_timedwait timeout
by Stefan Dösinger 04 Dec '17

04 Dec '17

Hi Daniel and Piotr, I am having a trouble with _Cnd_timedwait and I am trying to understand a few things. The problem I'm running into is that the application I am dealing with passes a timestamp that is 30 days into the future. This overflows in _Xtime_diff_to_millis(2) and the result we get is somewhere in the area of -1708070296. Now _Cnd_timedwait casts this to an ULONGLONG, so I would expect the multiplication to come up with the right result, but no, the function passes a timeout of 170807029600000 to NtWaitForKeyedEvent, which is interpreted as an absolute value in the past and instantly times out. To get the right result I have to assign the result of _Xtime_diff_to_millis to an ULONG and cast this back to a 64 bit signed value - otherwise the multiplication happens in unsigned 32 bit and results in a positive number that will fit in a a signed 64 bit integer with ease. So my two questions are: 1) Why go through _Xtime_diff_to_millis at all? If I understand the server code right NtWaitForKeyedEvent should do the right thing if we pass timeout.QuadPart = sec * 1000 * 1000 * 100 + nsec / 10. And indeed in my quick testing this works for the app and passes the tests. Are there timezone issues? 2) What C integer legalese prevents the current code from working? All the signed/unsigned conversion references I found talk about assignments, not casts in calculations. Cheers, Stefan

3 5

[PATCH] user32/tests: Added some tests for WM_GETTEXTLENGTH/WM_GETTEXT after EM_GETHANDLE was used
by Nikolay Sivov 04 Dec '17

04 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/tests/edit.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 0926a589e2..783ced66c9 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -2735,6 +2735,7 @@ static void test_EM_GETHANDLE(void) { static const char str0[] = "untouched"; static const char str1[] = "1111+1111+1111#"; + static const char str1_1[] = "2111+1111+1111#"; static const char str2[] = "2222-2222-2222-2222#"; static const char str3[] = "3333*3333*3333*3333*3333#"; CHAR current[42]; @@ -2783,6 +2784,33 @@ static void test_EM_GETHANDLE(void) "got %d and \"%s\" (expected %d and \"%s\")\n", len, buffer, lstrlenA(str1), str1); LocalUnlock(hmem); + /* See if WM_GETTEXTLENGTH/WM_GETTEXT still work. */ + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); +todo_wine + ok(len == lstrlenA(str1), "Unexpected text length %d.\n", len); + + lstrcpyA(current, str0); + r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); +todo_wine + ok((r == lstrlenA(str1)) && !lstrcmpA(current, str1), + "Unexpected retval %d and text \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1), str1); + + /* Application altered buffer contents, see if WM_GETTEXTLENGTH/WM_GETTEXT pick that up. */ + buffer = LocalLock(hmem); + ok(buffer != NULL, "got %p (expected != NULL)\n", buffer); + buffer[0] = '2'; + LocalUnlock(hmem); + + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); +todo_wine + ok(len == lstrlenA(str1), "Unexpected text length %d.\n", len); + + lstrcpyA(current, str0); + r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); +todo_wine + ok((r == lstrlenA(str1_1)) && !lstrcmpA(current, str1_1), + "Unexpected retval %d and text \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1_1), str1_1); + /* use LocalAlloc first to get a different handle */ halloc = LocalAlloc(LMEM_MOVEABLE, 42); ok(halloc != NULL, "got %p (expected != NULL)\n", halloc); -- 2.15.0

1 0

[Tools] testbot/Janitor: Import File::Path. It's needed for rmtree().
by Francois Gouget 04 Dec '17

04 Dec '17

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Janitor.pl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index fd1b256b..c07c21bd 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -37,6 +37,8 @@ sub BEGIN } } +use File::Path; + use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::Log; -- 2.15.0

1 0

[PATCH] testbot: Don't try to use the Message-Id if the email had none.
by Francois Gouget 04 Dec '17

04 Dec '17

This can happen if one directly feeds the output of git format-patch to the TestBot through formail, which can be useful for testing. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Patches.pm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index b5320dc2..42118e61 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -101,9 +101,12 @@ sub FromSubmission($$) $self->Subject(substr($Subject, 0, $PropertyDescriptor->GetMaxLength())); my $MessageId = $Head->get("Message-Id"); - $MessageId =~ s/\s*\n\s*/ /gs; - $PropertyDescriptor = $self->GetPropertyDescriptorByName("MessageId"); - $self->MessageId(substr($MessageId, 0, $PropertyDescriptor->GetMaxLength())); + if ($MessageId) + { + $MessageId =~ s/\s*\n\s*/ /gs; + $PropertyDescriptor = $self->GetPropertyDescriptorByName("MessageId"); + $self->MessageId(substr($MessageId, 0, $PropertyDescriptor->GetMaxLength())); + } $self->Disposition("Processing"); } -- 2.15.0

1 0

[PATCH] appwiz.cpl: move WineHQ URLs to https (try 2)
by Austin English 04 Dec '17

04 Dec '17

Try 2: Don't update winegecko/winemono download URLs, only the wiki links Signed-off-by: Austin English <austinenglish(a)gmail.com> --- dlls/appwiz.cpl/appwiz.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.rc b/dlls/appwiz.cpl/appwiz.rc index 5c8b31b525..589f27548f 100644 --- a/dlls/appwiz.cpl/appwiz.rc +++ b/dlls/appwiz.cpl/appwiz.rc @@ -102,7 +102,7 @@ FONT 8, "MS Shell Dlg" CONTROL "Wine could not find a Gecko package which is needed for applications embedding HTML " \ "to work correctly. Wine can automatically download and install it for you.\n\n" \ "Note: it is recommended to use your distribution's packages instead. " \ - "See <a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> for details.", + "See <a href=\"https://wiki.winehq.org/Gecko\">https://wiki.winehq.org/Gecko</a> for details.", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP @@ -117,7 +117,7 @@ FONT 8, "MS Shell Dlg" CONTROL "Wine could not find a wine-mono package which is needed for .NET applications " \ "to work correctly. Wine can automatically download and install it for you.\n\n" \ "Note: it is recommended to use your distribution's packages instead. " \ - "See <a href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for details.", + "See <a href=\"https://wiki.winehq.org/Mono\">https://wiki.winehq.org/Mono</a> for details.", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP -- 2.13.6

1 0

[PATCH] mshtml: Avoid potential moniker instance leak
by Nikolay Sivov 04 Dec '17

04 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mshtml/persist.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 25767ef57c..b82750a85e 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -918,10 +918,9 @@ static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, IStream prepare_for_binding(This, mon, FALSE); hres = set_moniker(This->window, mon, NULL, NULL, NULL, TRUE); - if(FAILED(hres)) - return hres; + if(SUCCEEDED(hres)) + hres = channelbsc_load_stream(This->window->pending_window, mon, pStm); - hres = channelbsc_load_stream(This->window->pending_window, mon, pStm); IMoniker_Release(mon); return hres; } @@ -976,10 +975,9 @@ static HRESULT WINAPI PersistStreamInit_InitNew(IPersistStreamInit *iface) prepare_for_binding(This, mon, FALSE); hres = set_moniker(This->window, mon, NULL, NULL, NULL, FALSE); - if(FAILED(hres)) - return hres; + if(SUCCEEDED(hres)) + hres = channelbsc_load_stream(This->window->pending_window, mon, NULL); - hres = channelbsc_load_stream(This->window->pending_window, mon, NULL); IMoniker_Release(mon); return hres; } -- 2.15.0

2 1

[PATCH 6/6] mshtml/tests: Added more event object tests.
by Jacek Caban 04 Dec '17

04 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/events.js | 256 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 255 insertions(+), 1 deletion(-)

1 0

[PATCH 5/6] mshtml: Expose IDocumentEvent to scripts.
by Jacek Caban 04 Dec '17

04 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 4 +++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/documentmode.js | 1 + 3 files changed, 5 insertions(+), 1 deletion(-)

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel