wine-commits November 2011

wine-commits@winehq.org

2 participants
852 discussions

Francois Gouget : dlls: Remove unneeded include directives in resource files.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 8eef0cc258f86b8696bfa2b30eba8d2821102daa URL: http://source.winehq.org/git/wine.git/?a=commit;h=8eef0cc258f86b8696bfa2b30… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 14 09:54:01 2011 +0100 dlls: Remove unneeded include directives in resource files. --- dlls/msvcrt/rsrc.rc | 5 +---- dlls/ntprint/ntprint.rc | 3 --- dlls/printui/printui.rc | 3 --- dlls/version/tests/version.rc | 2 -- dlls/winscard/rsrc.rc | 5 +---- include/wine/wine_common_ver.rc | 4 +--- 6 files changed, 3 insertions(+), 19 deletions(-) diff --git a/dlls/msvcrt/rsrc.rc b/dlls/msvcrt/rsrc.rc index 39abbef..8fa3de9 100644 --- a/dlls/msvcrt/rsrc.rc +++ b/dlls/msvcrt/rsrc.rc @@ -18,10 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winver.h" +#include "winresrc.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/dlls/ntprint/ntprint.rc b/dlls/ntprint/ntprint.rc index ca56d3f..272f151 100644 --- a/dlls/ntprint/ntprint.rc +++ b/dlls/ntprint/ntprint.rc @@ -19,9 +19,6 @@ * */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" #include "winver.h" #define WINE_FILENAME_STR "ntprint.dll" diff --git a/dlls/printui/printui.rc b/dlls/printui/printui.rc index d8d0d4b..bfbae98 100644 --- a/dlls/printui/printui.rc +++ b/dlls/printui/printui.rc @@ -19,9 +19,6 @@ * */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" #include "winver.h" #define WINE_FILENAME_STR "printui.dll" diff --git a/dlls/version/tests/version.rc b/dlls/version/tests/version.rc index c754e0c..e7d1b33 100644 --- a/dlls/version/tests/version.rc +++ b/dlls/version/tests/version.rc @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" #include "winver.h" VS_VERSION_INFO VERSIONINFO diff --git a/dlls/winscard/rsrc.rc b/dlls/winscard/rsrc.rc index 8226e9d..3ec383d 100644 --- a/dlls/winscard/rsrc.rc +++ b/dlls/winscard/rsrc.rc @@ -18,10 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winver.h" +#include "winresrc.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index 9cd607f..8447169 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -17,9 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" -#include "winver.h" +#include "winresrc.h" /* Assign WINE_FILEVERSION and WINE_FILEVERSION_STR high enough number

1 0

Nikolay Sivov : msxml3: Fix getNamedItem() for qualified node names.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 02cd5a008f011fcd8a58b8346fb536d576227ffb URL: http://source.winehq.org/git/wine.git/?a=commit;h=02cd5a008f011fcd8a58b8346… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 12 17:14:11 2011 +0300 msxml3: Fix getNamedItem() for qualified node names. --- dlls/msxml3/nodemap.c | 42 +++++++++++++++- dlls/msxml3/tests/domdoc.c | 110 +++++++++++++++++++++++++++++++++++++------ 2 files changed, 133 insertions(+), 19 deletions(-) diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index ebc2bd5..47adcd9 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -199,11 +199,47 @@ static HRESULT WINAPI xmlnodemap_Invoke( static HRESULT WINAPI xmlnodemap_getNamedItem( IXMLDOMNamedNodeMap *iface, BSTR name, - IXMLDOMNode** namedItem) + IXMLDOMNode** item) { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); - TRACE("(%p)->(%s %p)\n", This, debugstr_w(name), namedItem ); - return IXMLDOMNamedNodeMap_getQualifiedItem(iface, name, NULL, namedItem); + xmlChar *nameA, *local, *prefix; + BSTR uriW, localW; + xmlNsPtr ns; + HRESULT hr; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(name), item ); + + nameA = xmlchar_from_wchar(name); + local = xmlSplitQName2(nameA, &prefix); + heap_free(nameA); + + if (!local) + return IXMLDOMNamedNodeMap_getQualifiedItem(iface, name, NULL, item); + + /* try to get namespace uri for supplied qualified name */ + ns = xmlSearchNs(This->node->doc, This->node, prefix); + + xmlFree(prefix); + + if (!ns) + { + xmlFree(local); + if (item) *item = NULL; + return item ? S_FALSE : E_INVALIDARG; + } + + uriW = bstr_from_xmlChar(ns->href); + localW = bstr_from_xmlChar(local); + xmlFree(local); + + TRACE("got qualified node %s, uri=%s\n", debugstr_w(localW), debugstr_w(uriW)); + + hr = IXMLDOMNamedNodeMap_getQualifiedItem(iface, localW, uriW, item); + + SysFreeString(localW); + SysFreeString(uriW); + + return hr; } static HRESULT WINAPI xmlnodemap_setNamedItem( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index affdfaa..a79da43 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1746,6 +1746,12 @@ static const char* leading_spaces[] = { 0 }; +static const char default_ns_doc[] = { + "<?xml version=\"1.0\"?>" + "<a xmlns:ns=\"nshref\" xml:lang=\"ru\" ns:b=\"b attr\" xml:c=\"c attr\" " + " d=\"d attr\" />" +}; + static const WCHAR szNonExistentFile[] = { 'c', ':', '\\', 'N', 'o', 'n', 'e', 'x', 'i', 's', 't', 'e', 'n', 't', '.', 'x', 'm', 'l', 0 }; @@ -7973,63 +7979,135 @@ static void test_splitText(void) free_bstrs(); } +typedef struct { + const char *name; + const char *uri; + HRESULT hr; +} ns_item_t; + +/* default_ns_doc used */ +static const ns_item_t qualified_item_tests[] = { + { "xml:lang", NULL, S_FALSE }, + { "xml:lang", "http://www.w3.org/XML/1998/namespace", S_FALSE }, + { "lang", "http://www.w3.org/XML/1998/namespace", S_OK }, + { "ns:b", NULL, S_FALSE }, + { "ns:b", "nshref", S_FALSE }, + { "b", "nshref", S_OK }, + { "d", NULL, S_OK }, + { NULL } +}; + +static const ns_item_t named_item_tests[] = { + { "xml:lang", NULL, S_OK }, + { "lang", NULL, S_FALSE }, + { "ns:b", NULL, S_OK }, + { "b", NULL, S_FALSE }, + { "d", NULL, S_OK }, + { NULL } +}; + static void test_getQualifiedItem(void) { - IXMLDOMDocument *doc; - IXMLDOMElement *element; IXMLDOMNode *pr_node, *node; IXMLDOMNodeList *root_list; IXMLDOMNamedNodeMap *map; + IXMLDOMElement *element; + const ns_item_t* ptr; + IXMLDOMDocument *doc; VARIANT_BOOL b; + HRESULT hr; BSTR str; LONG len; - HRESULT hr; doc = create_document(&IID_IXMLDOMDocument); if (!doc) return; str = SysAllocString( szComplete4 ); hr = IXMLDOMDocument_loadXML( doc, str, &b ); - ok( hr == S_OK, "loadXML failed\n"); + EXPECT_HR(hr, S_OK); ok( b == VARIANT_TRUE, "failed to load XML string\n"); SysFreeString( str ); hr = IXMLDOMDocument_get_documentElement(doc, &element); - ok( hr == S_OK, "ret %08x\n", hr); + EXPECT_HR(hr, S_OK); hr = IXMLDOMElement_get_childNodes(element, &root_list); - ok( hr == S_OK, "ret %08x\n", hr); + EXPECT_HR(hr, S_OK); hr = IXMLDOMNodeList_get_item(root_list, 1, &pr_node); - ok( hr == S_OK, "ret %08x\n", hr); + EXPECT_HR(hr, S_OK); IXMLDOMNodeList_Release(root_list); hr = IXMLDOMNode_get_attributes(pr_node, &map); - ok( hr == S_OK, "ret %08x\n", hr); + EXPECT_HR(hr, S_OK); IXMLDOMNode_Release(pr_node); + len = 0; hr = IXMLDOMNamedNodeMap_get_length(map, &len); - ok( hr == S_OK, "ret %08x\n", hr); + EXPECT_HR(hr, S_OK); ok( len == 3, "length %d\n", len); hr = IXMLDOMNamedNodeMap_getQualifiedItem(map, NULL, NULL, NULL); - ok( hr == E_INVALIDARG, "ret %08x\n", hr); + EXPECT_HR(hr, E_INVALIDARG); node = (void*)0xdeadbeef; hr = IXMLDOMNamedNodeMap_getQualifiedItem(map, NULL, NULL, &node); - ok( hr == E_INVALIDARG, "ret %08x\n", hr); + EXPECT_HR(hr, E_INVALIDARG); ok( node == (void*)0xdeadbeef, "got %p\n", node); hr = IXMLDOMNamedNodeMap_getQualifiedItem(map, _bstr_("id"), NULL, NULL); - ok( hr == E_INVALIDARG, "ret %08x\n", hr); + EXPECT_HR(hr, E_INVALIDARG); hr = IXMLDOMNamedNodeMap_getQualifiedItem(map, _bstr_("id"), NULL, &node); - ok( hr == S_OK, "ret %08x\n", hr); + EXPECT_HR(hr, S_OK); + IXMLDOMNode_Release(node); + IXMLDOMNamedNodeMap_Release(map); + IXMLDOMElement_Release(element); - IXMLDOMNamedNodeMap_Release( map ); - IXMLDOMElement_Release( element ); - IXMLDOMDocument_Release( doc ); + hr = IXMLDOMDocument_loadXML(doc, _bstr_(default_ns_doc), &b); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("a"), &node); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)&element); + EXPECT_HR(hr, S_OK); + IXMLDOMNode_Release(node); + + hr = IXMLDOMElement_get_attributes(element, &map); + EXPECT_HR(hr, S_OK); + + ptr = qualified_item_tests; + while (ptr->name) + { + node = (void*)0xdeadbeef; + hr = IXMLDOMNamedNodeMap_getQualifiedItem(map, _bstr_(ptr->name), _bstr_(ptr->uri), &node); + ok(hr == ptr->hr, "%s, %s: got 0x%08x, expected 0x%08x\n", ptr->name, ptr->uri, hr, ptr->hr); + if (hr == S_OK) + IXMLDOMNode_Release(node); + else + ok(node == NULL, "%s, %s: got %p\n", ptr->name, ptr->uri, node); + ptr++; + } + + ptr = named_item_tests; + while (ptr->name) + { + node = (void*)0xdeadbeef; + hr = IXMLDOMNamedNodeMap_getNamedItem(map, _bstr_(ptr->name), &node); + ok(hr == ptr->hr, "%s: got 0x%08x, expected 0x%08x\n", ptr->name, hr, ptr->hr); + if (hr == S_OK) + IXMLDOMNode_Release(node); + else + ok(node == NULL, "%s: got %p\n", ptr->name, node); + ptr++; + } + + IXMLDOMNamedNodeMap_Release(map); + + IXMLDOMElement_Release(element); + IXMLDOMDocument_Release(doc); free_bstrs(); }

1 0

Hwang YunSong : po: Updated Korean translation.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 5fca6525d2de1e3ba5661ed418bd344cb9761899 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fca6525d2de1e3ba5661ed41… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sun Nov 13 22:54:49 2011 +0900 po: Updated Korean translation. --- po/ko.po | 38 ++++++++++++++++++-------------------- 1 files changed, 18 insertions(+), 20 deletions(-) diff --git a/po/ko.po b/po/ko.po index cb6ede1..064b6c5 100644 --- a/po/ko.po +++ b/po/ko.po @@ -2026,77 +2026,75 @@ msgstr "지역 설정" #: dxdiagn.rc:26 msgid "%uMB used, %uMB available" -msgstr "%uMB 사용됨, %uMB 가능함" +msgstr "%uMB 사용됨, %uMB 사용 가능함" #: gdi32.rc:25 msgid "Western" -msgstr "" +msgstr "서" #: gdi32.rc:26 msgid "Central European" -msgstr "" +msgstr "중부 유럽" #: gdi32.rc:27 msgid "Cyrillic" -msgstr "" +msgstr "키릴문자" #: gdi32.rc:28 -#, fuzzy msgid "Greek" -msgstr "녹색" +msgstr "그리스어" #: gdi32.rc:29 msgid "Turkish" -msgstr "" +msgstr "터키어" #: gdi32.rc:30 msgid "Hebrew" -msgstr "" +msgstr "히브리어" #: gdi32.rc:31 msgid "Arabic" -msgstr "" +msgstr "아랍어" #: gdi32.rc:32 msgid "Baltic" -msgstr "" +msgstr "발트어" #: gdi32.rc:33 msgid "Vietnamese" -msgstr "" +msgstr "베트남어" #: gdi32.rc:34 msgid "Thai" -msgstr "" +msgstr "타이어" #: gdi32.rc:35 -#, fuzzy msgid "Japanese" -msgstr "틀" +msgstr "일본" #: gdi32.rc:36 msgid "CHINESE_GB2312" -msgstr "" +msgstr "중국어 GB2312" #: gdi32.rc:37 msgid "Hangul" -msgstr "" +msgstr "한글" #: gdi32.rc:38 msgid "CHINESE_BIG5" -msgstr "" +msgstr "중국어 BIG5" #: gdi32.rc:39 msgid "Hangul(Johab)" -msgstr "" +msgstr "한글(조합)" #: gdi32.rc:40 msgid "Symbol" -msgstr "" +msgstr "기호" #: gdi32.rc:41 msgid "OEM/DOS" -msgstr "" +msgstr "OEM/도" #: hhctrl.rc:56 msgid "S&ync"

1 0

Hwang YunSong : cmdlgtst: Updated Korean translation.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: bc0a708f6da21fe6caa5b9db9e41a0dad8370fc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc0a708f6da21fe6caa5b9db9… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sun Nov 13 22:57:43 2011 +0900 cmdlgtst: Updated Korean translation. --- programs/cmdlgtst/Ko.rc | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/programs/cmdlgtst/Ko.rc b/programs/cmdlgtst/Ko.rc index fcd4eac..131d973 100644 --- a/programs/cmdlgtst/Ko.rc +++ b/programs/cmdlgtst/Ko.rc @@ -248,8 +248,8 @@ CAPTION "정보" FONT 9, "MS Shell Dlg" { DEFPUSHBUTTON "확인", IDOK, 72, 96, 50, 14 - LTEXT "공통 대화상자 테스트 지그 액서사이저, 버젼 1.20", -1, 13, 36, 168, 15 - LTEXT "(c) 1999-2000, Eric Williams. Rights are as granted under the WINE license. 코드를 숨기기 않는다면... 나누자!", -1, 18, 60, 157, 24 + LTEXT "공통 대화상자 시험 지그 운동기, 버젼 1.20", -1, 13, 36, 168, 15 + LTEXT "(c) 1999-2000, Eric Williams. WINE 라이센스 아래 권리가 부여됩니다. 코드를 숨기기 않는다면... 나누자!", -1, 18, 60, 157, 24 ICON "AboutIcon", -1, 84, 12, 18, 20 } @@ -259,13 +259,13 @@ CAPTION "사용법" FONT 9, "MS Shell Dlg" { DEFPUSHBUTTON "확인", IDOK, 70, 276, 50, 14 - LTEXT "공통 대화상자 테스트 지그 액서사이저, 버젼 1.20", -1, 13, 48, 168, 12 - LTEXT "This tool tests COMMDLG for Wine.", -1, 12, 72, 168, 12 - LTEXT "Flags are specified in the Flags menu.", -1, 12, 96, 168, 12 - LTEXT "Color dialog changes background color.", -1, 12, 120, 168, 12 - LTEXT "Font dialog changes all fonts, and font color if CF_EFFECTS is selected.", -1, 12, 144, 168, 24 - LTEXT "Upper left hand corner indicate full pathname and title of the last successful Open or Save.", -1, 12, 180, 168, 24 - LTEXT "(c) 1999-2000, Eric Williams. Rights are as granted under the WINE license. 코드를 숨기지 않는다면... 나누자!", -1, 12, 228, 168, 36 + LTEXT "공통 대화상자 시험 지그 운동기, 버젼 1.20", -1, 13, 48, 168, 12 + LTEXT "이 도구는 Wine의 공용대화상자를 시험합니다.", -1, 12, 72, 168, 12 + LTEXT "플래그는 플래그 메뉴에서 지정됩니다.", -1, 12, 96, 168, 12 + LTEXT "색상 대화상자는 배경 색상을 바꿉니다.", -1, 12, 120, 168, 12 + LTEXT "글꼴 대화상자는 모든 글꼴을 바꾸고, 만약 CF_EFFECTS가 선택되어있다면 글꼴 색상도 바꿀수 있습니다.", -1, 12, 144, 168, 24 + LTEXT "위쪽 왼쪽 구석에 마지막으로 성공한 열거나 저장한 완전한 경로명과 제목을 표시합니다.", -1, 12, 180, 168, 24 + LTEXT "(c) 1999-2000, Eric Williams. WINE 라이센스 아래 권리가 부여됩니다. 코드를 숨기지 않는다면... 나누자!", -1, 12, 228, 168, 36 ICON "AboutIcon", -1, 86, 12, 18, 20 CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 12, 216, 168, 2 } @@ -288,13 +288,13 @@ BEGIN AUTORADIOBUTTON "세로(&P)", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON AUTORADIOBUTTON "가로(&L)", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "가장자리", grp4, 80, 156, 152, 56, BS_GROUPBOX - LTEXT "왼쪽(&E):", stc15, 85, 172, 24, 8 - EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER - LTEXT "오른쪽(&R):", stc16, 155, 172, 31, 8 - EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + LTEXT "왼쪽(&E):", stc15, 82, 173, 30, 8 + EDITTEXT edt4, 111, 173, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + LTEXT "오른쪽(&R):", stc16, 151, 173, 36, 8 + EDITTEXT edt6, 187, 173, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "위(&O):", stc17, 88, 192, 21, 8 EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER - LTEXT "아래(&B):", stc18, 159, 192, 23, 8 + LTEXT "아래(&B):", stc18, 153, 192, 30, 8 EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER DEFPUSHBUTTON "확인", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON PUSHBUTTON "취소", IDCANCEL, 126, 220, 50, 14

1 0

Daniel Scharrer : include: Don't use min/max in d3dx9math. inl as they might not be defined at this point.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 86781a6a524fa336f893ffd0a87373ffd306913c URL: http://source.winehq.org/git/wine.git/?a=commit;h=86781a6a524fa336f893ffd0a… Author: Daniel Scharrer <dscharrer(a)gmail.com> Date: Sat Nov 12 02:08:23 2011 +0100 include: Don't use min/max in d3dx9math.inl as they might not be defined at this point. --- include/d3dx9math.inl | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/d3dx9math.inl b/include/d3dx9math.inl index 3f55aef..0d80cf9 100644 --- a/include/d3dx9math.inl +++ b/include/d3dx9math.inl @@ -991,16 +991,16 @@ static inline D3DXVECTOR2* D3DXVec2Lerp(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv static inline D3DXVECTOR2* D3DXVec2Maximize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2) { if ( !pout || !pv1 || !pv2) return NULL; - pout->x = max(pv1->x , pv2->x); - pout->y = max(pv1->y , pv2->y); + pout->x = pv1->x > pv2->x ? pv1->x : pv2->x; + pout->y = pv1->y > pv2->y ? pv1->y : pv2->y; return pout; } static inline D3DXVECTOR2* D3DXVec2Minimize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2) { if ( !pout || !pv1 || !pv2) return NULL; - pout->x = min(pv1->x , pv2->x); - pout->y = min(pv1->y , pv2->y); + pout->x = pv1->x < pv2->x ? pv1->x : pv2->x; + pout->y = pv1->y < pv2->y ? pv1->y : pv2->y; return pout; } @@ -1070,18 +1070,18 @@ static inline D3DXVECTOR3* D3DXVec3Lerp(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv static inline D3DXVECTOR3* D3DXVec3Maximize(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2) { if ( !pout || !pv1 || !pv2) return NULL; - pout->x = max(pv1->x , pv2->x); - pout->y = max(pv1->y , pv2->y); - pout->z = max(pv1->z , pv2->z); + pout->x = pv1->x > pv2->x ? pv1->x : pv2->x; + pout->y = pv1->y > pv2->y ? pv1->y : pv2->y; + pout->z = pv1->z > pv2->z ? pv1->z : pv2->z; return pout; } static inline D3DXVECTOR3* D3DXVec3Minimize(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2) { if ( !pout || !pv1 || !pv2) return NULL; - pout->x = min(pv1->x , pv2->x); - pout->y = min(pv1->y , pv2->y); - pout->z = min(pv1->z , pv2->z); + pout->x = pv1->x < pv2->x ? pv1->x : pv2->x; + pout->y = pv1->y < pv2->y ? pv1->y : pv2->y; + pout->z = pv1->z < pv2->z ? pv1->z : pv2->z; return pout; } @@ -1146,20 +1146,20 @@ static inline D3DXVECTOR4* D3DXVec4Lerp(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv static inline D3DXVECTOR4* D3DXVec4Maximize(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2) { if ( !pout || !pv1 || !pv2) return NULL; - pout->x = max(pv1->x , pv2->x); - pout->y = max(pv1->y , pv2->y); - pout->z = max(pv1->z , pv2->z); - pout->w = max(pv1->w , pv2->w); + pout->x = pv1->x > pv2->x ? pv1->x : pv2->x; + pout->y = pv1->y > pv2->y ? pv1->y : pv2->y; + pout->z = pv1->z > pv2->z ? pv1->z : pv2->z; + pout->w = pv1->w > pv2->w ? pv1->w : pv2->w; return pout; } static inline D3DXVECTOR4* D3DXVec4Minimize(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2) { if ( !pout || !pv1 || !pv2) return NULL; - pout->x = min(pv1->x , pv2->x); - pout->y = min(pv1->y , pv2->y); - pout->z = min(pv1->z , pv2->z); - pout->w = min(pv1->w , pv2->w); + pout->x = pv1->x < pv2->x ? pv1->x : pv2->x; + pout->y = pv1->y < pv2->y ? pv1->y : pv2->y; + pout->z = pv1->z < pv2->z ? pv1->z : pv2->z; + pout->w = pv1->w < pv2->w ? pv1->w : pv2->w; return pout; }

1 0

Henri Verbeet : wined3d: Get rid of the winetexturestates typedef.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 076edfe9d4b6cd39b6cf41b9f1d3e18688cc8673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=076edfe9d4b6cd39b6cf41b9f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 13 19:52:28 2011 +0100 wined3d: Get rid of the winetexturestates typedef. --- dlls/wined3d/wined3d_private.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d36c017..a331f4e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1841,7 +1841,8 @@ void resource_unload(struct wined3d_resource *resource) DECLSPEC_HIDDEN; /* Tests show that the start address of resources is 32 byte aligned */ #define RESOURCE_ALIGNMENT 16 -typedef enum winetexturestates { +enum wined3d_texture_state +{ WINED3DTEXSTA_ADDRESSU = 0, WINED3DTEXSTA_ADDRESSV = 1, WINED3DTEXSTA_ADDRESSW = 2, @@ -1854,7 +1855,7 @@ typedef enum winetexturestates { WINED3DTEXSTA_SRGBTEXTURE = 9, WINED3DTEXSTA_SHADOW = 10, MAX_WINETEXTURESTATES = 11, -} winetexturestates; +}; enum WINED3DSRGB {

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DSHADER_PARAM_REGISTER_TYPE typedef.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 66cb4a8ca966f4ad918fe46293bc6ac33621bc51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66cb4a8ca966f4ad918fe4629… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 13 19:52:27 2011 +0100 wined3d: Get rid of the WINED3DSHADER_PARAM_REGISTER_TYPE typedef. --- dlls/wined3d/shader.c | 2 +- dlls/wined3d/shader_sm4.c | 4 ++-- dlls/wined3d/wined3d_private.h | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 42c71ed..24b577a 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -311,7 +311,7 @@ static void shader_init(struct wined3d_shader *shader, struct wined3d_device *de /* Convert floating point offset relative to a register file to an absolute * offset for float constants. */ -static unsigned int shader_get_float_offset(WINED3DSHADER_PARAM_REGISTER_TYPE register_type, UINT register_idx) +static unsigned int shader_get_float_offset(enum wined3d_shader_register_type register_type, UINT register_idx) { switch (register_type) { diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 19f8c30..f6c3ec1 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -127,7 +127,7 @@ struct wined3d_sm4_opcode_info struct sysval_map { enum wined3d_sysval_semantic sysval; - WINED3DSHADER_PARAM_REGISTER_TYPE register_type; + enum wined3d_shader_register_type register_type; UINT register_idx; }; @@ -173,7 +173,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_UTOF, WINED3DSIH_UTOF, 1, 1}, }; -static const WINED3DSHADER_PARAM_REGISTER_TYPE register_type_table[] = +static const enum wined3d_shader_register_type register_type_table[] = { /* WINED3D_SM4_RT_TEMP */ WINED3DSPR_TEMP, /* WINED3D_SM4_RT_INPUT */ WINED3DSPR_INPUT, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 11e0297..d36c017 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -286,7 +286,7 @@ enum wined3d_sampler_texture_type WINED3DSTT_VOLUME = 4, }; -typedef enum _WINED3DSHADER_PARAM_REGISTER_TYPE +enum wined3d_shader_register_type { WINED3DSPR_TEMP = 0, WINED3DSPR_INPUT = 1, @@ -314,7 +314,7 @@ typedef enum _WINED3DSHADER_PARAM_REGISTER_TYPE WINED3DSPR_CONSTBUFFER, WINED3DSPR_NULL, WINED3DSPR_RESOURCE, -} WINED3DSHADER_PARAM_REGISTER_TYPE; +}; enum wined3d_immconst_type { @@ -597,7 +597,7 @@ struct wined3d_shader_context struct wined3d_shader_register { - WINED3DSHADER_PARAM_REGISTER_TYPE type; + enum wined3d_shader_register_type type; UINT idx; UINT array_idx; const struct wined3d_shader_src_param *rel_addr;

1 0

Henri Verbeet : wined3d: Introduce a "state" variable in shader_glsl_load_constants().
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 13efdc6a37d3c42d562edbecfb3c2e4d924b7dd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13efdc6a37d3c42d562edbecf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 13 19:52:26 2011 +0100 wined3d: Introduce a "state" variable in shader_glsl_load_constants(). --- dlls/wined3d/glsl_shader.c | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fc642c9..ff17fcf 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -714,6 +714,7 @@ static void shader_glsl_load_constants(const struct wined3d_context *context, const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_device *device = context->swapchain->device; struct wined3d_stateblock *stateBlock = device->stateBlock; + const struct wined3d_state *state = &stateBlock->state; struct shader_glsl_priv *priv = device->shader_priv; float position_fixup[4]; @@ -731,40 +732,40 @@ static void shader_glsl_load_constants(const struct wined3d_context *context, if (useVertexShader) { - const struct wined3d_shader *vshader = stateBlock->state.vertex_shader; + const struct wined3d_shader *vshader = state->vertex_shader; /* Load DirectX 9 float constants/uniforms for vertex shader */ - shader_glsl_load_constantsF(vshader, gl_info, stateBlock->state.vs_consts_f, + shader_glsl_load_constantsF(vshader, gl_info, state->vs_consts_f, prog->vuniformF_locations, &priv->vconst_heap, priv->stack, constant_version); /* Load DirectX 9 integer constants/uniforms for vertex shader */ - shader_glsl_load_constantsI(vshader, gl_info, prog->vuniformI_locations, stateBlock->state.vs_consts_i, + shader_glsl_load_constantsI(vshader, gl_info, prog->vuniformI_locations, state->vs_consts_i, stateBlock->changed.vertexShaderConstantsI & vshader->reg_maps.integer_constants); /* Load DirectX 9 boolean constants/uniforms for vertex shader */ - shader_glsl_load_constantsB(vshader, gl_info, programId, stateBlock->state.vs_consts_b, + shader_glsl_load_constantsB(vshader, gl_info, programId, state->vs_consts_b, stateBlock->changed.vertexShaderConstantsB & vshader->reg_maps.boolean_constants); /* Upload the position fixup params */ - shader_get_position_fixup(context, &stateBlock->state, position_fixup); + shader_get_position_fixup(context, state, position_fixup); GL_EXTCALL(glUniform4fvARB(prog->posFixup_location, 1, position_fixup)); checkGLcall("glUniform4fvARB"); } if (usePixelShader) { - const struct wined3d_shader *pshader = stateBlock->state.pixel_shader; + const struct wined3d_shader *pshader = state->pixel_shader; /* Load DirectX 9 float constants/uniforms for pixel shader */ - shader_glsl_load_constantsF(pshader, gl_info, stateBlock->state.ps_consts_f, + shader_glsl_load_constantsF(pshader, gl_info, state->ps_consts_f, prog->puniformF_locations, &priv->pconst_heap, priv->stack, constant_version); /* Load DirectX 9 integer constants/uniforms for pixel shader */ - shader_glsl_load_constantsI(pshader, gl_info, prog->puniformI_locations, stateBlock->state.ps_consts_i, + shader_glsl_load_constantsI(pshader, gl_info, prog->puniformI_locations, state->ps_consts_i, stateBlock->changed.pixelShaderConstantsI & pshader->reg_maps.integer_constants); /* Load DirectX 9 boolean constants/uniforms for pixel shader */ - shader_glsl_load_constantsB(pshader, gl_info, programId, stateBlock->state.ps_consts_b, + shader_glsl_load_constantsB(pshader, gl_info, programId, state->ps_consts_b, stateBlock->changed.pixelShaderConstantsB & pshader->reg_maps.boolean_constants); /* Upload the environment bump map matrix if needed. The needsbumpmat member specifies the texture stage to load the matrix from. @@ -775,7 +776,7 @@ static void shader_glsl_load_constants(const struct wined3d_context *context, if(prog->bumpenvmat_location[i] == -1) continue; - data = (const float *)&stateBlock->state.texture_states[i][WINED3DTSS_BUMPENVMAT00]; + data = (const float *)&state->texture_states[i][WINED3DTSS_BUMPENVMAT00]; GL_EXTCALL(glUniformMatrix2fvARB(prog->bumpenvmat_location[i], 1, 0, data)); checkGLcall("glUniformMatrix2fvARB"); @@ -784,8 +785,8 @@ static void shader_glsl_load_constants(const struct wined3d_context *context, * needsbumpmat check. */ if (prog->luminancescale_location[i] != -1) { - const GLfloat *scale = (const GLfloat *)&stateBlock->state.texture_states[i][WINED3DTSS_BUMPENVLSCALE]; - const GLfloat *offset = (const GLfloat *)&stateBlock->state.texture_states[i][WINED3DTSS_BUMPENVLOFFSET]; + const GLfloat *scale = (const GLfloat *)&state->texture_states[i][WINED3DTSS_BUMPENVLSCALE]; + const GLfloat *offset = (const GLfloat *)&state->texture_states[i][WINED3DTSS_BUMPENVLOFFSET]; GL_EXTCALL(glUniform1fvARB(prog->luminancescale_location[i], 1, scale)); checkGLcall("glUniform1fvARB");

1 0

Henri Verbeet : wined3d: x11_copy_to_screen() shouldn' t be called on mapped surfaces.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: a44401af0fa5e68dc20ff650f636af1b92b60b21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a44401af0fa5e68dc20ff650f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 13 19:52:25 2011 +0100 wined3d: x11_copy_to_screen() shouldn't be called on mapped surfaces. --- dlls/wined3d/swapchain.c | 40 ++++------------------------------------ 1 files changed, 4 insertions(+), 36 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index a02a189..d04d9c1 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -677,6 +677,9 @@ void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *r if (!(front->resource.usage & WINED3DUSAGE_RENDERTARGET)) return; + if (front->flags & SFLAG_LOCKED) + ERR("Trying to blit a mapped surface.\n"); + TRACE("Copying surface %p to screen.\n", front); src_dc = front->hDC; @@ -690,48 +693,13 @@ void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *r TRACE("offset %s.\n", wine_dbgstr_point(&offset)); -#if 0 - /* FIXME: This doesn't work... if users really want to run - * X in 8bpp, then we need to call directly into display.drv - * (or Wine's equivalent), and force a private colormap - * without default entries. */ - if (front->palette) - { - SelectPalette(dst_dc, front->palette->hpal, FALSE); - RealizePalette(dst_dc); /* sends messages => deadlocks */ - } -#endif - draw_rect.left = 0; draw_rect.right = front->resource.width; draw_rect.top = 0; draw_rect.bottom = front->resource.height; -#if 0 - /* TODO: Support clippers. */ - if (front->clipper) - { - RECT xrc; - HWND hwnd = front->clipper->hWnd; - if (hwnd && GetClientRect(hwnd,&xrc)) - { - OffsetRect(&xrc, offset.x, offset.y); - IntersectRect(&draw_rect, &draw_rect, &xrc); - } - } -#endif - - if (!rect) - { - /* Only use this if the caller did not pass a rectangle, since - * due to double locking this could be the wrong one... */ - if (front->lockedRect.left != front->lockedRect.right) - IntersectRect(&draw_rect, &draw_rect, &front->lockedRect); - } - else - { + if (rect) IntersectRect(&draw_rect, &draw_rect, rect); - } BitBlt(dst_dc, draw_rect.left - offset.x, draw_rect.top - offset.y, draw_rect.right - draw_rect.left, draw_rect.bottom - draw_rect.top,

1 0

Henri Verbeet : ddraw: Use wined3d_mutex_lock() / wined3d_mutex_unlock() for locking.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: a2963b662c52d909f085888d31bf4b07cdb01620 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2963b662c52d909f085888d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 13 19:52:24 2011 +0100 ddraw: Use wined3d_mutex_lock() / wined3d_mutex_unlock() for locking. --- dlls/ddraw/clipper.c | 30 ++-- dlls/ddraw/ddraw.c | 219 +++++++++++++------------ dlls/ddraw/ddraw_private.h | 3 - dlls/ddraw/device.c | 386 ++++++++++++++++++++++++-------------------- dlls/ddraw/light.c | 9 +- dlls/ddraw/main.c | 30 ++--- dlls/ddraw/material.c | 18 +- dlls/ddraw/palette.c | 19 ++- dlls/ddraw/surface.c | 284 ++++++++++++++++++--------------- dlls/ddraw/vertexbuffer.c | 33 +++-- dlls/ddraw/viewport.c | 73 +++++---- 11 files changed, 597 insertions(+), 507 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a2963b662c52d909f0858…

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
86
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 November 2011