July 2009 - Wine-commits - list.winehq.org

David Adam : d3dx9: Fix D3DXMatrixStack_RotateAxisLocal to make tests pass in Windows.
by Alexandre Julliard 20 Jul '09

20 Jul '09

Module: wine Branch: master Commit: 94c7ab72f5cac262141923194d730df07c1d77e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94c7ab72f5cac262141923194… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Fri Jul 17 18:01:03 2009 +0200 d3dx9: Fix D3DXMatrixStack_RotateAxisLocal to make tests pass in Windows. --- dlls/d3dx9_36/math.c | 1 - dlls/d3dx9_36/tests/math.c | 3 --- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 925674a..c2193c8 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -946,7 +946,6 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_RotateAxisLocal(ID3DXMatrixStack *ifa TRACE("iface %p\n", iface); - if (!pv) return D3DERR_INVALIDCALL; D3DXMatrixRotationAxis(&temp, pv, angle); D3DXMatrixMultiply(&This->stack[This->current], &temp, &This->stack[This->current]); diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 4c1a21d..610aa23 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1519,9 +1519,6 @@ static void test_matrix_stack(void) ok(SUCCEEDED(hr), "Pop failed, hr %#x\n", hr); ok(D3DXMatrixIsIdentity(ID3DXMatrixStack_GetTop(stack)), "The top should be an identity matrix\n"); - hr = ID3DXMatrixStack_RotateAxisLocal(stack, NULL, 2.0f); - ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); - refcount = ID3DXMatrixStack_Release(stack); ok(!refcount, "Matrix stack has %u references left.\n", refcount); }

1 0

David Adam : d3dx9: Fix D3DXMatrixStack_RotateAxis to make tests pass in Windows.
by Alexandre Julliard 20 Jul '09

20 Jul '09

Module: wine Branch: master Commit: 02758ea8f8071be16b16d9c79c16eb8e64e63005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02758ea8f8071be16b16d9c79… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Fri Jul 17 17:58:36 2009 +0200 d3dx9: Fix D3DXMatrixStack_RotateAxis to make tests pass in Windows. --- dlls/d3dx9_36/math.c | 1 - dlls/d3dx9_36/tests/math.c | 3 --- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index a4135da..925674a 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -933,7 +933,6 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_RotateAxis(ID3DXMatrixStack *iface, C TRACE("iface %p\n", iface); - if (!pv) return D3DERR_INVALIDCALL; D3DXMatrixRotationAxis(&temp, pv, angle); D3DXMatrixMultiply(&This->stack[This->current], &This->stack[This->current], &temp); diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index bfeed05..4c1a21d 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1519,9 +1519,6 @@ static void test_matrix_stack(void) ok(SUCCEEDED(hr), "Pop failed, hr %#x\n", hr); ok(D3DXMatrixIsIdentity(ID3DXMatrixStack_GetTop(stack)), "The top should be an identity matrix\n"); - hr = ID3DXMatrixStack_RotateAxis(stack, NULL, 2.0f); - ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); - hr = ID3DXMatrixStack_RotateAxisLocal(stack, NULL, 2.0f); ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr);

1 0

David Adam : d3dx9: Fix D3DXMatrixStack_MultMatrixLocal to make tests pass in Windows.
by Alexandre Julliard 20 Jul '09

20 Jul '09

Module: wine Branch: master Commit: 0729e91e2119d8b51d0e03e2c39597798acea277 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0729e91e2119d8b51d0e03e2c… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Fri Jul 17 17:56:30 2009 +0200 d3dx9: Fix D3DXMatrixStack_MultMatrixLocal to make tests pass in Windows. --- dlls/d3dx9_36/math.c | 1 - dlls/d3dx9_36/tests/math.c | 3 --- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index c540b21..a4135da 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -866,7 +866,6 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrixLocal(ID3DXMatrixStack *ifa TRACE("iface %p\n", iface); - if (!pm) return D3DERR_INVALIDCALL; D3DXMatrixMultiply(&This->stack[This->current], pm, &This->stack[This->current]); return D3D_OK; diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index fa2f857..bfeed05 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1519,9 +1519,6 @@ static void test_matrix_stack(void) ok(SUCCEEDED(hr), "Pop failed, hr %#x\n", hr); ok(D3DXMatrixIsIdentity(ID3DXMatrixStack_GetTop(stack)), "The top should be an identity matrix\n"); - hr = ID3DXMatrixStack_MultMatrixLocal(stack, NULL); - ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); - hr = ID3DXMatrixStack_RotateAxis(stack, NULL, 2.0f); ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr);

1 0

David Adam : d3dx9: Fix D3DXMatrixStack_MultMatrix to make tests pass in Windows.
by Alexandre Julliard 20 Jul '09

20 Jul '09

Module: wine Branch: master Commit: 3b6cbaeb038e59b9b7d7fc705bbb401c00d1ec7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b6cbaeb038e59b9b7d7fc705… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Fri Jul 17 17:54:22 2009 +0200 d3dx9: Fix D3DXMatrixStack_MultMatrix to make tests pass in Windows. --- dlls/d3dx9_36/math.c | 1 - dlls/d3dx9_36/tests/math.c | 3 --- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 941f205..c540b21 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -855,7 +855,6 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrix(ID3DXMatrixStack *iface, C TRACE("iface %p\n", iface); - if (!pm) return D3DERR_INVALIDCALL; D3DXMatrixMultiply(&This->stack[This->current], &This->stack[This->current], pm); return D3D_OK; diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 7b513da..fa2f857 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1519,9 +1519,6 @@ static void test_matrix_stack(void) ok(SUCCEEDED(hr), "Pop failed, hr %#x\n", hr); ok(D3DXMatrixIsIdentity(ID3DXMatrixStack_GetTop(stack)), "The top should be an identity matrix\n"); - hr = ID3DXMatrixStack_MultMatrix(stack, NULL); - ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); - hr = ID3DXMatrixStack_MultMatrixLocal(stack, NULL); ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr);

1 0

David Adam : d3dx9: Fix D3DXMatrixStack_LoadMatrix to make tests pass in Windows.
by Alexandre Julliard 20 Jul '09

20 Jul '09

Module: wine Branch: master Commit: c88860a221b3d7aa7b2d8b72ea0b43acc5423d96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c88860a221b3d7aa7b2d8b72e… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Fri Jul 17 17:51:50 2009 +0200 d3dx9: Fix D3DXMatrixStack_LoadMatrix to make tests pass in Windows. --- dlls/d3dx9_36/math.c | 1 - dlls/d3dx9_36/tests/math.c | 3 --- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index ff19369..941f205 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -844,7 +844,6 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_LoadMatrix(ID3DXMatrixStack *iface, C TRACE("iface %p\n", iface); - if (!pm) return D3DERR_INVALIDCALL; This->stack[This->current] = *pm; return D3D_OK; diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index d2bdac0..7b513da 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1483,9 +1483,6 @@ static void test_matrix_stack(void) hr = ID3DXMatrixStack_Push(stack); ok(SUCCEEDED(hr), "Push failed, hr %#x\n", hr); - hr = ID3DXMatrixStack_LoadMatrix(stack, NULL); - ok(hr == D3DERR_INVALIDCALL, "LoadMatrix returned %#x, expected D3DERR_INVALIDCALL\n", hr); - hr = ID3DXMatrixStack_LoadMatrix(stack, &mat1); ok(SUCCEEDED(hr), "LoadMatrix failed, hr %#x\n", hr); expect_mat(&mat1, ID3DXMatrixStack_GetTop(stack));

1 0

David Adam : d3dx9: Fix D3DXVec4Normalize to make tests pass in Windows.
by Alexandre Julliard 20 Jul '09

20 Jul '09

Module: wine Branch: master Commit: 8823decbd4b1fdcc3285ac4a3817bbd3ded4d653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8823decbd4b1fdcc3285ac4a3… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Fri Jul 17 18:19:45 2009 +0200 d3dx9: Fix D3DXVec4Normalize to make tests pass in Windows. --- dlls/d3dx9_36/math.c | 20 ++++++-------------- dlls/d3dx9_36/tests/math.c | 4 ---- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 1367884..ff19369 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1725,20 +1725,12 @@ D3DXVECTOR4* WINAPI D3DXVec4Normalize(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv) FLOAT norm; norm = D3DXVec4Length(pv); - if ( !norm ) - { - out.x = 0.0f; - out.y = 0.0f; - out.z = 0.0f; - out.w = 0.0f; - } - else - { - out.x = pv->x / norm; - out.y = pv->y / norm; - out.z = pv->z / norm; - out.w = pv->w / norm; - } + + out.x = pv->x / norm; + out.y = pv->y / norm; + out.z = pv->z / norm; + out.w = pv->w / norm; + *pout = out; return pout; } diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 4b764cf..d2bdac0 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1419,10 +1419,6 @@ static void D3DXVector4Test(void) expectedvec.x = 1.0f/11.0f; expectedvec.y = 2.0f/11.0f; expectedvec.z = 4.0f/11.0f; expectedvec.w = 10.0f/11.0f; D3DXVec4Normalize(&gotvec,&u); expect_vec4(expectedvec,gotvec); - /* Test the nul vector */ - expectedvec.x = 0.0f; expectedvec.y = 0.0f; expectedvec.z = 0.0f; expectedvec.w = 0.0f; - D3DXVec4Normalize(&gotvec,&nul); - expect_vec4(expectedvec,gotvec); /*_______________D3DXVec4Scale____________________________*/ expectedvec.x = -6.5f; expectedvec.y = -13.0f; expectedvec.z = -26.0f; expectedvec.w = -65.0f;

1 0

David Adam : d3dx9: Fix D3DXVec3TransformCoord to make tests pass in Windows.
by Alexandre Julliard 20 Jul '09

20 Jul '09

Module: wine Branch: master Commit: 878bcb519c4b87a4c751effd60135f965e1648e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=878bcb519c4b87a4c751effd6… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Fri Jul 17 18:18:32 2009 +0200 d3dx9: Fix D3DXVec3TransformCoord to make tests pass in Windows. --- dlls/d3dx9_36/math.c | 18 +++++------------- dlls/d3dx9_36/tests/math.c | 7 +------ 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 31078e5..1367884 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1598,20 +1598,12 @@ D3DXVECTOR3* WINAPI D3DXVec3TransformCoord(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 norm = pm->u.m[0][3] * pv->x + pm->u.m[1][3] * pv->y + pm->u.m[2][3] *pv->z + pm->u.m[3][3]; - if ( norm ) - { - CONST D3DXVECTOR3 v = *pv; - out.x = (pm->u.m[0][0] * v.x + pm->u.m[1][0] * v.y + pm->u.m[2][0] * v.z + pm->u.m[3][0]) / norm; - out.y = (pm->u.m[0][1] * v.x + pm->u.m[1][1] * v.y + pm->u.m[2][1] * v.z + pm->u.m[3][1]) / norm; - out.z = (pm->u.m[0][2] * v.x + pm->u.m[1][2] * v.y + pm->u.m[2][2] * v.z + pm->u.m[3][2]) / norm; - } - else - { - out.x = 0.0f; - out.y = 0.0f; - out.z = 0.0f; - } + out.x = (pm->u.m[0][0] * pv->x + pm->u.m[1][0] * pv->y + pm->u.m[2][0] * pv->z + pm->u.m[3][0]) / norm; + out.y = (pm->u.m[0][1] * pv->x + pm->u.m[1][1] * pv->y + pm->u.m[2][1] * pv->z + pm->u.m[3][1]) / norm; + out.z = (pm->u.m[0][2] * pv->x + pm->u.m[1][2] * pv->y + pm->u.m[2][2] * pv->z + pm->u.m[3][2]) / norm; + *pout = out; + return pout; } diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 8879e1c..4b764cf 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1115,7 +1115,7 @@ static void D3DXVector2Test(void) static void D3DXVector3Test(void) { D3DVIEWPORT9 viewport; - D3DXVECTOR3 expectedvec, gotvec, nul, nulproj, u, v, w, x; + D3DXVECTOR3 expectedvec, gotvec, nul, u, v, w, x; LPD3DXVECTOR3 funcpointer; D3DXVECTOR4 expectedtrans, gottrans; D3DXMATRIX mat, projection, view, world; @@ -1290,11 +1290,6 @@ static void D3DXVector3Test(void) expectedvec.x = 70.0f/124.0f; expectedvec.y = 88.0f/124.0f; expectedvec.z = 106.0f/124.0f; D3DXVec3TransformCoord(&gotvec,&u,&mat); expect_vec3(expectedvec,gotvec); - /* Test the nul projected vector */ - nulproj.x = 1.0f; nulproj.y = -1.0f, nulproj.z = -1.0f; - expectedvec.x = 0.0f; expectedvec.y = 0.0f; expectedvec.z = 0.0f; - D3DXVec3TransformCoord(&gotvec,&nulproj,&mat); - expect_vec3(expectedvec,gotvec); /*_______________D3DXVec3TransformNormal______________________*/ expectedvec.x = 57.0f; expectedvec.y = 74.0f; expectedvec.z = 91.0f;

1 0

David Adam : d3dx9: Fix D3DXVec2TransformCoord to make tests pass in Windows.
by Alexandre Julliard 20 Jul '09

20 Jul '09

Module: wine Branch: master Commit: e37aff31b460fde0219a75d5057f8db91fd2e0a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e37aff31b460fde0219a75d50… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Fri Jul 17 18:14:32 2009 +0200 d3dx9: Fix D3DXVec2TransformCoord to make tests pass in Windows. --- dlls/d3dx9_36/math.c | 17 ++++++----------- dlls/d3dx9_36/tests/math.c | 7 +------ 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 30f7ec9..31078e5 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1440,20 +1440,15 @@ D3DXVECTOR4* WINAPI D3DXVec2TransformArray(D3DXVECTOR4* out, UINT outstride, CON D3DXVECTOR2* WINAPI D3DXVec2TransformCoord(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv, CONST D3DXMATRIX *pm) { + D3DXVECTOR2 v; FLOAT norm; + v = *pv; norm = pm->u.m[0][3] * pv->x + pm->u.m[1][3] * pv->y + pm->u.m[3][3]; - if ( norm ) - { - CONST D3DXVECTOR2 v = *pv; - pout->x = (pm->u.m[0][0] * v.x + pm->u.m[1][0] * v.y + pm->u.m[3][0]) / norm; - pout->y = (pm->u.m[0][1] * v.x + pm->u.m[1][1] * v.y + pm->u.m[3][1]) / norm; - } - else - { - pout->x = 0.0f; - pout->y = 0.0f; - } + + pout->x = (pm->u.m[0][0] * v.x + pm->u.m[1][0] * v.y + pm->u.m[3][0]) / norm; + pout->y = (pm->u.m[0][1] * v.x + pm->u.m[1][1] * v.y + pm->u.m[3][1]) / norm; + return pout; } diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 6e9f25d..8879e1c 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -950,7 +950,7 @@ static void D3DXQuaternionTest(void) static void D3DXVector2Test(void) { - D3DXVECTOR2 expectedvec, gotvec, nul, nulproj, u, v, w, x; + D3DXVECTOR2 expectedvec, gotvec, nul, u, v, w, x; LPD3DXVECTOR2 funcpointer; D3DXVECTOR4 expectedtrans, gottrans; D3DXMATRIX mat; @@ -1105,11 +1105,6 @@ static void D3DXVector2Test(void) expectedvec.x = 0.6f; expectedvec.y = 11.0f/15.0f; D3DXVec2TransformCoord(&gotvec,&u,&mat); expect_vec(expectedvec,gotvec); - /* Test the nul projected vector */ - nulproj.x = -2.0f; nulproj.y = -1.0f; - expectedvec.x = 0.0f; expectedvec.y = 0.0f; - D3DXVec2TransformCoord(&gotvec,&nulproj,&mat); - expect_vec(expectedvec,gotvec); /*_______________D3DXVec2TransformNormal______________________*/ expectedvec.x = 23.0f; expectedvec.y = 30.0f;

1 0

Vincent Povirk : mapi32: Add version numbers to version resource.
by Alexandre Julliard 20 Jul '09

20 Jul '09

Module: wine Branch: master Commit: eff5de1231560c13055c03f1f1f95fa396a2f286 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eff5de1231560c13055c03f1f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jul 17 10:40:07 2009 -0500 mapi32: Add version numbers to version resource. --- dlls/mapi32/version.rc | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/version.rc b/dlls/mapi32/version.rc index 0f95516..d3a620b 100644 --- a/dlls/mapi32/version.rc +++ b/dlls/mapi32/version.rc @@ -18,5 +18,9 @@ #define WINE_FILEDESCRIPTION_STR "Wine Messaging API" #define WINE_FILENAME_STR "mapi32.dll" +#define WINE_FILEVERSION 1,0,0,0 +#define WINE_FILEVERSION_STR "1.0.0.0" +#define WINE_PRODUCTVERSION 1,0,0,0 +#define WINE_PRODUCTVERSION_STR "1.0.0.0" #include "wine/wine_common_ver.rc"

1 0

Ricardo Filipe : winhlp32: Update Portuguese translation and convert to UTF8.
by Alexandre Julliard 20 Jul '09

20 Jul '09

Module: wine Branch: master Commit: f0f54890e3b33176edbc3b4e2bfe301d4586b5f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0f54890e3b33176edbc3b4e2… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Thu Jul 16 12:22:18 2009 -0700 winhlp32: Update Portuguese translation and convert to UTF8. --- programs/winhlp32/Pt.rc | 92 ++++++++++++++++++++++++++++++++++------------- 1 files changed, 67 insertions(+), 25 deletions(-) diff --git a/programs/winhlp32/Pt.rc b/programs/winhlp32/Pt.rc index 9a12e58..28933a2 100644 --- a/programs/winhlp32/Pt.rc +++ b/programs/winhlp32/Pt.rc @@ -6,7 +6,8 @@ * Portuguese translation by Gustavo Junior Alves <alves(a)correionet.com.br> * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> * Copyright 2003 Marcelo Duarte - * Copyright 2004,2007 Am�rico Jos� Melo + * Copyright 2004,2007 Américo José Melo + * Copyright 2009 Ricardo Filipe * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -25,6 +26,8 @@ #include "winhelp_res.h" +#pragma code_page(65001) + /* Menu */ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN @@ -65,9 +68,9 @@ MAIN_MENU MENU } POPUP "Aj&uda" { MENUITEM "Ajuda &na ajuda", MNID_HELP_HELPON - MENUITEM "Sempre &vis�vel", MNID_HELP_HELPTOP + MENUITEM "Sempre &visível", MNID_HELP_HELPTOP MENUITEM SEPARATOR - MENUITEM "&Informa��es...", MNID_HELP_ABOUT + MENUITEM "&Informações...", MNID_HELP_ABOUT #ifdef WINELIB MENUITEM "&Sobre WINE", MNID_HELP_WINE #endif @@ -94,33 +97,49 @@ MAIN_MENU MENU POPUP "In&dicador" { MENUITEM "&Definir...", MNID_BKMK_DEFINE } - POPUP "&Options" { - POPUP "Help always visible" + POPUP "&Opções" { + POPUP "Ajuda sempre visível" BEGIN - MENUITEM "Default", MNID_OPTS_HELP_DEFAULT - MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE - MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + MENUITEM "Omissão", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visível", MNID_OPTS_HELP_VISIBLE + MENUITEM "Invisível", MNID_OPTS_HELP_NONVISIBLE END - MENUITEM "History", MNID_OPTS_HISTORY - POPUP "Fonts" + MENUITEM "Histórico", MNID_OPTS_HISTORY + POPUP "Tipos de Letra" BEGIN - MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Pequeno", MNID_OPTS_FONTS_SMALL MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL - MENUITEM "Large", MNID_OPTS_FONTS_LARGE + MENUITEM "Grande", MNID_OPTS_FONTS_LARGE END - MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + MENUITEM "Usar cores do sistema", MNID_OPTS_SYSTEM_COLORS } POPUP "Aj&uda" { MENUITEM "Ajuda &na ajuda", MNID_HELP_HELPON - MENUITEM "Sempre &vis�vel", MNID_HELP_HELPTOP + MENUITEM "Sempre &visível", MNID_HELP_HELPTOP MENUITEM SEPARATOR - MENUITEM "&Informa��es...", MNID_HELP_ABOUT + MENUITEM "&Informações...", MNID_HELP_ABOUT #ifdef WINELIB MENUITEM "&Acerca do WINE", MNID_HELP_WINE #endif } } +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Índice" +{ + LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER +} + +IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Procura" +{ + LTEXT "Ainda não implementado", -1, 10, 10, 180, 150 +} + /* Strings */ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN @@ -130,10 +149,10 @@ STRINGTABLE DISCARDABLE STID_WINE_HELP, "Ajuda WINE" STID_WHERROR, "ERRO" STID_WARNING, "AVISO" -STID_INFO, "Informa��o" -STID_NOT_IMPLEMENTED, "N�o implementado" +STID_INFO, "Informação" +STID_NOT_IMPLEMENTED, "Não implementado" STID_HLPFILE_ERROR_s, "Erro encontrado na leitura do arquivo de ajuda '%s'" -STID_INDEX, "&Conte�do" +STID_INDEX, "&Conteúdo" STID_CONTENTS, "Summary" STID_BACK, "&Voltar" STID_ALL_FILES, "Todos os arquivos (*.*)" @@ -150,15 +169,38 @@ STRINGTABLE DISCARDABLE STID_WINE_HELP, "Ajuda WINE" STID_WHERROR, "ERRO" STID_WARNING, "AVISO" -STID_INFO, "Informa��o" -STID_NOT_IMPLEMENTED, "N�o implementado" +STID_INFO, "Informação" +STID_NOT_IMPLEMENTED, "Não implementado" STID_HLPFILE_ERROR_s, "Erro encontrado na leitura do ficheiro de ajuda '%s'" -STID_INDEX, "&Conte�do" -STID_CONTENTS, "Summary" +STID_INDEX, "&Conteúdo" +STID_CONTENTS, "Sumário" STID_BACK, "&Voltar" STID_ALL_FILES, "Todos os ficheiros (*.*)" STID_HELP_FILES_HLP, "Ficheiros de ajuda (*.hlp)" -STID_FILE_NOT_FOUND_s "N�o � poss�vel encontrar '%s'. Deseja procurar este ficheiro voc� mesmo?" -STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " +STID_FILE_NOT_FOUND_s "Não é possível encontrar '%s'. Deseja procurar este ficheiro você mesmo?" +STID_NO_RICHEDIT "Não foi possível encontrar uma implementação do richedit... A abortar" +STID_PSH_INDEX, "Tópicos de ajuda: " } + +CONTEXT_MENU MENU LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE +BEGIN + POPUP "" + BEGIN + MENUITEM "Anotação...", MNID_CTXT_ANNOTATE + MENUITEM "Copiar", MNID_CTXT_COPY + MENUITEM "Imprimir...", MNID_CTXT_PRINT + POPUP "Tipos de letra" + BEGIN + MENUITEM "Pequeno", MNID_CTXT_FONTS_SMALL + MENUITEM "Normal", MNID_CTXT_FONTS_NORMAL + MENUITEM "Grande", MNID_CTXT_FONTS_LARGE + END + POPUP "Ajuda sempre visível" + BEGIN + MENUITEM "Omissão", MNID_CTXT_HELP_DEFAULT + MENUITEM "Visível", MNID_CTXT_HELP_VISIBLE + MENUITEM "Invisível", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "Usar cores do sistema", MNID_CTXT_SYSTEM_COLORS + END +END

1 0