wine-commits February 2020

wine-commits@winehq.org

2 participants
874 discussions

Zebediah Figura : d3d8: Retrieve texture states from the primary stateblock.
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: 942e21003781c787a26571ae65776bb036374f2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=942e21003781c787a26571ae… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 21 17:04:49 2020 -0600 d3d8: Retrieve texture states from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 7c1a6fe9fd..41384d84bc 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2251,26 +2251,38 @@ tss_lookup[] = }; static HRESULT WINAPI d3d8_device_GetTextureStageState(IDirect3DDevice8 *iface, - DWORD stage, D3DTEXTURESTAGESTATETYPE Type, DWORD *value) + DWORD stage, D3DTEXTURESTAGESTATETYPE state, DWORD *value) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); + const struct wined3d_stateblock_state *device_state; const struct tss_lookup *l; - TRACE("iface %p, stage %u, state %#x, value %p.\n", iface, stage, Type, value); + TRACE("iface %p, stage %u, state %#x, value %p.\n", iface, stage, state, value); + + if (stage >= WINED3DVERTEXTEXTURESAMPLER0 && stage <= WINED3DVERTEXTEXTURESAMPLER3) + stage -= (WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS); + + if (stage >= WINED3D_MAX_COMBINED_SAMPLERS) + { + WARN("Invalid stage %u.\n", stage); + *value = 0; + return D3D_OK; + } - if (Type >= ARRAY_SIZE(tss_lookup)) + if (state >= ARRAY_SIZE(tss_lookup)) { - WARN("Invalid Type %#x passed.\n", Type); + WARN("Invalid state %#x.\n", state); return D3D_OK; } - l = &tss_lookup[Type]; + l = &tss_lookup[state]; wined3d_mutex_lock(); + device_state = wined3d_stateblock_get_state(device->state); if (l->sampler_state) - *value = wined3d_device_get_sampler_state(device->wined3d_device, stage, l->u.sampler_state); + *value = device_state->sampler_states[stage][l->u.sampler_state]; else - *value = wined3d_device_get_texture_stage_state(device->wined3d_device, stage, l->u.texture_state); + *value = device_state->texture_states[stage][l->u.texture_state]; wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : d3d8: Stop setting the device state in d3d8_device_SetTexture().
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: 27e8a5dd63aa9b0dea83ceea2355364fe89d6488 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27e8a5dd63aa9b0dea83ceea… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 21 17:04:48 2020 -0600 d3d8: Stop setting the device state in d3d8_device_SetTexture(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 481f4f3846..7c1a6fe9fd 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2203,9 +2203,6 @@ static HRESULT WINAPI d3d8_device_SetTexture(IDirect3DDevice8 *iface, DWORD stag wined3d_mutex_lock(); wined3d_stateblock_set_texture(device->update_state, stage, texture_impl ? texture_impl->wined3d_texture : NULL); - if (!device->recording) - wined3d_device_set_texture(device->wined3d_device, stage, - texture_impl ? texture_impl->wined3d_texture : NULL); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : d3d8: Retrieve textures from the primary stateblock.
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: 19e5693c91be1442d5105427b0badd6ef4a28fd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19e5693c91be1442d5105427… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 21 17:04:47 2020 -0600 d3d8: Retrieve textures from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 19dc844ee2..481f4f3846 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2165,8 +2165,18 @@ static HRESULT WINAPI d3d8_device_GetTexture(IDirect3DDevice8 *iface, DWORD stag if (!texture) return D3DERR_INVALIDCALL; + if (stage >= WINED3DVERTEXTEXTURESAMPLER0 && stage <= WINED3DVERTEXTEXTURESAMPLER3) + stage -= (WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS); + + if (stage >= WINED3D_MAX_COMBINED_SAMPLERS) + { + WARN("Ignoring invalid stage %u.\n", stage); + *texture = NULL; + return D3D_OK; + } + wined3d_mutex_lock(); - if ((wined3d_texture = wined3d_device_get_texture(device->wined3d_device, stage))) + if ((wined3d_texture = wined3d_stateblock_get_state(device->state)->textures[stage])) { texture_impl = wined3d_texture_get_parent(wined3d_texture); *texture = &texture_impl->IDirect3DBaseTexture8_iface;

1 0

Zebediah Figura : d3d8: Stop setting the device state in d3d8_device_SetPixelShaderConstant().
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: 84f9bc17161f6c2bf1be7516ca206da94b225f1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=84f9bc17161f6c2bf1be7516… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 21 17:04:46 2020 -0600 d3d8: Stop setting the device state in d3d8_device_SetPixelShaderConstant(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index d9f914f125..19dc844ee2 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3290,8 +3290,6 @@ static HRESULT WINAPI d3d8_device_SetPixelShaderConstant(IDirect3DDevice8 *iface wined3d_mutex_lock(); hr = wined3d_stateblock_set_ps_consts_f(device->update_state, start_register, count, data); - if (SUCCEEDED(hr) && !device->recording) - hr = wined3d_device_set_ps_consts_f(device->wined3d_device, start_register, count, data); wined3d_mutex_unlock(); return hr;

1 0

Zebediah Figura : d3d8: Retrieve pixel shader constants from the primary stateblock.
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: a7afb912d99d1467dcb6b4b5695f1a37b412468a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7afb912d99d1467dcb6b4b5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 21 17:04:45 2020 -0600 d3d8: Retrieve pixel shader constants from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 957f663174..d9f914f125 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3298,19 +3298,22 @@ static HRESULT WINAPI d3d8_device_SetPixelShaderConstant(IDirect3DDevice8 *iface } static HRESULT WINAPI d3d8_device_GetPixelShaderConstant(IDirect3DDevice8 *iface, - DWORD start_register, void *data, DWORD count) + DWORD start_idx, void *constants, DWORD count) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - HRESULT hr; + const struct wined3d_vec4 *src; - TRACE("iface %p, start_register %u, data %p, count %u.\n", - iface, start_register, data, count); + TRACE("iface %p, start_idx %u, constants %p, count %u.\n", iface, start_idx, constants, count); + + if (!constants || start_idx >= WINED3D_MAX_PS_CONSTS_F || count > WINED3D_MAX_PS_CONSTS_F - start_idx) + return WINED3DERR_INVALIDCALL; wined3d_mutex_lock(); - hr = wined3d_device_get_ps_consts_f(device->wined3d_device, start_register, count, data); + src = wined3d_stateblock_get_state(device->state)->ps_consts_f; + memcpy(constants, &src[start_idx], count * sizeof(*src)); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_GetPixelShaderFunction(IDirect3DDevice8 *iface,

1 0

Shinjo Park : Update Korean website translation (wineconf).
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: website Branch: master Commit: fc06bc48bc22a4032a5e83061315d89441058721 URL: https://source.winehq.org/git/website.git/?a=commit;h=fc06bc48bc22a4032a5e8… Author: Shinjo Park <peremen(a)gmail.com> Date: Fri Feb 21 01:25:02 2020 +0100 Update Korean website translation (wineconf). Although the translation itself had not been changed, the URLs included in the template is now synchronized with the English page. Signed-off-by: Shinjo Park <peremen(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- templates/ko/wineconf/rsvp.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/ko/wineconf/rsvp.template b/templates/ko/wineconf/rsvp.template index 37171eef..ac4fb116 100644 --- a/templates/ko/wineconf/rsvp.template +++ b/templates/ko/wineconf/rsvp.template @@ -1,3 +1,3 @@ - + -<iframe src="https://docs.google.com/forms/d/e/1FAIpQLSf5eAdYjHyQg13cndWcQFTIS4Wym5fyjV0…" width="90%" height="1200" frameborder="0" marginheight="0" marginwidth="0">불러오는 중...</iframe> +<iframe src="https://docs.google.com/forms/d/e/1FAIpQLScHtRCy2l8SFv1r-SZjTVxDNiiXSC64Gnx…" width="90%" height="1500" frameborder="0" marginheight="0" marginwidth="0">불러오는 중...</iframe>

1 0

Shinjo Park : Update Korean website translation (global/).
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: website Branch: master Commit: d3bab57447e63df554813d3bd3efe1704e2237de URL: https://source.winehq.org/git/website.git/?a=commit;h=d3bab57447e63df554813… Author: Shinjo Park <peremen(a)gmail.com> Date: Fri Feb 21 01:25:00 2020 +0100 Update Korean website translation (global/). Fixed incorrect Korean translation of templates in global subdirectory. Signed-off-by: Shinjo Park <peremen(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- templates/ko/global/404.template | 14 +++++++------- templates/ko/global/fatal_error.template | 16 ++++++++-------- templates/ko/global/xml/trans/global.xml | 14 +++++++------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/templates/ko/global/404.template b/templates/ko/global/404.template index deb0e37e..37d26a47 100644 --- a/templates/ko/global/404.template +++ b/templates/ko/global/404.template @@ -1,18 +1,18 @@  - + -<h1 class="title">404 파일을 찾을 수 없음<h1> +<h1 class="title">404 Not Found</h1> <p> - 죄송합니다. 요청하신 파일을 찾을 수 없습니다. 주소를 확인하시고 - 다시 시도해 주세요. + 죄송합니다. 요청한 문서를 찾을 수 없습니다. URL을 확인한 후 + 다시 시도해 주십시오. </p> <hr> <p> - WineHQ.org의 하이퍼링크를 타고 오셨다면, - WineHQ.org에 보고해 주십시오. - <a href="//bugs.winehq.org/enter_bug.cgi?product=WineHQ.org">버그질라</a>. + WineHQ.org에 있는 페이지의 링크를 따라온 경우에 이 페이지를 보게 되었다면 + WineHQ.org의 + <a href="//bugs.winehq.org/enter_bug.cgi?product=WineHQ.org">Bugzilla</a>에 보고해 주십시오. </p> diff --git a/templates/ko/global/fatal_error.template b/templates/ko/global/fatal_error.template index 7a881537..6844d3b9 100644 --- a/templates/ko/global/fatal_error.template +++ b/templates/ko/global/fatal_error.template @@ -10,17 +10,17 @@ </style> <div id="fatal_error" class="cornerround dropshadow"> -<h1>Fatal Error</h1> -<p><b>죄송합니다.</b> 저희 시스템 내부에 문제가 발생했습니다. -지금은 요청을 처리할 수가 없습니다.</p> +<h1>치명적 오류</h1> +<p><b>죄송합니다.</b> 시스템에 내부 오류가 발생했습니다. +지금은 요청을 처리할 수 없습니다.</p> <pre width="72" style="white-space: pre-wrap;"> -<b>Error:</b> {$errstr} -<b>No:</b> {$errno} -<b>Line:</b> {$errline} -<b>File:</b> {$errfile} +<b>오류:</b> {$errstr} +<b>번호:</b> {$errno} +<b>줄:</b> {$errline} +<b>파일:</b> {$errfile} {$debug} </pre> -<p class="center">이 오류가 계속 나온다면 <a href="mailto:web-admin@winehq.org">웹관리자</a>와 접촉하십시오.</p> +<p class="center">이 오류가 계속 발생한다면 <a href="mailto:web-admin@winehq.org">웹 사이트 관리자</a>에게 연락해 주십시오.</p> </div> diff --git a/templates/ko/global/xml/trans/global.xml b/templates/ko/global/xml/trans/global.xml index 89702b6d..3f98c164 100644 --- a/templates/ko/global/xml/trans/global.xml +++ b/templates/ko/global/xml/trans/global.xml @@ -2,17 +2,17 @@ <trans lang="ko" table="global">  - <str name="tab_winehq">와인HQ</str> + <str name="tab_winehq">WineHQ</str> <str name="tab_wiki">위키</str> - <str name="tab_appdb">응용 무른모 정보기지</str> - <str name="tab_bugs">버그질라</str> - <str name="tab_forums">토론장</str> + <str name="tab_appdb">AppDB</str> + <str name="tab_bugs">Bugzilla</str> + <str name="tab_forums">포럼</str>  - <str name="search_placeholder">찾기</str> + <str name="search_placeholder">검색</str>  - <str name="hosted_by">호스트 : </str> - <str name="hosted_by_alt">CodeWeavers - 윈도우용 응용 무른모를 리눅스와 맥에서</str> + <str name="hosted_by">호스팅 제공: </str> + <str name="hosted_by_alt">CodeWeavers - Windows용 프로그램과 게임을 Mac과 리눅스에서 실행하기</str> </trans>

1 0

Shinjo Park : Update Korean website translation.
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: website Branch: master Commit: 313e1d34745e888fda4aedf8b40ecf6ff696fc6b URL: https://source.winehq.org/git/website.git/?a=commit;h=313e1d34745e888fda4ae… Author: Shinjo Park <peremen(a)gmail.com> Date: Fri Feb 21 01:25:01 2020 +0100 Update Korean website translation. Synchronized the terms used in Korean website translation to follow the Korean translation after fixing the bug 46050. The previous website translation extensively presented the "linguistic purism", which merely confuses the Korean user nowadays. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46050 Signed-off-by: Shinjo Park <peremen(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- templates/ko/about.template | 92 ++++++++++----------- templates/ko/announce.template | 6 +- templates/ko/documentation.template | 58 +++++++------- templates/ko/donate.template | 46 ++++++----- templates/ko/forums.template | 129 ++++++++++++++++-------------- templates/ko/getinvolved.template | 89 ++++++--------------- templates/ko/help.template | 51 ++++++------ templates/ko/home.template | 154 ++++++++++++++++++++++++++---------- templates/ko/interview.template | 6 +- templates/ko/irc.template | 82 ++++++++++--------- templates/ko/lang.template | 6 +- templates/ko/news.template | 9 +-- templates/ko/search.template | 4 +- templates/ko/wwn.template | 4 +- templates/ko/wwn_content.template | 10 +-- templates/ko/wwn_interview.template | 4 +- 16 files changed, 402 insertions(+), 348 deletions(-) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=313e1d34745e888fd…

1 0

Shinjo Park : Remove Korean translation of news_row.template.
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: website Branch: master Commit: 7fb13eb65231841e4043037a04db2b7e3b272cb4 URL: https://source.winehq.org/git/website.git/?a=commit;h=7fb13eb65231841e40430… Author: Shinjo Park <peremen(a)gmail.com> Date: Fri Feb 21 01:24:59 2020 +0100 Remove Korean translation of news_row.template. There is basically nothing to translate there, removing it. Signed-off-by: Shinjo Park <peremen(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- templates/ko/news_row.template | 5 ----- 1 file changed, 5 deletions(-) diff --git a/templates/ko/news_row.template b/templates/ko/news_row.template deleted file mode 100644 index f6e0e844..00000000 --- a/templates/ko/news_row.template +++ /dev/null @@ -1,5 +0,0 @@ -<p class="newstitle">{$title}</p> -<p class="newsdate">{$date}</p> -<div class="newsblock"> -{$body} -</div>

1 0

Shinjo Park : Remove Korean translation of license.template.
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: website Branch: master Commit: 9dde8840a0c9bd07b1c0ccad2e6eae5ab16175c4 URL: https://source.winehq.org/git/website.git/?a=commit;h=9dde8840a0c9bd07b1c0c… Author: Shinjo Park <peremen(a)gmail.com> Date: Fri Feb 21 01:24:58 2020 +0100 Remove Korean translation of license.template. No other translation templates are translating the license.template file, and the information is now on wiki, so removing it from Korean website translation. Signed-off-by: Shinjo Park <peremen(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- templates/ko/license.template | 834 ------------------------------------------ 1 file changed, 834 deletions(-) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=9dde8840a0c9bd07b…

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
88
Older →

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 2020