December 2008 - Wine-commits

Alexandre Julliard : include: Disable the asm optimizations for the Windows build.
by Alexandre Julliard 10 Dec '08

10 Dec '08

Module: wine Branch: master Commit: 4bddbedc4189ff58bcc986b9f89f56cbc9c2066b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bddbedc4189ff58bcc986b9f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 9 17:10:20 2008 +0100 include: Disable the asm optimizations for the Windows build. --- include/winbase.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 6fa4dce..e3c8ec9 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2460,7 +2460,7 @@ static inline LONG WINAPI InterlockedDecrement( LONG volatile *dest ) /* A few optimizations for gcc */ -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64)) +#if defined(__GNUC__) && !defined(__MINGW32__) && (defined(__i386__) || defined(__x86_64__)) extern inline DWORD WINAPI GetLastError(void); extern inline DWORD WINAPI GetLastError(void)

1 0

Alexandre Julliard : include: Fix the definition of 64-bit types for Mingw64.
by Alexandre Julliard 10 Dec '08

10 Dec '08

Module: wine Branch: master Commit: 74d63c020c9ab7b356b5cafdfb30b47e9cb952c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74d63c020c9ab7b356b5cafdf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 9 17:42:13 2008 +0100 include: Fix the definition of 64-bit types for Mingw64. --- include/basetsd.h | 2 +- include/msvcrt/direct.h | 2 +- include/msvcrt/io.h | 2 +- include/msvcrt/malloc.h | 2 +- include/msvcrt/mbstring.h | 2 +- include/msvcrt/memory.h | 2 +- include/msvcrt/search.h | 2 +- include/msvcrt/stddef.h | 2 +- include/msvcrt/stdio.h | 2 +- include/msvcrt/stdlib.h | 2 +- include/msvcrt/string.h | 2 +- include/msvcrt/sys/types.h | 2 +- include/msvcrt/time.h | 2 +- include/msvcrt/wchar.h | 2 +- include/windef.h | 17 +++++++++-------- 15 files changed, 23 insertions(+), 22 deletions(-) diff --git a/include/basetsd.h b/include/basetsd.h index 8f853a4..409f958 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -59,7 +59,7 @@ extern "C" { # define __int32 int # endif # ifndef __int64 -# ifdef _WIN64 +# if defined(_WIN64) && !defined(__MINGW64__) # define __int64 long # else # define __int64 long long diff --git a/include/msvcrt/direct.h b/include/msvcrt/direct.h index b0c4af8..d71aee0 100644 --- a/include/msvcrt/direct.h +++ b/include/msvcrt/direct.h @@ -29,7 +29,7 @@ typedef unsigned short wchar_t; #endif #if !defined(_MSC_VER) && !defined(__int64) -# ifdef _WIN64 +# if defined(_WIN64) && !defined(__MINGW64__) # define __int64 long # else # define __int64 long long diff --git a/include/msvcrt/io.h b/include/msvcrt/io.h index 6009fe9..ef4a312 100644 --- a/include/msvcrt/io.h +++ b/include/msvcrt/io.h @@ -25,7 +25,7 @@ typedef unsigned short wchar_t; #endif #if !defined(_MSC_VER) && !defined(__int64) -# ifdef _WIN64 +# if defined(_WIN64) && !defined(__MINGW64__) # define __int64 long # else # define __int64 long long diff --git a/include/msvcrt/malloc.h b/include/msvcrt/malloc.h index bee2173..b71c4fd 100644 --- a/include/msvcrt/malloc.h +++ b/include/msvcrt/malloc.h @@ -39,7 +39,7 @@ #endif #if !defined(_MSC_VER) && !defined(__int64) -# ifdef _WIN64 +# if defined(_WIN64) && !defined(__MINGW64__) # define __int64 long # else # define __int64 long long diff --git a/include/msvcrt/mbstring.h b/include/msvcrt/mbstring.h index 124d215..a9c38cf 100644 --- a/include/msvcrt/mbstring.h +++ b/include/msvcrt/mbstring.h @@ -30,7 +30,7 @@ #endif #if !defined(_MSC_VER) && !defined(__int64) -# ifdef _WIN64 +# if defined(_WIN64) && !defined(__MINGW64__) # define __int64 long # else # define __int64 long long diff --git a/include/msvcrt/memory.h b/include/msvcrt/memory.h index a5217df..e2f5a37 100644 --- a/include/msvcrt/memory.h +++ b/include/msvcrt/memory.h @@ -16,7 +16,7 @@ #endif #if !defined(_MSC_VER) && !defined(__int64) -# ifdef _WIN64 +# if defined(_WIN64) && !defined(__MINGW64__) # define __int64 long # else # define __int64 long long diff --git a/include/msvcrt/search.h b/include/msvcrt/search.h index af648d5..ff5bf80 100644 --- a/include/msvcrt/search.h +++ b/include/msvcrt/search.h @@ -28,7 +28,7 @@ #endif #if !defined(_MSC_VER) && !defined(__int64) -# ifdef _WIN64 +# if defined(_WIN64) && !defined(__MINGW64__) # define __int64 long # else # define __int64 long long diff --git a/include/msvcrt/stddef.h b/include/msvcrt/stddef.h index eb45c87..d0fe7de 100644 --- a/include/msvcrt/stddef.h +++ b/include/msvcrt/stddef.h @@ -28,7 +28,7 @@ #endif #if !defined(_MSC_VER) && !defined(__int64) -# ifdef _WIN64 +# if defined(_WIN64) && !defined(__MINGW64__) # define __int64 long # else # define __int64 long long diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index b177664..55d9444 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -22,7 +22,7 @@ #endif #if !defined(_MSC_VER) && !defined(__int64) -# ifdef _WIN64 +# if defined(_WIN64) && !defined(__MINGW64__) # define __int64 long # else # define __int64 long long diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index ddaae61..0010c33 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -49,7 +49,7 @@ typedef struct #endif #if !defined(_MSC_VER) && !defined(__int64) -# ifdef _WIN64 +# if defined(_WIN64) && !defined(__MINGW64__) # define __int64 long # else # define __int64 long long diff --git a/include/msvcrt/string.h b/include/msvcrt/string.h index a963553..d70cd23 100644 --- a/include/msvcrt/string.h +++ b/include/msvcrt/string.h @@ -23,7 +23,7 @@ typedef unsigned short wchar_t; #endif #if !defined(_MSC_VER) && !defined(__int64) -# ifdef _WIN64 +# if defined(_WIN64) && !defined(__MINGW64__) # define __int64 long # else # define __int64 long long diff --git a/include/msvcrt/sys/types.h b/include/msvcrt/sys/types.h index 663ad62..dac8d64 100644 --- a/include/msvcrt/sys/types.h +++ b/include/msvcrt/sys/types.h @@ -28,7 +28,7 @@ #endif #if !defined(_MSC_VER) && !defined(__int64) -# ifdef _WIN64 +# if defined(_WIN64) && !defined(__MINGW64__) # define __int64 long # else # define __int64 long long diff --git a/include/msvcrt/time.h b/include/msvcrt/time.h index deb17e1..9b9a516 100644 --- a/include/msvcrt/time.h +++ b/include/msvcrt/time.h @@ -37,7 +37,7 @@ typedef unsigned short wchar_t; #endif #if !defined(_MSC_VER) && !defined(__int64) -# ifdef _WIN64 +# if defined(_WIN64) && !defined(__MINGW64__) # define __int64 long # else # define __int64 long long diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 611b738..4e4892f 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -42,7 +42,7 @@ typedef unsigned short wchar_t; #endif #if !defined(_MSC_VER) && !defined(__int64) -# ifdef _WIN64 +# if defined(_WIN64) && !defined(__MINGW64__) # define __int64 long # else # define __int64 long long diff --git a/include/windef.h b/include/windef.h index 8c0a0bb..3c9de7a 100644 --- a/include/windef.h +++ b/include/windef.h @@ -37,18 +37,19 @@ extern "C" { /* Calling conventions definitions */ -#if defined(__i386__) && !defined(_X86_) -# define _X86_ -#endif - -#if defined(_X86_) && !defined(__i386__) -# define __i386__ -#endif - #if defined(__x86_64__) && !defined(_WIN64) #define _WIN64 #endif +#ifndef _WIN64 +# if defined(__i386__) && !defined(_X86_) +# define _X86_ +# endif +# if defined(_X86_) && !defined(__i386__) +# define __i386__ +# endif +#endif + #ifndef __stdcall # ifdef __i386__ # ifdef __GNUC__

1 0

Zachary Goldberg : remove some leftovers from the writing process
by Jeremy Newman 09 Dec '08

09 Dec '08

Module: website Branch: master Commit: 87c04e2cca8ed7359dab1a0e3266c9aef58e93d8 URL: http://source.winehq.org/git/website.git/?a=commit;h=87c04e2cca8ed7359dab1a… Author: Zachary Goldberg <zgold(a)bluesata.com> Date: Tue Dec 9 16:16:41 2008 -0600 remove some leftovers from the writing process --- wwn/en/wn20081209_354.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/wwn/en/wn20081209_354.xml b/wwn/en/wn20081209_354.xml index b435bf0..750622c 100644 --- a/wwn/en/wn20081209_354.xml +++ b/wwn/en/wn20081209_354.xml @@ -72,7 +72,7 @@ Its main goal is to bring in the holiday season with merry making and Wine. It a <p>Welcome to the new and improved winehq.org! WineConf 2008 sparked the idea of redoing the winehq.org, Wiki, AppDB and Bugzilla aesthetics. Jeremy Newman, and *OTHERS* have been working hard on this design ever since! </p> <p> -The new design is meant to have a more modern as well as a more user-centric feel. In particular a lot of effort went into making the winehq.org landing page an effective first place to send people for any information about Wine BLAH BLAH BLAH more on the website from the ML. +The new design is meant to have a more modern as well as a more user-centric feel. In particular a lot of effort went into making the winehq.org landing page an effective first place to send people for any information about Wine. </p> <p>

1 0

Jeremy Newman : add a workaound for old issue and interview URLs
by Jeremy Newman 09 Dec '08

09 Dec '08

Module: website Branch: master Commit: f4cc16f647566c0d015802e714fc2432101fef57 URL: http://source.winehq.org/git/website.git/?a=commit;h=f4cc16f647566c0d015802… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Dec 9 15:04:32 2008 -0600 add a workaound for old issue and interview URLs --- site | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/site b/site index 9915d70..209c6b8 100644 --- a/site +++ b/site @@ -75,6 +75,24 @@ else define("PAGE", 'home'); } +// homepage old URL redirects +if (defined("PAGE") and PAGE == "home") +{ + // fix old WWN issue URLS + if (isset($_GET['issue']) and intval($_GET['issue']) > 0) + { + $html->redirect("{$config->base_url}wwn/{$_GET['issue']}"); + exit(); + } + + // fix old interview URLS + if (isset($_GET['interview']) and intval($_GET['interview']) > 0) + { + $html->redirect("{$config->base_url}interview/{$_GET['interview']}"); + exit(); + } +} + // loag page content $html->page = $html->template("local", PAGE);

1 0

Jeremy Newman : fix documentation link to not use redirect
by Jeremy Newman 09 Dec '08

09 Dec '08

Module: website Branch: master Commit: 59ed3e45161222f131b171cf2e0255c5718174ab URL: http://source.winehq.org/git/website.git/?a=commit;h=59ed3e45161222f131b171… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Dec 9 14:48:50 2008 -0600 fix documentation link to not use redirect clean up docs page a bit --- templates/en/documentation.template | 3 ++- templates/en/help.template | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/templates/en/documentation.template b/templates/en/documentation.template index 42a4008..fc81638 100644 --- a/templates/en/documentation.template +++ b/templates/en/documentation.template @@ -1,6 +1,7 @@  + -<h1>Documentation</h1> +<h1 class="title">Documentation</h1> <h2>Guides</h2> <ul> diff --git a/templates/en/help.template b/templates/en/help.template index 075f892..953f305 100644 --- a/templates/en/help.template +++ b/templates/en/help.template @@ -34,10 +34,10 @@ <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="{$root}/docs"><img src="{$root}/images/docs.png" /><br />Docs</a> + <a href="{$root}/documentation"><img src="{$root}/images/docs.png" /><br />Docs</a> </td> <td valign="top"> - We recommend that you read our online <a href="{$root}/site/docs">Documentation</a> + We recommend that you read our online <a href="{$root}/site/documentation">Documentation</a> to find the answer to your question. Also of interest is our <a href="http://wiki.winehq.org/HowTo">HowTo</a> which contains some useful information for the first time user.

1 0

Alexandre Julliard : update-winehq: Update the generated URLs for the new site.
by Alexandre Julliard 09 Dec '08

09 Dec '08

Module: tools Branch: master Commit: 827d79917e808ebc2ba678c52fac82d227e56e3e URL: http://source.winehq.org/git/tools.git/?a=commit;h=827d79917e808ebc2ba678c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 9 20:06:05 2008 +0100 update-winehq: Update the generated URLs for the new site. --- update-winehq | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/update-winehq b/update-winehq index 6a359a6..046a8b8 100755 --- a/update-winehq +++ b/update-winehq @@ -46,7 +46,7 @@ while (<ANNOUNCE>) if (/^What's new in this release/) { $whats_new = 1; - push @text, " <a href=\"?announce=$rel\">What's new</a> in this release:"; + push @text, " <a href=\"{\$root}/announce/$rel\">What's new</a> in this release:"; next; } if (/^\s*$/) @@ -77,7 +77,7 @@ while (<ANNOUNCE>) } push @text, "<p>The source is <a href=\"http://prdownloads.sourceforge.net/wine/wine-$rel.tar.bz2\">available now</a>.\n"; -push @text, "Binary packages are in the process of being built, and will appear soon at their respective <a href=\"/site/download\">download locations</a>.\n"; +push @text, "Binary packages are in the process of being built, and will appear soon at their respective <a href=\"{\$root}/download\">download locations</a>.\n"; push @text, "</p></body></news>\n"; close ANNOUNCE;

1 0

Jeremy Newman : sync with sidebar changes from appdb
by Jeremy Newman 09 Dec '08

09 Dec '08

Module: bugzilla Branch: master Commit: 86060f4a250135a4704899323bf8255b49f3f5ee URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=86060f4a250135a470489… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Dec 9 14:19:33 2008 -0600 sync with sidebar changes from appdb --- styles.css | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/styles.css b/styles.css index 3f0712d..409a4e9 100644 --- a/styles.css +++ b/styles.css @@ -110,7 +110,6 @@ BODY { } #sidebar LI { width: 156px; - height: 20px; margin: 0; padding: 5px 0 0 0; background-image: url('images/side_menu_bg.png'); @@ -118,7 +117,7 @@ BODY { font-size: 10px; color: white; } -#sidebar LI P { margin: 0; padding: 0 0 0 15px; } +#sidebar LI P { margin: 0; padding: 0 15px 5px 15px; } #sidebar LI.top { height: 33px; margin: 0;

1 0

Jeremy Newman : fix some spacing issues with the sidebar nav
by Jeremy Newman 09 Dec '08

09 Dec '08

Module: appdb Branch: master Commit: 0136e4a92bdefe7943f9fa9f8eb8d45d691a40d5 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=0136e4a92bdefe7943f9fa9f… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Dec 9 14:17:51 2008 -0600 fix some spacing issues with the sidebar nav --- include/menu.php | 2 +- styles.css | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/menu.php b/include/menu.php index 3c6e358..dfa6fc2 100644 --- a/include/menu.php +++ b/include/menu.php @@ -30,7 +30,7 @@ class htmlmenu { function addmisc($sStuff, $sAlign = "left") { - echo "<div align=\"$sAlign\">$sStuff</div>\n"; + echo "<li><p style=\"text-align: $sAlign\">$sStuff</p></li>\n"; } function done($form = null) diff --git a/styles.css b/styles.css index c1faa70..dc41329 100644 --- a/styles.css +++ b/styles.css @@ -110,7 +110,6 @@ BODY { } #sidebar LI { width: 156px; - height: 20px; margin: 0; padding: 5px 0 0 0; background-image: url('images/side_menu_bg.png'); @@ -118,7 +117,7 @@ BODY { font-size: 10px; color: white; } -#sidebar LI P { margin: 0; padding: 0 0 0 15px; } +#sidebar LI P { margin: 0; padding: 0 15px 5px 15px; } #sidebar LI.top { height: 33px; margin: 0;

1 0

Jeremy Newman : adding a simple howto on setting up the website
by Jeremy Newman 09 Dec '08

09 Dec '08

Module: website Branch: master Commit: f274c7ec54fba5d76706ee049113f6dcef44f28e URL: http://source.winehq.org/git/website.git/?a=commit;h=f274c7ec54fba5d76706ee… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Dec 9 14:00:54 2008 -0600 adding a simple howto on setting up the website --- README | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/README b/README new file mode 100644 index 0000000..3ed65c2 --- /dev/null +++ b/README @@ -0,0 +1,41 @@ +WineHQ (lostwages) Website Template Engine +ver 3.0 +by Jeremy Newman <jnewman(a)codeweavers.com> +----------------------------------------------------------------------- + +Installation Requirements: + * Apache 2.0 or higher + * mod_rewrite enabled in Apache config + * PHP 5.0 or higher + +Setting Up. +-------------- +1. cp include/htaccess.sample .htaccess +2. edit .htaccess + * change Rewritebase to the subdir path from the root of your website. + iow, if you have the site as http://www.example.com/winehq_org/ + then Rewritebase /winehq_org/ + otherwise if this site is the root, leave Rewritebase / +3. change last rule RewriteRule ^(.+) /site/$1 to have same path as above, leaving in /site/. + i.e. RewriteRule ^(.+) /winehq_org/site/$1 if using subdir +4. cp include/winehq.conf.sample include/winehq.conf +5. edit include/winehq.conf + +Templates. +-------------- +For any path in your website, create a .template file in templates/en/ +For example, http://www.example.com/winehq_org/new_page + is templates/en/new_page.template +You can nest templates into subdirs. + +The following varables can be used in templates. + +{$root} : relative path back to root of website +{$base_url} : full URL of main website, as defined in winehq.conf +{$self} : same as $_SERVER['PHP_SELF'] in PHP +{$request_uri} : same as $_SERVER['REQUEST_URI'] in PHP + +You can also add global vars to include/globals.conf and they will be availbe as +{$config_[key]} where [key] is the name you defined in globals.conf + +

1 0

Jeremy Newman : hover on sidebar should not change font weight
by Jeremy Newman 09 Dec '08

09 Dec '08

Module: appdb Branch: master Commit: 270b65b0f8d4ebd39f67dab9e4458f994cc8b371 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=270b65b0f8d4ebd39f67dab9… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Dec 9 13:31:40 2008 -0600 hover on sidebar should not change font weight --- styles.css | 38 +------------------------------------- 1 files changed, 1 insertions(+), 37 deletions(-) diff --git a/styles.css b/styles.css index 0013964..c1faa70 100644 --- a/styles.css +++ b/styles.css @@ -137,7 +137,7 @@ BODY { background-repeat: no-repeat; } #sidebar A { font-size: 10px; color: white; text-decoration: none; } -#sidebar A:hover { font-size: 10px; color: #ffcfcf; text-decoration: underline; font-weight: bold; } +#sidebar A:hover { font-size: 10px; text-decoration: underline; } /* main content well */ #main_content { @@ -182,20 +182,6 @@ BODY { } #footer IMG { vertical-align: middle; } -/* debug log */ -#debug_log -{ - clear: both; - height: 150px; - margin: 10px; - border: 2px inset #999999; - font-family: monospace, sans-serif; - color: #c0c0c0; - background-color: #090909; - overflow: auto; - font-size: 10px; -} - /* header text */ H1.title { color: #A50D0D; border-bottom: 1px solid #A50D0D; margin: 0px; } H3.title { color: #A50D0D; border-bottom: 1px solid #A50D0D; margin: 0px; } @@ -254,28 +240,6 @@ div.rbox b.r3 { margin: 0 2px; } div.rbox b.rtop b.r4, b.rbottom b.r4 { margin: 0 1px; height: 2px} div.rbox div.content { margin: 0; background-color: #FFFFFF; } -/* WWN Colors */ -.wwn TABLE { margin: 0px; padding: 0px; border-spacing: 0; } -.wwn TH { color: #A50D0D; border-bottom: 1px solid #A50D0D; margin: 5px 0 5px 0; padding: 5px 0 5px 0; text-align: left; } -.wwnQuote { color: #A8003C; } -p.indent { padding-left: 1em; padding-right: 1em;} - -/* RSS Feed Links */ -ul.rss { - list-style: none; - padding: 0 0 0 2px; - margin: 0; -} -ul.rss li { - background: url("./images/feed.gif") no-repeat 0 1px; - padding: 0px 0 0px 0px; - height: 18px; -} -ul.rss li a { - font-size: 8pt; - padding: 0 0 0 18px; -} - /* template navigation links */ .link-container { position: relative; height: 1.2em; } .link-container p { position: absolute; width: 50%; margin: 0; }

1 0