May 2011 - Wine-commits - list.winehq.org

Akihiro Sagawa : gdi32: Pass a proper code point from GetGlyphOutlineA to W version.
by Alexandre Julliard 04 May '11

04 May '11

Module: wine Branch: master Commit: 79ab0c3375e0da711235152bbb65618c171e732f URL: http://source.winehq.org/git/wine.git/?a=commit;h=79ab0c3375e0da711235152bb… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 4 19:58:16 2011 +0900 gdi32: Pass a proper code point from GetGlyphOutlineA to W version. --- dlls/gdi32/font.c | 1 + dlls/gdi32/tests/font.c | 2 -- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 93b425a..6f5e479 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2521,6 +2521,7 @@ DWORD WINAPI GetGlyphOutlineA( HDC hdc, UINT uChar, UINT fuFormat, len = 1; mbchs[0] = (uChar & 0xff); } + uChar = 0; MultiByteToWideChar(cp, 0, mbchs, len, (LPWSTR)&uChar, 1); } diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 900177e..da155e1 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3247,14 +3247,12 @@ static void test_GetGlyphOutline(void) ok(ret == ret2 && memcmp(&gm, &gm2, sizeof gm) == 0, "%d %d\n", ret, ret2); ret = GetGlyphOutlineA(hdc, 0xcc8041, GGO_BITMAP, &gm, 0, NULL, &mat); - todo_wine ok(ret == ret2 && memcmp(&gm, &gm2, sizeof gm) == 0, "Expected to ignore superfluous bytes, got %d %d\n", ret, ret2); /* expected to ignore superfluous bytes (double-byte character) */ ret = GetGlyphOutlineA(hdc, c[i].a, GGO_BITMAP, &gm, 0, NULL, &mat); ret2 = GetGlyphOutlineA(hdc, c[i].a | 0xdead0000, GGO_BITMAP, &gm2, 0, NULL, &mat); - todo_wine ok(ret == ret2 && memcmp(&gm, &gm2, sizeof gm) == 0, "Expected to ignore superfluous bytes, got %d %d\n", ret, ret2);

1 0

Nikolay Sivov : msxml3: Basic tests for startElement().
by Alexandre Julliard 04 May '11

04 May '11

Module: wine Branch: master Commit: 6e123f3cbfe4397bc80d35e84101f30aee372175 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e123f3cbfe4397bc80d35e84… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 4 12:21:39 2011 +0400 msxml3: Basic tests for startElement(). --- dlls/msxml3/tests/saxreader.c | 91 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 0f732ad..46e8004 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -957,6 +957,96 @@ static void test_mxwriter_startenddocument(void) free_bstrs(); } +static void test_mxwriter_startendelement(void) +{ + static const char winehqA[] = "http://winehq.org"; + ISAXContentHandler *content; + IMXWriter *writer; + VARIANT dest; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IMXWriter_put_omitXMLDeclaration(writer, VARIANT_TRUE); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ISAXContentHandler_startDocument(content); + ok(hr == S_OK, "got %08x\n", hr); + + /* qualified name without defined namespace */ + hr = ISAXContentHandler_startElement(content, NULL, 0, NULL, 0, _bstr_("a:b"), 3, NULL); + todo_wine ok(hr == E_INVALIDARG, "got %08x\n", hr); + + hr = ISAXContentHandler_startElement(content, NULL, 0, _bstr_("b"), 1, _bstr_("a:b"), 3, NULL); + todo_wine ok(hr == E_INVALIDARG, "got %08x\n", hr); + + /* only local name is an error too */ + hr = ISAXContentHandler_startElement(content, NULL, 0, _bstr_("b"), 1, NULL, 0, NULL); + todo_wine ok(hr == E_INVALIDARG, "got %08x\n", hr); + + /* only local name is an error too */ + hr = ISAXContentHandler_startElement(content, _bstr_(""), 0, _bstr_("b"), 1, NULL, 0, NULL); + todo_wine ok(hr == E_INVALIDARG, "got %08x\n", hr); + + /* all string pointers should be not null */ + hr = ISAXContentHandler_startElement(content, _bstr_(""), 0, _bstr_("b"), 1, _bstr_(""), 0, NULL); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + ok(hr == S_OK, "got %08x\n", hr); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + todo_wine ok(!lstrcmpW(_bstr_("<>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + hr = ISAXContentHandler_startElement(content, _bstr_(""), 0, _bstr_(""), 0, _bstr_("b"), 1, NULL); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + ok(hr == S_OK, "got %08x\n", hr); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + todo_wine ok(!lstrcmpW(_bstr_("<>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + hr = ISAXContentHandler_endElement(content, _bstr_(""), 0, _bstr_(""), 0, _bstr_("b"), 1); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + ok(hr == S_OK, "got %08x\n", hr); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + todo_wine ok(!lstrcmpW(_bstr_("<>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + /* some with namespace URI */ + hr = ISAXContentHandler_startElement(content, _bstr_(winehqA), sizeof(winehqA), _bstr_(""), 0, _bstr_("nspace:c"), 8, NULL); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + + hr = ISAXContentHandler_endElement(content, _bstr_(winehqA), sizeof(winehqA), _bstr_(""), 0, _bstr_("nspace:c"), 8); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + ok(hr == S_OK, "got %08x\n", hr); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + todo_wine ok(!lstrcmpW(_bstr_("<><nspace:c/>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + hr = ISAXContentHandler_endDocument(content); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + + ISAXContentHandler_Release(content); + IMXWriter_Release(writer); + + free_bstrs(); +} + START_TEST(saxreader) { ISAXXMLReader *reader; @@ -988,6 +1078,7 @@ START_TEST(saxreader) test_mxwriter_contenthandler(); test_mxwriter_startenddocument(); + test_mxwriter_startendelement(); test_mxwriter_properties(); test_mxwriter_flush(); }

1 0

Huw Davies : oleaut32/tests: Skip the named time tests for locales that use the 24 hour clock.
by Alexandre Julliard 04 May '11

04 May '11

Module: wine Branch: master Commit: da27bb59379834f501d89aeca9540e1e2f9a4edd URL: http://source.winehq.org/git/wine.git/?a=commit;h=da27bb59379834f501d89aeca… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 4 11:26:50 2011 +0100 oleaut32/tests: Skip the named time tests for locales that use the 24 hour clock. --- dlls/oleaut32/tests/varformat.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index b1fe73f..ae74429 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -310,10 +310,10 @@ static void test_VarFormat(void) } /* Named time formats */ - GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_STIME, buff, sizeof(buff)/sizeof(char)); - if (buff[0] != ':' || buff[1]) + GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_STIMEFORMAT, buff, sizeof(buff)/sizeof(char)); + if (strcmp(buff, "h:mm:ss tt")) { - skip("Skipping namedtime tests as time separator is '%s'\n", buff); + skip("Skipping named time tests as time format is '%s'\n", buff); } else {

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 04 May '11

04 May '11

Module: wine Branch: master Commit: 1f391208f9142fb650007a9a3d1be5f1c8ad3afd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f391208f9142fb650007a9a3… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed May 4 11:44:25 2011 +0900 po: Update Korean translation. --- po/ko.po | 25 ++++++++----------------- 1 files changed, 8 insertions(+), 17 deletions(-) diff --git a/po/ko.po b/po/ko.po index 47d67de..e1d2a73 100644 --- a/po/ko.po +++ b/po/ko.po @@ -356,7 +356,6 @@ msgstr "" "여백을 다시 입력하시오." #: comdlg32.rc:74 -#, fuzzy msgid "The 'Number of copies' field cannot be empty." msgstr " '복사본 수'의 숫자값은 빈 값이 올 수 없습니다." @@ -685,9 +684,8 @@ msgid "Unstructured Address" msgstr "비구조화 주소" #: crypt32.rc:51 -#, fuzzy msgid "S/MIME Capabilities" -msgstr "SMIME 특성" +msgstr "S/MIME 능력" #: crypt32.rc:52 msgid "Prefer Signed Data" @@ -9180,9 +9178,8 @@ msgid "&Export Registry File..." msgstr "레지스트리 파일 내보내기(&E)..." #: regedit.rc:42 regedit.rc:87 -#, fuzzy msgid "&Modify..." -msgstr "수정(&M)" +msgstr "고치기(&M)..." #: regedit.rc:46 regedit.rc:97 msgid "&Key" @@ -9241,9 +9238,8 @@ msgid "&About Registry Editor" msgstr "레지스트리 편집기 정보(&A)" #: regedit.rc:88 -#, fuzzy msgid "Modify Binary Data..." -msgstr "이진값 고치기" +msgstr "이진값 고치기..." #: regedit.rc:109 msgid "&Export..." @@ -10161,9 +10157,8 @@ msgid "Regular Metafile Viewer" msgstr "정규 메타파일 보기" #: winecfg.rc:32 -#, fuzzy msgid "Configure..." -msgstr "설정" +msgstr "설정..." #: winecfg.rc:39 msgid "Libraries" @@ -10303,9 +10298,8 @@ msgid "None" msgstr "없음" #: winecfg.rc:81 -#, fuzzy msgid "Autodetect..." -msgstr "자동으로 찾기" +msgstr "자동으로 찾기..." #: winecfg.rc:82 msgid "Local hard disk" @@ -10710,9 +10704,8 @@ msgid "Re&name..." msgstr "이름바꾸기(&N)..." #: winefile.rc:31 -#, fuzzy msgid "Propert&ies\tAlt+Enter" -msgstr "속성(&I)...\tAlt+Enter" +msgstr "속성(&I)\tAlt+Enter" #: winefile.rc:33 msgid "&Run..." @@ -10731,9 +10724,8 @@ msgid "&Disk" msgstr "디스크(&D)" #: winefile.rc:45 -#, fuzzy msgid "Connect &Network Drive..." -msgstr "네트워크 드라이브 연결(&N)" +msgstr "네트워크 드라이브 연결(&N)..." #: winefile.rc:46 msgid "&Disconnect Network Drive" @@ -10764,9 +10756,8 @@ msgid "Sort by &Date" msgstr "날짜로 정렬(&D)" #: winefile.rc:60 -#, fuzzy msgid "Filter by&..." -msgstr "&...로 여과" +msgstr "&...로 걸려내기" #: winefile.rc:67 msgid "&Drivebar"

1 0

Hwang YunSong : winecfg: Update Korean resource.
by Alexandre Julliard 04 May '11

04 May '11

Module: wine Branch: master Commit: 0a51b005d3535ec7e6cdc196156c4d10d52372dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a51b005d3535ec7e6cdc1961… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed May 4 11:48:44 2011 +0900 winecfg: Update Korean resource. --- programs/winecfg/Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc index f2ea54d..38f7c37 100644 --- a/programs/winecfg/Ko.rc +++ b/programs/winecfg/Ko.rc @@ -141,7 +141,7 @@ BEGIN LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,18,232,76 PUSHBUTTON "추가(&A)...",IDC_BUTTON_ADD,15,98,37,14 PUSHBUTTON "제거(&R)",IDC_BUTTON_REMOVE,56,98,37,14 - PUSHBUTTON "자동찾기(&D)...",IDC_BUTTON_AUTODETECT,197,98,49,14 + PUSHBUTTON "자동찾기(&D)",IDC_BUTTON_AUTODETECT,197,98,49,14 /* editing drive details */ LTEXT "경로(&P):",IDC_STATIC_PATH,13,123,25,9

1 0

Jacek Caban : wininet: Moved connected check out of NETCON_set_timeout.
by Alexandre Julliard 04 May '11

04 May '11

Module: wine Branch: master Commit: 4c1c5fe64c2fc9e297b3cc7c7b1ebbc480304a02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c1c5fe64c2fc9e297b3cc7c7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 4 11:47:32 2011 +0000 wininet: Moved connected check out of NETCON_set_timeout. --- dlls/wininet/http.c | 5 +++++ dlls/wininet/netconnection.c | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index bc1fcf4..d925975 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1995,6 +1995,11 @@ static DWORD HTTPREQ_SetOption(object_header_t *hdr, DWORD option, void *buffer, if (size != sizeof(DWORD)) return ERROR_INVALID_PARAMETER; + if(NETCON_connected(&req->netConnection)) { + FIXME("unsupported without active connection\n"); + return ERROR_SUCCESS; + } + return NETCON_set_timeout(&req->netConnection, option == INTERNET_OPTION_SEND_TIMEOUT, *(DWORD*)buffer); diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 1142523..fbfb113 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -896,11 +896,6 @@ DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, int value) int result; struct timeval tv; - /* FIXME: we should probably store the timeout in the connection to set - * when we do connect */ - if (!NETCON_connected(connection)) - return ERROR_SUCCESS; - /* value is in milliseconds, convert to struct timeval */ tv.tv_sec = value / 1000; tv.tv_usec = (value % 1000) * 1000;

1 0

Michael Stefaniuc : mlang: COM cleanup.
by Alexandre Julliard 04 May '11

04 May '11

Module: wine Branch: master Commit: c39fb845ea75f7f7a56552bffc5271a312a1e31f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c39fb845ea75f7f7a56552bff… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed May 4 14:06:22 2011 +0200 mlang: COM cleanup. --- dlls/mlang/mlang.c | 78 ++++++++++++++++++++++++++-------------------------- 1 files changed, 39 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c39fb845ea75f7f7a5655…

1 0

Piotr Caban : wine.inf: Add quotes to webbrowser command keys.
by Alexandre Julliard 04 May '11

04 May '11

Module: wine Branch: master Commit: 54833c9b7cf5f8f5e37b43038e1fa4c1c369deb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54833c9b7cf5f8f5e37b43038… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 4 13:20:41 2011 +0200 wine.inf: Add quotes to webbrowser command keys. --- dlls/msi/tests/package.c | 5 +---- tools/wine.inf.in | 10 +++++----- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 6060ea4..ce8866c 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -7983,10 +7983,7 @@ static void test_appsearch(void) size = sizeof(prop); r = MsiGetPropertyA( hpkg, "WEBBROWSERPROG", prop, &size ); ok( r == ERROR_SUCCESS, "get property failed: %d\n", r); - todo_wine - { - ok( lstrlenA(prop) != 0, "Expected non-zero length\n"); - } + ok( lstrlenA(prop) != 0, "Expected non-zero length\n"); size = sizeof(prop); r = MsiGetPropertyA( hpkg, "NOTEPAD", prop, &size ); diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 1ce4ffc..8e8eba8 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -176,7 +176,7 @@ HKCR,folder\shell\open\ddeexec,"NoActivateHandler",2,"" HKCR,folder\shell\open\ddeexec\application,,2,"Folders" HKCR,hlpfile,,2,"Help File" HKCR,hlpfile\shell\open\command,,2,"%11%\winhlp32.exe %1" -HKCR,htmlfile\shell\open\command,,2,"%11%\winebrowser.exe -nohome" +HKCR,htmlfile\shell\open\command,,2,"""%11%\winebrowser.exe"" -nohome" HKCR,htmlfile\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," HKCR,htmlfile\shell\open\ddeexec,"NoActivateHandler",2,"" HKCR,htmlfile\shell\open\ddeexec\Application,,2,"IExplore" @@ -210,22 +210,22 @@ HKCR,txtfile\shell\print\command,,2,"%11%\notepad.exe /p %1" HKCR,wrifile\shell\open\command,,2,"%11%\wordpad.exe %1" HKCR,wrifile\shell\print\command,,2,"%11%\wordpad.exe /p %1" HKCR,xmlfile,,2,"XML Document" -HKCR,xmlfile\shell\open\command,,2,"%11%\winebrowser.exe -nohome" +HKCR,xmlfile\shell\open\command,,2,"""%11%\winebrowser.exe"" -nohome" HKCR,xmlfile\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," HKCR,xmlfile\shell\open\ddeexec,"NoActivateHandler",2,"" HKCR,xmlfile\shell\open\ddeexec\Application,,2,"IExplore" HKCR,xmlfile\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" -HKCR,ftp\shell\open\command,,2,"%11%\winebrowser.exe -nohome" +HKCR,ftp\shell\open\command,,2,"""%11%\winebrowser.exe"" -nohome" HKCR,ftp\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," HKCR,ftp\shell\open\ddeexec,"NoActivateHandler",2,"" HKCR,ftp\shell\open\ddeexec\Application,,2,"IExplore" HKCR,ftp\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" -HKCR,http\shell\open\command,,2,"%11%\winebrowser.exe -nohome" +HKCR,http\shell\open\command,,2,"""%11%\winebrowser.exe"" -nohome" HKCR,http\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," HKCR,http\shell\open\ddeexec,"NoActivateHandler",2,"" HKCR,http\shell\open\ddeexec\Application,,2,"IExplore" HKCR,http\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" -HKCR,https\shell\open\command,,2,"%11%\winebrowser.exe -nohome" +HKCR,https\shell\open\command,,2,"""%11%\winebrowser.exe"" -nohome" HKCR,https\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," HKCR,https\shell\open\ddeexec,"NoActivateHandler",2,"" HKCR,https\shell\open\ddeexec\Application,,2,"IExplore"

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetPixelShader().
by Alexandre Julliard 04 May '11

04 May '11

Module: wine Branch: master Commit: 59abf094cfe8b8eec57632f88c4fe7fa9a9bd3da URL: http://source.winehq.org/git/wine.git/?a=commit;h=59abf094cfe8b8eec57632f88… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue May 3 21:25:24 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetPixelShader(). --- dlls/d3dx9_36/effect.c | 53 ++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 49 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index fcc3050..22f6993 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -325,6 +325,10 @@ static void free_parameter(D3DXHANDLE handle, BOOL element, BOOL child) HeapFree(GetProcessHeap(), 0, *(LPSTR *)param->data); break; + case D3DXPT_PIXELSHADER: + if (*(IUnknown **)param->data) IUnknown_Release(*(IUnknown **)param->data); + break; + default: FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type)); break; @@ -993,8 +997,22 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetValue(ID3DXBaseEffect *iface, D3DXH if (data && param && param->data && param->bytes <= bytes) { - TRACE("Copy %u bytes\n", param->bytes); - memcpy(data, param->data, param->bytes); + if (param->type == D3DXPT_PIXELSHADER) + { + UINT i; + + for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) + { + IUnknown *unk = ((IUnknown **)param->data)[i]; + if (unk) IUnknown_AddRef(unk); + ((IUnknown **)data)[i] = unk; + } + } + else + { + TRACE("Copy %u bytes\n", param->bytes); + memcpy(data, param->data, param->bytes); + } return D3D_OK; } @@ -1306,10 +1324,23 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetTexture(ID3DXBaseEffect *iface, D3D static HRESULT WINAPI ID3DXBaseEffectImpl_GetPixelShader(ID3DXBaseEffect *iface, D3DXHANDLE parameter, LPDIRECT3DPIXELSHADER9 *pshader) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = is_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, pshader %p stub\n", This, parameter, pshader); + TRACE("iface %p, parameter %p, pshader %p\n", This, parameter, pshader); - return E_NOTIMPL; + if (!param) param = get_parameter_by_name(This, NULL, parameter); + + if (pshader && param && !param->element_count && param->type == D3DXPT_PIXELSHADER) + { + *pshader = *(LPDIRECT3DPIXELSHADER9 *)param->data; + if (*pshader) IDirect3DPixelShader9_AddRef(*pshader); + TRACE("Returning %p\n", *pshader); + return D3D_OK; + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_GetVertexShader(ID3DXBaseEffect *iface, D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9 *vshader) @@ -3054,6 +3085,7 @@ static HRESULT d3dx9_parse_value(struct d3dx_parameter *param, void *value, cons switch (param->type) { case D3DXPT_STRING: + case D3DXPT_PIXELSHADER: read_dword(ptr, &id); TRACE("Id: %u\n", id); param->base->objects[id] = get_parameter_handle(param); @@ -3159,6 +3191,15 @@ static HRESULT d3dx9_parse_data(struct d3dx_parameter *param, const char **ptr) } break; + case D3DXPT_PIXELSHADER: + hr = IDirect3DDevice9_CreatePixelShader(param->base->effect->device, (DWORD *)*ptr, (LPDIRECT3DPIXELSHADER9 *)param->data); + if (hr != D3D_OK) + { + WARN("Failed to create pixel shader\n"); + return hr; + } + break; + default: FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type)); break; @@ -3247,6 +3288,10 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const ch param->bytes = sizeof(LPCSTR); break; + case D3DXPT_PIXELSHADER: + param->bytes = sizeof(LPDIRECT3DPIXELSHADER9); + break; + default: FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type)); break;

1 0

Henri Verbeet : d3d8/tests: Fix some failure messages in test_depth_stencil_size().
by Alexandre Julliard 04 May '11

04 May '11

Module: wine Branch: master Commit: b20a2703e40c50ae2f5b8cc872427ff094374207 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b20a2703e40c50ae2f5b8cc87… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 3 22:30:18 2011 +0200 d3d8/tests: Fix some failure messages in test_depth_stencil_size(). --- dlls/d3d8/tests/device.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 16fc22b..259d089 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2151,13 +2151,13 @@ static void test_depth_stencil_size(void) hr = IDirect3DDevice8_SetRenderTarget(device, rt, ds); ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice8_SetRenderTarget returned %#x, expected D3DERR_INVALIDCALL.\n", hr); hr = IDirect3DDevice8_SetRenderTarget(device, rt, ds_bigger); - ok(SUCCEEDED(hr), "IDirect3DDevice8_CreateDepthStencilSurface failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "IDirect3DDevice8_SetRenderTarget failed, hr %#x.\n", hr); /* try to set the small ds without changing the render target at the same time */ hr = IDirect3DDevice8_SetRenderTarget(device, NULL, ds); ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice8_SetRenderTarget returned %#x, expected D3DERR_INVALIDCALL.\n", hr); hr = IDirect3DDevice8_SetRenderTarget(device, NULL, ds_bigger2); - ok(SUCCEEDED(hr), "IDirect3DDevice8_CreateDepthStencilSurface failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "IDirect3DDevice8_SetRenderTarget failed, hr %#x.\n", hr); hr = IDirect3DDevice8_GetRenderTarget(device, &surf); ok(surf == rt, "The render target is %p, expected %p\n", surf, rt); @@ -2167,7 +2167,7 @@ static void test_depth_stencil_size(void) IDirect3DSurface8_Release(surf); hr = IDirect3DDevice8_SetRenderTarget(device, NULL, NULL); - ok(SUCCEEDED(hr), "IDirect3DDevice8_CreateDepthStencilSurface failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "IDirect3DDevice8_SetRenderTarget failed, hr %#x.\n", hr); hr = IDirect3DDevice8_GetDepthStencilSurface(device, &surf); ok(surf == NULL, "The depth stencil is %p, expected NULL\n", surf); if (surf) IDirect3DSurface8_Release(surf);

1 0