November 2016 - Wine-Commits

Matteo Bruni : include: Add d3d11 error codes.
by Alexandre Julliard Nov. 14, 2016

Nov. 14, 2016

Module: wine Branch: master Commit: e176ed3d2135704f07facc8a80d4958e0654e1bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e176ed3d2135704f07facc8a8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Nov 14 11:01:51 2016 -0600 include: Add d3d11 error codes. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11.idl | 3 +++ include/winerror.h | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index 767321b..262c932 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -3239,6 +3239,9 @@ cpp_quote("#include <d3d10shader.h>") cpp_quote("#include <d3d10effect.h>") cpp_quote("#include <d3d10_1shader.h>") +const UINT _FACD3D11 = 0x87c; +cpp_quote("#define MAKE_D3D11_HRESULT(code) MAKE_HRESULT(SEVERITY_ERROR, _FACD3D11, code)") + cpp_quote("typedef HRESULT (WINAPI* PFN_D3D11_CREATE_DEVICE)(IDXGIAdapter*,D3D_DRIVER_TYPE,HMODULE,UINT,") cpp_quote(" const D3D_FEATURE_LEVEL*,UINT,UINT,ID3D11Device**,D3D_FEATURE_LEVEL*,ID3D11DeviceContext**);") diff --git a/include/winerror.h b/include/winerror.h index b0848b5..27b86b0 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -3010,6 +3010,11 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define SCARD_W_CACHE_ITEM_STALE _HRESULT_TYPEDEF_(0x80100071) #define SCARD_W_CACHE_ITEM_TOO_BIG _HRESULT_TYPEDEF_(0x80100072) +#define D3D11_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS _HRESULT_TYPEDEF_(0x887c0001) +#define D3D11_ERROR_FILE_NOT_FOUND _HRESULT_TYPEDEF_(0x887c0002) +#define D3D11_ERROR_TOO_MANY_UNIQUE_VIEW_OBJECTS _HRESULT_TYPEDEF_(0x887c0003) +#define D3D11_ERROR_DEFERRED_CONTEXT_MAP_WITHOUT_INITIAL_DISCARD _HRESULT_TYPEDEF_(0x887c0004) + #define WINCODEC_ERR_WRONGSTATE _HRESULT_TYPEDEF_(0x88982f04) #define WINCODEC_ERR_VALUEOUTOFRANGE _HRESULT_TYPEDEF_(0x88982f05) #define WINCODEC_ERR_UNKNOWNIMAGEFORMAT _HRESULT_TYPEDEF_(0x88982f07)

1 0

Jeremy Newman : rename devel to getinvolved
by Jeremy Newman Nov. 14, 2016

Nov. 14, 2016

Module: website Branch: master Commit: b6ff3a82d533a39db445870dcb3695f3821a19d7 URL: http://source.winehq.org/git/website.git/?a=commit;h=b6ff3a82d533a39db44587… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Nov 14 15:15:29 2016 -0600 rename devel to getinvolved added redirect for old page --- include/htaccess.sample | 9 +++++---- templates/de/{devel.template => getinvolved.template} | 0 templates/de/home.template | 2 +- templates/en/{devel.template => getinvolved.template} | 0 templates/en/home.template | 6 +++--- templates/es/home.template | 2 +- templates/fr/home.template | 2 +- templates/pl/{devel.template => getinvolved.template} | 0 templates/pl/home.template | 2 +- templates/pt/home.template | 2 +- templates/tr/{devel.template => getinvolved.template} | 0 templates/tr/home.template | 2 +- templates/uk/home.template | 2 +- 13 files changed, 15 insertions(+), 14 deletions(-) diff --git a/include/htaccess.sample b/include/htaccess.sample index 39f329b..ae04e8d 100644 --- a/include/htaccess.sample +++ b/include/htaccess.sample @@ -31,10 +31,11 @@ RedirectPermanent /index.php https://www.winehq.org/ RedirectPermanent /about.shtml https://www.winehq.org/about RedirectPermanent /about/index.php https://www.winehq.org/about RedirectPermanent /community.shtml https://www.winehq.org/contributions -RedirectPermanent /dev https://www.winehq.org/devel -RedirectPermanent /dev.shtml https://www.winehq.org/devel -RedirectPermanent /dev.html https://www.winehq.org/devel -RedirectPermanent /devstart.shtml https://www.winehq.org/devel +RedirectPermanent /devel https://www.winehq.org/getinvolved +RedirectPermanent /dev https://www.winehq.org/getinvolved +RedirectPermanent /dev.shtml https://www.winehq.org/getinvolved +RedirectPermanent /dev.html https://www.winehq.org/getinvolved +RedirectPermanent /devstart.shtml https://www.winehq.org/getinvolved RedirectPermanent /download/index.php https://www.winehq.org/download RedirectPermanent /download.shtml https://www.winehq.org/download RedirectPermanent /download.html https://www.winehq.org/download diff --git a/templates/de/devel.template b/templates/de/getinvolved.template similarity index 100% rename from templates/de/devel.template rename to templates/de/getinvolved.template diff --git a/templates/de/home.template b/templates/de/home.template index e8e79ba..05ad0ff 100644 --- a/templates/de/home.template +++ b/templates/de/home.template @@ -63,7 +63,7 @@ </a> <div class="clear"></div> - <a class="winehq_menu_item devel" href="{$root}/devel"> + <a class="winehq_menu_item devel" href="{$root}/getinvolved"> <span class="icon"></span> <span class="title">Entwicklung</span> <span class="subtitle">Werde ein Wine-Entwickler.</span> diff --git a/templates/en/devel.template b/templates/en/getinvolved.template similarity index 100% rename from templates/en/devel.template rename to templates/en/getinvolved.template diff --git a/templates/en/home.template b/templates/en/home.template index 88d2341..00bb228 100644 --- a/templates/en/home.template +++ b/templates/en/home.template @@ -63,10 +63,10 @@ </a> <div class="clear"></div> - <a class="winehq_menu_item devel" href="{$root}/devel"> + <a class="winehq_menu_item devel" href="{$root}/getinvolved"> <span class="icon"></span> - <span class="title">Development</span> - <span class="subtitle">Become a Wine developer.</span> + <span class="title">Get Involved</span> + <span class="subtitle">Become a Wine advocate.</span> </a> <div class="clear"></div> diff --git a/templates/es/home.template b/templates/es/home.template index a96bfdf..7b33c51 100644 --- a/templates/es/home.template +++ b/templates/es/home.template @@ -63,7 +63,7 @@ </a> <div class="clear"></div> - <a class="winehq_menu_item devel" href="{$root}/devel"> + <a class="winehq_menu_item devel" href="{$root}/getinvolved"> <span class="icon"></span> <span class="title">Desarrollo</span> <span class="subtitle">Conviértase en un desarrollador de Wine.</span> diff --git a/templates/fr/home.template b/templates/fr/home.template index 87b5577..78822bd 100644 --- a/templates/fr/home.template +++ b/templates/fr/home.template @@ -63,7 +63,7 @@ </a> <div class="clear"></div> - <a class="winehq_menu_item devel" href="{$root}/devel"> + <a class="winehq_menu_item devel" href="{$root}/getinvolved"> <span class="icon"></span> <span class="title">Développement</span> <span class="subtitle">Devenez un développeur Wine.</span> diff --git a/templates/pl/devel.template b/templates/pl/getinvolved.template similarity index 100% rename from templates/pl/devel.template rename to templates/pl/getinvolved.template diff --git a/templates/pl/home.template b/templates/pl/home.template index fdbf5b1..10f9d0a 100644 --- a/templates/pl/home.template +++ b/templates/pl/home.template @@ -67,7 +67,7 @@ za to z wyglądem podobnym do innych aplikacji na twoim komputerze.</p> </a> <div class="clear"></div> - <a class="winehq_menu_item devel" href="{$root}/devel"> + <a class="winehq_menu_item devel" href="{$root}/getinvolved"> <span class="icon"></span> <span class="title">Rozwój</span> <span class="subtitle">Zacznij programować dla Wine.</span> diff --git a/templates/pt/home.template b/templates/pt/home.template index e3a2e21..6f0e146 100644 --- a/templates/pt/home.template +++ b/templates/pt/home.template @@ -67,7 +67,7 @@ com um visual semelhante às outras aplicações do seu computador.</p> </a> <div class="clear"></div> - <a class="winehq_menu_item devel" href="{$root}/devel"> + <a class="winehq_menu_item devel" href="{$root}/getinvolved"> <span class="icon"></span> <span class="title">Desenvolvimento</span> <span class="subtitle">Torne-se um desenvolvedor do Wine.</span> diff --git a/templates/tr/devel.template b/templates/tr/getinvolved.template similarity index 100% rename from templates/tr/devel.template rename to templates/tr/getinvolved.template diff --git a/templates/tr/home.template b/templates/tr/home.template index 7830139..7603cc9 100644 --- a/templates/tr/home.template +++ b/templates/tr/home.template @@ -63,7 +63,7 @@ </a> <div class="clear"></div> - <a class="winehq_menu_item devel" href="{$root}/devel"> + <a class="winehq_menu_item devel" href="{$root}/getinvolved"> <span class="icon"></span> <span class="title">Geliştir</span> <span class="subtitle">Wine geliştiricisi olun.</span> diff --git a/templates/uk/home.template b/templates/uk/home.template index 02e1821..54c30a6 100644 --- a/templates/uk/home.template +++ b/templates/uk/home.template @@ -63,7 +63,7 @@ </a> <div class="clear"></div> - <a class="winehq_menu_item devel" href="{$root}/devel"> + <a class="winehq_menu_item devel" href="{$root}/getinvolved"> <span class="icon"></span> <span class="title">Розробка</span> <span class="subtitle">Стати розробником Wine.</span>

1 0

Jeremy Newman : move contrubuting link to top of table
by Jeremy Newman Nov. 14, 2016

Nov. 14, 2016

Module: website Branch: master Commit: fbf484b7699c19587422953f6b31e97b77a0e72e URL: http://source.winehq.org/git/website.git/?a=commit;h=fbf484b7699c1958742295… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Nov 14 15:21:23 2016 -0600 move contrubuting link to top of table --- templates/de/getinvolved.template | 20 ++++++++++---------- templates/en/getinvolved.template | 18 +++++++++--------- templates/pl/getinvolved.template | 20 ++++++++++---------- templates/tr/getinvolved.template | 16 ++++++++-------- 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/templates/de/getinvolved.template b/templates/de/getinvolved.template index 828b5fe..895cfc3 100644 --- a/templates/de/getinvolved.template +++ b/templates/de/getinvolved.template @@ -15,37 +15,37 @@ Hilfsmittel, die wir unseren Entwicklern zur Verfügung stellen.</p> <tr bgcolor="#ffffff"> <td> - <a href="https://wiki.winehq.org/Developers">Wine Wiki Entwicklerdokumentation (en)</a> + <a href="https://wiki.winehq.org/Main_Page#Contribute">Zu Wine beitragen</a> </td> <td valign="top"> - Die <a href="https://wiki.winehq.org/Developers">Wine Wiki Developer</a>-Seiten werden aktuellere - Informationen haben, als diese Seite. Sie sollten das Erste sein, was sich neue Entwickler ansehen. + Informationen für beginnende Mitarbeiter. </td> </tr> <tr bgcolor="#ffffff"> <td> - <a href="https://www.codeweavers.com/about/jobs">Praktika</a> + <a href="https://wiki.winehq.org/Developers">Wine Wiki Entwicklerdokumentation (en)</a> </td> <td valign="top"> - Ab Herbst 2009 wird CodeWeavers jedes Quartal 1-2 Praktikumstellen im Wine-Entwicklungsbereich für - qualifizierende Studenten anbieten. Wir nehmen Bewerbungen für diese Stellen zu jedem Zeitpunkt - entgegen. Studenten sind gleichermaßen aus den USA wie auch aus Übersee willkommen. + Die <a href="https://wiki.winehq.org/Developers">Wine Wiki Developer</a>-Seiten werden aktuellere + Informationen haben, als diese Seite. Sie sollten das Erste sein, was sich neue Entwickler ansehen. </td> </tr> <tr bgcolor="#ffffff"> <td> - <a href="https://wiki.winehq.org/WineHelfen">Zu Wine beitragen</a> + <a href="https://www.codeweavers.com/about/jobs">Praktika</a> </td> <td valign="top"> - Informationen für beginnende Mitarbeiter. + Ab Herbst 2009 wird CodeWeavers jedes Quartal 1-2 Praktikumstellen im Wine-Entwicklungsbereich für + qualifizierende Studenten anbieten. Wir nehmen Bewerbungen für diese Stellen zu jedem Zeitpunkt + entgegen. Studenten sind gleichermaßen aus den USA wie auch aus Übersee willkommen. </td> </tr> <tr bgcolor="#ffffff"> <td> - <a href="{$root}/docs/winedev-guide/index">Entwicklerhandbuch</a> + <a href="https://wiki.winehq.org/Wine_Developer's_Guide">Entwicklerhandbuch</a> </td> <td valign="top"> Online verfügbares Handbuch für die Wine-Entwicklung. diff --git a/templates/en/getinvolved.template b/templates/en/getinvolved.template index 10cf5f2..956fc83 100644 --- a/templates/en/getinvolved.template +++ b/templates/en/getinvolved.template @@ -14,31 +14,31 @@ various resources available for our developers.</p> <div class="row padding-md"> <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/Developers">Wine Wiki Developer Documentation</a> + <a href="https://wiki.winehq.org/Main_Page#Contribute">Contributing to Wine</a> </div> <div class="col-xs-9 col-md-10"> - The <a href="https://wiki.winehq.org/Developers">Wine Wiki Developer</a> pages will have more current - information than this page. It should be the first place for new developers to look. + Information for 1st time contributors. </div> </div> <div class="row padding-md"> <div class="col-xs-3 col-md-2"> - <a href="https://www.codeweavers.com/about/jobs">Internships</a> + <a href="https://wiki.winehq.org/Developers">Wine Wiki Developer Documentation</a> </div> <div class="col-xs-9 col-md-10"> - CodeWeavers fills 1-2 Wine Development Internship slots every quarter for students and recent graduates. - Applications are accepted on an ongoing basis, and candidates from both the United States and overseas - are welcome. + The <a href="https://wiki.winehq.org/Developers">Wine Wiki Developer</a> pages will have more current + information than this page. It should be the first place for new developers to look. </div> </div> <div class="row padding-md"> <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/Main_Page#Contribute">Contributing to Wine</a> + <a href="https://www.codeweavers.com/about/jobs">Internships</a> </div> <div class="col-xs-9 col-md-10"> - Information for 1st time contributors. + CodeWeavers fills 1-2 Wine Development Internship slots every quarter for students and recent graduates. + Applications are accepted on an ongoing basis, and candidates from both the United States and overseas + are welcome. </div> </div> diff --git a/templates/pl/getinvolved.template b/templates/pl/getinvolved.template index 07ffba2..1e432a5 100644 --- a/templates/pl/getinvolved.template +++ b/templates/pl/getinvolved.template @@ -15,37 +15,37 @@ rozmaitych materiałów dostępnych dla programistów Wine.</p> <tr bgcolor="#ffffff"> <td> - <a href="https://wiki.winehq.org/Developers">Dokumentacja Wine Wiki Developer</a> + <a href="https://wiki.winehq.org/Main_Page#Contribute">Udzielanie się w Wine</a> </td> <td valign="top"> - Strony <a href="https://wiki.winehq.org//Developers">Wine Wiki Developer</a> będą zawierały bardziej aktualne - informacje niż ta strona. Powinno to miejsce pierwsze w kolejności do odwiedzenia przez nowych programistów. + Informacje dla tych, którzy będą się udzielali po raz pierwszy. </td> </tr> <tr bgcolor="#ffffff"> <td> - <a href="https://www.codeweavers.com/about/jobs">Praktyki/Staże</a> + <a href="https://wiki.winehq.org/Developers">Dokumentacja Wine Wiki Developer</a> </td> <td valign="top"> - Z początkiem jesieni 2009, CodeWeavers będzie oferował od 1 do 2 miejsc w Wine Development Internship na każdy kwartał - dla wykwalifikowanych studentów na poziomie przed dyplomowym i podyplomowym. Aplikacje na te miejsca przyjmujemy w - trybie ciągłym. Studenci ze Stanów Zjednoczonych jak i zagraniczni są równie miło widziani. + Strony <a href="https://wiki.winehq.org/Developers">Wine Wiki Developer</a> będą zawierały bardziej aktualne + informacje niż ta strona. Powinno to miejsce pierwsze w kolejności do odwiedzenia przez nowych programistów. </td> </tr> <tr bgcolor="#ffffff"> <td> - <a href="https://wiki.winehq.org/HelpingWine">Udzielanie się w Wine</a> + <a href="https://www.codeweavers.com/about/jobs">Praktyki/Staże</a> </td> <td valign="top"> - Informacje dla tych, którzy będą się udzielali po raz pierwszy. + Z początkiem jesieni 2009, CodeWeavers będzie oferował od 1 do 2 miejsc w Wine Development Internship na każdy kwartał + dla wykwalifikowanych studentów na poziomie przed dyplomowym i podyplomowym. Aplikacje na te miejsca przyjmujemy w + trybie ciągłym. Studenci ze Stanów Zjednoczonych jak i zagraniczni są równie miło widziani. </td> </tr> <tr bgcolor="#ffffff"> <td> - <a href="{$root}/docs/winedev-guide/index">Przewodnik programisty</a> + <a href="https://wiki.winehq.org/Wine_Developer's_Guide">Przewodnik programisty</a> </td> <td valign="top"> Materiały online na temat programowania dla Wine. diff --git a/templates/tr/getinvolved.template b/templates/tr/getinvolved.template index 7b93124..e838d7b 100644 --- a/templates/tr/getinvolved.template +++ b/templates/tr/getinvolved.template @@ -14,35 +14,35 @@ <tr bgcolor="#ffffff"> <td> - <a href="https://wiki.winehq.org/Developers">Wine Wiki Geliştirici Belgeleri</a> + <a href="https://wiki.winehq.org/Main_Page#Contribute">Wine'a Katkıda Bulunmak</a> </td> <td valign="top"> - The <a href="https://wiki.winehq.org//Developers">Wine Wiki Geliştirici</a> sayfaları bu sayfadan daha güncel bilgi içerecektir. Bu sayfa yeni geliştiricilerin bakması gereken ilk yer olmalıdır. + İlk kez katkıda bulunanlar için bilgi. </td> </tr> <tr bgcolor="#ffffff"> <td> - <a href="https://www.codeweavers.com/about/jobs">Stajlar</a> + <a href="https://wiki.winehq.org/Developers">Wine Wiki Geliştirici Belgeleri</a> </td> <td valign="top"> - CodeWeavers, her 3 ayda bir öğrenciler ve yeni mezunlar için 1-2 Wine Geliştirme Staj pozisyonunu doldurur. - Başvurular sürekli kabul edilir ve Amerika ve diğer ülkelerden de kabul edilmektedir. + The <a href="https://wiki.winehq.org//Developers">Wine Wiki Geliştirici</a> sayfaları bu sayfadan daha güncel bilgi içerecektir. Bu sayfa yeni geliştiricilerin bakması gereken ilk yer olmalıdır. </td> </tr> <tr bgcolor="#ffffff"> <td> - <a href="https://wiki.winehq.org/HelpingWine">Wine'a Katkıda Bulunmak</a> + <a href="https://www.codeweavers.com/about/jobs">Stajlar</a> </td> <td valign="top"> - İlk kez katkıda bulunanlar için bilgi. + CodeWeavers, her 3 ayda bir öğrenciler ve yeni mezunlar için 1-2 Wine Geliştirme Staj pozisyonunu doldurur. + Başvurular sürekli kabul edilir ve Amerika ve diğer ülkelerden de kabul edilmektedir. </td> </tr> <tr bgcolor="#ffffff"> <td> - <a href="{$root}/docs/winedev-guide/index">Geliştirici Kılavuzu</a> + <a href="https://wiki.winehq.org/Wine_Developer's_Guide">Geliştirici Kılavuzu</a> </td> <td valign="top"> Wine ile geliştirme için çevrimiçi kaynak.

1 0

Jeremy Newman : add link to privacy policy
by Jeremy Newman Nov. 14, 2016

Nov. 14, 2016

Module: website Branch: master Commit: 5cd3dd8c672bf46fef5fa83b3966c79b17a251c5 URL: http://source.winehq.org/git/website.git/?a=commit;h=5cd3dd8c672bf46fef5fa8… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Nov 14 15:15:08 2016 -0600 add link to privacy policy --- templates/en/global/layout/content.template | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/en/global/layout/content.template b/templates/en/global/layout/content.template index ab5dc78..226edc8 100644 --- a/templates/en/global/layout/content.template +++ b/templates/en/global/layout/content.template @@ -68,6 +68,7 @@ <span class="glyphicon glyphicon-globe large"></span> {$langCur} (<a href="{$root}/lang">{$langChange}</a>) </div> <div class="col-xs-6 text-right"> + <a href="https://wiki.winehq.org/WineHQ_Wiki:Privacy_policy">Privacy Policy</a><br><br> {trans($hosted_by)} <a href="https://www.codeweavers.com/"><img src="{$root}/images/cw_logo_sm.png" alt="CodeWeavers" title="{trans($hosted_by_alt)}"></a>

1 0

Jeremy Newman : create authors file to give credit where it is due
by Jeremy Newman Nov. 14, 2016

Nov. 14, 2016

Module: appdb Branch: master Commit: 754a603b045cbf084b13afc237ab26a08de89e55 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=754a603b045cbf084b13afc2… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Nov 14 10:40:39 2016 -0600 create authors file to give credit where it is due --- AUTHORS | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..f443da0 --- /dev/null +++ b/AUTHORS @@ -0,0 +1,43 @@ +# WineHQ Application Database (AppDB) Authors and Contributors + +Maintainer: + Jeremy Newman <jnewman(a)codeweavers.com> + +Adam Lewis +Alexander Nicolaysen Sørnes +Alexander N. Sørnes +Alexandre Julliard +Alexandru Balut +Alex Băluț +Andre Hentschel +Andrew Nguyen +Austin English +Ben Hodgetts +Charles Leop +Chris Morgan +Christoph Korn +daoo +David Lee Lambert +EA Durbin +Edwin Smulders +Eric Blade +Francois Gouget +Henti Smith +Ivan Leo Puoti +Jason Weisberger +Jeff Zaroyko +Jeremy Newman +Jonathan Ernst +Loki Satyr +Lukas Middendorf +Luke Bratch +Marcus Meissner +Michael Ploujnikov +Mitchell Mebane +Ofir Petruska +Paul van Schayck +Rafal Maj +Ricardo Filipe +Stefan Pflüger +Tom Wickline +Tony Lambregts

1 0

Jeremy Newman : change wiki link, markdown
by Jeremy Newman Nov. 14, 2016

Nov. 14, 2016

Module: appdb Branch: master Commit: 2431809b02e2c23c58e5f6621730c765c08ccffb URL: http://source.winehq.org/git/appdb.git/?a=commit;h=2431809b02e2c23c58e5f662… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Nov 14 10:42:01 2016 -0600 change wiki link, markdown --- TODO | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TODO b/TODO index a827994..3e59ea0 100644 --- a/TODO +++ b/TODO @@ -1,5 +1,5 @@ -WineHQ Application Database TODO List +# WineHQ Application Database TODO List For the current TODO list please refer to the Wine Wiki at: -http://wiki.winehq.org/AppdbInfo +https://wiki.winehq.org/AppDB_ToDo_List

1 0

Jeremy Newman : add help redirect, and fix 404
by Jeremy Newman Nov. 14, 2016

Nov. 14, 2016

Module: appdb Branch: master Commit: 80cdb3beb74fe6dd159baa0e3d230cc2edfe0d84 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=80cdb3beb74fe6dd159baa0e… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Nov 14 10:41:39 2016 -0600 add help redirect, and fix 404 --- .htaccess | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 98a1d1e..5884b93 100644 --- a/.htaccess +++ b/.htaccess @@ -4,11 +4,14 @@ allow from all # uncomment this to take the website offline # RedirectMatch ^.*$ http://appdb.winehq.org/site_outage.html +# Redirects +RedirectPermanent /help https://wiki.winehq.org/Category:AppDB + # Set Our Default Directory Index DirectoryIndex index.php # 404 not found document -ErrorDocument 404 http://www.winehq.org/site/404 +ErrorDocument 404 https://www.winehq.org/site/404 # Modify the PHP configuration (global vars, etc.) php_flag allow_call_time_pass_reference 1

1 0

Jeremy Newman : update, convert to markdown syntax, cleanup
by Jeremy Newman Nov. 14, 2016

Nov. 14, 2016

Module: appdb Branch: master Commit: 85526a780e99f833177de92519894f5221732e5d URL: http://source.winehq.org/git/appdb.git/?a=commit;h=85526a780e99f833177de925… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Nov 14 10:40:13 2016 -0600 update, convert to markdown syntax, cleanup --- README | 104 ++++++++++++++++------------------------------------------------- 1 file changed, 25 insertions(+), 79 deletions(-) diff --git a/README b/README index c13d3fc..c624bf6 100644 --- a/README +++ b/README @@ -1,93 +1,39 @@ -WineHQ Application Database -#------------------------------------------------------------------------# -Authors: +# WineHQ Application Database + +Maintainer: Jeremy Newman <jnewman(a)codeweavers.com> - Charles Leop <charles(a)codeweavers.com> - -Contributors: - Paul van Schayck <polleke(a)gmail.com> - Chris Morgan <cmorgan(a)alum.wpi.edu> - Tony Lambregts <tony_lambregts(a)telusplanet.net> - Jonathan Ernst <Jonathan(a)ErnstFamily.ch> -To install locally for testing/hacking: -#------------------------------------------------------------------------# +## To install locally for testing/hacking: + +1. Copy AppDB files to somewhere where your web server can access them. -# Symlink from /var/www to the appdb directory +2. Copy include/config.php.sample to include/config.php -# Copy include/config.php.sample to include/config.php +3. Edit include/config.php as you see fit, the default name of the database + used in the table creation step below is "apidb", you'll have to modify + these files if you change this in config.php -# Edit include/config.php as you see fit, the default name of the database - used in the table creation step below is "apidb", you'll have to modify - these files if you change this in config.php - - # NOTE: You must update the APPDB_ROOT entry to be YOUR url to the application database - If this the APPDB_ROOT isn't correct your urls will point to the wrong pages. + **NOTE:** You must update the APPDB_ROOT entry to be YOUR url to the application database + If this the APPDB_ROOT isn't correct your urls will point to the wrong pages. - # NOTE: if you've changed the name of the database by changing the define of - 'APPS_DB' in include/config.php you'll have to modify the 'create database' and 'use' + **NOTE:** if you've changed the name of the database by changing the define of + *APPS_DB* in include/config.php you'll have to modify the *create database* and *use* entries in pretty much every file in the /tables/ directory. The recommendation is to leave the default value of APPS_DB to keep things simple -# 'cd tables', run './create_tables' to create the database tables - -# Look in include/config.php at the 'APPS_DBUSER' and 'APPS_DBPASS' defines. - Ensure that this user and password exist in your mysql users list and that this user - has been granted 'SELECT', 'INSERT', 'UPDATE' and 'DELETE' privileges on the database - defined by the value of 'APPS_DB' in include/config.php - -# Try to open up localhost/appdb, if you get a directory listing - Edit your /etc/apache/httpd.conf "DirectoryIndex" to include index.php - so apache will open index.php after not finding index.html/index.htm etc - -# Also ensure these options in /etc/apache/php.ini: - register_globals 0 - short_open_tag 0 - register_long_arrays 0 - magic_quotes_gpc 0 - Or ensure your appdb directory has AllowOverride' set to 'All' inside - httpd.conf to let .htaccess set these settings. - -# An AppDB admin user has been automatically created while running - the create_tables script - email: admin(a)localhost - password: testing - You should change the password as soon as possible! - -#------------------------------------------------------------------------# -You can either set up a real bugzilla database or a fake one -# -# cd tables, run ./create_bugzilla_tables to create the fake bugzilla tables -#------------------------------------------------------------------------# -# or installing a real bugzilla database (hope this helps) -# -# download buzilla (password for cvs is cvs) - -cd /var/www/html -export CVSROOT=:pserver:cvs(a)cvs.winehq.org:/home/wine -cvs login -cvs -z 0 checkout bugzilla - -# change directory to bugzilla and change the group ownership to apache. - -cd bugzilla -chgrp -R apache . -chmod -R g+rX . - +4. to create the database tables: `cd tables; ./create_tables` -# change to su and run ./checksetup.pl and fix up what it finds wrong. -# this may take several runs +5. Look in include/config.php at the 'APPS_DBUSER' and 'APPS_DBPASS' defines. + Ensure that this user and password exist in your mysql users list and that this user + has been granted 'SELECT', 'INSERT', 'UPDATE' and 'DELETE' privileges on the database + defined by the value of 'APPS_DB' in include/config.php -su -./checksetup.pl +6. Ensure your appdb directory has *AllowOverride* set to *All* in Apache config to let + .htaccess use required PHP settings. Or duplicate the .htaccess/PHP settings in your Apache config. -# in the /etc/httpd/conf/hppt.conf file find "AddHandler cgi-script .cgi" and add the following. +7. An AppDB admin user has been automatically created while running the create_tables script -<Directory "/var/www/html/bugzilla"> -Options ExecCGI -AllowOverride Limit -Order allow,deny -Allow from all -</Directory> + **email:** admin(a)localhost **password:** testing -# edit local config as necessary to allow access. +8. You can either set up a real bugzilla database or a fake one. +to create the fake bugzilla tables: `cd tables; ./create_bugzilla_tables`

1 0

Jeremy Newman : removed
by Jeremy Newman Nov. 14, 2016

Nov. 14, 2016

Module: appdb Branch: master Commit: 7a30372a911f4150fac75034adf31ed9eddebb77 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=7a30372a911f4150fac75034… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Nov 14 10:41:10 2016 -0600 removed --- README.xinha_customizations | 43 ------------------------------------------- 1 file changed, 43 deletions(-) diff --git a/README.xinha_customizations b/README.xinha_customizations deleted file mode 100644 index 787e4eb..0000000 --- a/README.xinha_customizations +++ /dev/null @@ -1,43 +0,0 @@ -Removed: - contrib/ - exapmles/ - plugins/Abbreviation - plugins/CSS - plugins/CSSPicker - plugins/DefinitionList - plugins/DoubleClick - plugins/EditTag - plugins/Equation - don't think we need this - plugins/ExtendedFileManager - plugins/FormOperations - plugins/Forms - plugins/GenericPlugin - demo plugin - plugins/GetHtml - plugins/HorizontalRule - plugins/HtmlEntities - plugins/InsertAnchor - plugins/InsertNote - plugins/InsertPagebreak - plugins/InsertSmiley - no thanks - plugins/InsertSnippet - plugins/InsertSnippet2 - plugins/InsertWords - plugins/ImageManager - plugins/LangMarks - plugins/Linker - plugins/MootoolsFileManager - plugins/PasteText - plugins/PersistentStorage - plugins/PreserveScripts - plugins/PSFixed - plugins/PSLocal - plugins/PSServer - plugins/QuickTag - plugins/SaveOnBlur - plugins/SaveSubmit - plugins/SetId - plugins/SmartReplace - plugins/UnFormat - plugins/UnsavedChanges - plugins/WysiwigWrap - unsupported_plugins/

1 0

Jeremy Newman : change email link to send to forum page instead
by Jeremy Newman Nov. 13, 2016

Nov. 13, 2016

Module: appdb Branch: master Commit: 3de12f6d20c627c28f745e42c2d879ed77f038f7 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=3de12f6d20c627c28f745e42… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Sun Nov 13 14:59:50 2016 -0600 change email link to send to forum page instead --- include/sidebar.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/sidebar.php b/include/sidebar.php index fdd5b83..d748f2e 100644 --- a/include/sidebar.php +++ b/include/sidebar.php @@ -22,7 +22,7 @@ function global_sidebar_menu() $g->add("Help", "https://wiki.winehq.org/Category:AppDB"); $g->add("Statistics", BASE."appdbStats.php"); $g->add('Distributions ('.distribution::objectGetEntriesCount('accepted').')', BASE.'objectManager.php?sClass=distribution&sTitle=View%20Distributions'); - $g->add("Email Us", "mailto:appdb(a)winehq.org"); + $g->add("Contact Us", "https://forum.winehq.org/viewforum.php?f=11"); $g->done(); }

1 0