September 2011 - Wine-Commits

Alistair Leslie-Hughes : advapi32: Correct test for NT4 prior to sp4.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: 1833124218a0826cf96cdc12e9c8db77c18bffe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1833124218a0826cf96cdc12e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 9 19:31:02 2011 +1000 advapi32: Correct test for NT4 prior to sp4. --- dlls/advapi32/tests/security.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 336cc9c..4cc1402 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2913,8 +2913,8 @@ static void test_SetEntriesInAclA(void) ExplicitAccess.Trustee.TrusteeType = TRUSTEE_IS_WELL_KNOWN_GROUP; ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_SID; ExplicitAccess.Trustee.ptstrName = EveryoneSid; - ExplicitAccess.Trustee.MultipleTrusteeOperation = 0xDEADBEEF; - ExplicitAccess.Trustee.pMultipleTrustee = (PVOID)0xDEADBEEF; + ExplicitAccess.Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; + ExplicitAccess.Trustee.pMultipleTrustee = NULL; res = pSetEntriesInAclA(1, &ExplicitAccess, OldAcl, &NewAcl); ok(res == ERROR_SUCCESS, "SetEntriesInAclA failed: %u\n", res); ok(NewAcl != NULL, "returned acl was NULL\n");

1 0

Jörg Höhle : mmdevapi: IsFormatSupported fills closest match iff it returns S_FALSE.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: 3e1d4028811e5b57df264ac21dd4c56b383f9da9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e1d4028811e5b57df264ac21… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Aug 2 21:49:12 2011 +0200 mmdevapi: IsFormatSupported fills closest match iff it returns S_FALSE. --- dlls/winealsa.drv/mmdevdrv.c | 12 ++++++------ dlls/wineoss.drv/mmdevdrv.c | 14 ++++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 916c247..0c47876 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1189,6 +1189,9 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, dump_fmt(fmt); + if(out) + *out = NULL; + EnterCriticalSection(&This->lock); if((err = snd_pcm_hw_params_any(This->pcm_handle, This->hw_params)) < 0){ @@ -1320,17 +1323,14 @@ exit: LeaveCriticalSection(&This->lock); HeapFree(GetProcessHeap(), 0, formats); - if(hr == S_OK || !out){ - CoTaskMemFree(closest); - if(out) - *out = NULL; - }else if(closest){ + if(hr == S_FALSE && out) { closest->nBlockAlign = closest->nChannels * closest->wBitsPerSample / 8; closest->nAvgBytesPerSec = closest->nBlockAlign * closest->nSamplesPerSec; *out = closest; - } + } else + CoTaskMemFree(closest); TRACE("returning: %08x\n", hr); return hr; diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 93f71cc..629f4f7 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -676,6 +676,9 @@ static HRESULT setup_oss_device(ACImpl *This, const WAVEFORMATEX *fmt, WAVEFORMATEXTENSIBLE *fmtex = (void*)fmt; WAVEFORMATEX *closest = NULL; + if(out) + *out = NULL; + tmp = oss_format = get_oss_format(fmt); if(oss_format < 0) return AUDCLNT_E_UNSUPPORTED_FORMAT; @@ -689,6 +692,8 @@ static HRESULT setup_oss_device(ACImpl *This, const WAVEFORMATEX *fmt, } closest = clone_format(fmt); + if(!closest) + return E_OUTOFMEMORY; tmp = fmt->nSamplesPerSec; if(ioctl(This->fd, SNDCTL_DSP_SPEED, &tmp) < 0){ @@ -723,17 +728,14 @@ static HRESULT setup_oss_device(ACImpl *This, const WAVEFORMATEX *fmt, ret = S_FALSE; } - if(ret == S_OK || !out){ - CoTaskMemFree( closest); - if(out) - *out = NULL; - }else{ + if(ret == S_FALSE && out){ closest->nBlockAlign = closest->nChannels * closest->wBitsPerSample / 8; closest->nAvgBytesPerSec = closest->nBlockAlign * closest->nSamplesPerSec; *out = closest; - } + } else + CoTaskMemFree(closest); TRACE("returning: %08x\n", ret); return ret;

1 0

Hans Leidekker : msi: Ignore unknown components in the FeatureComponents table.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: 258fc7137fa4456b80a87472f206cf16405e68af URL: http://source.winehq.org/git/wine.git/?a=commit;h=258fc7137fa4456b80a87472f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 9 11:02:11 2011 +0200 msi: Ignore unknown components in the FeatureComponents table. --- dlls/msi/action.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 69384be..62d857a 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1048,10 +1048,9 @@ static UINT iterate_load_featurecomponents(MSIRECORD *row, LPVOID param) comp = msi_get_loaded_component( ilfs->package, component ); if (!comp) { - ERR("unknown component %s\n", debugstr_w(component)); - return ERROR_FUNCTION_FAILED; + WARN("ignoring unknown component %s\n", debugstr_w(component)); + return ERROR_SUCCESS; } - add_feature_component( ilfs->feature, comp ); comp->Enabled = TRUE;

1 0

Francois Gouget : po: Remove English strings from the Thai translation.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: 44aefb180e566532e7e9ad4e01cb1f4a2bb9fe2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=44aefb180e566532e7e9ad4e0… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 9 02:13:49 2011 +0200 po: Remove English strings from the Thai translation. --- po/th.po | 136 ++++++++++++++++++++----------------------------------------- 1 files changed, 45 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=44aefb180e566532e7e9a…

1 0

Hwang YunSong : dinput: New Korean resource.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: d045719761e12790bcc989d1ea83d9c416e24a37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d045719761e12790bcc989d1e… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Fri Sep 9 11:00:30 2011 +0900 dinput: New Korean resource. --- dlls/dinput/Makefile.in | 3 ++- dlls/dinput/dinput_Ko.rc | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in index d614def..0054363 100644 --- a/dlls/dinput/Makefile.in +++ b/dlls/dinput/Makefile.in @@ -24,6 +24,7 @@ PO_SRCS = dinput.rc RC_SRCS = \ dinput.rc \ - dinput_En.rc + dinput_En.rc \ + dinput_Ko.rc @MAKE_DLL_RULES@ diff --git a/dlls/dinput/dinput_Ko.rc b/dlls/dinput/dinput_Ko.rc new file mode 100644 index 0000000..043ce5d --- /dev/null +++ b/dlls/dinput/dinput_Ko.rc @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2011 Lucas Fialho Zawacki + * Copyright (c) 2011 YunSong Hwang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +IDD_CONFIGUREDEVICES DIALOG 0, 0, 270, 260 +STYLE DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_CAPTION | WS_VISIBLE +CAPTION "장치 설정" +FONT 8, "Ms Shell Dlg" +{ + DEFPUSHBUTTON "확인", IDOK, 10, 236, 50, 14 + DEFPUSHBUTTON "취소", IDCANCEL, 65, 236, 50, 14 + DEFPUSHBUTTON "재설정", IDC_RESET, 210, 236, 50, 14 + COMBOBOX IDC_PLAYERCOMBO, 10, 50, 90, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS + COMBOBOX IDC_CONTROLLERCOMBO, 10, 20, 90, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "플레이어", IDC_PLAYERTEXT, 10, 40, 21, 8, SS_LEFT + LTEXT "장치", IDC_DEVICETEXT, 10, 10, 22, 8, SS_LEFT + LTEXT "행동", IDC_ACTIONTEXT, 10, 70, 24, 8, SS_LEFT + LTEXT "매핑", IDC_MAPPINGTEXT, 120, 8, 28, 8, SS_LEFT + LISTBOX IDC_ACTIONLIST, 10, 80, 90, 130, WS_TABSTOP | WS_VSCROLL | LBS_NOINTEGRALHEIGHT | LBS_NOTIFY + AUTOCHECKBOX "할당 정렬", IDC_CHECKBOXSORT, 120, 215, 60, 8 + CONTROL "Listview", IDC_DEVICEOBJECTSLIST, "SysListView32", LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 120, 20, 140, 190 +}

1 0

Hwang YunSong : po: Updated Korean translation.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: 90152743c996453d1f630c527766c7f67fb3c17d URL: http://source.winehq.org/git/wine.git/?a=commit;h=90152743c996453d1f630c527… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Fri Sep 9 10:59:49 2011 +0900 po: Updated Korean translation. --- po/ko.po | 69 +++++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 39 insertions(+), 30 deletions(-) diff --git a/po/ko.po b/po/ko.po index b8cb315..03457cb 100644 --- a/po/ko.po +++ b/po/ko.po @@ -2013,14 +2013,12 @@ msgid "Default MidiOut Device" msgstr "기본 미디출력 장치" #: dinput.rc:34 -#, fuzzy msgid "Action" -msgstr "Activation" +msgstr "행동" #: dinput.rc:35 -#, fuzzy msgid "Object" -msgstr "객체(&O)" +msgstr "객체" #: dxdiagn.rc:25 msgid "Regional Setting" @@ -2093,7 +2091,7 @@ msgstr "숨기기" #: hhctrl.rc:41 ieframe.rc:65 shdoclc.rc:164 shdoclc.rc:188 msgid "Stop" -msgstr "정지" +msgstr "멈추기" #: hhctrl.rc:42 ieframe.rc:66 shell32.rc:59 msgid "Refresh" @@ -7668,6 +7666,25 @@ msgid "" "and all subfolders.\n" "/D Processes folders as well.\n" msgstr "" +"ATTRIB - 파일 속성을 보여주거나 바꿉니다.\n" +"\n" +"문법:\n" +"ATTRIB [+R | -R] [+A | -A ] [+S | -S] [+H | -H] [드라이브:][경로][파일이름]\n" +"\t [/S [/D]]\n" +"\n" +"어디에:\n" +"\n" +"+ 속성을 설정합니다.\n" +"- 속성을 지웁니다.\n" +"R 읽기-전용 파일 속성을 설정합니다\n" +"A 압축 파일 속성을 설정합니다.\n" +"S 시스템 파일 속성을 설정합니다.\n" +"H 숨은 파일 속성을 설정합니다.\n" +"[드라이브:][경로][파일이름]\n" +"속성 작업을 할 파일이나 파일들을 지정합니다.\n" +"/S 현재 폴더와 모든 하위 폴더에서 일치하는 파일들을 \n" +"처리합니.\n" +"/D 폴더를 함께 처리합니다.\n" #: clock.rc:29 msgid "Ana&log" @@ -7830,7 +7847,6 @@ msgstr "" "아무 매개변수가 없는 HELP눈 CMD의 모든 내장 명령을 보여줍니다.\n" #: cmd.rc:94 -#, fuzzy msgid "" "IF is used to conditionally execute a command.\n" "\n" @@ -7843,12 +7859,12 @@ msgid "" msgstr "" "IF는 명령을 선택적으로 실행 할 때 사용한다.\n" "\n" -"Syntax:\tIF [NOT] EXIST 파일이름 명령\n" -"IF [NOT] string1==string2 명령\n" -"IF [NOT] ERRORLEVEL 숫자 명령\n" +"문법: IF [NOT] EXIST 파일이름 명령\n" +" IF [NOT] string1==string2 명령\n" +" IF [NOT] ERRORLEVEL 숫자 명령\n" "\n" -"명령의 첫번째 형식에서, string1 과 string2는 반드시 2개의 따옴표로\n" -"둘려놓아야 합니다. 대소문자는 구분하지 않습니다.\n" +"명령의 두번째 형식에서, string1 과 string2는 반드시 2개의 따옴표로\n" +"둘려놓아야 합니다.이 비교는 대소문자를 구분하지 않습니다.\n" #: cmd.rc:100 msgid "" @@ -7924,7 +7940,6 @@ msgstr "" "넘치게 하는 이전 명령의 결과를 읽도록 한다\n" #: cmd.rc:149 -#, fuzzy msgid "" "PROMPT sets the command-line prompt.\n" "\n" @@ -7946,17 +7961,18 @@ msgid "" "The prompt can also be changed by altering the PROMPT environment variable,\n" "so the command 'SET PROMPT=text' has the same effect as 'PROMPT text'.\n" msgstr "" -"PROMPT 명령라인 프롬프트 설정.\n" +"PROMPT 명령-라인 프롬프트 설정.\n" "\n" "이 문자는 cmd가 입력을 기다리고 있을 때 시작 줄에 나타나는 PROMPT\n" "명령(그리고 스페이스 다음에)에 뒤따른다.\n" "\n" "뒤의 문자의 문자열의 특별한 의미 설명:\n" "\n" -"$$ 달러 기호 $_ 라인피드 $b 파이프 기호 (|)\n" -"$d C현재 날짜 $e 이스케이프 $g > 기호\n" +"$$ 달러 기호 $_ 라인피드 $b 파이프 기호 " +"(|)\n" +"$d 현재 날짜 $e 이스케이프 $g > 기호\n" "$l < 기호 $n 현재 드라이브 $p 현재 경로\n" -"$q 등호 기호 $t 현재 시간 $v cmd 버젼\n" +"$q 등호 기호 $t 현재 시간 $v cmd 버젼\n" "\n" "프롬프트가 기본상태인 채로 프롬프트문자를 재설정하지 않고 PROMPT 명령을\n" "사용했을 때 ,이것은 현재 디렉토리 (포함해서현재 드라이브 문자) 에 \"보다 큰" @@ -8185,7 +8201,6 @@ msgstr "" "호출한 셀로 돌아갑니다.\n" #: cmd.rc:287 -#, fuzzy msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -8492,7 +8507,6 @@ msgid "Default gateway" msgstr "기본 게이트웨이" #: net.rc:27 -#, fuzzy msgid "" "The syntax of this command is:\n" "\n" @@ -8502,10 +8516,10 @@ msgid "" "\n" "Where 'command' is one of HELP, START, STOP or USE.\n" msgstr "" -"명령어 문법:\n" +"이 명령어의 문법은:\n" "\n" "NET 명령어[매개변수]\n" -" -or-\n" +" -나-\n" "NET 명령어 /HELP\n" "\n" "명령어에 들어갈 수 있는 것은 HELP, START, STOP이나 USE중의 하나임\n" @@ -9047,15 +9061,15 @@ msgstr "인터페이스" #: oleview.rc:138 msgid "Registry" -msgstr "Registry" +msgstr "레지스트리" #: oleview.rc:139 msgid "Implementation" -msgstr "Implementation" +msgstr "구현" #: oleview.rc:140 msgid "Activation" -msgstr "Activation" +msgstr "활성화" #: oleview.rc:142 msgid "CoGetClassObject failed." @@ -10426,7 +10440,6 @@ msgstr "" "다. 만약 당신이 계속 진행하기를 원한다면 반드시 다시 만드십시오!" #: winecfg.rc:80 -#, fuzzy msgctxt "Drive letter" msgid "Letter" msgstr "문자" @@ -10668,7 +10681,6 @@ msgstr "" "옵션:\n" #: wineconsole.rc:49 -#, fuzzy msgid "" " --backend={user|curses} Choosing user will spawn a new window, curses " "will\n" @@ -10676,16 +10688,14 @@ msgid "" "console.\n" msgstr "" " --backend={user|curses} 사용자가 새 창을 열 것인지,\n" -" curses가 Wine 콘솔처럼 현재 터미널에 나타낼 것인" -"지 선택\n" +" curses으로 Wine 콘솔처럼 현재 터미널에 나타낼 것" +"인지 선택\n" #: wineconsole.rc:51 -#, fuzzy msgid " <command> The Wine program to launch in the console.\n" msgstr " <명령> The Wine 프로그램은 콘솔을 통해서 시작됨\n" #: wineconsole.rc:52 -#, fuzzy msgid "" "\n" "Example:\n" @@ -11319,7 +11329,6 @@ msgid "D" msgstr "D" #: xcopy.rc:77 -#, fuzzy msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n"

1 0

Francois Gouget : po: Add a linefeed to fix the Lithuanian translation.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: 3598c0dabc4df429a1c2f627af0de37254d0276e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3598c0dabc4df429a1c2f627a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 9 12:51:37 2011 +0200 po: Add a linefeed to fix the Lithuanian translation. --- po/lt.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/lt.po b/po/lt.po index 21a1880..649d7e9 100644 --- a/po/lt.po +++ b/po/lt.po @@ -7731,7 +7731,7 @@ msgstr "" "Nurodo failą ar failus attrib apdorojimui.\n" "/S Apdoroja atitinkančius failus dabartiniame\n" "aplanke ir poaplankiuose.\n" -"/D Taip pat apdoroja aplankus." +"/D Taip pat apdoroja aplankus.\n" #: clock.rc:29 msgid "Ana&log"

1 0

Francois Gouget : po: Remove English strings from the Swedish translation.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: 88b1591e24a015757c8e034edd325bc8f2c793e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88b1591e24a015757c8e034ed… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 9 02:20:29 2011 +0200 po: Remove English strings from the Swedish translation. --- po/sv.po | 231 ++++++++++++++++++++++++++++---------------------------------- 1 files changed, 105 insertions(+), 126 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=88b1591e24a015757c8e0…

1 0

Hans Leidekker : msi: Return the right error from ResolveSource when the user cancels.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: bd3885946c20be13cc2f96d2bdd8bd5490ddc1da URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd3885946c20be13cc2f96d2b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 9 11:01:12 2011 +0200 msi: Return the right error from ResolveSource when the user cancels. --- dlls/msi/action.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 4c857f9..69384be 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5149,11 +5149,11 @@ static UINT ACTION_ResolveSource(MSIPACKAGE* package) msg = msi_build_error_string(package, 1302, 1, prompt); while(attrib == INVALID_FILE_ATTRIBUTES) { - rc = MessageBoxW(NULL,msg,NULL,MB_OKCANCEL); + rc = MessageBoxW(NULL, msg, NULL, MB_OKCANCEL); if (rc == IDCANCEL) { - rc = ERROR_INSTALL_USEREXIT; - break; + msi_free(prompt); + return ERROR_INSTALL_USEREXIT; } attrib = GetFileAttributesW(package->db->path); }

1 0

Henri Verbeet : wined3d: Use the CPU blitter for blitting to converted surfaces.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: 5c57b53a6c6038f8d25178ce77b781e68561cf11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c57b53a6c6038f8d25178ce7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 8 23:50:36 2011 +0200 wined3d: Use the CPU blitter for blitting to converted surfaces. --- dlls/wined3d/surface.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d62e31c..b92a1a1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1554,6 +1554,15 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC goto cpu; } + /* We want to avoid invalidating the sysmem location for converted + * surfaces, since otherwise we'd have to convert the data back when + * locking them. */ + if (dst_surface->flags & SFLAG_CONVERTED) + { + WARN("Converted surface, using CPU blit.\n"); + return surface_cpu_blt(dst_surface, &dst_rect, src_surface, &src_rect, flags, fx, filter); + } + if (flags & ~simple_blit) { WARN("Using fallback for complex blit (%#x).\n", flags); @@ -2181,7 +2190,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct /* Only support read back of converted P8 surfaces. */ if (surface->flags & SFLAG_CONVERTED && format->id != WINED3DFMT_P8_UINT) { - FIXME("Readback conversion not supported for format %s.\n", debug_d3dformat(format->id)); + ERR("Trying to read back converted surface %p with format %s.\n", surface, debug_d3dformat(format->id)); return; }

1 0