September 2012 - Wine-commits

Henri Verbeet : d3d10core: Implement d3d10_depthstencil_view_GetDesc().
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: 05d1fbb392c71b4fd81c30d58961a49f9242119c URL: http://source.winehq.org/git/wine.git/?a=commit;h=05d1fbb392c71b4fd81c30d58… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 13 09:18:14 2012 +0200 d3d10core: Implement d3d10_depthstencil_view_GetDesc(). --- dlls/d3d10core/d3d10core_private.h | 3 +- dlls/d3d10core/device.c | 2 +- dlls/d3d10core/view.c | 115 +++++++++++++++++++++++++++++++++++- 3 files changed, 116 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index f45fd34..25fda7c 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -129,11 +129,12 @@ struct d3d10_depthstencil_view ID3D10DepthStencilView ID3D10DepthStencilView_iface; LONG refcount; + D3D10_DEPTH_STENCIL_VIEW_DESC desc; ID3D10Resource *resource; }; HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view, - ID3D10Resource *resource) DECLSPEC_HIDDEN; + ID3D10Resource *resource, const D3D10_DEPTH_STENCIL_VIEW_DESC *desc) DECLSPEC_HIDDEN; /* ID3D10RenderTargetView */ struct d3d10_rendertarget_view diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index d184c02..e6c26c2 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -803,7 +803,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilView(ID3D10Devic return E_OUTOFMEMORY; } - if (FAILED(hr = d3d10_depthstencil_view_init(object, resource))) + if (FAILED(hr = d3d10_depthstencil_view_init(object, resource, desc))) { WARN("Failed to initialize depthstencil view, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index 9bf4fcb..40712fc 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -45,6 +45,101 @@ static struct wined3d_resource *wined3d_resource_from_resource(ID3D10Resource *r } } +static HRESULT set_dsdesc_from_resource(D3D10_DEPTH_STENCIL_VIEW_DESC *desc, ID3D10Resource *resource) +{ + D3D10_RESOURCE_DIMENSION dimension; + HRESULT hr; + + ID3D10Resource_GetType(resource, &dimension); + + switch (dimension) + { + case D3D10_RESOURCE_DIMENSION_TEXTURE1D: + { + D3D10_TEXTURE1D_DESC texture_desc; + ID3D10Texture1D *texture; + + if (FAILED(hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture1D, (void **)&texture))) + { + ERR("Resource of type TEXTURE1D doesn't implement ID3D10Texture1D.\n"); + return E_INVALIDARG; + } + + ID3D10Texture1D_GetDesc(texture, &texture_desc); + ID3D10Texture1D_Release(texture); + + desc->Format = texture_desc.Format; + if (texture_desc.ArraySize == 1) + { + desc->ViewDimension = D3D10_DSV_DIMENSION_TEXTURE1D; + desc->u.Texture1D.MipSlice = 0; + } + else + { + desc->ViewDimension = D3D10_DSV_DIMENSION_TEXTURE1DARRAY; + desc->u.Texture1DArray.MipSlice = 0; + desc->u.Texture1DArray.FirstArraySlice = 0; + desc->u.Texture1DArray.ArraySize = 1; + } + + return S_OK; + } + + case D3D10_RESOURCE_DIMENSION_TEXTURE2D: + { + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10Texture2D *texture; + + if (FAILED(hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture2D, (void **)&texture))) + { + ERR("Resource of type TEXTURE2D doesn't implement ID3D10Texture2D.\n"); + return E_INVALIDARG; + } + + ID3D10Texture2D_GetDesc(texture, &texture_desc); + ID3D10Texture2D_Release(texture); + + desc->Format = texture_desc.Format; + if (texture_desc.ArraySize == 1) + { + if (texture_desc.SampleDesc.Count == 1) + { + desc->ViewDimension = D3D10_DSV_DIMENSION_TEXTURE2D; + desc->u.Texture2D.MipSlice = 0; + } + else + { + desc->ViewDimension = D3D10_DSV_DIMENSION_TEXTURE2DMS; + } + } + else + { + if (texture_desc.SampleDesc.Count == 1) + { + desc->ViewDimension = D3D10_DSV_DIMENSION_TEXTURE2DARRAY; + desc->u.Texture2DArray.MipSlice = 0; + desc->u.Texture2DArray.FirstArraySlice = 0; + desc->u.Texture2DArray.ArraySize = 1; + } + else + { + desc->ViewDimension = D3D10_DSV_DIMENSION_TEXTURE2DMSARRAY; + desc->u.Texture2DMSArray.FirstArraySlice = 0; + desc->u.Texture2DMSArray.ArraySize = 1; + } + } + + return S_OK; + } + + default: + FIXME("Unhandled resource dimension %#x.\n", dimension); + case D3D10_RESOURCE_DIMENSION_BUFFER: + case D3D10_RESOURCE_DIMENSION_TEXTURE3D: + return E_INVALIDARG; + } +} + static HRESULT set_rtdesc_from_resource(D3D10_RENDER_TARGET_VIEW_DESC *desc, ID3D10Resource *resource) { D3D10_RESOURCE_DIMENSION dimension; @@ -269,7 +364,11 @@ static void STDMETHODCALLTYPE d3d10_depthstencil_view_GetResource(ID3D10DepthSte static void STDMETHODCALLTYPE d3d10_depthstencil_view_GetDesc(ID3D10DepthStencilView *iface, D3D10_DEPTH_STENCIL_VIEW_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3d10_depthstencil_view *view = impl_from_ID3D10DepthStencilView(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + *desc = view->desc; } static const struct ID3D10DepthStencilViewVtbl d3d10_depthstencil_view_vtbl = @@ -290,11 +389,23 @@ static const struct ID3D10DepthStencilViewVtbl d3d10_depthstencil_view_vtbl = }; HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view, - ID3D10Resource *resource) + ID3D10Resource *resource, const D3D10_DEPTH_STENCIL_VIEW_DESC *desc) { + HRESULT hr; + view->ID3D10DepthStencilView_iface.lpVtbl = &d3d10_depthstencil_view_vtbl; view->refcount = 1; + if (!desc) + { + if (FAILED(hr = set_dsdesc_from_resource(&view->desc, resource))) + return hr; + } + else + { + view->desc = *desc; + } + view->resource = resource; ID3D10Resource_AddRef(resource);

1 0

Jeremy Newman : update to CSS3 rounded corners
by Jeremy Newman 13 Sep '12

13 Sep '12

Module: website Branch: master Commit: 2cf54af445334916cddec3996c3ed637815eeb12 URL: http://source.winehq.org/git/website.git/?a=commit;h=2cf54af445334916cddec3… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Sep 13 10:52:41 2012 -0500 update to CSS3 rounded corners --- templates/de/home.template | 54 +++++++++++++++++-------------------------- templates/en/home.template | 1 + templates/es/home.template | 54 +++++++++++++++++-------------------------- templates/fr/home.template | 54 +++++++++++++++++-------------------------- templates/he/home.template | 54 +++++++++++++++++-------------------------- templates/pl/home.template | 54 +++++++++++++++++-------------------------- templates/pt/home.template | 54 +++++++++++++++++-------------------------- templates/tr/home.template | 54 +++++++++++++++++-------------------------- 8 files changed, 148 insertions(+), 231 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=2cf54af445334916cd…

1 0

Jeremy Newman : updated content well to use CSS3 rounded corners instead of the old hack
by Jeremy Newman 13 Sep '12

13 Sep '12

Module: website Branch: master Commit: deeb1b3231feb1673fc352eb7b8f5a01dabd3661 URL: http://source.winehq.org/git/website.git/?a=commit;h=deeb1b3231feb1673fc352… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Sep 12 20:26:06 2012 -0500 updated content well to use CSS3 rounded corners instead of the old hack --- templates/de/global/themes/winehq/content.template | 8 +------- templates/en/global/themes/winehq/content.template | 8 +------- templates/fr/global/themes/winehq/content.template | 8 +------- templates/he/global/themes/winehq/content.template | 8 +------- templates/tr/global/themes/winehq/content.template | 8 +------- 5 files changed, 5 insertions(+), 35 deletions(-) diff --git a/templates/de/global/themes/winehq/content.template b/templates/de/global/themes/winehq/content.template index 17579c6..3810436 100644 --- a/templates/de/global/themes/winehq/content.template +++ b/templates/de/global/themes/winehq/content.template @@ -52,19 +52,13 @@ </div> <div id="main_content"> - <div class="rbox"> - <b class="rtop"><b class="r1"></b><b class="r2"></b><b class="r3"></b><b class="r4"></b></b> - <div class="content" style="padding: 35px 20px 10px 80px"> + <div class="content cornerround" style="padding: 35px 20px 10px 80px">  - {$page_body} -  </div> - <b class="rbottom"><b class="r4"></b><b class="r3"></b><b class="r2"></b><b class="r1"></b></b> - </div> </div> <div id="footer"> diff --git a/templates/en/global/themes/winehq/content.template b/templates/en/global/themes/winehq/content.template index 9467a67..eba6d2d 100644 --- a/templates/en/global/themes/winehq/content.template +++ b/templates/en/global/themes/winehq/content.template @@ -51,19 +51,13 @@ </div> <div id="main_content"> - <div class="rbox"> - <b class="rtop"><b class="r1"></b><b class="r2"></b><b class="r3"></b><b class="r4"></b></b> - <div class="content" style="padding: 35px 20px 10px 80px"> + <div class="content cornerround" style="padding: 35px 20px 10px 80px">  - {$page_body} -  </div> - <b class="rbottom"><b class="r4"></b><b class="r3"></b><b class="r2"></b><b class="r1"></b></b> - </div> </div> <div id="footer"> diff --git a/templates/fr/global/themes/winehq/content.template b/templates/fr/global/themes/winehq/content.template index 93d92fa..b14e532 100644 --- a/templates/fr/global/themes/winehq/content.template +++ b/templates/fr/global/themes/winehq/content.template @@ -51,19 +51,13 @@ </div> <div id="main_content"> - <div class="rbox"> - <b class="rtop"><b class="r1"></b><b class="r2"></b><b class="r3"></b><b class="r4"></b></b> - <div class="content" style="padding: 35px 20px 10px 80px"> + <div class="content cornerround" style="padding: 35px 20px 10px 80px">  - {$page_body} -  </div> - <b class="rbottom"><b class="r4"></b><b class="r3"></b><b class="r2"></b><b class="r1"></b></b> - </div> </div> <div id="footer"> diff --git a/templates/he/global/themes/winehq/content.template b/templates/he/global/themes/winehq/content.template index fb7f647..7f91621 100644 --- a/templates/he/global/themes/winehq/content.template +++ b/templates/he/global/themes/winehq/content.template @@ -52,19 +52,13 @@ </div> <div id="main_content"> - <div class="rbox"> - <b class="rtop"><b class="r1"></b><b class="r2"></b><b class="r3"></b><b class="r4"></b></b> - <div class="content" style="padding: 35px 80px 10px 20px"> + <div class="content cornerround" style="padding: 35px 20px 10px 80px">  - {$page_body} -  </div> - <b class="rbottom"><b class="r4"></b><b class="r3"></b><b class="r2"></b><b class="r1"></b></b> - </div> </div> <div id="footer"> diff --git a/templates/tr/global/themes/winehq/content.template b/templates/tr/global/themes/winehq/content.template index 40e7e76..5dc8ad6 100644 --- a/templates/tr/global/themes/winehq/content.template +++ b/templates/tr/global/themes/winehq/content.template @@ -51,19 +51,13 @@ </div> <div id="main_content"> - <div class="rbox"> - <b class="rtop"><b class="r1"></b><b class="r2"></b><b class="r3"></b><b class="r4"></b></b> - <div class="content" style="padding: 35px 20px 10px 80px"> + <div class="content cornerround" style="padding: 35px 20px 10px 80px">  - {$page_body} -  </div> - <b class="rbottom"><b class="r4"></b><b class="r3"></b><b class="r2"></b><b class="r1"></b></b> - </div> </div> <div id="footer">

1 0

Jeremy Newman : use CSS3 rounded corners on homepage
by Jeremy Newman 13 Sep '12

13 Sep '12

Module: website Branch: master Commit: c5dbfd19b1a85ad3fab4f638493eceeb32824f38 URL: http://source.winehq.org/git/website.git/?a=commit;h=c5dbfd19b1a85ad3fab4f6… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Sep 12 20:26:42 2012 -0500 use CSS3 rounded corners on homepage --- templates/en/home.template | 55 ++++++++++++++++--------------------------- 1 files changed, 21 insertions(+), 34 deletions(-) diff --git a/templates/en/home.template b/templates/en/home.template index f397d91..cbd8cb4 100644 --- a/templates/en/home.template +++ b/templates/en/home.template @@ -6,9 +6,7 @@ <div id="main_left"> - <div class="rbox"> - <b class="rtop"><b class="r1"></b><b class="r2"></b><b class="r3"></b><b class="r4"></b></b> - <div class="content" style="padding: 15px 10px 20px 60px; height: 445px; overflow: auto;"> + <div class="content cornerround" style="padding: 15px 10px 20px 60px; height: 445px; overflow: auto;"> <div class="winehq_menu"> <div class="info" onClick="document.location='{$root}/about/';"> @@ -53,50 +51,39 @@ </div> </div> - <b class="rbottom"><b class="r4"></b><b class="r3"></b><b class="r2"></b><b class="r1"></b></b> - </div> - </div> <div id="main_right"> - <div class="rbox"> - <b class="rtop"><b class="r1"></b><b class="r2"></b><b class="r3"></b><b class="r4"></b></b> - <div class="content" style="padding: 5px 10px 5px 10px; height: 85px; overflow: auto;"> - + <div class="content cornerround" style="padding: 10px; height: 85px; overflow: auto;"> <h3 class="title" style="margin: 0;">Latest Releases</h3> - <table style="margin: 7px 0 0 15px; border-spacing: 0; border: 0;"> - <tr><td>Stable:</td> - <td style="padding-left: 15px; padding-bottom: 2px;"> - <b><a href="{$root}/announce/{$config_stable_release}">Wine {$config_stable_release}</a></b> - <span class="small"> - (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_…">shortlog</a>) - </span> - </td></tr> - <tr><td>Development:</td> - <td style="padding-left: 15px;"> - <b><a href="{$root}/announce/{$config_master_release}">Wine {$config_master_release}</a></b> - <span class="small"> - (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_…">shortlog</a>) - </span> - </td></tr> - </table> + <table style="margin: 7px 0 0 15px; border-spacing: 0; border: 0;"> + <tr><td>Stable:</td> + <td style="padding-left: 15px; padding-bottom: 2px;"> + <b><a href="{$root}/announce/{$config_stable_release}">Wine {$config_stable_release}</a></b> + <span class="small"> + (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_…">shortlog</a>) + </span> + </td></tr> + <tr><td>Development:</td> + <td style="padding-left: 15px;"> + <b><a href="{$root}/announce/{$config_master_release}">Wine {$config_master_release}</a></b> + <span class="small"> + (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_…">shortlog</a>) + </span> + </td></tr> + </table> </div> - <b class="rbottom"><b class="r4"></b><b class="r3"></b><b class="r2"></b><b class="r1"></b></b> - </div> - - <div class="rbox" style="margin-top: 15px;"> - <b class="rtop"><b class="r1"></b><b class="r2"></b><b class="r3"></b><b class="r4"></b></b> - <div class="content" style="padding: 10px; height: 340px; overflow: auto;"> + <div class="content cornerround" style="margin-top: 15px; padding: 10px 0px 10px 10px;"> + <div style="height: 340px; overflow: auto; padding-right: 10px;"> <h3 class="title"><a href="{$root}/news/">News</a></h3>  <p><a href="{$root}/news/">more news...</a></p> + </div> </div> - <b class="rbottom"><b class="r4"></b><b class="r3"></b><b class="r2"></b><b class="r1"></b></b> - </div> </div>

1 0

Kyle Auble : Remove links to Dev. Cheatsheet
by Jeremy Newman 13 Sep '12

13 Sep '12

Module: website Branch: master Commit: 6660e5620375e660c2795296d6783a3d36a06c81 URL: http://source.winehq.org/git/website.git/?a=commit;h=6660e5620375e660c27952… Author: Kyle Auble <randomidman48(a)yahoo.com> Date: Tue Sep 11 15:10:30 2012 -0700 Remove links to Dev. Cheatsheet The cheatsheet's content isn't very focused or introductory. Splitting it up over the proper wiki pages makes more sense. --- templates/de/devel.template | 9 --------- templates/de/documentation.template | 6 ------ templates/en/devel.template | 9 --------- templates/en/documentation.template | 7 ------- templates/he/devel.template | 9 --------- templates/he/documentation.template | 6 ------ templates/pl/devel.template | 9 --------- templates/pl/documentation.template | 7 ------- templates/tr/devel.template | 9 --------- 9 files changed, 0 insertions(+), 71 deletions(-) diff --git a/templates/de/devel.template b/templates/de/devel.template index 61c5d4b..b0a629f 100644 --- a/templates/de/devel.template +++ b/templates/de/devel.template @@ -45,15 +45,6 @@ Hilfsmittel, die wir unseren Entwicklern zur Verfügung stellen.</p> <tr bgcolor="#ffffff"> <td> - <a href="{$root}/developer-cheatsheet">Entwickler-Spickzettel</a> - </td> - <td valign="top"> - Fünf-Minuten Einführung in die Wine-Entwicklung - </td> - </tr> - - <tr bgcolor="#ffffff"> - <td> <a href="{$root}/docs/winedev-guide/index">Entwicklerhandbuch</a> </td> <td valign="top"> diff --git a/templates/de/documentation.template b/templates/de/documentation.template index e66c6f2..82a3fae 100644 --- a/templates/de/documentation.template +++ b/templates/de/documentation.template @@ -41,13 +41,7 @@ <li> <a href="{$root}/howto">Wie man dabei hilft Programme mit Wine zum laufen zu kriegen (en)</a><br> Eine kurze Einführung für alle die uns helfen wollen das es funktioniert.<br> - </li><br> - - <li> - <a href="{$root}/developer-cheatsheet">Erste Schritte zur Wine Entwicklung (en)</a><br> - Ein Crashkurs im Wine entwickeln und debuggen.<br> </li> - </ul> <h2>Man Pages</h2> diff --git a/templates/en/devel.template b/templates/en/devel.template index 422edd8..b72130e 100644 --- a/templates/en/devel.template +++ b/templates/en/devel.template @@ -45,15 +45,6 @@ various resources available for our developers.</p> <tr bgcolor="#ffffff"> <td> - <a href="{$root}/developer-cheatsheet">Developer Cheatsheet</a> - </td> - <td valign="top"> - 5 minute intro to Wine development - </td> - </tr> - - <tr bgcolor="#ffffff"> - <td> <a href="{$root}/docs/winedev-guide/index">Developers Guide</a> </td> <td valign="top"> diff --git a/templates/en/documentation.template b/templates/en/documentation.template index 7f5496d..d00a1c2 100644 --- a/templates/en/documentation.template +++ b/templates/en/documentation.template @@ -42,14 +42,7 @@ <a href="{$root}/howto">How to help get applications working in Wine</a><br> A short guide for those who want to help us make things work.<br> - </li><br> - - <li> - <a href="{$root}/developer-cheatsheet">Getting started with Wine - development</a><br> - A crash course in Wine development and debugging. <br> </li> - </ul> <h2>Man Pages</h2> diff --git a/templates/he/devel.template b/templates/he/devel.template index 0f70353..8d3e7f4 100644 --- a/templates/he/devel.template +++ b/templates/he/devel.template @@ -44,15 +44,6 @@ <tr bgcolor="#ffffff"> <td> - <a href="{$root}/developer-cheatsheet">שליף למתכנתים</a> - </td> - <td valign="top"> - הקדמה של 5 דקות לתכנות Wine. - </td> - </tr> - - <tr bgcolor="#ffffff"> - <td> <a href="{$root}/docs/winedev-guide/index">מדריך למתכנתים</a> </td> <td valign="top"> diff --git a/templates/he/documentation.template b/templates/he/documentation.template index 6e88f08..b08dab0 100644 --- a/templates/he/documentation.template +++ b/templates/he/documentation.template @@ -42,13 +42,7 @@ <a href="{$root}/howto">כיצד לסייע בהסבת יישומים כדי שיעבדו ב־Wine</a><br> מדריך קצר לאלו המעוניינים לסייע לנו כדי שהדברים יעבדו.<br> - </li><br> - - <li> - <a href="{$root}/developer-cheatsheet">כיצדל התחיל בתכנות Wine</a><br> - קורס מהיר לתכנות וניפוי שגיאות ב־Wine. <br> </li> - </ul> <h2>עמודי Man (מדריכי שימוש)</h2> diff --git a/templates/pl/devel.template b/templates/pl/devel.template index 97c2f45..1fbd8fe 100644 --- a/templates/pl/devel.template +++ b/templates/pl/devel.template @@ -45,15 +45,6 @@ rozmaitych materiałów dostępnych dla programistów Wine.</p> <tr bgcolor="#ffffff"> <td> - <a href="{$root}/developer-cheatsheet">Developer Cheatsheet</a> - </td> - <td valign="top"> - 5-minutowe wprowadzenie w programowanie dla Wine - </td> - </tr> - - <tr bgcolor="#ffffff"> - <td> <a href="{$root}/docs/winedev-guide/index">Przewodnik programisty</a> </td> <td valign="top"> diff --git a/templates/pl/documentation.template b/templates/pl/documentation.template index 728d186..6b8be5d 100644 --- a/templates/pl/documentation.template +++ b/templates/pl/documentation.template @@ -42,14 +42,7 @@ <a href="{$root}/howto">Jak pomóc w procesie uruchamiania aplikacji pod Wine</a><br> Krótki przewodnik dla tych, którzy chcą nam pomóc w umożliwianiu uruchamiania aplikacji.<br> - </li><br> - - <li> - <a href="{$root}/developer-cheatsheet">Pierwsze kroki w programowaniu - Wine</a><br> - Wypłyń na głęboką wodę w programowaniu i debugowaniu Wine. <br> </li> - </ul> <h2>Instrukcje obsługi</h2> diff --git a/templates/tr/devel.template b/templates/tr/devel.template index a35adb5..b9705ba 100644 --- a/templates/tr/devel.template +++ b/templates/tr/devel.template @@ -44,15 +44,6 @@ <tr bgcolor="#ffffff"> <td> - <a href="{$root}/developer-cheatsheet">Developer Cheatsheet</a> - </td> - <td valign="top"> - 5 minute intro to Wine development - </td> - </tr> - - <tr bgcolor="#ffffff"> - <td> <a href="{$root}/docs/winedev-guide/index">Developers Guide</a> </td> <td valign="top">

1 0

Kyle Auble : Delete Developer Cheatsheets
by Jeremy Newman 13 Sep '12

13 Sep '12

Module: website Branch: master Commit: d82d59ec1dcd8a7fdc0943a2127ff28a8f137125 URL: http://source.winehq.org/git/website.git/?a=commit;h=d82d59ec1dcd8a7fdc0943… Author: Kyle Auble <randomidman48(a)yahoo.com> Date: Tue Sep 11 15:10:49 2012 -0700 Delete Developer Cheatsheets The Hebrew version was completely untranslated so only the German and English versions' content was moved to the wiki. --- templates/de/developer-cheatsheet.template | 642 ---------------------------- templates/en/developer-cheatsheet.template | 569 ------------------------ templates/he/developer-cheatsheet.template | 569 ------------------------ 3 files changed, 0 insertions(+), 1780 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=d82d59ec1dcd8a7fdc…

1 0

Kyle Auble : Rewrite English About page
by Jeremy Newman 13 Sep '12

13 Sep '12

Module: website Branch: master Commit: fc7376c259d0b04378c3ca85068fbb6310d72563 URL: http://source.winehq.org/git/website.git/?a=commit;h=fc7376c259d0b04378c3ca… Author: Kyle Auble <randomidman48(a)yahoo.com> Date: Tue Sep 11 15:11:00 2012 -0700 Rewrite English About page Rewrite of the About page to include content from the wiki. Reformatted the page in the process. --- templates/en/about.template | 69 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 61 insertions(+), 8 deletions(-) diff --git a/templates/en/about.template b/templates/en/about.template index 8696f5b..4531a3a 100644 --- a/templates/en/about.template +++ b/templates/en/about.template @@ -3,20 +3,73 @@ <h1 class="title">About Wine</h1> -<p>Wine lets you run Windows software on other operating systems. With Wine, you can install and run these applications just like you would in Windows.</p> +<p>Wine (originally an acronym for "Wine Is Not an Emulator") is a +compatibility layer capable of running Windows applications on several +POSIX-compliant operating systems, such as Linux, Mac OSX, & BSD. +Instead of simulating internal Windows logic like a virtual machine or +emulator, Wine translates Windows API calls into POSIX calls on-the-fly, +eliminating the performance and memory penalties of other methods and +allowing you to cleanly integrate Windows applications into your +desktop.</p> -<p>Wine is still under active development. Not every program works yet, however there are already <a href="http://wiki.winehq.org/UsageStatistics" title="Wine Usage Statistics">several million people</a> using Wine to run their software.</p> +<p>Wine began in 1993 under the initial coordination of Bob Amstadt as a +way to support running Windows 3.1 programs on Linux. Very early on, +leadership over Wine's development passed to Alexandre Julliard, who has +managed the project ever since. Over the years, as the Windows API and +applications have evolved to take advantage of new hardware and +software, Wine has adapted to support new features, all while being +ported to other OSes, becoming more stable, and providing a better +user-experience.</p> + +<p>An ambitious project by definition, work on Wine would steadily +continue for 15 years before the program finally reached v1.0, the first +stable release, in 2008. Several releases later, Wine is still under +active development today, and although there is more work to be done, +<a href="http://wiki.winehq.org/UsageStatistics" title="Wine Usage +Statistics">millions of people</a> are estimated to use Wine to run +their Windows software on the OS of their choice.</p> <h3>Open Source and User Driven</h3> -<p>Wine will always be <a href="http://wiki.winehq.org/Licensing" title="Wine licensing">free software</a>. Approximately half of Wine's source code is written by volunteers. The rest is sponsored by commercial interests, especially <a href="http://www.codeweavers.com/products/" title="CodeWeavers CrossOver Office">CodeWeavers</a> who sell a supported version of Wine.</p> +<p>Wine will always be <a href="http://www.winehq.org/license" +title="Wine licensing">free software</a>. Approximately half of Wine's +source code is written by volunteers, with the remaining effort +sponsored by commercial interests, especially +<a href="http://www.codeweavers.com/products/" title="CodeWeavers +CrossOver Office">CodeWeavers</a>, which sells a supported version of +Wine.</p> -<p>Wine is heavily reliant on its user community. User tests fill our <a href="http://appdb.winehq.org/" title="Wine Application Database">Application Database</a> to track how well programs work, and all the answers in the <a href="http://forums.winehq.org/" title="WineHQ Forums">forums</a> come from volunteers.</p> +<p>Wine is heavily reliant on its user community too. Users volunteer +their time to share tips and test results on how well their programs +work in our <a href="http://appdb.winehq.org/" title="Wine Application +Database">Application Database</a>, file bug reports to notify +developers of problems in our <a href="http://bugs.winehq.org/" +title="Bugzilla">Bug-Tracker</a>, and answer questions in our +<a href="http://forums.winehq.org/" title="WineHQ Forums">forums</a>. +</p> <h3>Learn more:</h3> + +<p><i>(Several of the following pages are currently being reworked and +may not be up-to-date)</i></p> + <ul> - <li><a href="http://wiki.winehq.org/ImportanceOfWine">Why Wine is so Important</a></li> - <li><a href="http://wiki.winehq.org/Debunking_Wine_Myths">Common Myths about Wine</a></li> - <li><a href="http://wiki.winehq.org/WineHistory">History of the Wine Project</a></li> - <li><a href="http://wiki.winehq.org/ProjectOrganization">Organization and Leadership</a></li> + <li><a href="http://wiki.winehq.org/ImportanceOfWine">Why Wine is so + Important</a> + </li> + <li><a href="http://wiki.winehq.org/Debunking_Wine_Myths">Common + Myths about Wine</a> + </li> + <li><a href="http://wiki.winehq.org/WineHistory">History of the Wine + Project</a> + </li> + <li><a href="http://wiki.winehq.org/ProjectOrganization"> + Organization and Leadership</a> + </li> + <li><a href="http://wiki.winehq.org/WhosWho">Some Contributor Bios + </a> + </li> + <li><a href="http://wiki.winehq.org/Acknowledgements">Other + Acknowledgements</a> + </li> </ul>

1 0

Jeremy Newman : added cornerround, and white background for content wells
by Jeremy Newman 13 Sep '12

13 Sep '12

Module: website Branch: master Commit: aacacdde0e890fd6eb3684e0b14da1e5a4e6ad1f URL: http://source.winehq.org/git/website.git/?a=commit;h=aacacdde0e890fd6eb3684… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Sep 12 17:02:35 2012 -0500 added cornerround, and white background for content wells --- styles.css | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/styles.css b/styles.css index da0d476..65c948f 100644 --- a/styles.css +++ b/styles.css @@ -100,6 +100,9 @@ BODY { padding: 85px 10px 10px 100px; } +/* set background color of content wells */ +#main_content .content, #main_left .content, #main_right .content { background-color: #fff; } + /* main content well front page left column */ #main_left { width: 58%; @@ -226,6 +229,14 @@ hr text-align: left; } +/* rounded corners */ +.cornerround +{ + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; +} + /* Rounded Corner Box */ div.rbox { display:block; margin: 0px; } div.rbox b.rtop, b.rbottom { display:block; margin: 0px; }

1 0

Piotr Caban : msvcp: Fixed displaying of not NULL-terminated strings in debug traces.
by Alexandre Julliard 12 Sep '12

12 Sep '12

Module: wine Branch: master Commit: dadc409bae6bd326beb5b03ca4d20e9e44250481 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dadc409bae6bd326beb5b03ca… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 12 13:27:42 2012 +0200 msvcp: Fixed displaying of not NULL-terminated strings in debug traces. --- dlls/msvcp100/string.c | 24 ++++++++++++------------ dlls/msvcp60/string.c | 24 ++++++++++++------------ dlls/msvcp90/string.c | 24 ++++++++++++------------ 3 files changed, 36 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dadc409bae6bd326beb5b…

1 0

Qian Hong : gdi32: Fixed localized font full name (UNIQUE ID).
by Alexandre Julliard 12 Sep '12

12 Sep '12

Module: wine Branch: master Commit: 6c1e264e8e6d6c76db3c40e491bd83810cab0865 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c1e264e8e6d6c76db3c40e49… Author: Qian Hong <fracting(a)gmail.com> Date: Wed Sep 12 21:42:04 2012 +0800 gdi32: Fixed localized font full name (UNIQUE ID). --- dlls/gdi32/freetype.c | 4 +++- dlls/gdi32/tests/font.c | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9412df2..2587d99 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6578,7 +6578,9 @@ static BOOL get_outline_text_metrics(GdiFont *font) } lenface = (strlenW(face_nameW) + 1) * sizeof(WCHAR); - full_nameW = get_face_name( ft_face, TT_NAME_ID_UNIQUE_ID, TT_MS_LANGID_ENGLISH_UNITED_STATES ); + full_nameW = get_face_name( ft_face, TT_NAME_ID_UNIQUE_ID, GetSystemDefaultLangID() ); + if (!full_nameW) + full_nameW = get_face_name( ft_face, TT_NAME_ID_UNIQUE_ID, TT_MS_LANGID_ENGLISH_UNITED_STATES ); if (!full_nameW) { WCHAR fake_nameW[] = {'f','a','k','e',' ','n','a','m','e', 0}; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 0c67fe7..3b79bd0 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4147,7 +4147,12 @@ static void test_fullname2_helper(const char *Family) bufW[0] = 0; bufA[0] = 0; - ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_UNIQUE_ID, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_UNIQUE_ID, bufW, buf_size, GetSystemDefaultLangID()); + if (!ret) + { + trace("no localized UNIQUE_ID found.\n"); + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_UNIQUE_ID, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); + } ok(ret, "UNIQUE_ID (full name) could not be read\n"); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpFullName;

1 0