October 2007 - Wine-Commits

David Adam : d3dx8: Implement D3DXPlaneDotNormalize.
by Alexandre Julliard Oct. 24, 2007

Oct. 24, 2007

Module: wine Branch: master Commit: a00353b394547356e6f8bb99b0e40079f996cba6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a00353b394547356e6f8bb99b… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Tue Oct 23 11:06:33 2007 +0200 d3dx8: Implement D3DXPlaneDotNormalize. --- dlls/d3dx8/tests/math.c | 11 +++++++++++ include/d3dx8math.inl | 6 ++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index c318a45..e73a619 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -60,6 +60,17 @@ static void D3DXPlaneTest(void) expected = 0.0f; got = D3DXPlaneDotCoord(NULL,NULL), ok( expected == got, "Expected : %f, Got : %f\n",expected, got); + +/*_______________D3DXPlaneDotNormal______________*/ + expected = -35.0f; + got = D3DXPlaneDotNormal(&plane,&vec), + ok( expected == got, "Expected : %f, Got : %f\n",expected, got); + expected = 0.0f; + got = D3DXPlaneDotNormal(NULL,&vec), + ok( expected == got, "Expected : %f, Got : %f\n",expected, got); + expected = 0.0f; + got = D3DXPlaneDotNormal(NULL,NULL), + ok( expected == got, "Expected : %f, Got : %f\n",expected, got); } static void D3X8QuaternionTest(void) diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index e8e6a02..71f9641 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -270,6 +270,12 @@ static inline FLOAT D3DXPlaneDotCoord(CONST D3DXPLANE *pp, CONST D3DXVECTOR4 *pv return ( (pp->a) * (pv->x) + (pp->b) * (pv->y) + (pp->c) * (pv->z) + (pp->d) ); } +static inline FLOAT D3DXPlaneDotNormal(CONST D3DXPLANE *pp, CONST D3DXVECTOR4 *pv) +{ + if ( !pp || !pv ) return 0.0f; + return ( (pp->a) * (pv->x) + (pp->b) * (pv->y) + (pp->c) * (pv->z) ); +} + /*__________________D3DXQUATERNION____________________*/ static inline D3DXQUATERNION* D3DXQuaternionConjugate(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq)

1 0

David Adam : d3dx8: Implement D3DXPlaneDotCoord.
by Alexandre Julliard Oct. 24, 2007

Oct. 24, 2007

Module: wine Branch: master Commit: 3247fa0d673df68603d97c45a20d8f63cc6909da URL: http://source.winehq.org/git/wine.git/?a=commit;h=3247fa0d673df68603d97c45a… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Tue Oct 23 11:01:43 2007 +0200 d3dx8: Implement D3DXPlaneDotCoord. --- dlls/d3dx8/tests/math.c | 11 +++++++++++ include/d3dx8math.inl | 8 +++++++- 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 2d5bdbb..c318a45 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -49,6 +49,17 @@ static void D3DXPlaneTest(void) expected = 0.0f; got = D3DXPlaneDot(NULL,NULL), ok( expected == got, "Expected : %f, Got : %f\n",expected, got); + +/*_______________D3DXPlaneDotCoord________________*/ + expected = -28.0f; + got = D3DXPlaneDotCoord(&plane,&vec), + ok( expected == got, "Expected : %f, Got : %f\n",expected, got); + expected = 0.0f; + got = D3DXPlaneDotCoord(NULL,&vec), + ok( expected == got, "Expected : %f, Got : %f\n",expected, got); + expected = 0.0f; + got = D3DXPlaneDotCoord(NULL,NULL), + ok( expected == got, "Expected : %f, Got : %f\n",expected, got); } static void D3X8QuaternionTest(void) diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index 78146ec..e8e6a02 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -258,12 +258,18 @@ static inline D3DXVECTOR4* D3DXVec4Subtract(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 /*__________________D3DXQUATERNION____________________*/ -static inline FLOAT D3DXPlaneDot( CONST D3DXPLANE *pp, CONST D3DXVECTOR4 *pv) +static inline FLOAT D3DXPlaneDot(CONST D3DXPLANE *pp, CONST D3DXVECTOR4 *pv) { if ( !pp || !pv ) return 0.0f; return ( (pp->a) * (pv->x) + (pp->b) * (pv->y) + (pp->c) * (pv->z) + (pp->d) * (pv->w) ); } +static inline FLOAT D3DXPlaneDotCoord(CONST D3DXPLANE *pp, CONST D3DXVECTOR4 *pv) +{ + if ( !pp || !pv ) return 0.0f; + return ( (pp->a) * (pv->x) + (pp->b) * (pv->y) + (pp->c) * (pv->z) + (pp->d) ); +} + /*__________________D3DXQUATERNION____________________*/ static inline D3DXQUATERNION* D3DXQuaternionConjugate(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq)

1 0

David Adam : d3dx8: Implement D3DXPlaneDot.
by Alexandre Julliard Oct. 24, 2007

Oct. 24, 2007

Module: wine Branch: master Commit: 10259cd87c51946d82abc41059c076b0fa213a57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10259cd87c51946d82abc4105… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Tue Oct 23 10:58:41 2007 +0200 d3dx8: Implement D3DXPlaneDot. --- dlls/d3dx8/tests/math.c | 22 ++++++++++++++++++++++ include/d3dx8math.inl | 8 ++++++++ 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index c5d731b..2d5bdbb 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -30,6 +30,27 @@ #define expect_vec4(expectedvec,gotvec) ok((fabs(expectedvec.x-gotvec.x)<admitted_error)&&(fabs(expectedvec.y-gotvec.y)<admitted_error)&&(fabs(expectedvec.z-gotvec.z)<admitted_error)&&(fabs(expectedvec.w-gotvec.w)<admitted_error),"Expected Vector= (%f, %f, %f, %f)\n , Got Vector= (%f, %f, %f, %f)\n", expectedvec.x, expectedvec.y, expectedvec.z, expectedvec.w, gotvec.x, gotvec.y, gotvec.z, gotvec.w); +static void D3DXPlaneTest(void) +{ + D3DXPLANE plane; + D3DXVECTOR4 vec; + FLOAT expected, got; + + plane.a = -3.0f; plane.b = -1.0f; plane.c = 4.0f; plane.d = 7.0f; + vec.x = 2.0f; vec.y = 5.0f; vec.z = -6.0f; vec.w = 11.0f; + +/*_______________D3DXPlaneDot________________*/ + expected = 42.0f; + got = D3DXPlaneDot(&plane,&vec), + ok( expected == got, "Expected : %f, Got : %f\n",expected, got); + expected = 0.0f; + got = D3DXPlaneDot(NULL,&vec), + ok( expected == got, "Expected : %f, Got : %f\n",expected, got); + expected = 0.0f; + got = D3DXPlaneDot(NULL,NULL), + ok( expected == got, "Expected : %f, Got : %f\n",expected, got); +} + static void D3X8QuaternionTest(void) { D3DXQUATERNION expectedquat, gotquat, q, r, s; @@ -430,6 +451,7 @@ static void D3X8Vector4Test(void) START_TEST(math) { + D3DXPlaneTest(); D3X8QuaternionTest(); D3X8Vector2Test(); D3X8Vector3Test(); diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index 066dce2..78146ec 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -258,6 +258,14 @@ static inline D3DXVECTOR4* D3DXVec4Subtract(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 /*__________________D3DXQUATERNION____________________*/ +static inline FLOAT D3DXPlaneDot( CONST D3DXPLANE *pp, CONST D3DXVECTOR4 *pv) +{ + if ( !pp || !pv ) return 0.0f; + return ( (pp->a) * (pv->x) + (pp->b) * (pv->y) + (pp->c) * (pv->z) + (pp->d) * (pv->w) ); +} + +/*__________________D3DXQUATERNION____________________*/ + static inline D3DXQUATERNION* D3DXQuaternionConjugate(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq) { if ( !pout || !pq) return NULL;

1 0

Bang Jun-young : shlwapi: SHRegDuplicateHKey() is now defined in the Windows SDK.
by Alexandre Julliard Oct. 24, 2007

Oct. 24, 2007

Module: wine Branch: master Commit: 74c5d1750bc0a481ab3f786e928023bb3808a6cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=74c5d1750bc0a481ab3f786e9… Author: Bang Jun-young <junyoung(a)mogua.com> Date: Wed Oct 24 07:30:58 2007 +0900 shlwapi: SHRegDuplicateHKey() is now defined in the Windows SDK. --- include/shlwapi.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/shlwapi.h b/include/shlwapi.h index 21b1e99..94d98c8 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -83,10 +83,10 @@ DWORD WINAPI SHCopyKeyA(HKEY,LPCSTR,HKEY,DWORD); DWORD WINAPI SHCopyKeyW(HKEY,LPCWSTR,HKEY,DWORD); #define SHCopyKey WINELIB_NAME_AW(SHCopyKey) -/* Undocumented registry functions */ - HKEY WINAPI SHRegDuplicateHKey(HKEY); +/* Undocumented registry functions */ + DWORD WINAPI SHDeleteOrphanKeyA(HKEY,LPCSTR); DWORD WINAPI SHDeleteOrphanKeyW(HKEY,LPCWSTR); #define SHDeleteOrphanKey WINELIB_NAME_AW(SHDeleteOrphanKey)

1 0

Dmitry Timoshkov : shlwapi: Use existing shlwapi/ Win32 APIs to compare strings in Windows encoding.
by Alexandre Julliard Oct. 24, 2007

Oct. 24, 2007

Module: wine Branch: master Commit: 54c83b388c0b4038d62fd0881344f41ebd010380 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54c83b388c0b4038d62fd0881… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Oct 24 14:03:25 2007 +0900 shlwapi: Use existing shlwapi/Win32 APIs to compare strings in Windows encoding. --- dlls/shlwapi/ordinal.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index d3e5825..f5c0217 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -33,6 +33,7 @@ #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "winreg.h" #include "wingdi.h" #include "winuser.h" @@ -796,7 +797,7 @@ BOOL WINAPI SetDlgItemTextWrapW(HWND hWnd, INT iItem, LPCWSTR lpszText) */ DWORD WINAPI StrCmpNCA(LPCSTR lpszSrc, LPCSTR lpszCmp, INT len) { - return strncmp(lpszSrc, lpszCmp, len); + return StrCmpNA(lpszSrc, lpszCmp, len); } /************************************************************************* @@ -806,7 +807,7 @@ DWORD WINAPI StrCmpNCA(LPCSTR lpszSrc, LPCSTR lpszCmp, INT len) */ DWORD WINAPI StrCmpNCW(LPCWSTR lpszSrc, LPCWSTR lpszCmp, INT len) { - return strncmpW(lpszSrc, lpszCmp, len); + return StrCmpNW(lpszSrc, lpszCmp, len); } /************************************************************************* @@ -825,7 +826,7 @@ DWORD WINAPI StrCmpNCW(LPCWSTR lpszSrc, LPCWSTR lpszCmp, INT len) */ DWORD WINAPI StrCmpNICA(LPCSTR lpszSrc, LPCSTR lpszCmp, DWORD len) { - return strncasecmp(lpszSrc, lpszCmp, len); + return StrCmpNIA(lpszSrc, lpszCmp, len); } /************************************************************************* @@ -835,7 +836,7 @@ DWORD WINAPI StrCmpNICA(LPCSTR lpszSrc, LPCSTR lpszCmp, DWORD len) */ DWORD WINAPI StrCmpNICW(LPCWSTR lpszSrc, LPCWSTR lpszCmp, DWORD len) { - return strncmpiW(lpszSrc, lpszCmp, len); + return StrCmpNIW(lpszSrc, lpszCmp, len); } /************************************************************************* @@ -853,7 +854,7 @@ DWORD WINAPI StrCmpNICW(LPCWSTR lpszSrc, LPCWSTR lpszCmp, DWORD len) */ DWORD WINAPI StrCmpCA(LPCSTR lpszSrc, LPCSTR lpszCmp) { - return strcmp(lpszSrc, lpszCmp); + return lstrcmpA(lpszSrc, lpszCmp); } /************************************************************************* @@ -863,7 +864,7 @@ DWORD WINAPI StrCmpCA(LPCSTR lpszSrc, LPCSTR lpszCmp) */ DWORD WINAPI StrCmpCW(LPCWSTR lpszSrc, LPCWSTR lpszCmp) { - return strcmpW(lpszSrc, lpszCmp); + return lstrcmpW(lpszSrc, lpszCmp); } /************************************************************************* @@ -881,7 +882,7 @@ DWORD WINAPI StrCmpCW(LPCWSTR lpszSrc, LPCWSTR lpszCmp) */ DWORD WINAPI StrCmpICA(LPCSTR lpszSrc, LPCSTR lpszCmp) { - return strcasecmp(lpszSrc, lpszCmp); + return lstrcmpiA(lpszSrc, lpszCmp); } /************************************************************************* @@ -891,7 +892,7 @@ DWORD WINAPI StrCmpICA(LPCSTR lpszSrc, LPCSTR lpszCmp) */ DWORD WINAPI StrCmpICW(LPCWSTR lpszSrc, LPCWSTR lpszCmp) { - return strcmpiW(lpszSrc, lpszCmp); + return lstrcmpiW(lpszSrc, lpszCmp); } /*************************************************************************

1 0

Dmitry Timoshkov : ntdll: Use symbolic names when possible.
by Alexandre Julliard Oct. 24, 2007

Oct. 24, 2007

Module: wine Branch: master Commit: 4009de3662f469ff2097f7a3e43f5c92fabcf3d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4009de3662f469ff2097f7a3e… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Oct 24 14:02:38 2007 +0900 ntdll: Use symbolic names when possible. --- dlls/ntdll/tests/rtlstr.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index a99011d..61da443 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -1686,15 +1686,17 @@ static void test_RtlIsTextUnicode(void) flags = IS_TEXT_UNICODE_UNICODE_MASK; ok(pRtlIsTextUnicode(unicode, sizeof(unicode), &flags), "Text should not pass a Unicode\n"); - todo_wine ok(flags == 0x6, "Expected flags 0x6, obtained %d\n", flags); + todo_wine + ok(flags == (IS_TEXT_UNICODE_STATISTICS | IS_TEXT_UNICODE_CONTROLS), + "Expected flags 0x6, obtained %x\n", flags); flags = IS_TEXT_UNICODE_REVERSE_MASK; ok(!pRtlIsTextUnicode(unicode, sizeof(unicode), &flags), "Text should not pass reverse Unicode tests\n"); - ok(flags == 0, "Expected flags 0, obtained %d\n", flags); + ok(flags == 0, "Expected flags 0, obtained %x\n", flags); flags = IS_TEXT_UNICODE_ODD_LENGTH; ok(!pRtlIsTextUnicode(unicode, sizeof(unicode) - 1, &flags), "Odd length test should have passed\n"); - ok(flags == IS_TEXT_UNICODE_ODD_LENGTH, "Expected flags 0x200, obtained %d\n", flags); + ok(flags == IS_TEXT_UNICODE_ODD_LENGTH, "Expected flags 0x200, obtained %x\n", flags); be_unicode = HeapAlloc(GetProcessHeap(), 0, sizeof(unicode) + sizeof(WCHAR)); be_unicode[0] = 0xfffe; @@ -1707,11 +1709,15 @@ static void test_RtlIsTextUnicode(void) flags = IS_TEXT_UNICODE_REVERSE_MASK; ok(!pRtlIsTextUnicode(&be_unicode[1], sizeof(unicode), &flags), "Reverse endian should be Unicode\n"); - todo_wine ok(flags == 0x70, "Expected flags 0x70, obtained %x\n", flags); + todo_wine + ok(flags == (IS_TEXT_UNICODE_REVERSE_ASCII16 | IS_TEXT_UNICODE_REVERSE_STATISTICS | IS_TEXT_UNICODE_REVERSE_CONTROLS), + "Expected flags 0x70, obtained %x\n", flags); flags = IS_TEXT_UNICODE_REVERSE_MASK; ok(!pRtlIsTextUnicode(be_unicode, sizeof(unicode) + 2, &flags), "Reverse endian should be Unicode\n"); - todo_wine ok(flags == 0xc0, "Expected flags 0xc0, obtained %x\n", flags); + todo_wine + ok(flags == (IS_TEXT_UNICODE_REVERSE_CONTROLS | IS_TEXT_UNICODE_REVERSE_SIGNATURE), + "Expected flags 0xc0, obtained %x\n", flags); HeapFree(GetProcessHeap(), 0, be_unicode); }

1 0

Dmitry Timoshkov : shlwapi: Forward more entries to user32 exports.
by Alexandre Julliard Oct. 24, 2007

Oct. 24, 2007

Module: wine Branch: master Commit: fd9774cef636a0d4a2e83debdeff72db87a27bcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd9774cef636a0d4a2e83debd… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Oct 24 14:04:07 2007 +0900 shlwapi: Forward more entries to user32 exports. --- dlls/shlwapi/ordinal.c | 21 --------------------- dlls/shlwapi/shlwapi.spec | 6 +++--- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index f5c0217..ee60ea9 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -739,27 +739,6 @@ BOOL WINAPI GetStringType3ExW(LPWSTR lpszStr, DWORD dwLen, LPVOID p3) } /************************************************************************* - * @ [SHLWAPI.36] - * - * Insert a bitmap menu item at the bottom of a menu. - * - * PARAMS - * hMenu [I] Menu to insert into - * flags [I] Flags for insertion - * id [I] Menu ID of the item - * str [I] Menu text for the item - * - * RETURNS - * Success: TRUE, the item is inserted into the menu - * Failure: FALSE, if any parameter is invalid - */ -BOOL WINAPI AppendMenuWrapW(HMENU hMenu, UINT flags, UINT id, LPCWSTR str) -{ - TRACE("(%p,0x%08x,0x%08x,%s)\n",hMenu, flags, id, debugstr_w(str)); - return InsertMenuW(hMenu, -1, flags | MF_BITMAP, id, str); -} - -/************************************************************************* * @ [SHLWAPI.138] * * Set the text of a given dialog item. diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 3a920d0..ffde04c 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -33,7 +33,7 @@ 33 stdcall -noname IsCharDigitW(long) 34 stdcall -noname IsCharXDigitW(long) 35 stdcall -noname GetStringType3ExW(ptr long ptr) -36 stdcall -noname AppendMenuWrapW(long long long wstr) +36 stdcall -noname AppendMenuWrapW(long long long wstr) user32.AppendMenuW 37 stdcall @(ptr long long long long) user32.CallWindowProcW 38 stdcall @(wstr) user32.CharLowerW 39 stdcall @(wstr long) user32.CharLowerBuffW @@ -423,8 +423,8 @@ 423 stdcall -noname _SHGlobalCounterCreateNamedW(wstr long) 424 stdcall -noname _SHGlobalCounterDecrement(long) 425 stdcall -noname DeleteMenuWrap(ptr long long) -426 stub -noname DestroyMenuWrap -427 stub -noname TrackPopupMenuWrap +426 stdcall -noname DestroyMenuWrap(long) user32.DestroyMenu +427 stdcall -noname TrackPopupMenuWrap(long long long long long long ptr) user32.TrackPopupMenu 428 stdcall @(long long long long long ptr) user32.TrackPopupMenuEx 429 stdcall -noname MLIsMLHInstance(long) 430 stdcall -noname MLSetMLHInstance(long long)

1 0

Dan Hipschman : oleaut32: Add stubs for IPropertyBag_Read.
by Alexandre Julliard Oct. 24, 2007

Oct. 24, 2007

Module: wine Branch: master Commit: 816f99328827cc1d8e0885c4399a8e65ee56e69b URL: http://source.winehq.org/git/wine.git/?a=commit;h=816f99328827cc1d8e0885c43… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Oct 23 20:15:02 2007 -0700 oleaut32: Add stubs for IPropertyBag_Read. --- dlls/oleaut32/usrmarshal.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 9976334..c97fc9e 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -1991,3 +1991,25 @@ HRESULT __RPC_STUB ITypeLib2_GetDocumentation2_Stub( FIXME("not implemented\n"); return E_FAIL; } + +HRESULT CALLBACK IPropertyBag_Read_Proxy( + IPropertyBag* This, + LPCOLESTR pszPropName, + VARIANT *pVar, + IErrorLog *pErrorLog) +{ + FIXME("not implemented\n"); + return E_FAIL; +} + +HRESULT __RPC_STUB IPropertyBag_Read_Stub( + IPropertyBag* This, + LPCOLESTR pszPropName, + VARIANT *pVar, + IErrorLog *pErrorLog, + DWORD varType, + IUnknown *pUnkObj) +{ + FIXME("not implemented\n"); + return E_FAIL; +}

1 0

Dan Hipschman : widl: Use error_loc instead of yyerror.
by Alexandre Julliard Oct. 24, 2007

Oct. 24, 2007

Module: wine Branch: master Commit: 1aab1072c1838d0f167dd94dc4c0c16ae9df5be3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aab1072c1838d0f167dd94dc… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Oct 23 20:18:56 2007 -0700 widl: Use error_loc instead of yyerror. --- tools/widl/parser.y | 45 ++++++++++++++++++++++----------------------- 1 files changed, 22 insertions(+), 23 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 6a93995..11ddd45 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -423,7 +423,7 @@ m_attributes: { $$ = NULL; } attributes: '[' attrib_list ']' { $$ = $2; if (!$$) - yyerror("empty attribute lists unsupported"); + error_loc("empty attribute lists unsupported\n"); } ; @@ -513,7 +513,7 @@ attribute: { $$ = NULL; } uuid_string: aUUID | aSTRING { if (!is_valid_uuid($1)) - yyerror("invalid UUID: %s", $1); + error_loc("invalid UUID: %s\n", $1); $$ = parse_uuid($1); } ; @@ -624,7 +624,7 @@ expr_list_const: expr_const { $$ = append_expr( NULL, $1 ); expr_const: expr { $$ = $1; if (!$$->is_const) - yyerror("expression is not constant"); + error_loc("expression is not constant\n"); } ; @@ -658,7 +658,7 @@ funcdef: free($4); $$ = make_func(v, $6); if (is_attr(v->attrs, ATTR_IN)) { - yyerror("inapplicable attribute [in] for function '%s'",$$->def->name); + error_loc("inapplicable attribute [in] for function '%s'\n",$$->def->name); } } ; @@ -721,8 +721,8 @@ int_std: tINT { $$ = make_builtin($<str>1); } coclass: tCOCLASS aIDENTIFIER { $$ = make_class($2); } | tCOCLASS aKNOWNTYPE { $$ = find_type($2, 0); - if ($$->defined) yyerror("multiple definition error"); - if ($$->kind != TKIND_COCLASS) yyerror("%s was not declared a coclass", $2); + if ($$->defined) error_loc("multiple definition error\n"); + if ($$->kind != TKIND_COCLASS) error_loc("%s was not declared a coclass\n", $2); } ; @@ -755,11 +755,11 @@ dispinterface: tDISPINTERFACE aIDENTIFIER { $$ = get_type(0, $2, 0); $$->kind = dispinterfacehdr: attributes dispinterface { attr_t *attrs; $$ = $2; - if ($$->defined) yyerror("multiple definition error"); + if ($$->defined) error_loc("multiple definition error\n"); attrs = make_attr(ATTR_DISPINTERFACE); $$->attrs = append_attr( $1, attrs ); $$->ref = find_type("IDispatch", 0); - if (!$$->ref) yyerror("IDispatch is undefined"); + if (!$$->ref) error_loc("IDispatch is undefined\n"); $$->defined = TRUE; if (!parse_only && do_header) write_forward($$); } @@ -803,7 +803,7 @@ interfacehdr: attributes interface { $$.interface = $2; $$.old_pointer_default = pointer_default; if (is_attr($1, ATTR_POINTERDEFAULT)) pointer_default = get_attrv($1, ATTR_POINTERDEFAULT); - if ($2->defined) yyerror("multiple definition error"); + if ($2->defined) error_loc("multiple definition error\n"); $2->attrs = $1; $2->defined = TRUE; if (!parse_only && do_header) write_forward($2); @@ -824,7 +824,7 @@ interfacedef: interfacehdr inherit | interfacehdr ':' aIDENTIFIER '{' import int_statements '}' { $$ = $1.interface; $$->ref = find_type2($3, 0); - if (!$$->ref) yyerror("base class '%s' not found in import", $3); + if (!$$->ref) error_loc("base class '%s' not found in import\n", $3); $$->funcs = $6; compute_method_indexes($$); if (!parse_only && do_header) write_interface($$); @@ -1584,7 +1584,7 @@ static type_t *reg_type(type_t *type, const char *name, int t) struct rtype *nt; int hash; if (!name) { - yyerror("registering named type without name"); + error_loc("registering named type without name\n"); return type; } hash = hash_ident(name); @@ -1649,7 +1649,7 @@ static type_t *reg_typedefs(type_t *type, pident_list_t *pidents, attr_list_t *a if (c != RPC_FC_CHAR && c != RPC_FC_BYTE && c != RPC_FC_WCHAR) { pident = LIST_ENTRY( list_head( pidents ), const pident_t, entry ); - yyerror("'%s': [string] attribute is only valid on 'char', 'byte', or 'wchar_t' pointers and arrays", + error_loc("'%s': [string] attribute is only valid on 'char', 'byte', or 'wchar_t' pointers and arrays\n", pident->var->name); } } @@ -1691,11 +1691,11 @@ static type_t *reg_typedefs(type_t *type, pident_list_t *pidents, attr_list_t *a if (is_ptr(cur)) cur->type = ptr_type; else - yyerror("'%s': pointer attribute applied to non-pointer type", + error_loc("'%s': pointer attribute applied to non-pointer type\n", cur->name); } else if (is_str && ! is_ptr(cur)) - yyerror("'%s': [string] attribute applied to non-pointer type", + error_loc("'%s': [string] attribute applied to non-pointer type\n", cur->name); if (is_incomplete(cur)) @@ -1712,7 +1712,7 @@ static type_t *find_type(const char *name, int t) while (cur && (cur->t != t || strcmp(cur->name, name))) cur = cur->next; if (!cur) { - yyerror("type '%s' not found", name); + error_loc("type '%s' not found\n", name); return NULL; } return cur->type; @@ -1816,7 +1816,7 @@ static int get_struct_type(var_list_t *fields) { has_conformance = 1; if (field->type->declarray && list_next(fields, &field->entry)) - yyerror("field '%s' deriving from a conformant array must be the last field in the structure", + error_loc("field '%s' deriving from a conformant array must be the last field in the structure\n", field->name); } if (field->type->length_is) @@ -1876,7 +1876,7 @@ static int get_struct_type(var_list_t *fields) case RPC_FC_CPSTRUCT: has_conformance = 1; if (list_next( fields, &field->entry )) - yyerror("field '%s' deriving from a conformant array must be the last field in the structure", + error_loc("field '%s' deriving from a conformant array must be the last field in the structure\n", field->name); has_pointer = 1; break; @@ -1884,7 +1884,7 @@ static int get_struct_type(var_list_t *fields) case RPC_FC_CSTRUCT: has_conformance = 1; if (list_next( fields, &field->entry )) - yyerror("field '%s' deriving from a conformant array must be the last field in the structure", + error_loc("field '%s' deriving from a conformant array must be the last field in the structure\n", field->name); break; @@ -1893,8 +1893,7 @@ static int get_struct_type(var_list_t *fields) break; default: - fprintf(stderr,"Unknown struct member %s with type (0x%02x)\n", - field->name, t->type); + error_loc("Unknown struct member %s with type (0x%02x)\n", field->name, t->type); /* fallthru - treat it as complex */ /* as soon as we see one of these these members, it's bogus... */ @@ -1936,7 +1935,7 @@ static var_t *reg_const(var_t *var) struct rconst *nc; int hash; if (!var->name) { - yyerror("registering constant without name"); + error_loc("registering constant without name\n"); return var; } hash = hash_ident(var->name); @@ -1954,7 +1953,7 @@ static var_t *find_const(char *name, int f) while (cur && strcmp(cur->name, name)) cur = cur->next; if (!cur) { - if (f) yyerror("constant '%s' not found", name); + if (f) error_loc("constant '%s' not found\n", name); return NULL; } return cur->var; @@ -2054,7 +2053,7 @@ static void check_arg(var_t *arg) type_t *t = arg->type; if (t->type == 0 && ! is_var_ptr(arg)) - yyerror("argument '%s' has void type", arg->name); + error_loc("argument '%s' has void type\n", arg->name); } static void check_all_user_types(ifref_list_t *ifrefs)

1 0

Dan Hipschman : widl: parser_error must append a newline, so write a new function, error_loc.
by Alexandre Julliard Oct. 24, 2007

Oct. 24, 2007

Module: wine Branch: master Commit: 9051918976a9fdd7b0dd6c09f5b5028d7b2a6616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9051918976a9fdd7b0dd6c09f… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Oct 23 20:18:18 2007 -0700 widl: parser_error must append a newline, so write a new function, error_loc. --- tools/widl/parser.l | 10 +++++----- tools/widl/proxy.c | 2 +- tools/widl/utils.c | 11 +++++++++++ tools/widl/utils.h | 1 + 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 78ee4b2..d2fd3c1 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -113,14 +113,14 @@ UUID *parse_uuid(const char *u) yy_pop_state(); lineno = (int)strtol(yytext, &cptr, 10); if(!lineno) - parser_error("Malformed '#...' line-directive; invalid linenumber\n"); + error_loc("Malformed '#...' line-directive; invalid linenumber\n"); fname = strchr(cptr, '"'); if(!fname) - parser_error("Malformed '#...' line-directive; missing filename\n"); + error_loc("Malformed '#...' line-directive; missing filename\n"); fname++; cptr = strchr(fname, '"'); if(!cptr) - parser_error("Malformed '#...' line-directive; missing terminating \""); + error_loc("Malformed '#...' line-directive; missing terminating \"\n"); *cptr = '\0'; line_number = lineno - 1; /* We didn't read the newline */ free( input_name ); @@ -414,7 +414,7 @@ int do_import(char *fname) first_import = import; if (!(path = wpp_find_include( fname, input_name ))) - parser_error("Unable to open include file %s\n", fname); + error_loc("Unable to open include file %s\n", fname); import_stack[ptr].temp_name = temp_name; import_stack[ptr].input_name = input_name; @@ -427,7 +427,7 @@ int do_import(char *fname) if (ret) exit(1); if((f = fopen(temp_name, "r")) == NULL) - parser_error("Unable to open %s\n", temp_name); + error_loc("Unable to open %s\n", temp_name); import_stack[ptr].state = YY_CURRENT_BUFFER; yy_switch_to_buffer(yy_create_buffer(f, YY_BUF_SIZE)); diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 0255923..3c8d6ef 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -509,7 +509,7 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) gen_stub(iface, cur, cname, *proc_offset); *proc_offset += get_size_procformatstring_func( cur ); if (midx == -1) midx = idx; - else if (midx != idx) parser_error("method index mismatch in write_proxy\n"); + else if (midx != idx) error("method index mismatch in write_proxy\n"); midx++; } } diff --git a/tools/widl/utils.c b/tools/widl/utils.c index 1382597..7dafc10 100644 --- a/tools/widl/utils.c +++ b/tools/widl/utils.c @@ -65,16 +65,27 @@ static void generic_msg(const char *s, const char *t, const char *n, va_list ap) } +/* yyerror: yacc assumes this is not newline terminated. */ int parser_error(const char *s, ...) { va_list ap; va_start(ap, s); generic_msg(s, "Error", parser_text, ap); + fprintf(stderr, "\n"); va_end(ap); exit(1); return 1; } +void error_loc(const char *s, ...) +{ + va_list ap; + va_start(ap, s); + generic_msg(s, "Error", parser_text, ap); + va_end(ap); + exit(1); +} + int parser_warning(const char *s, ...) { va_list ap; diff --git a/tools/widl/utils.h b/tools/widl/utils.h index 37f12f0..c9cc2ba 100644 --- a/tools/widl/utils.h +++ b/tools/widl/utils.h @@ -35,6 +35,7 @@ char *xstrdup(const char *str); int parser_error(const char *s, ...) __attribute__((format (printf, 1, 2))); int parser_warning(const char *s, ...) __attribute__((format (printf, 1, 2))); +void error_loc(const char *s, ...) __attribute__((format (printf, 1, 2))); void error(const char *s, ...) __attribute__((format (printf, 1, 2))); void warning(const char *s, ...) __attribute__((format (printf, 1, 2))); void chat(const char *s, ...) __attribute__((format (printf, 1, 2)));

1 0