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

Detlef Riekenberg : urlmon/tests: Add tests for CoInternetCreateZoneManager .
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 099f031051af2112b82a98c4aa3910fbd70a3542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=099f031051af2112b82a98c4a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Jul 8 00:03:21 2009 +0200 urlmon/tests: Add tests for CoInternetCreateZoneManager. --- dlls/urlmon/tests/sec_mgr.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index e35cf48..07d409e 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -282,6 +282,47 @@ static void test_polices(void) IInternetZoneManager_Release(zonemgr); } +static void test_CoInternetCreateZoneManager(void) +{ + IInternetZoneManager *zonemgr = NULL; + IUnknown *punk = NULL; + HRESULT hr; + + hr = CoInternetCreateZoneManager(NULL, &zonemgr, 0); + ok(hr == S_OK, "CoInternetCreateZoneManager result: 0x%x\n", hr); + if (FAILED(hr)) + return; + + hr = IInternetZoneManager_QueryInterface(zonemgr, &IID_IUnknown, (void **) &punk); + ok(SUCCEEDED(hr), "got 0x%x with %p (expected Success)n", hr, punk); + if (punk) + IUnknown_Release(punk); + + hr = IInternetZoneManager_QueryInterface(zonemgr, &IID_IInternetZoneManager, (void **) &punk); + ok(SUCCEEDED(hr), "got 0x%x with %p (expected Success)n", hr, punk); + if (punk) + IUnknown_Release(punk); + + + hr = IInternetZoneManager_QueryInterface(zonemgr, &IID_IInternetZoneManagerEx, (void **) &punk); + if (SUCCEEDED(hr)) { + IUnknown_Release(punk); + + hr = IInternetZoneManager_QueryInterface(zonemgr, &IID_IInternetZoneManagerEx2, (void **) &punk); + if (punk) + IUnknown_Release(punk); + else + win_skip("InternetZoneManagerEx2 not supported\n"); + + } + else + win_skip("InternetZoneManagerEx not supported\n"); + + hr = IInternetZoneManager_Release(zonemgr); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + +} + static void test_CreateZoneEnumerator(void) { IInternetZoneManager *zonemgr = NULL; @@ -500,6 +541,7 @@ START_TEST(sec_mgr) test_SecurityManager(); test_polices(); + test_CoInternetCreateZoneManager(); test_CreateZoneEnumerator(); test_GetZoneActionPolicy(); test_GetZoneAt();

1 0

Henri Verbeet : wined3d: Fix a sign compare warning in shader_vaddline().
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 6211643bf540209869b711c582e31b33715aae92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6211643bf540209869b711c58… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 8 09:49:29 2009 +0200 wined3d: Fix a sign compare warning in shader_vaddline(). --- dlls/wined3d/baseshader.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 4e3fb92..e67e7ed 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -159,9 +159,8 @@ int shader_vaddline(SHADER_BUFFER* buffer, const char *format, va_list args) rc = vsnprintf(base, SHADER_PGMSIZE - 1 - buffer->bsize, format, args); - if (rc < 0 || /* C89 */ - rc > SHADER_PGMSIZE - 1 - buffer->bsize) { /* C99 */ - + if (rc < 0 /* C89 */ || (unsigned int)rc > SHADER_PGMSIZE - 1 - buffer->bsize /* C99 */) + { ERR("The buffer allocated for the shader program string " "is too small at %d bytes.\n", SHADER_PGMSIZE); buffer->bsize = SHADER_PGMSIZE - 1;

1 0

Detlef Riekenberg : include: Add IInternetZoneManagerEx2 interface for IE7.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 437caf390ec27cc2cc083948b463cab474ce6b14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=437caf390ec27cc2cc083948b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jul 7 22:59:42 2009 +0200 include: Add IInternetZoneManagerEx2 interface for IE7. --- include/urlmon.idl | 88 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 80 insertions(+), 8 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index 4e902a2..3c6576b 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1210,20 +1210,26 @@ interface IInternetZoneManager : IUnknown URLTEMPLATE_CUSTOM = 0x00000, URLTEMPLATE_PREDEFINED_MIN = 0x10000, URLTEMPLATE_LOW = 0x10000, + URLTEMPLATE_MEDLOW = 0x10500, URLTEMPLATE_MEDIUM = 0x11000, + URLTEMPLATE_MEDHIGH = 0x11500, URLTEMPLATE_HIGH = 0x12000, URLTEMPLATE_PREDEFINED_MAX = 0x20000, } URLTEMPLATE ; typedef enum { - ZAFLAGS_CUSTOM_EDIT = 0x00000001, - ZAFLAGS_ADD_SITES = 0x00000002, - ZAFLAGS_REQUIRE_VERIFICATION = 0x00000004, - ZAFLAGS_INCLUDE_PROXY_OVERRIDE = 0x00000008, - ZAFLAGS_INCLUDE_INTRANET_SITES = 0x00000010, - ZAFLAGS_NO_UI = 0x00000020, - ZAFLAGS_SUPPORTS_VERIFICATION = 0x00000040, - ZAFLAGS_UNC_AS_INTRANET = 0x00000080, + ZAFLAGS_CUSTOM_EDIT = 0x00000001, + ZAFLAGS_ADD_SITES = 0x00000002, + ZAFLAGS_REQUIRE_VERIFICATION = 0x00000004, + ZAFLAGS_INCLUDE_PROXY_OVERRIDE = 0x00000008, + ZAFLAGS_INCLUDE_INTRANET_SITES = 0x00000010, + ZAFLAGS_NO_UI = 0x00000020, + ZAFLAGS_SUPPORTS_VERIFICATION = 0x00000040, + ZAFLAGS_UNC_AS_INTRANET = 0x00000080, + ZAFLAGS_DETECT_INTRANET = 0x00000100, + ZAFLAGS_USE_LOCKED_ZONES = 0x00010000, + ZAFLAGS_VERIFY_TEMPLATE_SETTINGS = 0x00020000, + ZAFLAGS_NO_CACHE = 0x00040000, } ZAFLAGS ; enum { @@ -1316,6 +1322,72 @@ interface IInternetZoneManager : IUnknown [in] DWORD dwReserved); } +/***************************************************************************** + * IInternetZoneManagerEx interface + */ +[ + local, + object, + uuid(A4C23339-8E06-431E-9BF4-7E711C085648), + pointer_default(unique) +] +interface IInternetZoneManagerEx : IInternetZoneManager +{ + HRESULT GetZoneActionPolicyEx( + [in] DWORD dwZone, + [in] DWORD dwAction, + [out] BYTE* pPolicy, + [in] DWORD cbPolicy, + [in] URLZONEREG urlZoneReg, + [in] DWORD dwFlags); + + HRESULT SetZoneActionPolicyEx( + [in] DWORD dwZone, + [in] DWORD dwAction, + [in] BYTE* pPolicy, + [in] DWORD cbPolicy, + [in] URLZONEREG urlZoneReg, + [in] DWORD dwFlags); + +} + +/***************************************************************************** + * IInternetZoneManagerEx2 interface + */ + +cpp_quote("#define SECURITY_IE_STATE_GREEN 0") +cpp_quote("#define SECURITY_IE_STATE_RED 1") + +[ + local, + object, + uuid(EDC17559-DD5D-4846-8EEF-8BECBA5A4ABF), + pointer_default(unique) +] +interface IInternetZoneManagerEx2 : IInternetZoneManagerEx +{ + HRESULT GetZoneAttributesEx( + [in] DWORD dwZone, + [in, out, unique] ZONEATTRIBUTES* pZoneAttributes, + [in] DWORD dwFlags); + + HRESULT GetZoneSecurityState( + [in] DWORD dwZoneIndex, + [in] BOOL fRespectPolicy, + [in, out] LPDWORD pdwState, + [in, out] BOOL *pfPolicyEncountered); + + HRESULT GetIESecurityState( + [in] BOOL fRespectPolicy, + [in, out] LPDWORD pdwState, + [in, out] BOOL *pfPolicyEncountered, + [in] BOOL fNoCache); + + HRESULT FixInsecureSettings(void); + +} + + typedef struct _tagSOFTDISTINFO { ULONG cbSize;

1 0

Huw Davies : wordpad: Add English neutral translations.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 6df07402c0cc773cf3a4de45f158609f9f0931db URL: http://source.winehq.org/git/wine.git/?a=commit;h=6df07402c0cc773cf3a4de45f… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 8 15:24:08 2009 +0100 wordpad: Add English neutral translations. --- programs/wordpad/En.rc | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc index 3f8070c..fe92de7 100644 --- a/programs/wordpad/En.rc +++ b/programs/wordpad/En.rc @@ -244,3 +244,12 @@ BEGIN STRING_PRINTING_NOT_IMPLEMENTED, "Printing not implemented" STRING_MAX_TAB_STOPS, "Cannot add more than 32 tab stops." END + +LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + STRING_ALIGN_LEFT, "Left" + STRING_ALIGN_RIGHT, "Right" + STRING_ALIGN_CENTER, "Centre" +END

1 0

Andrew Eikum : gdiplus: Don' t modify container list if container restoration fails.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: a06c2570e5870d1c5538760442956fedab1594ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=a06c2570e5870d1c553876044… Author: Andrew Eikum <andrew(a)brightnightgames.com> Date: Tue Jul 7 22:30:29 2009 -0500 gdiplus: Don't modify container list if container restoration fails. --- dlls/gdiplus/graphics.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b81a984..12f1e26 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3400,7 +3400,7 @@ GpStatus WINGDIPAPI GdipComment(GpGraphics *graphics, UINT sizeData, GDIPCONST B return NotImplemented; } -GpStatus WINGDIPAPI GdipEndContainer(GpGraphics *graphics, GraphicsState state) +GpStatus WINGDIPAPI GdipEndContainer(GpGraphics *graphics, GraphicsContainer state) { GpStatus sts; GraphicsContainerItem *container, *container2; @@ -3419,6 +3419,10 @@ GpStatus WINGDIPAPI GdipEndContainer(GpGraphics *graphics, GraphicsState state) if(&container->entry == &graphics->containers) return Ok; + sts = restore_container(graphics, container); + if(sts != Ok) + return sts; + /* remove all of the containers on top of the found container */ LIST_FOR_EACH_ENTRY_SAFE(container, container2, &graphics->containers, GraphicsContainerItem, entry){ if(container->contid == state) @@ -3428,10 +3432,9 @@ GpStatus WINGDIPAPI GdipEndContainer(GpGraphics *graphics, GraphicsState state) } list_remove(&container->entry); - sts = restore_container(graphics, container); delete_container(container); - return sts; + return Ok; } GpStatus WINGDIPAPI GdipScaleWorldTransform(GpGraphics *graphics, REAL sx,

1 0

Anders Jonsson : winedbg: Add Swedish translation.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: f7ec04766b302fff9ffc4d86b1b4bd06bdc34472 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7ec04766b302fff9ffc4d86b… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Tue Jul 7 22:16:41 2009 +0200 winedbg: Add Swedish translation. --- programs/winedbg/Makefile.in | 3 +- programs/winedbg/rsrc_Sv.rc | 60 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index c3329e2..fa13abf 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -37,7 +37,8 @@ RC_SRCS = \ rsrc_Ko.rc \ rsrc_Lt.rc \ rsrc_Nl.rc \ - rsrc_Ru.rc + rsrc_Ru.rc \ + rsrc_Sv.rc LEX_SRCS = debug.l BISON_SRCS = dbg.y diff --git a/programs/winedbg/rsrc_Sv.rc b/programs/winedbg/rsrc_Sv.rc new file mode 100644 index 0000000..7a24982 --- /dev/null +++ b/programs/winedbg/rsrc_Sv.rc @@ -0,0 +1,60 @@ +/* + * Swedish Language Support + * + * Copyright 2008 Anders Jonsson + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +IDM_DEBUG_POPUP MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Felsök", ID_DEBUG + END +END + +IDD_CRASH_DLG DIALOGEX 100, 100, 273, 175 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Programfel" +FONT 8, "Tahoma" +BEGIN + LTEXT "",IDC_STATIC_BG,0,0,273,52,WS_BORDER,0 + LTEXT "Programmet %s har stött på ett allvarligt problem och \ + måste avslutas. Vi ber om ursäkt för besväret.", + IDC_STATIC_TXT1,27,10,224,30 + LTEXT "Detta kan ha orsakats av ett fel i programmet eller en brist i Wine. \ + Du kan söka på http://appdb.winehq.org efter tips om hur man kör \ + detta program.\n\n\ + Om problemet inte uppstår i Windows och ännu inte har rapporterats \ + så kan du rapportera det på http://bugs.winehq.org.",IDC_STATIC_TXT2,27,60,224,100 + DEFPUSHBUTTON "Stäng", IDOK, 205, 151, 60, 16, WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_AUTO_CAPTION "Krasch i Wine-program" + IDS_INVALID_PARAMS "Interna fel - ogiltiga parametrar mottogs" + IDS_UNIDENTIFIED "(oidentifierad)" +END + +#pragma code_page(default)

1 0

Detlef Riekenberg : urlmon: Partial InternetZoneManagerEx2 implementation.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 1c6efb42417725ff93a48ab6c47befe7dfed2a5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c6efb42417725ff93a48ab6c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jul 7 23:55:00 2009 +0200 urlmon: Partial InternetZoneManagerEx2 implementation. --- dlls/urlmon/sec_mgr.c | 163 +++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 143 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c6efb42417725ff93a48…

1 0

Huw Davies : gdi32/tests: Don' t continue with the tests if GetWinMetaFileBits fails.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 904b2749f79b096f6ed04462ee00734ca42d1461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=904b2749f79b096f6ed04462e… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 8 15:20:25 2009 +0100 gdi32/tests: Don't continue with the tests if GetWinMetaFileBits fails. --- dlls/gdi32/tests/metafile.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 49a5489..2eacd37 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2331,7 +2331,7 @@ static void getwinmetafilebits(UINT mode, int scale, RECT *rc) UINT size, emf_size, i; WORD check = 0; DWORD rec_num = 0; - METAHEADER *mh; + METAHEADER *mh = NULL; METARECORD *rec; INT horz_res, vert_res, horz_size, vert_size; @@ -2363,6 +2363,7 @@ static void getwinmetafilebits(UINT mode, int scale, RECT *rc) size = GetWinMetaFileBits(emf, 0, NULL, mode, display_dc); ok(size, "GetWinMetaFileBits returns 0\n"); + if(!size) goto end; mh = HeapAlloc(GetProcessHeap(), 0, size); GetWinMetaFileBits(emf, size, (BYTE*)mh, mode, display_dc); @@ -2464,6 +2465,7 @@ static void getwinmetafilebits(UINT mode, int scale, RECT *rc) rec = (METARECORD*)((WORD*)rec + rec->rdSize); } +end: HeapFree(GetProcessHeap(), 0, mh); HeapFree(GetProcessHeap(), 0, enh_header); DeleteEnhMetaFile(emf);

1 0

Paul Vriens : comctl32/tests: Fix test failures with comctl32 <= 5.80.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: f88d9ab195c810d504a77c66fdd408fe1a601359 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f88d9ab195c810d504a77c66f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jul 8 11:57:23 2009 +0200 comctl32/tests: Fix test failures with comctl32 <= 5.80. --- dlls/comctl32/tests/datetime.c | 26 +++++++++++++++++--------- 1 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 8fdbbe5..038a789 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -423,10 +423,13 @@ static void test_dtm_set_range_swap_min_max(HWND hWndDateTime) r = SendMessage(hWndDateTime, DTM_GETRANGE, 0, (LPARAM)getSt); ok(r == (GDTR_MIN | GDTR_MAX), "Expected %x, not %x(GDTR_MIN) or %x(GDTR_MAX), got %lx\n", (GDTR_MIN | GDTR_MAX), GDTR_MIN, GDTR_MAX, r); todo_wine { - expect_systime(&st[0], &getSt[0]); - } - todo_wine { - expect_systime(&st[1], &getSt[1]); + ok(compare_systime(&st[0], &getSt[0]) == 1 || + broken(compare_systime(&st[0], &getSt[1]) == 1), /* comctl32 version <= 5.80 */ + "ST1 != ST2\n"); + + ok(compare_systime(&st[1], &getSt[1]) == 1 || + broken(compare_systime(&st[1], &getSt[0]) == 1), /* comctl32 version <= 5.80 */ + "ST1 != ST2\n"); } fill_systime_struct(&st[0], 1980, 1, 3, 23, 14, 34, 37, 465); @@ -439,7 +442,9 @@ static void test_dtm_set_range_swap_min_max(HWND hWndDateTime) and doing DTM_SETSYSTEMTIME */ expect_systime_date(&st[0], &getSt[0]); todo_wine { - expect_systime_time(&origSt, &getSt[0]); + ok(compare_systime_time(&origSt, &getSt[0]) == 1 || + broken(compare_systime_time(&st[0], &getSt[0]) == 1), /* comctl32 version <= 5.80 */ + "ST1.time != ST2.time\n"); } /* set st[0] to value higher than minimum */ @@ -455,10 +460,13 @@ static void test_dtm_set_range_swap_min_max(HWND hWndDateTime) r = SendMessage(hWndDateTime, DTM_GETRANGE, 0, (LPARAM)getSt); ok(r == (GDTR_MIN | GDTR_MAX), "Expected %x, not %x(GDTR_MIN) or %x(GDTR_MAX), got %lx\n", (GDTR_MIN | GDTR_MAX), GDTR_MIN, GDTR_MAX, r); todo_wine { - expect_systime(&st[0], &getSt[1]); - } - todo_wine { - expect_systime(&st[1], &getSt[0]); + ok(compare_systime(&st[0], &getSt[1]) == 1 || + broken(compare_systime(&st[0], &getSt[0]) == 1), /* comctl32 version <= 5.80 */ + "ST1 != ST2\n"); + + ok(compare_systime(&st[1], &getSt[0]) == 1 || + broken(compare_systime(&st[1], &getSt[1]) == 1), /* comctl32 version <= 5.80 */ + "ST1 != ST2\n"); } /* set st[0] to value higher than st[1] */

1 0

Henri Verbeet : wined3d: Fix a sign compare warning in glsl_shader.c.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: e41831990df6991c5ed06b5c98a556f0381abe73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e41831990df6991c5ed06b5c9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 8 09:49:28 2009 +0200 wined3d: Fix a sign compare warning in glsl_shader.c. --- dlls/wined3d/glsl_shader.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index bc84737..e15436c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -769,9 +769,9 @@ static void shader_glsl_update_float_pixel_constants(IWineD3DDevice *iface, UINT } } -static int vec4_varyings(DWORD shader_major, const WineD3D_GL_Info *gl_info) +static unsigned int vec4_varyings(DWORD shader_major, const WineD3D_GL_Info *gl_info) { - int ret = GL_LIMITS(glsl_varyings) / 4; + unsigned int ret = GL_LIMITS(glsl_varyings) / 4; /* 4.0 shaders do not write clip coords because d3d10 does not support user clipplanes */ if(shader_major > 3) return ret; @@ -1186,7 +1186,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * if (This->baseShader.reg_maps.shader_version.major >= 3) { DWORD idx = ((IWineD3DPixelShaderImpl *)This)->input_reg_map[reg->idx]; - DWORD in_count = vec4_varyings(This->baseShader.reg_maps.shader_version.major, gl_info); + unsigned int in_count = vec4_varyings(This->baseShader.reg_maps.shader_version.major, gl_info); if (reg->rel_addr) { @@ -3351,7 +3351,7 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_in UINT semantic_idx_in, semantic_idx_out; DWORD *set; DWORD in_idx; - DWORD in_count = vec4_varyings(3, gl_info); + unsigned int in_count = vec4_varyings(3, gl_info); char reg_mask[6], reg_mask_out[6]; char destination[50]; WORD input_map, output_map; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index da51604..d3d32e4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2747,7 +2747,7 @@ typedef struct IWineD3DPixelShaderImpl { struct wined3d_shader_signature_element input_signature[MAX_REG_INPUT]; DWORD input_reg_map[MAX_REG_INPUT]; BOOL input_reg_used[MAX_REG_INPUT]; - int declared_in_count; + unsigned int declared_in_count; /* The GL shader */ void *backend_priv;

1 0

Nikolay Sivov : comctl32/listview: A basic test for column width default value.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 76c0d49b52e045b722c27f9a9a21edf54aa014cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=76c0d49b52e045b722c27f9a9… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jul 7 22:36:50 2009 +0400 comctl32/listview: A basic test for column width default value. --- dlls/comctl32/tests/listview.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index c0b272b..6d3a2d2 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3753,6 +3753,31 @@ todo_wine { DestroyWindow(hwnd); } +static void test_getcolumnwidth(void) +{ + HWND hwnd; + DWORD ret; + DWORD_PTR style; + LVCOLUMNA col; + + /* default column width */ + hwnd = create_custom_listview_control(0); + ret = SendMessage(hwnd, LVM_GETCOLUMNWIDTH, 0, 0); + expect(0, ret); + style = GetWindowLong(hwnd, GWL_STYLE); + SetWindowLong(hwnd, GWL_STYLE, style | LVS_LIST); + ret = SendMessage(hwnd, LVM_GETCOLUMNWIDTH, 0, 0); + todo_wine expect(8, ret); + style = GetWindowLong(hwnd, GWL_STYLE) & ~LVS_LIST; + SetWindowLong(hwnd, GWL_STYLE, style | LVS_REPORT); + col.mask = 0; + ret = SendMessage(hwnd, LVM_INSERTCOLUMNA, 0, (LPARAM)&col); + expect(0, ret); + ret = SendMessage(hwnd, LVM_GETCOLUMNWIDTH, 0, 0); + expect(10, ret); + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -3807,6 +3832,7 @@ START_TEST(listview) test_notifyformat(); test_indentation(); test_getitemspacing(); + test_getcolumnwidth(); if (!load_v6_module(&ctx_cookie)) {

1 0

Francois Gouget : winefile: Remove space before ellipsis.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 8b93076819f082304b003305f7c2403eb56c9df4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b93076819f082304b003305f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 8 07:26:50 2009 +0200 winefile: Remove space before ellipsis. --- programs/winefile/Fr.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winefile/Fr.rc b/programs/winefile/Fr.rc index 8603db3..1b39edc 100644 --- a/programs/winefile/Fr.rc +++ b/programs/winefile/Fr.rc @@ -104,7 +104,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "Trier par ta&ille", ID_VIEW_SORT_SIZE MENUITEM "Trier par dat&e", ID_VIEW_SORT_DATE MENUITEM SEPARATOR - MENUITEM "Trier &par ...", ID_VIEW_FILTER + MENUITEM "Trier &par...", ID_VIEW_FILTER } POPUP "&Options" {

1 0

Henri Verbeet : wined3d: Implement a A8R8G8B8 to X8R8G8B8 surface format converter.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 7089128d2aa8bda04f6074fea6d68b99e6a84dcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7089128d2aa8bda04f6074fea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 8 09:49:25 2009 +0200 wined3d: Implement a A8R8G8B8 to X8R8G8B8 surface format converter. --- dlls/wined3d/surface_base.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index fd1bb76..5c00b2b 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -724,6 +724,25 @@ static void convert_r5g6b5_x8r8g8b8(const BYTE *src, BYTE *dst, } } +static void convert_a8r8g8b8_x8r8g8b8(const BYTE *src, BYTE *dst, + DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h) +{ + unsigned int x, y; + + TRACE("Converting %ux%u pixels, pitches %u %u\n", w, h, pitch_in, pitch_out); + + for (y = 0; y < h; ++y) + { + const DWORD *src_line = (const DWORD *)(src + y * pitch_in); + DWORD *dst_line = (DWORD *)(dst + y * pitch_out); + + for (x = 0; x < w; ++x) + { + dst_line[x] = 0xff000000 | (src_line[x] & 0xffffff); + } + } +} + struct d3dfmt_convertor_desc { WINED3DFORMAT from, to; void (*convert)(const BYTE *src, BYTE *dst, DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h); @@ -733,6 +752,7 @@ static const struct d3dfmt_convertor_desc convertors[] = { {WINED3DFMT_R32_FLOAT, WINED3DFMT_R16_FLOAT, convert_r32_float_r16_float}, {WINED3DFMT_R5G6B5, WINED3DFMT_X8R8G8B8, convert_r5g6b5_x8r8g8b8}, + {WINED3DFMT_A8R8G8B8, WINED3DFMT_X8R8G8B8, convert_a8r8g8b8_x8r8g8b8}, }; static inline const struct d3dfmt_convertor_desc *find_convertor(WINED3DFORMAT from, WINED3DFORMAT to)

1 0

Nikolay Sivov : comctl32/listview: Basic LVN_(BEGIN|END)SCROLL tests.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 1b2a6a08aaaa77961336691d054b6a71a6066b18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b2a6a08aaaa77961336691d0… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jul 8 00:03:33 2009 +0400 comctl32/listview: Basic LVN_(BEGIN|END)SCROLL tests. --- dlls/comctl32/tests/listview.c | 55 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6d3a2d2..b886d86 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -240,6 +240,12 @@ static const struct message editbox_create_pos[] = { { 0 } }; +static const struct message scroll_parent_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, LVN_BEGINSCROLL }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ENDSCROLL }, + { 0 } +}; + struct subclass_info { WNDPROC oldproc; @@ -290,6 +296,15 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP case LVN_ENDLABELEDIT: /* always accept new item text */ return TRUE; + case LVN_BEGINSCROLL: + case LVN_ENDSCROLL: + { + NMLVSCROLL *pScroll = (NMLVSCROLL*)lParam; + + trace("LVN_%sSCROLL: (%d,%d)\n", pScroll->hdr.code == LVN_BEGINSCROLL ? + "BEGIN" : "END", pScroll->dx, pScroll->dy); + } + break; } break; } @@ -3778,6 +3793,45 @@ static void test_getcolumnwidth(void) DestroyWindow(hwnd); } +static void test_scrollnotify(void) +{ + HWND hwnd; + DWORD ret; + + hwnd = create_listview_control(0); + + insert_column(hwnd, 0); + insert_column(hwnd, 1); + insert_item(hwnd, 0); + + /* make it scrollable - resize */ + ret = SendMessage(hwnd, LVM_SETCOLUMNWIDTH, 0, MAKELPARAM(100, 0)); + expect(TRUE, ret); + ret = SendMessage(hwnd, LVM_SETCOLUMNWIDTH, 1, MAKELPARAM(100, 0)); + expect(TRUE, ret); + + /* try with dummy call */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = SendMessage(hwnd, LVM_SCROLL, 0, 0); + expect(TRUE, ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, scroll_parent_seq, + "scroll notify 1", TRUE); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = SendMessage(hwnd, LVM_SCROLL, 1, 0); + expect(TRUE, ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, scroll_parent_seq, + "scroll notify 2", TRUE); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = SendMessage(hwnd, LVM_SCROLL, 1, 1); + expect(TRUE, ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, scroll_parent_seq, + "scroll notify 3", TRUE); + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -3844,6 +3898,7 @@ START_TEST(listview) test_get_set_view(); test_canceleditlabel(); test_mapidindex(); + test_scrollnotify(); unload_v6_module(ctx_cookie);

1 0

Henri Verbeet : wined3d: Avoid destroying the currently active context for non-implicit swapchains.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 6d8e1e52c83edbb3598db90b2e3a4121237fefc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d8e1e52c83edbb3598db90b2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 8 09:49:26 2009 +0200 wined3d: Avoid destroying the currently active context for non-implicit swapchains. --- dlls/wined3d/swapchain.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 3591e83..272a425 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -64,7 +64,24 @@ static void WINAPI IWineD3DSwapChainImpl_Destroy(IWineD3DSwapChain *iface, D3DCB HeapFree(GetProcessHeap(), 0, This->backBuffer); } - for(i = 0; i < This->num_contexts; i++) { + for (i = 0; i < This->num_contexts; ++i) + { + if (This->context[i] == This->wineD3DDevice->activeContext) + { + IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *)This->wineD3DDevice->swapchains[0]; + + /* Avoid destroying the currently active context for non-implicit swapchains. */ + if (This != swapchain) + { + TRACE("Would destroy currently active context %p on a non-implicit swapchain.\n", This->context[i]); + + if (swapchain->backBuffer) + ActivateContext(This->wineD3DDevice, swapchain->backBuffer[0], CTXUSAGE_RESOURCELOAD); + else + ActivateContext(This->wineD3DDevice, swapchain->frontBuffer, CTXUSAGE_RESOURCELOAD); + } + } + DestroyContext(This->wineD3DDevice, This->context[i]); } /* Restore the screen resolution if we rendered in fullscreen

1 0

Henri Verbeet : wined3d: Trace the D3D shader in find_glsl_vshader() / find_glsl_pshader().
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 949cd089d52299b2e56c97313755fdb16c162ddc URL: http://source.winehq.org/git/wine.git/?a=commit;h=949cd089d52299b2e56c97313… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 8 09:49:27 2009 +0200 wined3d: Trace the D3D shader in find_glsl_vshader() / find_glsl_pshader(). It's quite useful to know to which D3D shader a GLSL shader corresponds. --- dlls/wined3d/glsl_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 983efb6..bc84737 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3866,7 +3866,7 @@ static GLhandleARB find_glsl_pshader(IWineD3DPixelShaderImpl *shader, const stru } } - TRACE("No matching GL shader found, compiling a new shader\n"); + TRACE("No matching GL shader found for shader %p, compiling a new shader.\n", shader); if(shader_data->shader_array_size == shader_data->num_gl_shaders) { if (shader_data->num_gl_shaders) { @@ -3934,7 +3934,7 @@ static GLhandleARB find_glsl_vshader(IWineD3DVertexShaderImpl *shader, const str } } - TRACE("No matching GL shader found, compiling a new shader\n"); + TRACE("No matching GL shader found for shader %p, compiling a new shader.\n", shader); if(shader_data->shader_array_size == shader_data->num_gl_shaders) { if (shader_data->num_gl_shaders)

1 0

Francois Gouget : notepad: Remove spaces before '\n's.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 1e602c57d0aac6019d118c572e36431b7c205e61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e602c57d0aac6019d118c572… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 8 07:26:39 2009 +0200 notepad: Remove spaces before '\n's. --- programs/notepad/De.rc | 8 ++++---- programs/notepad/En.rc | 8 ++++---- programs/notepad/Fr.rc | 8 ++++---- programs/notepad/No.rc | 8 ++++---- programs/notepad/Pt.rc | 4 ++-- programs/notepad/Sv.rc | 8 ++++---- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/programs/notepad/De.rc b/programs/notepad/De.rc index 51546e3..ed3202d 100644 --- a/programs/notepad/De.rc +++ b/programs/notepad/De.rc @@ -134,9 +134,9 @@ STRING_UNICODE_LE, "Unicode (UTF-16)" STRING_UNICODE_BE, "Unicode (UTF-16 Big-Endian)" STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ -Diese Datei enth�lt Unicode-Zeichen, die verloren gehen, wenn \n\ -Sie die Datei mit %s-Zeichenkodierung speichern. \n\ -Um die Zeichen beizubehalten, klicken Sie Abbrechen und w�hlen \n\ -Sie eine der Unicode-Optionen in der Liste. \n\ +Diese Datei enth�lt Unicode-Zeichen, die verloren gehen, wenn\n\ +Sie die Datei mit %s-Zeichenkodierung speichern.\n\ +Um die Zeichen beizubehalten, klicken Sie Abbrechen und w�hlen\n\ +Sie eine der Unicode-Optionen in der Liste.\n\ M�chten Sie fortfahren?" } diff --git a/programs/notepad/En.rc b/programs/notepad/En.rc index 3c4d052..fb774cf 100644 --- a/programs/notepad/En.rc +++ b/programs/notepad/En.rc @@ -133,9 +133,9 @@ STRING_UNICODE_LE, "Unicode (UTF-16)" STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)" STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ -This file contains Unicode characters which will be lost if \n\ -you save this file in the %s encoding. \n\ -To keep these characters, click Cancel, and then select \n\ -one of the Unicode options in the Encoding drop down list. \n\ +This file contains Unicode characters which will be lost if\n\ +you save this file in the %s encoding.\n\ +To keep these characters, click Cancel, and then select\n\ +one of the Unicode options in the Encoding drop down list.\n\ Continue?" } diff --git a/programs/notepad/Fr.rc b/programs/notepad/Fr.rc index 9c8373b..3ec4262 100644 --- a/programs/notepad/Fr.rc +++ b/programs/notepad/Fr.rc @@ -137,9 +137,9 @@ STRING_UNICODE_LE, "Unicode (UTF-16)" STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)" STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ -Ce fichier contient des caractères Unicode qui seront perdus si \n\ -vous le sauvez dans le codage %s. \n\ -Pour conserver ces caractères, cliquez sur Annuler et sélectionnez \n\ -une des alternatives Unicode dans la liste déroulante Codage. \n\ +Ce fichier contient des caractères Unicode qui seront perdus si\n\ +vous le sauvez dans le codage %s.\n\ +Pour conserver ces caractères, cliquez sur Annuler et sélectionnez\n\ +une des alternatives Unicode dans la liste déroulante Codage.\n\ Continuer ?" } diff --git a/programs/notepad/No.rc b/programs/notepad/No.rc index 512fa2d..271e038 100644 --- a/programs/notepad/No.rc +++ b/programs/notepad/No.rc @@ -133,9 +133,9 @@ STRING_UNICODE_LE, "Unicode (UTF-16)" STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)" STRING_LOSS_OF_UNICODE_CHARACTERS, "«%s»\n\ -Denne filen inneholder Unicode-tegn som vil gå tapt hvis \n\ -filen lagres med tegnkodingen %s. \n\ -Trykk Avbryt og velg et av Unicode-valgene fra listen \n\ -hvis du vil beholde tegnene. \n\ +Denne filen inneholder Unicode-tegn som vil gå tapt hvis\n\ +filen lagres med tegnkodingen %s.\n\ +Trykk Avbryt og velg et av Unicode-valgene fra listen\n\ +hvis du vil beholde tegnene.\n\ Fortsette?" } diff --git a/programs/notepad/Pt.rc b/programs/notepad/Pt.rc index eeae39d..194225c 100644 --- a/programs/notepad/Pt.rc +++ b/programs/notepad/Pt.rc @@ -215,8 +215,8 @@ STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)" STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ Este ficheiro contém caracteres Unicode que serão perdidos se\n\ -guardar este ficheiro na codificação %s. \n\ +guardar este ficheiro na codificação %s.\n\ Para manter estes caracteres, carregue em Cancelar, e depois seleccione\n\ -uma das opções Unicode na lista de Codificações. \n\ +uma das opções Unicode na lista de Codificações.\n\ Continuar?" } diff --git a/programs/notepad/Sv.rc b/programs/notepad/Sv.rc index 75d0e59..cfc675f 100644 --- a/programs/notepad/Sv.rc +++ b/programs/notepad/Sv.rc @@ -134,9 +134,9 @@ STRING_UNICODE_LE, "Unicode (UTF-16)" STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)" STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ -Denna fil inneh�ller Unicode-tecken vilka kommer att g� \n\ -f�rlorade om du sparar filen under kodningen %s. \n\ -Klicka Avbryt och v�lj sedan ett av Unicode-alternativen \n\ -i teckenkodningslistan f�r att beh�lla dessa tecken. \n\ +Denna fil inneh�ller Unicode-tecken vilka kommer att g�\n\ +f�rlorade om du sparar filen under kodningen %s.\n\ +Klicka Avbryt och v�lj sedan ett av Unicode-alternativen\n\ +i teckenkodningslistan f�r att beh�lla dessa tecken.\n\ Vill du forts�tta?" }

1 0

Alexander Scott-Johns : notepad: Add Cancel button to message box displayed when opening a non-existent file with the command line .
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 0c82108a484b1df670b09714c33f10bd29d9c011 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c82108a484b1df670b09714c… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Tue Jul 7 19:31:48 2009 +0100 notepad: Add Cancel button to message box displayed when opening a non-existent file with the command line. --- programs/notepad/main.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 104a834..d45fac7 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -607,7 +607,7 @@ static int AlertFileDoesNotExist(LPCWSTR szFileName) LoadStringW(Globals.hInstance, STRING_ERROR, szResource, ARRAY_SIZE(szResource)); nResult = MessageBoxW(Globals.hMainWnd, szMessage, szResource, - MB_ICONEXCLAMATION | MB_YESNO); + MB_ICONEXCLAMATION | MB_YESNOCANCEL); return(nResult); } @@ -707,6 +707,10 @@ static void HandleCommandLine(LPWSTR cmdline) case IDNO: break; + + case IDCANCEL: + DestroyWindow(Globals.hMainWnd); + break; } } }

1 0

Erik Inge Bolsø : wined3d: Fix Nvidia GTX series misdetection.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 48995f33547b2ce09597a8859dd170ba2da3ac0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=48995f33547b2ce09597a8859… Author: Erik Inge Bolsø <knan-wine(a)anduin.net> Date: Tue Jul 7 18:25:16 2009 +0200 wined3d: Fix Nvidia GTX series misdetection. --- dlls/wined3d/directx.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 162e9fc..d3f56ce 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1546,13 +1546,13 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { vidmem = 1024; } /* Geforce 200 - midend high */ - if (strstr(gl_renderer, "GTX 275")) + else if (strstr(gl_renderer, "GTX 275")) { gl_info->gl_card = CARD_NVIDIA_GEFORCE_GTX275; vidmem = 896; } /* Geforce 200 - midend */ - if (strstr(gl_renderer, "GTX 260")) + else if (strstr(gl_renderer, "GTX 260")) { gl_info->gl_card = CARD_NVIDIA_GEFORCE_GTX260; vidmem = 1024;

1 0

Paul Vriens : ws2_32/tests: Fix a test failure on NT4.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: b7e147331124bd8d9cfd01a18cbb7a533336a601 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7e147331124bd8d9cfd01a18… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jul 7 17:08:04 2009 +0200 ws2_32/tests: Fix a test failure on NT4. --- dlls/ws2_32/tests/sock.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b667008..c90111d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2620,8 +2620,10 @@ static void test_AcceptEx(void) bret = pAcceptEx(listener, acceptor, NULL, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); - ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on NULL buffer " - "returned %d + errno %d\n", bret, WSAGetLastError()); + ok(bret == FALSE && + (WSAGetLastError() == WSAEINVAL || + broken(WSAGetLastError() == WSAEFAULT)), /* NT4 */ + "AcceptEx on NULL buffer returned %d + errno %d\n", bret, WSAGetLastError()); bret = pAcceptEx(listener, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16,

1 0

Jacek Caban : urlmon: Ignore QueryInterface call for an undocumented interface.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: a21c1f3c313c037c20582bdd673a06b9bc2c5680 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a21c1f3c313c037c20582bdd6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 7 20:15:52 2009 +0200 urlmon: Ignore QueryInterface call for an undocumented interface. --- dlls/urlmon/tests/protocol.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index f1e3b53..81eed27 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -853,6 +853,8 @@ static IInternetProtocolSink mime_protocol_sink = { &mime_protocol_sink_vtbl }; static HRESULT QueryInterface(REFIID riid, void **ppv) { + static const IID IID_undocumented = {0x58DFC7D0,0x5381,0x43E5,{0x9D,0x72,0x4C,0xDD,0xE4,0xCB,0x0F,0x1A}}; + *ppv = NULL; if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IInternetProtocolSink, riid)) @@ -862,6 +864,10 @@ static HRESULT QueryInterface(REFIID riid, void **ppv) if(IsEqualGUID(&IID_IUriContainer, riid)) return E_NOINTERFACE; /* TODO */ + /* NOTE: IE8 queries for undocumented {58DFC7D0-5381-43E5-9D72-4CDDE4CB0F1A} interface. */ + if(IsEqualGUID(&IID_undocumented, riid)) + return E_NOINTERFACE; + if(*ppv) return S_OK;

1 0

Jacek Caban : mshtml: Added support for VT_UINT name in IHTMLElementCollection::item.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: cf2e8619ef12295daa148c71085e67aa322739ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf2e8619ef12295daa148c710… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 7 21:01:19 2009 +0200 mshtml: Added support for VT_UINT name in IHTMLElementCollection::item. --- dlls/mshtml/htmlelemcol.c | 51 +++++++++++++++++++++++++------------------- dlls/mshtml/tests/dom.c | 18 ++++++++++++++- 2 files changed, 45 insertions(+), 24 deletions(-) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 049da58..4362890 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -236,39 +236,43 @@ static BOOL is_elem_name(HTMLElement *elem, LPCWSTR name) return ret; } +static HRESULT get_item_idx(HTMLElementCollection *This, UINT idx, IDispatch **ret) +{ + if(idx < This->len) { + *ret = (IDispatch*)This->elems[idx]; + IDispatch_AddRef(*ret); + } + + return S_OK; +} + static HRESULT WINAPI HTMLElementCollection_item(IHTMLElementCollection *iface, VARIANT name, VARIANT index, IDispatch **pdisp) { HTMLElementCollection *This = ELEMCOL_THIS(iface); + HRESULT hres = S_OK; - TRACE("(%p)->(v(%d) v(%d) %p)\n", This, V_VT(&name), V_VT(&index), pdisp); + TRACE("(%p)->(%s %s %p)\n", This, debugstr_variant(&name), debugstr_variant(&index), pdisp); *pdisp = NULL; - if(V_VT(&name) == VT_I4) { - TRACE("name is VT_I4: %d\n", V_I4(&name)); - + switch(V_VT(&name)) { + case VT_I4: if(V_I4(&name) < 0) return E_INVALIDARG; - if(V_I4(&name) >= This->len) - return S_OK; + hres = get_item_idx(This, V_I4(&name), pdisp); + break; - *pdisp = (IDispatch*)This->elems[V_I4(&name)]; - IDispatch_AddRef(*pdisp); - TRACE("Returning pdisp=%p\n", pdisp); - return S_OK; - } + case VT_UINT: + hres = get_item_idx(This, V_UINT(&name), pdisp); + break; - if(V_VT(&name) == VT_BSTR) { + case VT_BSTR: { DWORD i; - TRACE("name is VT_BSTR: %s\n", debugstr_w(V_BSTR(&name))); - if(V_VT(&index) == VT_I4) { LONG idx = V_I4(&index); - TRACE("index = %d\n", idx); - if(idx < 0) return E_INVALIDARG; @@ -281,8 +285,6 @@ static HRESULT WINAPI HTMLElementCollection_item(IHTMLElementCollection *iface, *pdisp = (IDispatch*)HTMLELEM(This->elems[i]); IDispatch_AddRef(*pdisp); } - - return S_OK; }else { elem_vector_t buf = {NULL, 0, 8}; @@ -304,13 +306,18 @@ static HRESULT WINAPI HTMLElementCollection_item(IHTMLElementCollection *iface, heap_free(buf.buf); } - - return S_OK; } + break; + } + + default: + FIXME("Unsupported name %s\n", debugstr_variant(&name)); + hres = E_NOTIMPL; } - FIXME("unsupported arguments\n"); - return E_INVALIDARG; + if(SUCCEEDED(hres)) + TRACE("returning %p\n", *pdisp); + return hres; } static HRESULT WINAPI HTMLElementCollection_tags(IHTMLElementCollection *iface, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index cb25926..a153a14 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1025,7 +1025,7 @@ static void _test_elem_collection(unsigned line, IUnknown *unk, LONG len; DWORD i; VARIANT name, index; - IDispatch *disp; + IDispatch *disp, *disp2; HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLElementCollection, (void**)&col); @@ -1041,9 +1041,9 @@ static void _test_elem_collection(unsigned line, IUnknown *unk, len = exlen; V_VT(&index) = VT_EMPTY; - V_VT(&name) = VT_I4; for(i=0; i<len; i++) { + V_VT(&name) = VT_I4; V_I4(&name) = i; disp = (void*)0xdeadbeef; hres = IHTMLElementCollection_item(col, name, index, &disp); @@ -1053,15 +1053,29 @@ static void _test_elem_collection(unsigned line, IUnknown *unk, continue; _test_elem_type(line, (IUnknown*)disp, elem_types[i]); + + if(!i) { + V_VT(&name) = VT_UINT; + V_I4(&name) = 0; + disp2 = (void*)0xdeadbeef; + hres = IHTMLElementCollection_item(col, name, index, &disp2); + ok_(__FILE__,line) (hres == S_OK, "item(%d) failed: %08x\n", i, hres); + ok_(__FILE__,line) (iface_cmp((IUnknown*)disp, (IUnknown*)disp2), "disp != disp2\n"); + if(disp2) + IDispatch_Release(disp2); + } + IDispatch_Release(disp); } + V_VT(&name) = VT_I4; V_I4(&name) = len; disp = (void*)0xdeadbeef; hres = IHTMLElementCollection_item(col, name, index, &disp); ok_(__FILE__,line) (hres == S_OK, "item failed: %08x\n", hres); ok_(__FILE__,line) (disp == NULL, "disp != NULL\n"); + V_VT(&name) = VT_I4; V_I4(&name) = -1; disp = (void*)0xdeadbeef; hres = IHTMLElementCollection_item(col, name, index, &disp);

1 0

Ricardo Filipe : wineconsole: Update Portuguese translation and convert to UTF8.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 91dfbd5a825cf45409f8dac24c7d322e8c1b0fb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91dfbd5a825cf45409f8dac24… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Tue Jul 7 10:00:46 2009 -0700 wineconsole: Update Portuguese translation and convert to UTF8. --- programs/wineconsole/wineconsole_Pt.rc | 86 +++++++++++++++++++------------- 1 files changed, 51 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=91dfbd5a825cf45409f8d…

1 0

Ricardo Filipe : winecfg: Update Portuguese translation and convert to UTF8 .
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 6b31b2d649b6f08d35f2bda9199e58cc3fab8755 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b31b2d649b6f08d35f2bda91… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Tue Jul 7 09:44:53 2009 -0700 winecfg: Update Portuguese translation and convert to UTF8. --- programs/winecfg/Pt.rc | 163 ++++++++++++++++++++++++----------------------- 1 files changed, 83 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b31b2d649b6f08d35f2b…

1 0

Jacek Caban : urlmon: Moved more initialization code to init_test.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: e34916521401c2d71f792dd6d8aee111dd468627 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e34916521401c2d71f792dd6d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 7 21:00:54 2009 +0200 urlmon: Moved more initialization code to init_test. --- dlls/urlmon/tests/protocol.c | 39 +++++++++++++++++++-------------------- 1 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 81eed27..26ed8de 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -1801,8 +1801,9 @@ static const IClassFactoryVtbl MimeFilterCFVtbl = { static IClassFactory mimefilter_cf = { &MimeFilterCFVtbl }; -#define TEST_BINDING 1 -#define TEST_FILTER 2 +#define TEST_BINDING 0x01 +#define TEST_FILTER 0x02 +#define TEST_FIRST_HTTP 0x04 static void init_test(int prot, DWORD flags) { @@ -1818,6 +1819,9 @@ static void init_test(int prot, DWORD flags) ResetEvent(event_complete2); async_protocol = binding_protocol = filtered_protocol = NULL; filtered_sink = NULL; + http_is_first = (flags & TEST_FIRST_HTTP) != 0; + first_data_notif = TRUE; + state = 0; } static void test_priority(IInternetProtocol *protocol) @@ -2143,14 +2147,11 @@ static void test_file_protocol(void) { test_file_protocol_fail(); } -static BOOL http_protocol_start(LPCWSTR url, BOOL is_first) +static BOOL http_protocol_start(LPCWSTR url) { static BOOL got_user_agent = FALSE; HRESULT hres; - first_data_notif = TRUE; - state = 0; - SET_EXPECT(GetBindInfo); if (!(bindf & BINDF_FROMURLMON)) SET_EXPECT(ReportProgress_DIRECTBIND); @@ -2235,17 +2236,17 @@ static void test_http_info(IInternetProtocol *protocol) /* is_first refers to whether this is the first call to this function * _for this url_ */ -static void test_http_protocol_url(LPCWSTR url, BOOL is_https, BOOL is_first) +static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags) { IInternetProtocolInfo *protocol_info; IClassFactory *factory; IUnknown *unk; HRESULT hres; + init_test(prot, flags); http_url = url; - http_is_first = is_first; - hres = CoGetClassObject(is_https ? &CLSID_HttpSProtocol : &CLSID_HttpProtocol, + hres = CoGetClassObject(prot == HTTPS_TEST ? &CLSID_HttpSProtocol : &CLSID_HttpProtocol, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&unk); ok(hres == S_OK, "CoGetClassObject failed: %08x\n", hres); if(FAILED(hres)) @@ -2277,7 +2278,7 @@ static void test_http_protocol_url(LPCWSTR url, BOOL is_https, BOOL is_first) SET_EXPECT(ReportProgress_CONNECTING); SET_EXPECT(ReportProgress_SENDINGREQUEST); SET_EXPECT(ReportProgress_PROXYDETECTING); - if(! is_https) + if(prot == HTTP_TEST) SET_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); else SET_EXPECT(QueryService_HttpSecurity); @@ -2289,7 +2290,7 @@ static void test_http_protocol_url(LPCWSTR url, BOOL is_https, BOOL is_first) SET_EXPECT(Switch); } - if(!http_protocol_start(url, is_first)) + if(!http_protocol_start(url)) return; SET_EXPECT(ReportResult); @@ -2304,7 +2305,7 @@ static void test_http_protocol_url(LPCWSTR url, BOOL is_https, BOOL is_first) CHECK_CALLED(Switch); else CHECK_CALLED(ReportData); - if (is_https) + if(prot == HTTPS_TEST) CLEAR_CALLED(QueryService_HttpSecurity); while(1) { @@ -2332,7 +2333,7 @@ static void test_http_protocol_url(LPCWSTR url, BOOL is_https, BOOL is_first) } ok(hres == S_FALSE, "Read failed: %08x\n", hres); CHECK_CALLED(ReportResult); - if (is_https) + if(prot == HTTPS_TEST) CLEAR_CALLED(ReportProgress_SENDINGREQUEST); test_protocol_terminate(async_protocol); @@ -2354,24 +2355,23 @@ static void test_http_protocol(void) 'p','o','s','t','t','e','s','t','.','p','h','p',0}; trace("Testing http protocol (not from urlmon)...\n"); - tested_protocol = HTTP_TEST; bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA; - test_http_protocol_url(winehq_url, FALSE, TRUE); + test_http_protocol_url(winehq_url, HTTP_TEST, TEST_FIRST_HTTP); trace("Testing http protocol (from urlmon)...\n"); bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON; - test_http_protocol_url(winehq_url, FALSE, FALSE); + test_http_protocol_url(winehq_url, HTTP_TEST, 0); trace("Testing http protocol (to file)...\n"); bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON | BINDF_NEEDFILE; - test_http_protocol_url(winehq_url, FALSE, FALSE); + test_http_protocol_url(winehq_url, HTTP_TEST, 0); trace("Testing http protocol (post data)...\n"); http_post_test = TRUE; /* Without this flag we get a ReportProgress_CACHEFILENAMEAVAILABLE * notification with BINDVERB_POST */ bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON | BINDF_NOWRITECACHE; - test_http_protocol_url(posttest_url, FALSE, TRUE); + test_http_protocol_url(posttest_url, HTTP_TEST, TEST_FIRST_HTTP); http_post_test = FALSE; } @@ -2382,9 +2382,8 @@ static void test_https_protocol(void) '.','c','o','m','/','t','e','s','t','.','h','t','m','l',0}; trace("Testing https protocol (from urlmon)...\n"); - init_test(HTTPS_TEST, 0); bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON | BINDF_NOWRITECACHE; - test_http_protocol_url(codeweavers_url, TRUE, TRUE); + test_http_protocol_url(codeweavers_url, HTTPS_TEST, TEST_FIRST_HTTP); }

1 0

Jacek Caban : wininet: Rename WININETHANDLEHEADER to object_header_t.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 44d633a9026621cc00b19c0db76016d7e634e511 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44d633a9026621cc00b19c0db… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 7 21:46:09 2009 +0200 wininet: Rename WININETHANDLEHEADER to object_header_t. wininet struct names are very unreadable and I hope that patches renaming them will be accepted. --- dlls/wininet/ftp.c | 44 +++++++++++++++++++------------------- dlls/wininet/http.c | 28 ++++++++++++------------ dlls/wininet/internet.c | 54 +++++++++++++++++++++++----------------------- dlls/wininet/internet.h | 50 +++++++++++++++++++++--------------------- dlls/wininet/utility.c | 4 +- 5 files changed, 90 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=44d633a9026621cc00b19…

1 0

Peter Oberndorfer : winemenubuilder: Use heap_printf to allocate the right amount of memory and not cause heap corruption .
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 08a8f935c4f8ff69dfa6df070caf45d68d2a3e3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=08a8f935c4f8ff69dfa6df070… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Tue Jul 7 22:01:59 2009 +0200 winemenubuilder: Use heap_printf to allocate the right amount of memory and not cause heap corruption. --- programs/winemenubuilder/winemenubuilder.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index d9d7852..1eaa530 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -786,18 +786,15 @@ static char *extract_icon( LPCWSTR path, int index, const char *destFilename, BO /* Try to treat the source file as an exe */ if (destFilename) - xpm_path=HeapAlloc(GetProcessHeap(),0,strlen(iconsdir)+1+strlen(destFilename)+1+3); + xpm_path=heap_printf("%s/%s.png",iconsdir,destFilename); else - xpm_path=HeapAlloc(GetProcessHeap(), 0, strlen(iconsdir)+1+4+1+strlen(ico_name)+1+12+1+3); + xpm_path=heap_printf("%s/%04x_%s.%d.png",iconsdir,crc,ico_name,index); if (xpm_path == NULL) { WINE_ERR("could not extract icon %s, out of memory\n", wine_dbgstr_a(ico_name)); return NULL; } - if (destFilename) - sprintf(xpm_path,"%s/%s.png",iconsdir,destFilename); - else - sprintf(xpm_path,"%s/%04x_%s.%d.png",iconsdir,crc,ico_name,index); + if (ExtractFromEXEDLL( path, index, xpm_path )) goto end;

1 0

Frédéric Delanoy : iccvid: Fix French translation .
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: e662cf21078eb5fe85a94a69aa5377e2f884af6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e662cf21078eb5fe85a94a69a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jul 7 17:42:45 2009 +0200 iccvid: Fix French translation. --- dlls/iccvid/iccvid_Fr.rc | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/iccvid/iccvid_Fr.rc b/dlls/iccvid/iccvid_Fr.rc index f3862be..79d9cfd 100644 --- a/dlls/iccvid/iccvid_Fr.rc +++ b/dlls/iccvid/iccvid_Fr.rc @@ -18,10 +18,13 @@ #include "iccvid_private.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { - IDS_NAME "codec vid�o Cinepak" - IDS_DESCRIPTION "codec vid�o Cinepak" + IDS_NAME "Codec vidéo Cinepak" + IDS_DESCRIPTION "Codec vidéo Cinepak" }

1 0

Frédéric Delanoy : wineps.drv: Fix French translation & UI display.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 002b92e19127876267f35ab7d53c68495e701040 URL: http://source.winehq.org/git/wine.git/?a=commit;h=002b92e19127876267f35ab7d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jul 7 19:05:34 2009 +0200 wineps.drv: Fix French translation & UI display. --- dlls/wineps.drv/wps_Fr.rc | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/wps_Fr.rc b/dlls/wineps.drv/wps_Fr.rc index 5bac15c..c48f568 100644 --- a/dlls/wineps.drv/wps_Fr.rc +++ b/dlls/wineps.drv/wps_Fr.rc @@ -21,6 +21,9 @@ #include "psdlg.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL PAPER DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215 @@ -29,14 +32,14 @@ CAPTION "Papier" FONT 8, "MS Shell Dlg" { LTEXT "&Taille du papier :", -1, 10, 6, 100, 8 - LISTBOX IDD_PAPERS, 10, 15, 200, 45, LBS_STANDARD | LBS_HASSTRINGS | + LISTBOX IDD_PAPERS, 10, 17, 200, 45, LBS_STANDARD | LBS_HASSTRINGS | WS_TABSTOP GROUPBOX "Orientation", -1, 10, 80, 200, 50 CONTROL "&Portrait", IDD_ORIENT_PORTRAIT, "Button", BS_AUTORADIOBUTTON | - WS_TABSTOP, 20, 90, 60, 10 + WS_TABSTOP, 20, 93, 60, 10 CONTROL "P&aysage", IDD_ORIENT_LANDSCAPE, "Button", BS_AUTORADIOBUTTON, 20, 110, 60, 10 - LTEXT "Recto-verso:", IDD_DUPLEX_NAME, 10, 140, 100, 8 + LTEXT "Recto-verso :", IDD_DUPLEX_NAME, 10, 140, 100, 8 COMBOBOX IDD_DUPLEX, 10, 151, 200, 20, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_TABSTOP }

1 0

Frédéric Delanoy : avifil32: Fix French translation.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 34460a8242af5c37acc2bcd8bfb1d01d96a457a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34460a8242af5c37acc2bcd8b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jul 7 17:08:05 2009 +0200 avifil32: Fix French translation. --- dlls/avifil32/avifile_Fr.rc | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/avifil32/avifile_Fr.rc b/dlls/avifil32/avifile_Fr.rc index a04f0b4..d313226 100644 --- a/dlls/avifil32/avifile_Fr.rc +++ b/dlls/avifil32/avifile_Fr.rc @@ -2,8 +2,8 @@ * Avifil32 * French language support * - * Copyright 2002 Michael G�nnewig - * Copyright 2003 Vincent B�ron + * Copyright 2002 Michael Günnewig + * Copyright 2003 Vincent Béron * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,6 +22,9 @@ #include "avifile_private.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82 @@ -29,28 +32,28 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Options de compression" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&S�lectionnez un flux :",-1,2,5,154,10 + LTEXT "&Sélectionnez un flux :",-1,2,5,154,10 COMBOBOX IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Options...",IDC_OPTIONS,170,17,50,14 - AUTOCHECKBOX "&Imbriquer � chaque",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP + AUTOCHECKBOX "&Imbriquer toutes les",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL LTEXT "images",-1,129,43,36,9 - LTEXT "Format actuel:",-1,3,56,73,9 - LTEXT "Cet espace est � louer",IDC_FORMATTEXT,75,56,90,26 + LTEXT "Format actuel :",-1,3,56,73,9 + LTEXT "Cet espace est à louer",IDC_FORMATTEXT,75,56,90,26 DEFPUSHBUTTON "OK",IDOK,170,42,50,14 PUSHBUTTON "Annuler",IDCANCEL,170,61,50,14 END STRINGTABLE DISCARDABLE { - IDS_WAVESTREAMFORMAT "Waveform�: %s" + IDS_WAVESTREAMFORMAT "Waveform : %s" IDS_WAVEFILETYPE "Waveform" - IDS_ALLMULTIMEDIA "Tous les fichiers multim�dias" - IDS_ALLFILES "Tous les fichier (*.*)(a)*.*" - IDS_VIDEO "vid�o" + IDS_ALLMULTIMEDIA "Tous les fichiers multimédia" + IDS_ALLFILES "Tous les fichiers (*.*)(a)*.*" + IDS_VIDEO "vidéo" IDS_AUDIO "audio" IDS_AVISTREAMFORMAT "%s %s #%d" - IDS_AVIFILETYPE "Wine AVI-default-filehandler" - IDS_UNCOMPRESSED "non compress�" + IDS_AVIFILETYPE "Gestionnaire de fichiers AVI par défaut de Wine" + IDS_UNCOMPRESSED "non compressé" }

1 0

Frédéric Delanoy : oledlg: Fix French translation & UI display.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 569aa66f5e971cfc303edf1ad22b97df46fde231 URL: http://source.winehq.org/git/wine.git/?a=commit;h=569aa66f5e971cfc303edf1ad… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jul 7 18:48:33 2009 +0200 oledlg: Fix French translation & UI display. --- dlls/oledlg/oledlg_Fr.rc | 90 ++++++++++++++++++++++++---------------------- 1 files changed, 47 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=569aa66f5e971cfc303ed…

1 0

Ricardo Filipe : winefile: Update Portuguese translation and convert to UTF8.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 9046d2816644c89e5cd82f32fed0c7b90feb347b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9046d2816644c89e5cd82f32f… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Tue Jul 7 10:14:59 2009 -0700 winefile: Update Portuguese translation and convert to UTF8. --- programs/winefile/Pt.rc | 145 +++++++++++++++++++++++++++++++---------------- 1 files changed, 96 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9046d2816644c89e5cd82…

1 0

Frédéric Delanoy : setupapi: Fix French translation & UI display.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: c71454db688f87d61e268557412a68b81e61b325 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c71454db688f87d61e2685574… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jul 7 19:15:51 2009 +0200 setupapi: Fix French translation & UI display. --- dlls/setupapi/Fr.rc | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/setupapi/Fr.rc b/dlls/setupapi/Fr.rc index e18fa85..24095e5 100644 --- a/dlls/setupapi/Fr.rc +++ b/dlls/setupapi/Fr.rc @@ -2,7 +2,7 @@ * French resources for SETUPAPI * * Copyright 2001 Andreas Mohr - * Copyright 2003 Vincent B�ron + * Copyright 2003 Vincent Béron * Copyright 2009 Jonathan Ernst * * This library is free software; you can redistribute it and/or @@ -22,13 +22,16 @@ #include "setupapi_private.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { - IDS_PROMPTDISK "Le fichier ��%s�� sur %s est requis" + IDS_PROMPTDISK "Le fichier « %s » sur %s est requis" IDS_UNKNOWN "Inconnu" - IDS_COPYFROM "Copier les fichiers depuis�:" + IDS_COPYFROM "Copier les fichiers depuis :" IDS_INFO "Saisissez le chemin du fichier, puis cliquez sur OK." } @@ -38,9 +41,9 @@ CAPTION "Copie de fichiers..." FONT 8, "MS Shell Dlg" BEGIN PUSHBUTTON "Annuler", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Source�:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Source :", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Destination�:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Destination :", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -50,9 +53,9 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Fichiers requis" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Veuillez ins�rer le disque d'installation du fabriquant et\nassurez vous que le lecteur correct est s�lectionn� ci-dessous", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Veuillez insérer le disque d'installation du fabricant et\nassurez vous que le lecteur correct est sélectionné ci-dessous", IDC_FILENEEDED, 10, 10, 175, 25, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", IDC_INFO, 10, 50, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Copier les fichiers du fabriquan depuis�:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copier les fichiers du fabricant depuis :", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 PUSHBUTTON "OK", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "Annuler", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP

1 0

Frédéric Delanoy : serialui: Fix French translation & UI display.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 8907860f3e894224af2fa7f543af02b801c205e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8907860f3e894224af2fa7f54… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jul 7 17:32:28 2009 +0200 serialui: Fix French translation & UI display. --- dlls/serialui/Fr.rc | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/serialui/Fr.rc b/dlls/serialui/Fr.rc index 53c1fe3..8dc8fbb 100644 --- a/dlls/serialui/Fr.rc +++ b/dlls/serialui/Fr.rc @@ -3,7 +3,8 @@ * French language support * * Copyright 2000 Mike McCormack - * Copyright 2003 Vincent B�ron + * Copyright 2003 Vincent Béron + * Copyright 2009 Frédéric Delanoy * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,25 +23,28 @@ #include "serialui.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -IDD_SERIALUICONFIG DIALOG DISCARDABLE 0, 0, 160, 159 +IDD_SERIALUICONFIG DIALOG DISCARDABLE 0, 0, 180, 150 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Propri�t�s pour " +CAPTION "Propriétés pour " FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Vitesse de connexion", -1,5,20,55,10 - COMBOBOX IDC_BAUD, 60, 20, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "Parit�", -1,5,40,55,10 - COMBOBOX IDC_PARITY, 60, 40, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "Contr�le de flux", -1,5,60,55,10 - COMBOBOX IDC_FLOW, 60, 60, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "Bits de donn�es", -1,5,80,55,10 - COMBOBOX IDC_DATA, 60, 80, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "Bits de stop", -1,5,100,55,10 - COMBOBOX IDC_STOP, 60, 100, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK,30,138,50,14 - PUSHBUTTON "Annuler", IDCANCEL,85,138,50,14 + LTEXT "Vitesse de transmission (bauds)", -1,5,19,70,18 + COMBOBOX IDC_BAUD, 80, 20, 90, 15, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Parité", -1,5,42,55,10 + COMBOBOX IDC_PARITY, 80, 40, 90, 15, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Contrôle de flux", -1,5,62,55,10 + COMBOBOX IDC_FLOW, 80, 60, 90, 15, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Bits de données", -1,5,82,55,10 + COMBOBOX IDC_DATA, 80, 80, 90, 15, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Bits d'arrêt", -1,5,102,55,10 + COMBOBOX IDC_STOP, 80, 100, 90, 15, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK,30,125,50,14 + PUSHBUTTON "Annuler", IDCANCEL,93,125,50,14 /* these two buttons are for testing Get/SetDefaultCommConfig */ /* PUSHBUTTON "GetDefault", ID_GETDEFAULT,30,115,50,14 */ /* PUSHBUTTON "SetDefault", ID_SETDEFAULT,85,115,50,14 */

1 0

Ricardo Filipe : progman: Update Portuguese translation and convert to UTF8 .
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 9ed4f647ee831c09fd4408b1212633da860ee663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ed4f647ee831c09fd4408b12… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Tue Jul 7 07:36:54 2009 -0700 progman: Update Portuguese translation and convert to UTF8. --- programs/progman/Pt.rc | 106 ++++++++++++++++++++++++++++++------------------ 1 files changed, 66 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9ed4f647ee831c09fd440…

1 0

Ricardo Filipe : oledlg: Fix Portuguese translation.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 04de5762665147b0a66c114f66f7e38aca0e55e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04de5762665147b0a66c114f6… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Tue Jul 7 07:28:05 2009 -0700 oledlg: Fix Portuguese translation. --- dlls/oledlg/oledlg_Pt.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oledlg/oledlg_Pt.rc b/dlls/oledlg/oledlg_Pt.rc index 078d2c1..9ef209e 100644 --- a/dlls/oledlg/oledlg_Pt.rc +++ b/dlls/oledlg/oledlg_Pt.rc @@ -126,7 +126,7 @@ BEGIN CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 CONTROL "<< texto resultante fica aqui >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 CONTROL "Resultado", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 - CONTROL "", IDC_PS_SOURCETEXT, "Editar", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 + CONTROL "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 END STRINGTABLE DISCARDABLE

1 0

Ricardo Filipe : regedit: Update Portuguese translation and convert to UTF8 .
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 3591c44e5504220cc8c457e4737931e9c6b74f82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3591c44e5504220cc8c457e47… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Tue Jul 7 09:02:11 2009 -0700 regedit: Update Portuguese translation and convert to UTF8. --- programs/regedit/Pt.rc | 196 ++++++++++++++++++++++++++++++++++------------- 1 files changed, 142 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3591c44e5504220cc8c45…

1 0

Frédéric Delanoy : crypt32: Update French translation.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: db4e9128782b033e18128fbc2ce639ae2caf25e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db4e9128782b033e18128fbc2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jul 7 15:54:30 2009 +0200 crypt32: Update French translation. --- dlls/crypt32/crypt32_Fr.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32_Fr.rc b/dlls/crypt32/crypt32_Fr.rc index 030a3a9..b98636d 100644 --- a/dlls/crypt32/crypt32_Fr.rc +++ b/dlls/crypt32/crypt32_Fr.rc @@ -177,6 +177,7 @@ STRINGTABLE DISCARDABLE IDS_LOCALIZEDNAME_CA "Autorités intermédiaires" IDS_LOCALIZEDNAME_ADDRESSBOOK "Autres personnes" IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "Éditeurs de confiance" + IDS_LOCALIZEDNAME_DISALLOWED "Certificats non autorisés" } STRINGTABLE DISCARDABLE

1 0

Hib Eris : oleaut32: Prevent overflow in VarDecCmp.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 3e5159e169492bdaf95301794eeebd7af7e865a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e5159e169492bdaf95301794… Author: Hib Eris <hib(a)hiberis.nl> Date: Tue Jul 7 14:01:57 2009 +0200 oleaut32: Prevent overflow in VarDecCmp. --- dlls/oleaut32/tests/vartype.c | 24 ++++++++++++------------ dlls/oleaut32/vartype.c | 10 ++++++++++ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index c3ec180..419e027 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4420,11 +4420,11 @@ static void test_VarDecCmp(void) SETDEC(l,0,0,0,1); SETDEC(out,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_GT; SETDEC(l,0,0,0,1); SETDEC(out,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_GT; - SETDEC(l,0,0,0,1); SETDEC(out,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_GT; + SETDEC(l,0,0,0,1); SETDEC(out,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); EXPECT_GT; SETDEC(l,0,DECIMAL_NEG,0,1); SETDEC(out,0,0,0,1); MATH1(VarDecCmp); EXPECT_LT; SETDEC(l,0,DECIMAL_NEG,0,1); SETDEC(out,0,0,0,0); MATH1(VarDecCmp); EXPECT_LT; - SETDEC(l,0,DECIMAL_NEG,0,1); SETDEC(out,0,0,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_LT; + SETDEC(l,0,DECIMAL_NEG,0,1); SETDEC(out,0,0,-1,-1); MATH1(VarDecCmp); EXPECT_LT; SETDEC(l,0,DECIMAL_NEG,0,1); SETDEC(out,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_EQ; SETDEC(l,0,DECIMAL_NEG,0,1); SETDEC(out,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_LT; @@ -4450,13 +4450,13 @@ static void test_VarDecCmp(void) SETDEC(l,0,0,-1,-1); SETDEC(out,0,0,0,0); MATH1(VarDecCmp); EXPECT_GT; SETDEC(l,0,0,-1,-1); SETDEC(out,0,0,-1,-1); MATH1(VarDecCmp); EXPECT_EQ; - SETDEC(l,0,0,-1,-1); SETDEC(out,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); todo_wine EXPECT_GT; + SETDEC(l,0,0,-1,-1); SETDEC(out,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_GT; SETDEC(l,0,0,-1,-1); SETDEC(out,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_GT; - SETDEC(l,0,0,-1,-1); SETDEC(out,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_GT; + SETDEC(l,0,0,-1,-1); SETDEC(out,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); EXPECT_GT; - SETDEC(l,0,DECIMAL_NEG,-1,-1); SETDEC(out,0,0,0,1); MATH1(VarDecCmp); todo_wine EXPECT_LT; + SETDEC(l,0,DECIMAL_NEG,-1,-1); SETDEC(out,0,0,0,1); MATH1(VarDecCmp); EXPECT_LT; SETDEC(l,0,DECIMAL_NEG,-1,-1); SETDEC(out,0,0,0,0); MATH1(VarDecCmp); EXPECT_LT; - SETDEC(l,0,DECIMAL_NEG,-1,-1); SETDEC(out,0,0,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_LT; + SETDEC(l,0,DECIMAL_NEG,-1,-1); SETDEC(out,0,0,-1,-1); MATH1(VarDecCmp); EXPECT_LT; SETDEC(l,0,DECIMAL_NEG,-1,-1); SETDEC(out,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_LT; SETDEC(l,0,DECIMAL_NEG,-1,-1); SETDEC(out,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_LT; @@ -4469,11 +4469,11 @@ static void test_VarDecCmp(void) SETDEC(out,0,0,0,1); SETDEC(l,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_LT; SETDEC(out,0,0,0,1); SETDEC(l,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_LT; - SETDEC(out,0,0,0,1); SETDEC(l,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_LT; + SETDEC(out,0,0,0,1); SETDEC(l,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); EXPECT_LT; SETDEC(out,0,DECIMAL_NEG,0,1); SETDEC(l,0,0,0,1); MATH1(VarDecCmp); EXPECT_GT; SETDEC(out,0,DECIMAL_NEG,0,1); SETDEC(l,0,0,0,0); MATH1(VarDecCmp); EXPECT_GT; - SETDEC(out,0,DECIMAL_NEG,0,1); SETDEC(l,0,0,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_GT; + SETDEC(out,0,DECIMAL_NEG,0,1); SETDEC(l,0,0,-1,-1); MATH1(VarDecCmp); EXPECT_GT; SETDEC(out,0,DECIMAL_NEG,0,1); SETDEC(l,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_EQ; SETDEC(out,0,DECIMAL_NEG,0,1); SETDEC(l,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_GT; @@ -4499,13 +4499,13 @@ static void test_VarDecCmp(void) SETDEC(out,0,0,-1,-1); SETDEC(l,0,0,0,0); MATH1(VarDecCmp); EXPECT_LT; SETDEC(out,0,0,-1,-1); SETDEC(l,0,0,-1,-1); MATH1(VarDecCmp); EXPECT_EQ; - SETDEC(out,0,0,-1,-1); SETDEC(l,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); todo_wine EXPECT_LT; + SETDEC(out,0,0,-1,-1); SETDEC(l,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_LT; SETDEC(out,0,0,-1,-1); SETDEC(l,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_LT; - SETDEC(out,0,0,-1,-1); SETDEC(l,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_LT; + SETDEC(out,0,0,-1,-1); SETDEC(l,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); EXPECT_LT; - SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,0,0,1); MATH1(VarDecCmp); todo_wine EXPECT_GT; + SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,0,0,1); MATH1(VarDecCmp); EXPECT_GT; SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,0,0,0); MATH1(VarDecCmp); EXPECT_GT; - SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,0,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_GT; + SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,0,-1,-1); MATH1(VarDecCmp); EXPECT_GT; SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_GT; SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_GT; diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 2d5ae7d..7f53259 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -5788,6 +5788,16 @@ HRESULT WINAPI VarDecCmp(const DECIMAL* pDecLeft, const DECIMAL* pDecRight) HRESULT hRet; DECIMAL result; + if (!pDecLeft || !pDecRight) + return VARCMP_NULL; + + if ((!(DEC_SIGN(pDecLeft) & DECIMAL_NEG)) && (DEC_SIGN(pDecRight) & DECIMAL_NEG) && + (DEC_HI32(pDecLeft) | DEC_MID32(pDecLeft) | DEC_LO32(pDecLeft))) + return VARCMP_GT; + else if ((DEC_SIGN(pDecLeft) & DECIMAL_NEG) && (!(DEC_SIGN(pDecRight) & DECIMAL_NEG)) && + (DEC_HI32(pDecLeft) | DEC_MID32(pDecLeft) | DEC_LO32(pDecLeft))) + return VARCMP_LT; + /* Subtract right from left, and compare the result to 0 */ hRet = VarDecSub(pDecLeft, pDecRight, &result);

1 0

Huw Davies : hhctrl.ocx: Add English neutral translations.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 0cb9a6ec01efba753d5b49fa42a105d742313b45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cb9a6ec01efba753d5b49fa4… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 7 12:23:34 2009 +0100 hhctrl.ocx: Add English neutral translations. --- dlls/hhctrl.ocx/En.rc | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/En.rc b/dlls/hhctrl.ocx/En.rc index 95ccd51..b69383e 100644 --- a/dlls/hhctrl.ocx/En.rc +++ b/dlls/hhctrl.ocx/En.rc @@ -58,3 +58,13 @@ BEGIN IDTB_TOC_NEXT "IDTB_TOC_NEXT" IDTB_TOC_PREV "IDTB_TOC_PREV" END + +LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_CONTENTS "&Contents" + IDS_INDEX "I&ndex" + IDS_SEARCH "&Search" + IDS_FAVORITES "Favour&ites" +END

1 0

Huw Davies : shdoclc: Add English neutral translations and fix US English.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 0c61a5ac116b456e86e810614a1825e8138712ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c61a5ac116b456e86e810614… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 7 12:30:01 2009 +0100 shdoclc: Add English neutral translations and fix US English. --- dlls/shdoclc/En.rc | 220 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 219 insertions(+), 1 deletions(-) diff --git a/dlls/shdoclc/En.rc b/dlls/shdoclc/En.rc index b3823c2..4cb0a11 100644 --- a/dlls/shdoclc/En.rc +++ b/dlls/shdoclc/En.rc @@ -47,7 +47,7 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM "&Paste", IDM_PASTE MENUITEM SEPARATOR MENUITEM "Create Shor&tcut", IDM_CREATESHORTCUT - MENUITEM "Add to &Favourites", IDM_ADDFAVORITES + MENUITEM "Add to &Favorites", IDM_ADDFAVORITES MENUITEM "&View Source", IDM_VIEWSOURCE MENUITEM SEPARATOR MENUITEM "&Encoding", IDM_LANGUAGE @@ -246,3 +246,221 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM "Scroll Right", IDM_SCROLL_RIGHT } } + +LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL + +IDR_BROWSE_CONTEXT_MENU MENU +{ + POPUP "Default" + { + MENUITEM "&Back", IDM_GOBACKWARD + MENUITEM "F&orward", IDM_GOFORWARD + MENUITEM SEPARATOR + MENUITEM "&Save Background As...", IDM_SAVEBACKGROUND + MENUITEM "Set As Back&ground", IDM_SETWALLPAPER + MENUITEM "&Copy Background", IDM_COPYBACKGROUND + MENUITEM "Set as &Desktop Item", IDM_SETDESKTOPITEM + MENUITEM SEPARATOR + MENUITEM "Select &All", IDM_SELECTALL + MENUITEM "&Paste", IDM_PASTE + MENUITEM SEPARATOR + MENUITEM "Create Shor&tcut", IDM_CREATESHORTCUT + MENUITEM "Add to &Favourites", IDM_ADDFAVORITES + MENUITEM "&View Source", IDM_VIEWSOURCE + MENUITEM SEPARATOR + MENUITEM "&Encoding", IDM_LANGUAGE + MENUITEM SEPARATOR + MENUITEM "Pr&int", IDM_PRINT + MENUITEM "&Refresh", _IDM_REFRESH + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "&Properties", IDM_PROPERTIES + } + + POPUP "Image" + { + MENUITEM "&Open Link", IDM_FOLLOWLINKC + MENUITEM "Open Link in &New Window", IDM_FOLLOWLINKN + MENUITEM "Save Target &As...", IDM_SAVETARGET + MENUITEM "&Print Target", IDM_PRINTTARGET + MENUITEM SEPARATOR + MENUITEM "S&how Picture", IDM_SHOWPICTURE + MENUITEM "&Save Picture As...", IDM_SAVEPICTURE + MENUITEM "&E-mail Picture...", IDM_MP_EMAILPICTURE + MENUITEM "Pr&int Picture...", IDM_MP_PRINTPICTURE + MENUITEM "&Go to My Pictures", IDM_MP_MYPICS + MENUITEM "Set as Back&ground", IDM_SETWALLPAPER + MENUITEM "Set as &Desktop Item...", IDM_SETDESKTOPITEM + MENUITEM SEPARATOR + MENUITEM "Cu&t", IDM_CUT + MENUITEM "&Copy", IDM_COPY + MENUITEM "Copy Shor&tcut", IDM_COPYSHORTCUT + MENUITEM "&Paste", IDM_PASTE + MENUITEM SEPARATOR + MENUITEM "Add to &Favourites...", IDM_ADDFAVORITES + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "P&roperties", IDM_PROPERTIES + } + + POPUP "Control" + { + MENUITEM "&Undo", IDM_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t", IDM_CUT + MENUITEM "&Copy", IDM_COPY + MENUITEM "&Paste", IDM_PASTE + MENUITEM "&Delete", IDM_DELETE + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "Select &All", IDM_SELECTALL + } + + POPUP "Table" + { + POPUP "&Select" + { + MENUITEM "&Cell", IDM_CELLSELECT + MENUITEM "&Row", IDM_ROWSELECT + MENUITEM "&Column", IDM_COLUMNSELECT + MENUITEM "&Table", IDM_TABLESELECT + } + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "&Cell Properties", IDM_CELLPROPERTIES + MENUITEM "&Table Properties", IDM_TABLEPROPERTIES + } + + POPUP "1DSite Select" + { + MENUITEM "Cu&t", IDM_CUT + MENUITEM "&Copy", IDM_COPY + MENUITEM "Paste", IDM_PASTE + MENUITEM "Select &All", IDM_SELECTALL + MENUITEM "&Print", IDM_PRINT + MENUITEM SEPARATOR + } + + POPUP "Anchor" + { + MENUITEM "&Open", IDM_FOLLOWLINKC + MENUITEM "Open in &New Window", IDM_FOLLOWLINKN + MENUITEM "Save Target &As...", IDM_SAVETARGET + MENUITEM "&Print Target", IDM_PRINTTARGET + MENUITEM SEPARATOR + MENUITEM "Cut", IDM_CUT + MENUITEM "&Copy", IDM_COPY + MENUITEM "Copy Shor&tcut", IDM_COPYSHORTCUT + MENUITEM "&Paste", IDM_PASTE + MENUITEM SEPARATOR + MENUITEM "Add to &Favourites...",IDM_ADDFAVORITES + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "P&roperties", IDM_PROPERTIES + } + + POPUP "Context Unknown" + { + MENUITEM SEPARATOR + } + + POPUP "DYNSRC Image" + { + MENUITEM "&Open Link", IDM_FOLLOWLINKC + MENUITEM "Open Link in &New Window", IDM_FOLLOWLINKN + MENUITEM "Save Target &As...", IDM_SAVETARGET + MENUITEM "&Print Target", IDM_PRINTTARGET + MENUITEM SEPARATOR + MENUITEM "S&how Picture", IDM_SHOWPICTURE + MENUITEM "&Save Video As...", IDM_SAVEPICTURE + MENUITEM "Set as Back&ground", IDM_SETWALLPAPER + MENUITEM "Set as &Desktop Item...", IDM_SETDESKTOPITEM + MENUITEM SEPARATOR + MENUITEM "Cu&t", IDM_CUT + MENUITEM "&Copy", IDM_COPY + MENUITEM "Copy Shor&tcut", IDM_COPYSHORTCUT + MENUITEM "&Paste", IDM_PASTE + MENUITEM SEPARATOR + MENUITEM "Add to &Favourites...", IDM_ADDFAVORITES + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "Play", IDM_DYNSRCPLAY + MENUITEM "Stop", IDM_DYNSRCSTOP + MENUITEM "P&roperties", IDM_PROPERTIES + } + + POPUP "ART Image" + { + MENUITEM "&Open Link", IDM_FOLLOWLINKC + MENUITEM "Open Link in &New Window", IDM_FOLLOWLINKN + MENUITEM "Save Target &As...", IDM_SAVETARGET + MENUITEM "&Print Target", IDM_PRINTTARGET + MENUITEM SEPARATOR + MENUITEM "S&how Picture", IDM_SHOWPICTURE + MENUITEM "&Save Picture As...", IDM_SAVEPICTURE + MENUITEM "Set as Back&ground", IDM_SETWALLPAPER + MENUITEM "Set as &Desktop Item...", IDM_SETDESKTOPITEM + MENUITEM SEPARATOR + MENUITEM "Cu&t", IDM_CUT + MENUITEM "&Copy", IDM_COPY + MENUITEM "Copy Shor&tcut", IDM_COPYSHORTCUT + MENUITEM "&Paste", IDM_PASTE + MENUITEM SEPARATOR + MENUITEM "Add to &Favourites...", IDM_ADDFAVORITES + MENUITEM SEPARATOR + MENUITEM "Play", IDM_IMGARTPLAY + MENUITEM "Stop", IDM_IMGARTSTOP + MENUITEM "Rewind", IDM_IMGARTREWIND + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "P&roperties", IDM_PROPERTIES + } + + POPUP "Debug" + { + MENUITEM "Trace Tags", IDM_TRACETAGS + MENUITEM "Resource Failures", IDM_RESOURCEFAILURES + MENUITEM "Dump Tracking Info", IDM_DUMPTRACKINGINFO + MENUITEM "Debug Break", IDM_DEBUGBREAK + MENUITEM "Debug View", IDM_DEBUGVIEW + MENUITEM "Dump Tree", IDM_DUMPTREE + MENUITEM "Dump Lines", IDM_DUMPLINES + MENUITEM "Dump DisplayTree", IDM_DUMPDISPLAYTREE + MENUITEM "Dump FormatCaches", IDM_DUMPFORMATCACHES + MENUITEM "Dump LayoutRects", IDM_DUMPLAYOUTRECTS + MENUITEM "Memory Monitor", IDM_MEMORYMONITOR + MENUITEM "Performance Meters", IDM_PERFORMANCEMETERS + MENUITEM "Save HTML", IDM_SAVEHTML + MENUITEM SEPARATOR + MENUITEM "&Browse View", IDM_BROWSEMODE + MENUITEM "&Edit View", IDM_EDITMODE + } + + POPUP "Vertical Scrollbar" + { + MENUITEM "Scroll Here", IDM_SCROLL_HERE + MENUITEM SEPARATOR + MENUITEM "Top", IDM_SCROLL_TOP + MENUITEM "Bottom", IDM_SCROLL_BOTTOM + MENUITEM SEPARATOR + MENUITEM "Page Up", IDM_SCROLL_PAGEUP + MENUITEM "Page Down", IDM_SCROLL_PAGEDOWN + MENUITEM SEPARATOR + MENUITEM "Scroll Up", IDM_SCROLL_UP + MENUITEM "Scroll Down", IDM_SCROLL_DOWN + } + + POPUP "Horizontal Scrollbar" + { + MENUITEM "Scroll Here", IDM_SCROLL_HERE + MENUITEM SEPARATOR + MENUITEM "Left Edge", IDM_SCROLL_LEFTEDGE + MENUITEM "Right Edge", IDM_SCROLL_RIGHTEDGE + MENUITEM SEPARATOR + MENUITEM "Page Left", IDM_SCROLL_PAGELEFT + MENUITEM "Page Right", IDM_SCROLL_PAGERIGHT + MENUITEM SEPARATOR + MENUITEM "Scroll Left", IDM_SCROLL_LEFT + MENUITEM "Scroll Right", IDM_SCROLL_RIGHT + } +}

1 0

Huw Davies : regedit: Update English neutral translations.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: ba615affa89b90a61c9c7b7cf57fcc48c645f4b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba615affa89b90a61c9c7b7cf… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 7 12:17:17 2009 +0100 regedit: Update English neutral translations. --- programs/regedit/En.rc | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/programs/regedit/En.rc b/programs/regedit/En.rc index 3c152a4..8d127ad 100644 --- a/programs/regedit/En.rc +++ b/programs/regedit/En.rc @@ -97,6 +97,29 @@ BEGIN END END +IDD_ADDFAVORITE DIALOG DISCARDABLE 22, 17, 210, 55 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Add Favourite" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Name:",IDC_STATIC,5,5,119,8 + EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,120,36,40,15,WS_GROUP + PUSHBUTTON "Cancel",IDCANCEL,165,36,40,15,WS_GROUP +END + +IDD_DELFAVORITE DIALOG DISCARDABLE 22, 17, 210, 90 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Favourite" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Name:",IDC_STATIC,5,5,119,8 + LISTBOX IDC_NAME_LIST,5,15,200,52, WS_BORDER | WS_TABSTOP | LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL + DEFPUSHBUTTON "OK",IDOK,120,72,40,15,WS_GROUP + PUSHBUTTON "Cancel",IDCANCEL,165,72,40,15,WS_GROUP +END + + /* English Default (US) Resources */ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT

1 0

Paul Vriens : winhlp32: Improve Dutch translations and convert to UTF8.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 7cc7e7b06e3c7edbaff3e98471621765356aed22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cc7e7b06e3c7edbaff3e9847… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jul 7 13:39:32 2009 +0200 winhlp32: Improve Dutch translations and convert to UTF8. --- programs/winhlp32/Nl.rc | 46 ++++++++++++++++++++++++---------------------- 1 files changed, 24 insertions(+), 22 deletions(-) diff --git a/programs/winhlp32/Nl.rc b/programs/winhlp32/Nl.rc index 35daef7..029d582 100644 --- a/programs/winhlp32/Nl.rc +++ b/programs/winhlp32/Nl.rc @@ -21,6 +21,8 @@ #include "winhelp_res.h" +#pragma code_page(65001) + /* Menu */ MAIN_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL @@ -34,28 +36,28 @@ MAIN_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL MENUITEM "&Afsluiten", MNID_FILE_EXIT } POPUP "&Bewerken" { - MENUITEM "&Kopi�ren...", MNID_EDIT_COPYDLG + MENUITEM "&Kopiëren...", MNID_EDIT_COPYDLG MENUITEM SEPARATOR MENUITEM "&Annoteren...", MNID_EDIT_ANNOTATE } POPUP "&Favorieten" { MENUITEM "&Aanmaken...", MNID_BKMK_DEFINE } - POPUP "&Options" { - POPUP "Help always visible" + POPUP "&Opties" { + POPUP "Help altijd zichtbaar" BEGIN - MENUITEM "Default", MNID_OPTS_HELP_DEFAULT - MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE - MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + MENUITEM "Standaard", MNID_OPTS_HELP_DEFAULT + MENUITEM "Zichtbaar", MNID_OPTS_HELP_VISIBLE + MENUITEM "Niet zichtbaar", MNID_OPTS_HELP_NONVISIBLE END - MENUITEM "History", MNID_OPTS_HISTORY - POPUP "Fonts" + MENUITEM "Historie", MNID_OPTS_HISTORY + POPUP "Lettertype" BEGIN - MENUITEM "Small", MNID_OPTS_FONTS_SMALL - MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL - MENUITEM "Large", MNID_OPTS_FONTS_LARGE + MENUITEM "Klein", MNID_OPTS_FONTS_SMALL + MENUITEM "Standaard", MNID_OPTS_FONTS_NORMAL + MENUITEM "Groot", MNID_OPTS_FONTS_LARGE END - MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + MENUITEM "Gebruik systeemkleuren", MNID_OPTS_SYSTEM_COLORS } POPUP "&Help" { MENUITEM "Hulp &bij help", MNID_HELP_HELPON @@ -63,7 +65,7 @@ MAIN_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL MENUITEM SEPARATOR MENUITEM "&Info...", MNID_HELP_ABOUT #ifdef WINELIB - MENUITEM "&Over WINE", MNID_HELP_WINE + MENUITEM "&Over Wine", MNID_HELP_WINE #endif } } @@ -81,26 +83,26 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Zoeken" { - LTEXT "Nog niet geimplementeerd", -1, 10, 10, 180, 150 + LTEXT "Nog niet geïmplementeerd", -1, 10, 10, 180, 150 } /* Strings */ STRINGTABLE DISCARDABLE LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL { -STID_WINE_HELP, "WINE Help" +STID_WINE_HELP, "Wine Help" STID_WHERROR, "FOUT" STID_WARNING, "WAARSCHUWING" STID_INFO, "Informatie" -STID_NOT_IMPLEMENTED, "Niet ge�mplementeerd" -STID_HLPFILE_ERROR_s, "Fout bij het lezen van het helpbestand `%s'" -STID_INDEX, "&Inhoud" -STID_CONTENTS, "Summary" +STID_NOT_IMPLEMENTED, "Niet geïmplementeerd" +STID_HLPFILE_ERROR_s, "Fout bij het lezen van het helpbestand '%s'" +STID_INDEX, "Inde&x" +STID_CONTENTS, "&Inhoudsopgave" STID_BACK, "&Terug" STID_ALL_FILES, "Alle bestanden (*.*)" STID_HELP_FILES_HLP, "Helpbestanden (*.hlp)" STID_FILE_NOT_FOUND_s "Kan '%s' niet openen. Wilt u zelf dit bestand zoeken?" -STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " +STID_NO_RICHEDIT "Kan geen richedit implementatie vinden... Actie afgebroken" +STID_PSH_INDEX, "Help onderwerpen: " } CONTEXT_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL @@ -108,7 +110,7 @@ BEGIN POPUP "" BEGIN MENUITEM "Annotering...", MNID_CTXT_ANNOTATE - MENUITEM "Kopi�ren", MNID_CTXT_COPY + MENUITEM "Kopiëren", MNID_CTXT_COPY MENUITEM "Print...", MNID_CTXT_PRINT POPUP "Lettertypes" BEGIN

1 0

Hib Eris : oleaut32/tests: Add tests for VarDecCmp.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: eb8778f9a09d7f467e951eb075dae7f76686a493 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb8778f9a09d7f467e951eb07… Author: Hib Eris <hib(a)hiberis.nl> Date: Tue Jul 7 14:00:24 2009 +0200 oleaut32/tests: Add tests for VarDecCmp. --- dlls/oleaut32/tests/vartype.c | 95 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 3e5730b..c3ec180 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4413,9 +4413,104 @@ static void test_VarDecCmp(void) MATHVARS1; CHECKPTR(VarDecCmp); + SETDEC(l,0,0,0,1); SETDEC(out,0,0,0,1); MATH1(VarDecCmp); EXPECT_EQ; SETDEC(l,0,0,0,1); SETDEC(out,0,0,0,0); MATH1(VarDecCmp); EXPECT_GT; + SETDEC(l,0,0,0,1); SETDEC(out,0,0,-1,-1); MATH1(VarDecCmp); EXPECT_LT; + + SETDEC(l,0,0,0,1); SETDEC(out,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_GT; + SETDEC(l,0,0,0,1); SETDEC(out,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_GT; + SETDEC(l,0,0,0,1); SETDEC(out,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_GT; + + SETDEC(l,0,DECIMAL_NEG,0,1); SETDEC(out,0,0,0,1); MATH1(VarDecCmp); EXPECT_LT; + SETDEC(l,0,DECIMAL_NEG,0,1); SETDEC(out,0,0,0,0); MATH1(VarDecCmp); EXPECT_LT; + SETDEC(l,0,DECIMAL_NEG,0,1); SETDEC(out,0,0,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_LT; + + SETDEC(l,0,DECIMAL_NEG,0,1); SETDEC(out,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_EQ; + SETDEC(l,0,DECIMAL_NEG,0,1); SETDEC(out,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_LT; + SETDEC(l,0,DECIMAL_NEG,0,1); SETDEC(out,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); EXPECT_GT; + SETDEC(l,0,0,0,0); SETDEC(out,0,0,0,1); MATH1(VarDecCmp); EXPECT_LT; + SETDEC(l,0,0,0,0); SETDEC(out,0,0,0,0); MATH1(VarDecCmp); EXPECT_EQ; + SETDEC(l,0,0,0,0); SETDEC(out,0,0,-1,-1); MATH1(VarDecCmp); EXPECT_LT; + + SETDEC(l,0,0,0,0); SETDEC(out,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_GT; + SETDEC(l,0,0,0,0); SETDEC(out,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_EQ; + SETDEC(l,0,0,0,0); SETDEC(out,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); EXPECT_GT; + + SETDEC(l,0,DECIMAL_NEG,0,0); SETDEC(out,0,0,0,1); MATH1(VarDecCmp); EXPECT_LT; + SETDEC(l,0,DECIMAL_NEG,0,0); SETDEC(out,0,0,0,0); MATH1(VarDecCmp); EXPECT_EQ; + SETDEC(l,0,DECIMAL_NEG,0,0); SETDEC(out,0,0,-1,-1); MATH1(VarDecCmp); EXPECT_LT; + + SETDEC(l,0,DECIMAL_NEG,0,0); SETDEC(out,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_GT; + SETDEC(l,0,DECIMAL_NEG,0,0); SETDEC(out,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_EQ; + SETDEC(l,0,DECIMAL_NEG,0,0); SETDEC(out,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); EXPECT_GT; + + SETDEC(l,0,0,-1,-1); SETDEC(out,0,0,0,1); MATH1(VarDecCmp); EXPECT_GT; + SETDEC(l,0,0,-1,-1); SETDEC(out,0,0,0,0); MATH1(VarDecCmp); EXPECT_GT; + SETDEC(l,0,0,-1,-1); SETDEC(out,0,0,-1,-1); MATH1(VarDecCmp); EXPECT_EQ; + + SETDEC(l,0,0,-1,-1); SETDEC(out,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); todo_wine EXPECT_GT; + SETDEC(l,0,0,-1,-1); SETDEC(out,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_GT; + SETDEC(l,0,0,-1,-1); SETDEC(out,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_GT; + + SETDEC(l,0,DECIMAL_NEG,-1,-1); SETDEC(out,0,0,0,1); MATH1(VarDecCmp); todo_wine EXPECT_LT; + SETDEC(l,0,DECIMAL_NEG,-1,-1); SETDEC(out,0,0,0,0); MATH1(VarDecCmp); EXPECT_LT; + SETDEC(l,0,DECIMAL_NEG,-1,-1); SETDEC(out,0,0,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_LT; + + SETDEC(l,0,DECIMAL_NEG,-1,-1); SETDEC(out,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_LT; + SETDEC(l,0,DECIMAL_NEG,-1,-1); SETDEC(out,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_LT; + SETDEC(l,0,DECIMAL_NEG,-1,-1); SETDEC(out,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); EXPECT_EQ; + + + SETDEC(out,0,0,0,1); SETDEC(l,0,0,0,1); MATH1(VarDecCmp); EXPECT_EQ; + SETDEC(out,0,0,0,1); SETDEC(l,0,0,0,0); MATH1(VarDecCmp); EXPECT_LT; + SETDEC(out,0,0,0,1); SETDEC(l,0,0,-1,-1); MATH1(VarDecCmp); EXPECT_GT; + + SETDEC(out,0,0,0,1); SETDEC(l,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_LT; + SETDEC(out,0,0,0,1); SETDEC(l,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_LT; + SETDEC(out,0,0,0,1); SETDEC(l,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_LT; + + SETDEC(out,0,DECIMAL_NEG,0,1); SETDEC(l,0,0,0,1); MATH1(VarDecCmp); EXPECT_GT; + SETDEC(out,0,DECIMAL_NEG,0,1); SETDEC(l,0,0,0,0); MATH1(VarDecCmp); EXPECT_GT; + SETDEC(out,0,DECIMAL_NEG,0,1); SETDEC(l,0,0,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_GT; + + SETDEC(out,0,DECIMAL_NEG,0,1); SETDEC(l,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_EQ; + SETDEC(out,0,DECIMAL_NEG,0,1); SETDEC(l,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_GT; + SETDEC(out,0,DECIMAL_NEG,0,1); SETDEC(l,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); EXPECT_LT; + + SETDEC(out,0,0,0,0); SETDEC(l,0,0,0,1); MATH1(VarDecCmp); EXPECT_GT; + SETDEC(out,0,0,0,0); SETDEC(l,0,0,0,0); MATH1(VarDecCmp); EXPECT_EQ; + SETDEC(out,0,0,0,0); SETDEC(l,0,0,-1,-1); MATH1(VarDecCmp); EXPECT_GT; + + SETDEC(out,0,0,0,0); SETDEC(l,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_LT; + SETDEC(out,0,0,0,0); SETDEC(l,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_EQ; + SETDEC(out,0,0,0,0); SETDEC(l,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); EXPECT_LT; + + SETDEC(out,0,DECIMAL_NEG,0,0); SETDEC(l,0,0,0,1); MATH1(VarDecCmp); EXPECT_GT; + SETDEC(out,0,DECIMAL_NEG,0,0); SETDEC(l,0,0,0,0); MATH1(VarDecCmp); EXPECT_EQ; + SETDEC(out,0,DECIMAL_NEG,0,0); SETDEC(l,0,0,-1,-1); MATH1(VarDecCmp); EXPECT_GT; + + SETDEC(out,0,DECIMAL_NEG,0,0); SETDEC(l,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_LT; + SETDEC(out,0,DECIMAL_NEG,0,0); SETDEC(l,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_EQ; + SETDEC(out,0,DECIMAL_NEG,0,0); SETDEC(l,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); EXPECT_LT; + + SETDEC(out,0,0,-1,-1); SETDEC(l,0,0,0,1); MATH1(VarDecCmp); EXPECT_LT; + SETDEC(out,0,0,-1,-1); SETDEC(l,0,0,0,0); MATH1(VarDecCmp); EXPECT_LT; + SETDEC(out,0,0,-1,-1); SETDEC(l,0,0,-1,-1); MATH1(VarDecCmp); EXPECT_EQ; + + SETDEC(out,0,0,-1,-1); SETDEC(l,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); todo_wine EXPECT_LT; + SETDEC(out,0,0,-1,-1); SETDEC(l,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_LT; + SETDEC(out,0,0,-1,-1); SETDEC(l,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_LT; + + SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,0,0,1); MATH1(VarDecCmp); todo_wine EXPECT_GT; + SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,0,0,0); MATH1(VarDecCmp); EXPECT_GT; + SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,0,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_GT; + + SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_GT; + SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_GT; + SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); EXPECT_EQ; + } /*

1 0

Piotr Caban : jscript: Added Object_toString and Object_toLocaleString implementation.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 8ce4de7d2c92f65e317ce5e58e3ad5645f160bee URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ce4de7d2c92f65e317ce5e58… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 7 13:45:38 2009 +0200 jscript: Added Object_toString and Object_toLocaleString implementation. --- dlls/jscript/object.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index f2e3956..fe9a50c 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -35,15 +35,23 @@ static const WCHAR default_valueW[] = {'[','o','b','j','e','c','t',' ','O','b',' static HRESULT Object_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + if(retv) { + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = SysAllocString(default_valueW); + if(!V_BSTR(retv)) + return E_OUTOFMEMORY; + } + + return S_OK; } static HRESULT Object_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return Object_toString(dispex, lcid, flags, dp, retv, ei, sp); } static HRESULT Object_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp,

1 0

Piotr Caban : jscript: Added Object_valueOf implementation.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 3a1698ff06069cbf2397ca6a80eaa3869403c803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a1698ff06069cbf2397ca6a8… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 7 14:07:47 2009 +0200 jscript: Added Object_valueOf implementation. --- dlls/jscript/object.c | 12 ++++++++++-- dlls/jscript/tests/api.js | 3 +++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 9474bc4..f2e3956 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -49,8 +49,16 @@ static HRESULT Object_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, static HRESULT Object_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + if(retv) { + IDispatchEx_AddRef(_IDispatchEx_(dispex)); + + V_VT(retv) = VT_DISPATCH; + V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(dispex); + } + + return S_OK; } static HRESULT Object_hasOwnProperty(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 23a4ad5..7075aec 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -439,6 +439,9 @@ ok(arr.sort() === arr, "arr.sort() !== arr"); for(var i=0; i < arr.length; i++) ok(arr[i] === tmp[i], "arr[" + i + "] = " + arr[i] + " expected " + tmp[i]); +ok(arr.valueOf === Object.prototype.valueOf, "arr.valueOf !== Object.prototype.valueOf"); +ok(arr === arr.valueOf(), "arr !== arr.valueOf"); + var num = new Number(6); arr = [0,1,2]; tmp = arr.concat(3, [4,5], num);

1 0

Ricardo Filipe : comctl32: Update Portuguese translation and convert to UTF8.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: c5e02d71c1064e8bdc76df9740fa0958c40f0931 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5e02d71c1064e8bdc76df974… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Mon Jul 6 13:09:13 2009 -0700 comctl32: Update Portuguese translation and convert to UTF8. --- dlls/comctl32/comctl_Pt.rc | 45 +++++++------------------------------------ 1 files changed, 8 insertions(+), 37 deletions(-) diff --git a/dlls/comctl32/comctl_Pt.rc b/dlls/comctl32/comctl_Pt.rc index e96d9b5..914c4c2 100644 --- a/dlls/comctl32/comctl_Pt.rc +++ b/dlls/comctl32/comctl_Pt.rc @@ -1,6 +1,7 @@ /* * Copyright 2003 Marcelo Duarte - * Copyright 2006-2007 Am�rico Jos� Melo + * Copyright 2006-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 @@ -19,21 +20,9 @@ #include "comctl32.h" -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN +#pragma code_page(65001) -IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Propriedades para %s" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "Cancelar", IDCANCEL,58,122,50,14 - PUSHBUTTON "&Aplicar", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED - PUSHBUTTON "Ajuda", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 -END - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE @@ -47,27 +36,21 @@ BEGIN CONTROL "Separador", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 END - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN - IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Assistente" FONT 8, "MS Shell Dlg" BEGIN PUSHBUTTON "< &Voltar", IDC_BACK_BUTTON,71,138,50,14 - DEFPUSHBUTTON "&Avan�ar >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "&Avançar >", IDC_NEXT_BUTTON,121,138,50,14 DEFPUSHBUTTON "Finalizar", IDC_FINISH_BUTTON,121,138,50,14 PUSHBUTTON "Cancelar", IDCANCEL,178,138,50,14 PUSHBUTTON "Ajuda", IDHELP,235,138,50,14,WS_GROUP LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + CONTROL "Separador", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE END - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN - IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Personalizar barra de ferramentas" @@ -78,42 +61,30 @@ BEGIN PUSHBUTTON "&Ajuda", IDC_HELP_BTN,308,40,44,14 PUSHBUTTON "A&cima", IDC_MOVEUP_BTN,308,74,44,14 PUSHBUTTON "A&baixo", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "Bot�es &dispon�veis:", -1,4,5,84,10 + LTEXT "Botões &disponíveis:", -1,4,5,84,10 LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP PUSHBUTTON "&Adicionar ->", IDOK, 131, 42, 44, 14 PUSHBUTTON "<- &Remover", IDC_REMOVE_BTN,131,62,44,14 - LTEXT "&Bot�es da barra de ferramentas:", -1,182,5,78,10 + LTEXT "&Botões da barra de ferramentas:", -1,182,5,78,10 LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP END - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN - STRINGTABLE DISCARDABLE { IDS_CLOSE "Fechar" } - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN - STRINGTABLE DISCARDABLE { IDM_TODAY "Hoje:" IDM_GOTODAY "Ir para hoje" } - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN - STRINGTABLE DISCARDABLE { IDS_SEPARATOR "Separador" } - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN - STRINGTABLE DISCARDABLE { HKY_NONE "Nenhum"

1 0

Ricardo Filipe : clock: Update Portuguese translation and convert to UTF8.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: a6c8a095efd50aee5fc5e3fd8cbcfe34f818b855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6c8a095efd50aee5fc5e3fd8… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Tue Jul 7 03:26:39 2009 -0700 clock: Update Portuguese translation and convert to UTF8. --- programs/clock/Pt.rc | 50 ++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 38 insertions(+), 12 deletions(-) diff --git a/programs/clock/Pt.rc b/programs/clock/Pt.rc index 2b04583..1e64342 100644 --- a/programs/clock/Pt.rc +++ b/programs/clock/Pt.rc @@ -5,7 +5,7 @@ * Copyright 1999 Gustavo Junior Alves <alves(a)correionet.com.br> * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> * Copyright 2003 Marcelo Duarte - * Copyright 2004 Am�rico Jos� Melo + * Copyright 2004 Américo José Melo * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,25 +24,27 @@ #include "clock_res.h" +#pragma code_page(65001) + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN MAIN_MENU MENU { POPUP "&Propriedades" { - MENUITEM "&Anal�gico", IDM_ANALOG + MENUITEM "&Analógico", IDM_ANALOG MENUITEM "Digi&tal", IDM_DIGITAL MENUITEM SEPARATOR MENUITEM "&Fonte...", IDM_FONT MENUITEM SEPARATOR - MENUITEM "&Sem barra de t�tulo", IDM_NOTITLE + MENUITEM "&Sem barra de título", IDM_NOTITLE MENUITEM SEPARATOR MENUITEM "&Segundos", IDM_SECONDS MENUITEM "&Data", IDM_DATE MENUITEM SEPARATOR - MENUITEM "&Sempre vis�vel", IDM_ONTOP + MENUITEM "&Sempre visível", IDM_ONTOP } - POPUP "&Informa��es" { - MENUITEM "&Licen�a...", IDM_LICENSE + POPUP "&Informações" { + MENUITEM "&Licença...", IDM_LICENSE MENUITEM "&SEM GARANTIA...", IDM_NOWARRANTY MENUITEM "&Sobre Clock...", IDM_ABOUT } @@ -53,20 +55,20 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE MAIN_MENU MENU { POPUP "&Propriedades" { - MENUITEM "&Anal�gico", IDM_ANALOG + MENUITEM "&Analógico", IDM_ANALOG MENUITEM "Digi&tal", IDM_DIGITAL MENUITEM SEPARATOR MENUITEM "Tipo de &Letra...", IDM_FONT MENUITEM SEPARATOR - MENUITEM "&Sem barra de t�tulo", IDM_NOTITLE + MENUITEM "&Sem barra de título", IDM_NOTITLE MENUITEM SEPARATOR MENUITEM "&Segundos", IDM_SECONDS MENUITEM "&Data", IDM_DATE MENUITEM SEPARATOR - MENUITEM "&Sempre vis�vel", IDM_ONTOP + MENUITEM "&Sempre visível", IDM_ONTOP } - POPUP "&Informa��es" { - MENUITEM "&Licen�a...", IDM_LICENSE + POPUP "&Informações" { + MENUITEM "&Licença...", IDM_LICENSE MENUITEM "&SEM GARANTIA...", IDM_NOWARRANTY MENUITEM "&Acerca do Clock...", IDM_ABOUT } @@ -77,5 +79,29 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { -IDS_CLOCK, "Rel�gio" +IDS_CLOCK, "Relógio" +} + +STRINGTABLE DISCARDABLE LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE +{ +IDS_LICENSE_CAPTION, "Licença do Wine" +IDS_LICENSE, +"O Wine é software livre; você pode redistribuí-lo e/ou \ +modificá-lo sob os termos da GNU Lesser General Public \ +License tal como publicado pela Free Software Foundation; seja a \ +versão 2.1 da Licença, ou (por sua escolha) outra versão mais recente.\n\n\ +O Wine é distribuído na esperança que seja útil, \ +mas SEM QUALQUER GARANTIA; nem sequer a garantia implícita de \ +MERCANTIBILIDADE ou FEITO PARA UM PROPÓSITO ESPECÍFICO. veja a GNU \ +Lesser General Public License para mais detalhes.\n\n\ +Deverá ter recebido uma cópia da GNU Lesser General Public \ +License com o Wine; se não, escreva à Free Software \ +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." + +IDS_WARRANTY_CAPTION, "SEM GARANTIA" +IDS_WARRANTY, +"O Wine é distribuído na esperança que seja útil, \ +mas SEM QUALQUER GARANTIA; nem sequer a garantia implícita de \ +MERCANTIBILIDADE ou FEITO PARA UM PROPÓSITO ESPECÍFICO. veja a GNU \ +Lesser General Public License para mais detalhes." }

1 0

Piotr Caban : jscript: Fix DateConstr_parse implementation.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 12760a0c6b02888c085fef7a38f7ecec0cdf3ecd URL: http://source.winehq.org/git/wine.git/?a=commit;h=12760a0c6b02888c085fef7a3… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 7 13:44:53 2009 +0200 jscript: Fix DateConstr_parse implementation. --- dlls/jscript/date.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 525a3a2..3a681b9 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -2492,7 +2492,7 @@ static inline HRESULT date_parse(BSTR input, VARIANT *retv) { static HRESULT DateConstr_parse(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - VARIANT prim; + BSTR parse_str; HRESULT hres; TRACE("\n"); @@ -2503,16 +2503,14 @@ static HRESULT DateConstr_parse(DispatchEx *dispex, LCID lcid, WORD flags, DISPP return S_OK; } - hres = to_primitive(dispex->ctx, get_arg(dp,0), ei, &prim); + hres = to_string(dispex->ctx, get_arg(dp,0), ei, &parse_str); if(FAILED(hres)) return hres; - if(V_VT(&prim) != VT_BSTR) { - if(retv) - num_set_nan(retv); - return S_OK; - } - return date_parse(V_BSTR(&prim), retv); + hres = date_parse(parse_str, retv); + + SysFreeString(parse_str); + return hres; } static HRESULT DateConstr_UTC(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp,

1 0

Piotr Caban : jscript: Inherit Array valueOf from Object.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 7fcded1fc3ba541ee7b15bd6c51dd07676eb196b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fcded1fc3ba541ee7b15bd6c… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 7 13:45:06 2009 +0200 jscript: Inherit Array valueOf from Object. --- dlls/jscript/array.c | 11 +---------- dlls/jscript/global.c | 8 ++++---- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index cd40e43..75d3871 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -40,7 +40,6 @@ static const WCHAR sortW[] = {'s','o','r','t',0}; static const WCHAR spliceW[] = {'s','p','l','i','c','e',0}; static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; static const WCHAR toLocaleStringW[] = {'t','o','L','o','c','a','l','e','S','t','r','i','n','g',0}; -static const WCHAR valueOfW[] = {'v','a','l','u','e','O','f',0}; static const WCHAR unshiftW[] = {'u','n','s','h','i','f','t',0}; static const WCHAR hasOwnPropertyW[] = {'h','a','s','O','w','n','P','r','o','p','e','r','t','y',0}; static const WCHAR propertyIsEnumerableW[] = @@ -638,13 +637,6 @@ static HRESULT Array_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, D return E_NOTIMPL; } -static HRESULT Array_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT Array_unshift(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { @@ -732,7 +724,6 @@ static const builtin_prop_t Array_props[] = { {toLocaleStringW, Array_toLocaleString, PROPF_METHOD}, {toStringW, Array_toString, PROPF_METHOD}, {unshiftW, Array_unshift, PROPF_METHOD}, - {valueOfW, Array_valueOf, PROPF_METHOD} }; static const builtin_info_t Array_info = { @@ -809,7 +800,7 @@ static HRESULT alloc_array(script_ctx_t *ctx, BOOL use_constr, ArrayInstance **r if(use_constr) hres = init_dispex_from_constr(&array->dispex, ctx, &Array_info, ctx->array_constr); else - hres = init_dispex(&array->dispex, ctx, &Array_info, NULL); + hres = init_dispex_from_constr(&array->dispex, ctx, &Array_info, ctx->object_constr); if(FAILED(hres)) { heap_free(array); diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index a714f8e..4f95653 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -582,6 +582,10 @@ static HRESULT init_constructors(script_ctx_t *ctx) if(FAILED(hres)) return hres; + hres = create_object_constr(ctx, &ctx->object_constr); + if(FAILED(hres)) + return hres; + hres = create_array_constr(ctx, &ctx->array_constr); if(FAILED(hres)) return hres; @@ -598,10 +602,6 @@ static HRESULT init_constructors(script_ctx_t *ctx) if(FAILED(hres)) return hres; - hres = create_object_constr(ctx, &ctx->object_constr); - if(FAILED(hres)) - return hres; - hres = create_regexp_constr(ctx, &ctx->regexp_constr); if(FAILED(hres)) return hres;

1 0