wine-commits February 2012

wine-commits@winehq.org

2 participants
442 discussions

Henri Verbeet : ddraw/tests: Add tests for color keyed texturing with an alpha channel.
by Alexandre Julliard 29 Feb '12

29 Feb '12

Module: wine Branch: master Commit: 3c5a2549c504ccf31b88193b96e3ac2ff878c829 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c5a2549c504ccf31b88193b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 28 19:48:41 2012 +0100 ddraw/tests: Add tests for color keyed texturing with an alpha channel. --- dlls/ddraw/tests/ddraw1.c | 247 ++++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 208 ++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 191 ++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 158 +++++++++++++++++++++++++++++ 4 files changed, 801 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3c5a2549c504ccf31b881…

1 0

Henri Verbeet : wined3d: Support color keyed WINED3DFMT_B8G8R8A8_UNORM surfaces.
by Alexandre Julliard 29 Feb '12

29 Feb '12

Module: wine Branch: master Commit: 9c2575865625360b12b74360a0652199b299934f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c2575865625360b12b74360a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 28 19:48:40 2012 +0100 wined3d: Support color keyed WINED3DFMT_B8G8R8A8_UNORM surfaces. Color keying and alpha channels aren't mutually exclusive. --- dlls/wined3d/state.c | 7 +------ dlls/wined3d/surface.c | 28 ++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 6974321..a5d748a 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -538,12 +538,7 @@ static void state_alpha(struct wined3d_context *context, const struct wined3d_st struct wined3d_surface *surf = surface_from_resource(texture->sub_resources[0]); if (surf->CKeyFlags & WINEDDSD_CKSRCBLT) - { - /* The surface conversion does not do color keying conversion for surfaces that have an alpha - * channel on their own. Likewise, the alpha test shouldn't be set up for color keying if the - * surface has alpha bits */ - if (!surf->resource.format->alpha_mask) enable_ckey = TRUE; - } + enable_ckey = TRUE; } } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d293940..9ec3db3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4554,6 +4554,14 @@ HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_alpha_c } break; + case WINED3DFMT_B8G8R8A8_UNORM: + if (colorkey_active) + { + *conversion_type = WINED3D_CT_CK_ARGB32; + format->conv_byte_count = 4; + } + break; + default: break; } @@ -4765,6 +4773,26 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI } break; + case WINED3D_CT_CK_ARGB32: + { + unsigned int x, y; + for (y = 0; y < height; ++y) + { + source = src + pitch * y; + dest = dst + outpitch * y; + for (x = 0; x < width; ++x) + { + DWORD color = *(const DWORD *)source; + if (color_in_range(&surface->src_blt_color_key, color)) + color &= ~0xff000000; + *(DWORD*)dest = color; + source += 4; + dest += 4; + } + } + } + break; + default: ERR("Unsupported conversion type %#x.\n", conversion_type); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index df817af..cd9690c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2192,6 +2192,7 @@ enum wined3d_conversion_type WINED3D_CT_CK_5551, WINED3D_CT_CK_RGB24, WINED3D_CT_RGB32_888, + WINED3D_CT_CK_ARGB32, }; HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_alpha_ck, BOOL use_texturing,

1 0

Lucas Zawacki : dinput: Search for device objects of the correct type in BuildActionMap.
by Alexandre Julliard 29 Feb '12

29 Feb '12

Module: wine Branch: master Commit: 07f583478e0d5b182dff9dac14fbd96ba30773c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07f583478e0d5b182dff9dac1… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Tue Feb 28 15:22:20 2012 -0300 dinput: Search for device objects of the correct type in BuildActionMap. --- dlls/dinput/joystick.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 8dd1566..dfcaeb7 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -456,7 +456,7 @@ HRESULT WINAPI JoystickWGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface, if (type & object_types[j]) { /* Assure that the object exists */ - LPDIOBJECTDATAFORMAT odf = dataformat_to_odf_by_type(This->base.data_format.wine_df, inst, DIDFT_BUTTON); + LPDIOBJECTDATAFORMAT odf = dataformat_to_odf_by_type(This->base.data_format.wine_df, inst, object_types[j]); if (odf != NULL) {

1 0

Hasan Kiran : po: Update Turkish translation.
by Alexandre Julliard 28 Feb '12

28 Feb '12

Module: wine Branch: master Commit: ca2c071dc5ca0018aab4577cc17f62d47bfc09ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca2c071dc5ca0018aab4577cc… Author: Hasan Kiran <sunder67(a)hotmail.com> Date: Mon Feb 27 22:15:49 2012 +0000 po: Update Turkish translation. --- po/tr.po | 1754 +++++++++++++++++++------------------------------------------- 1 files changed, 531 insertions(+), 1223 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca2c071dc5ca0018aab45…

1 0

Eduardo García : po: Update Spanish translation.
by Alexandre Julliard 28 Feb '12

28 Feb '12

Module: wine Branch: master Commit: 766763f5ec7d939b46fb9aea65ff9f65c82662ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=766763f5ec7d939b46fb9aea6… Author: Eduardo García <eduardo.garcia(a)gmx.com> Date: Mon Feb 27 20:56:05 2012 +0100 po: Update Spanish translation. --- po/es.po | 255 +++++++++++++++++++++++++------------------------------------- 1 files changed, 102 insertions(+), 153 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=766763f5ec7d939b46fb9…

1 0

Zoltan Nagy : po: Update Hungarian translation.
by Alexandre Julliard 28 Feb '12

28 Feb '12

Module: wine Branch: master Commit: c312bfd40e568f87b0f0f5cacddad2e6b55cc013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c312bfd40e568f87b0f0f5cac… Author: Zoltan Nagy <e-sw(a)freemail.hu> Date: Mon Feb 27 17:34:12 2012 +0100 po: Update Hungarian translation. --- po/hu.po | 132 +++++++++++++++++++------------------------------------------ 1 files changed, 41 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c312bfd40e568f87b0f0f…

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 28 Feb '12

28 Feb '12

Module: wine Branch: master Commit: efafe20336d79b74f98ad46c399e827428225a37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efafe20336d79b74f98ad46c3… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Feb 27 22:47:15 2012 +0900 po: Update Korean translation. --- po/ko.po | 163 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 81 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=efafe20336d79b74f98ad…

1 0

Martin Jesper Low Madsen : po: Update Danish translation.
by Alexandre Julliard 28 Feb '12

28 Feb '12

Module: wine Branch: master Commit: b3f12f0a8b2467122db871e553199abe84655bbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3f12f0a8b2467122db871e55… Author: Martin Jesper Low Madsen <martinjlowm(a)gmail.com> Date: Mon Feb 27 00:06:42 2012 +0100 po: Update Danish translation. --- po/da.po | 1921 ++++++++++++++++++++++++++++---------------------------------- 1 files changed, 872 insertions(+), 1049 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b3f12f0a8b2467122db87…

1 0

Aric Stewart : usp10: Better handle 0 cases when caching scripts, languages and features.
by Alexandre Julliard 28 Feb '12

28 Feb '12

Module: wine Branch: master Commit: 9af6b11808e92857985015ded9c65b1a2b83f991 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9af6b11808e92857985015ded… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Feb 27 12:51:57 2012 -0600 usp10: Better handle 0 cases when caching scripts, languages and features. --- dlls/usp10/opentype.c | 63 ++++++++++++++++++++++++++++--------------------- 1 files changed, 36 insertions(+), 27 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 3c0af41..74046fd 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -871,12 +871,15 @@ static void GSUB_initialize_script_cache(ScriptCache *psc) script = (const GSUB_ScriptList*)((const BYTE*)header + GET_BE_WORD(header->ScriptList)); psc->script_count = GET_BE_WORD(script->ScriptCount); TRACE("initializing %i scripts in this font\n",psc->script_count); - psc->scripts = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(LoadedScript) * psc->script_count); - for (i = 0; i < psc->script_count; i++) + if (psc->script_count) { - int offset = GET_BE_WORD(script->ScriptRecord[i].Script); - psc->scripts[i].tag = MS_MAKE_TAG(script->ScriptRecord[i].ScriptTag[0], script->ScriptRecord[i].ScriptTag[1], script->ScriptRecord[i].ScriptTag[2], script->ScriptRecord[i].ScriptTag[3]); - psc->scripts[i].table = ((const BYTE*)script + offset); + psc->scripts = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(LoadedScript) * psc->script_count); + for (i = 0; i < psc->script_count; i++) + { + int offset = GET_BE_WORD(script->ScriptRecord[i].Script); + psc->scripts[i].tag = MS_MAKE_TAG(script->ScriptRecord[i].ScriptTag[0], script->ScriptRecord[i].ScriptTag[1], script->ScriptRecord[i].ScriptTag[2], script->ScriptRecord[i].ScriptTag[3]); + psc->scripts[i].table = ((const BYTE*)script + offset); + } } } } @@ -926,15 +929,18 @@ static void GSUB_initialize_language_cache(LoadedScript *script) script->default_language.tag = MS_MAKE_TAG('d','f','l','t'); script->default_language.table = (const BYTE*)table + GET_BE_WORD(table->DefaultLangSys); - TRACE("Deflang %p, LangCount %i\n",script->default_language.table, script->language_count); + if (script->language_count) + { + TRACE("Deflang %p, LangCount %i\n",script->default_language.table, script->language_count); - script->languages = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LoadedLanguage) * script->language_count); + script->languages = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LoadedLanguage) * script->language_count); - for (i = 0; i < script->language_count; i++) - { - int offset = GET_BE_WORD(table->LangSysRecord[i].LangSys); - script->languages[i].tag = MS_MAKE_TAG(table->LangSysRecord[i].LangSysTag[0], table->LangSysRecord[i].LangSysTag[1], table->LangSysRecord[i].LangSysTag[2], table->LangSysRecord[i].LangSysTag[3]); - script->languages[i].table = ((const BYTE*)table + offset); + for (i = 0; i < script->language_count; i++) + { + int offset = GET_BE_WORD(table->LangSysRecord[i].LangSys); + script->languages[i].tag = MS_MAKE_TAG(table->LangSysRecord[i].LangSysTag[0], table->LangSysRecord[i].LangSysTag[1], table->LangSysRecord[i].LangSysTag[2], table->LangSysRecord[i].LangSysTag[3]); + script->languages[i].table = ((const BYTE*)table + offset); + } } } } @@ -1019,23 +1025,26 @@ static void GSUB_initialize_feature_cache(LPCVOID table, LoadedLanguage *languag language->feature_count = GET_BE_WORD(lang->FeatureCount); TRACE("%i features\n",language->feature_count); - language->features = HeapAlloc(GetProcessHeap(),0,sizeof(LoadedFeature)*language->feature_count); + if (language->feature_count) + { + language->features = HeapAlloc(GetProcessHeap(),0,sizeof(LoadedFeature)*language->feature_count); - feature_list = (const GSUB_FeatureList*)((const BYTE*)header + GET_BE_WORD(header->FeatureList)); + feature_list = (const GSUB_FeatureList*)((const BYTE*)header + GET_BE_WORD(header->FeatureList)); - for (i = 0; i < language->feature_count; i++) - { - const GSUB_Feature *feature; - int j; - int index = GET_BE_WORD(lang->FeatureIndex[i]); - - language->features[i].tag = MS_MAKE_TAG(feature_list->FeatureRecord[index].FeatureTag[0], feature_list->FeatureRecord[index].FeatureTag[1], feature_list->FeatureRecord[index].FeatureTag[2], feature_list->FeatureRecord[index].FeatureTag[3]); - language->features[i].feature = ((const BYTE*)feature_list + GET_BE_WORD(feature_list->FeatureRecord[index].Feature)); - feature = (const GSUB_Feature*)language->features[i].feature; - language->features[i].lookup_count = GET_BE_WORD(feature->LookupCount); - language->features[i].lookups = HeapAlloc(GetProcessHeap(),0,sizeof(WORD) * language->features[i].lookup_count); - for (j = 0; j < language->features[i].lookup_count; j++) - language->features[i].lookups[j] = GET_BE_WORD(feature->LookupListIndex[j]); + for (i = 0; i < language->feature_count; i++) + { + const GSUB_Feature *feature; + int j; + int index = GET_BE_WORD(lang->FeatureIndex[i]); + + language->features[i].tag = MS_MAKE_TAG(feature_list->FeatureRecord[index].FeatureTag[0], feature_list->FeatureRecord[index].FeatureTag[1], feature_list->FeatureRecord[index].FeatureTag[2], feature_list->FeatureRecord[index].FeatureTag[3]); + language->features[i].feature = ((const BYTE*)feature_list + GET_BE_WORD(feature_list->FeatureRecord[index].Feature)); + feature = (const GSUB_Feature*)language->features[i].feature; + language->features[i].lookup_count = GET_BE_WORD(feature->LookupCount); + language->features[i].lookups = HeapAlloc(GetProcessHeap(),0,sizeof(WORD) * language->features[i].lookup_count); + for (j = 0; j < language->features[i].lookup_count; j++) + language->features[i].lookups[j] = GET_BE_WORD(feature->LookupListIndex[j]); + } } } }

1 0

Lauri Kenttä : readme: Update Swedish translation.
by Alexandre Julliard 28 Feb '12

28 Feb '12

Module: wine Branch: master Commit: e4a855d2f39fb7e3f0a074dc0599b8da62189987 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4a855d2f39fb7e3f0a074dc0… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Mon Feb 27 23:47:50 2012 +0200 readme: Update Swedish translation. --- documentation/README.sv | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-) diff --git a/documentation/README.sv b/documentation/README.sv index bb12f7c..fe62928 100644 --- a/documentation/README.sv +++ b/documentation/README.sv @@ -27,7 +27,7 @@ information och tips om hur problem kan l F�r att kompilera och k�ra Wine kr�vs ett av f�ljande: Linux version 2.0.36 eller senare - FreeBSD 6.3 eller senare + FreeBSD 7.0 eller senare Solaris x86 9 eller senare NetBSD-current Mac OS X 10.4 eller senare @@ -36,15 +36,9 @@ Wine kr operativsystemen ovan som st�ds. Andra operativsystem som st�der kerneltr�dar kommer eventuellt att st�djas i framtiden. -Information f�r Linux - �ven om Linux 2.2.x antagligen fortfarande fungerar, och Linux 2.0.x kanske - fungerar (tidiga 2.0.x-versioner uppvisade tr�drelaterade problem), s� �r - det b�st att ha en aktuell kernel som 2.4.x eller 2.6.x. - Information f�r FreeBSD - Wine kommer i regel inte fungera p� FreeBSD-versioner �ldre �n 6.3 eller 7.0. - FreeBSD 6.3 kan uppdateras for att st�dja Wine. Se - http://wiki.freebsd.org/Wine f�r mer information. + Wine kommer i regel inte att fungera p� FreeBSD-versioner �ldre �n 7.0. + Se http://wiki.freebsd.org/Wine f�r mer information. Information f�r Solaris Wine m�ste antagligen byggas med GNU toolchain (gcc, gas etc.). @@ -63,8 +57,7 @@ St Wine kan k�ra p� de flesta filsystem, men det har rapporterats problem vad g�ller kompatibilitet d� samba anv�nds f�r att ansluta till filer. NTFS tillhandah�ller inte heller alla filsystemsfunktioner som beh�vs av alla - program. Det rekommenderas att anv�nda ett Linux-filsystem som exempelvis - ext3. + program. Det rekommenderas att anv�nda ett riktigt Unix-filsystem. Grundl�ggande krav: Utvecklingsfilerna f�r X11 m�ste vara installerade (de kallas xlib6g-dev i

1 0

Jump to page:

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-commits February 2012