December 2010 - Wine-Commits

Eric Pouech : kernel32: In readline, now print control characters with ^ escape.
by Alexandre Julliard Dec. 13, 2010

Dec. 13, 2010

Module: wine Branch: master Commit: 8aa3ec414d8ff4a5ebd7ca32fa171c267af2640e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8aa3ec414d8ff4a5ebd7ca32f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Dec 12 22:31:49 2010 +0100 kernel32: In readline, now print control characters with ^ escape. --- dlls/kernel32/editline.c | 136 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 101 insertions(+), 35 deletions(-) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index 4dff110..b33798b 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -57,7 +57,7 @@ typedef struct WCEL_Context { (for consoles that can't change cursor pos) */ unsigned last_max; /* max number of chars written (for consoles that can't change cursor pos) */ - unsigned ofs; /* offset for cursor in current line */ + unsigned ofs; /* offset for cursor in current line */ WCHAR* yanked; /* yanked line */ unsigned mark; /* marked point (emacs mode only) */ CONSOLE_SCREEN_BUFFER_INFO csbi; /* current state (initial cursor, window size, attribute) */ @@ -111,10 +111,27 @@ static inline BOOL WCEL_IsSingleLine(WCEL_Context* ctx, size_t len) return ctx->csbi.dwCursorPosition.X + ctx->len + len <= ctx->csbi.dwSize.X; } -static inline COORD WCEL_GetCoord(WCEL_Context* ctx, int ofs) +static inline int WCEL_CharWidth(WCHAR wch) +{ + return wch < ' ' ? 2 : 1; +} + +static inline int WCEL_StringWidth(const WCHAR* str, int beg, int len) +{ + int i, ofs; + + for (i = 0, ofs = 0; i < len; i++) + ofs += WCEL_CharWidth(str[beg + i]); + return ofs; +} + +static inline COORD WCEL_GetCoord(WCEL_Context* ctx, int strofs) { COORD c; int len = ctx->csbi.dwSize.X - ctx->csbi.dwCursorPosition.X; + int ofs; + + ofs = WCEL_StringWidth(ctx->line, 0, strofs); c.Y = ctx->csbi.dwCursorPosition.Y; if (ofs >= len) @@ -127,35 +144,79 @@ static inline COORD WCEL_GetCoord(WCEL_Context* ctx, int ofs) return c; } +static DWORD WCEL_WriteConsole(WCEL_Context* ctx, DWORD beg, DWORD len) +{ + DWORD i, last, dw, ret = 0; + WCHAR tmp[2]; + + for (i = last = 0; i < len; i++) + { + if (ctx->line[beg + i] < ' ') + { + if (last != i) + { + WriteConsoleW(ctx->hConOut, &ctx->line[beg + last], i - last, &dw, NULL); + ret += dw; + } + tmp[0] = '^'; + tmp[1] = '@' + ctx->line[beg + i]; + WriteConsoleW(ctx->hConOut, tmp, 2, &dw, NULL); + last = i + 1; + ret += dw; + } + } + if (last != len) + { + WriteConsoleW(ctx->hConOut, &ctx->line[beg + last], len - last, &dw, NULL); + ret += dw; + } + return ret; +} + +static inline void WCEL_WriteNChars(WCEL_Context* ctx, char ch, int count) +{ + DWORD dw; + + if (count > 0) + { + while (count--) WriteFile(ctx->hConOut, &ch, 1, &dw, NULL); + } +} + static inline void WCEL_Update(WCEL_Context* ctx, int beg, int len) { - if (!ctx->shall_echo) return; - if (ctx->can_pos_cursor) + int i, last; + WCHAR tmp[2]; + + /* bare console case is handled in CONSOLE_ReadLine (we always reprint the whole string) */ + if (!ctx->shall_echo || !ctx->can_pos_cursor) return; + + for (i = last = beg; i < beg + len; i++) { - WriteConsoleOutputCharacterW(ctx->hConOut, &ctx->line[beg], len, - WCEL_GetCoord(ctx, beg), NULL); - FillConsoleOutputAttribute(ctx->hConOut, ctx->csbi.wAttributes, len, - WCEL_GetCoord(ctx, beg), NULL); + if (ctx->line[i] < ' ') + { + if (last != i) + { + WriteConsoleOutputCharacterW(ctx->hConOut, &ctx->line[last], i - last, + WCEL_GetCoord(ctx, last), NULL); + FillConsoleOutputAttribute(ctx->hConOut, ctx->csbi.wAttributes, i - last, + WCEL_GetCoord(ctx, last), NULL); + } + tmp[0] = '^'; + tmp[1] = '@' + ctx->line[i]; + WriteConsoleOutputCharacterW(ctx->hConOut, tmp, 2, + WCEL_GetCoord(ctx, i), NULL); + FillConsoleOutputAttribute(ctx->hConOut, ctx->csbi.wAttributes, 2, + WCEL_GetCoord(ctx, i), NULL); + last = i + 1; + } } - else + if (last != beg + len) { - char ch; - unsigned i; - DWORD dw; - - /* erase previous chars */ - ch = '\b'; - for (i = beg; i < ctx->last_rub; i++) - WriteFile(ctx->hConOut, &ch, 1, &dw, NULL); - beg = min(beg, ctx->last_rub); - - /* write new chars */ - WriteConsoleW(ctx->hConOut, &ctx->line[beg], ctx->len - beg, &dw, NULL); - /* clean rest of line (if any) */ - ch = ' '; - for (i = ctx->len; i < ctx->last_max; i++) - WriteFile(ctx->hConOut, &ch, 1, &dw, NULL); - ctx->last_rub = max(ctx->last_max, ctx->len); + WriteConsoleOutputCharacterW(ctx->hConOut, &ctx->line[last], i - last, + WCEL_GetCoord(ctx, last), NULL); + FillConsoleOutputAttribute(ctx->hConOut, ctx->csbi.wAttributes, i - last, + WCEL_GetCoord(ctx, last), NULL); } } @@ -887,18 +948,23 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor) } else if (!ctx.done && !ctx.error) { - char ch; - unsigned i; - DWORD dw; - + DWORD last; /* erase previous chars */ - ch = '\b'; - for (i = 0; i < ctx.last_rub; i++) - WriteFile(ctx.hConOut, &ch, 1, &dw, NULL); + WCEL_WriteNChars(&ctx, '\b', ctx.last_rub); /* write chars up to cursor */ - WriteConsoleW(ctx.hConOut, ctx.line, ctx.ofs, &dw, NULL); - if ((ctx.last_rub = ctx.ofs) > ctx.last_max) ctx.last_max = ctx.ofs; + ctx.last_rub = WCEL_WriteConsole(&ctx, 0, ctx.ofs); + /* write chars past cursor */ + last = ctx.last_rub + WCEL_WriteConsole(&ctx, ctx.ofs, ctx.len - ctx.ofs); + if (last < ctx.last_max) /* ctx.line has been shortened, erase */ + { + WCEL_WriteNChars(&ctx, ' ', ctx.last_max - last); + WCEL_WriteNChars(&ctx, '\b', ctx.last_max - last); + ctx.last_max = last; + } + else ctx.last_max = last; + /* reposition at cursor */ + WCEL_WriteNChars(&ctx, '\b', last - ctx.last_rub); } } if (ctx.error)

1 0

André Hentschel : msi: Fix test failure on some 2k3 machines.
by Alexandre Julliard Dec. 13, 2010

Dec. 13, 2010

Module: wine Branch: master Commit: 6e9b8412160d75de5b78227c8c72b1b15094bdd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e9b8412160d75de5b78227c8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 13 12:34:53 2010 +0100 msi: Fix test failure on some 2k3 machines. --- dlls/msi/tests/msi.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index e08f6bb..bb0d65f 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -7946,6 +7946,11 @@ static void test_MsiOpenProduct(void) /* LocalPackage has just the package name */ hprod = 0xdeadbeef; r = MsiOpenProductA(prodcode, &hprod); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + goto error; + } ok(r == ERROR_INSTALL_PACKAGE_OPEN_FAILED || r == ERROR_SUCCESS, "Expected ERROR_INSTALL_PACKAGE_OPEN_FAILED or ERROR_SUCCESS, got %d\n", r); if (r == ERROR_SUCCESS) @@ -7968,6 +7973,7 @@ static void test_MsiOpenProduct(void) "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); ok(hprod == 0xdeadbeef, "Expected hprod to be unchanged\n"); +error: RegDeleteValueA(props, "LocalPackage"); delete_key(props, "", access & KEY_WOW64_64KEY); RegCloseKey(props);

1 0

Detlef Riekenberg : configure: Ask for the correct development package for gstreamer base plugins.
by Alexandre Julliard Dec. 13, 2010

Dec. 13, 2010

Module: wine Branch: master Commit: 654bb4a2317198a4c9540f7d59afd14234acb2bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=654bb4a2317198a4c9540f7d5… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Dec 12 22:48:56 2010 +0100 configure: Ask for the correct development package for gstreamer base plugins. --- configure | 4 ++-- configure.ac | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 4e72097..c1256ba 100755 --- a/configure +++ b/configure @@ -10812,9 +10812,9 @@ fi fi if test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" != xyes; then : case "x$with_gstreamer" in - x) as_fn_append wine_notices "|gstreamer-0.10 ${notice_platform}development files not found, gstreamer support disabled" ;; + x) as_fn_append wine_notices "|gstreamer-0.10 base plugins ${notice_platform}development files not found, gstreamer support disabled" ;; xno) ;; - *) as_fn_error $? "gstreamer-0.10 ${notice_platform}development files not found, gstreamer support disabled + *) as_fn_error $? "gstreamer-0.10 base plugins ${notice_platform}development files not found, gstreamer support disabled This is an error since --with-gstreamer was requested." "$LINENO" 5 ;; esac fi diff --git a/configure.ac b/configure.ac index 8ad460d..71c14d3 100644 --- a/configure.ac +++ b/configure.ac @@ -1461,7 +1461,7 @@ then CPPFLAGS="$ac_save_CPPFLAGS" fi WINE_NOTICE_WITH(gstreamer,[test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" != xyes], - [gstreamer-0.10 ${notice_platform}development files not found, gstreamer support disabled]) + [gstreamer-0.10 base plugins ${notice_platform}development files not found, gstreamer support disabled]) test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" = xyes || enable_winegstreamer=${enable_winegstreamer:-no} dnl **** Check for ALSA 1.x ****

1 0

Detlef Riekenberg : cmd: Allow GOTO to a label which has a following whitespace, with test.
by Alexandre Julliard Dec. 13, 2010

Dec. 13, 2010

Module: wine Branch: master Commit: d62c6bb77f923bfa3d635f9e484feb78d8c3f78c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d62c6bb77f923bfa3d635f9e4… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Dec 13 00:04:19 2010 +0100 cmd: Allow GOTO to a label which has a following whitespace, with test. --- programs/cmd/builtins.c | 14 ++++++++++++-- programs/cmd/tests/test_builtins.cmd | 3 +++ programs/cmd/tests/test_builtins.cmd.exp | 1 + 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 5ccbb8f..8c3f727 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1150,6 +1150,7 @@ void WCMD_give_help (WCHAR *command) { void WCMD_goto (CMD_LIST **cmdList) { WCHAR string[MAX_PATH]; + WCHAR current[MAX_PATH]; /* Do not process any more parts of a processed multipart or multilines command */ if (cmdList) *cmdList = NULL; @@ -1174,8 +1175,17 @@ void WCMD_goto (CMD_LIST **cmdList) { SetFilePointer (context -> h, 0, NULL, FILE_BEGIN); while (WCMD_fgets (string, sizeof(string)/sizeof(WCHAR), context -> h)) { str = string; - while (isspaceW(*str)) str++; - if ((*str == ':') && (lstrcmpiW (++str, paramStart) == 0)) return; + while (isspaceW (*str)) str++; + if (*str == ':') { + DWORD index = 0; + str++; + while (((current[index] = str[index])) && (!isspaceW (current[index]))) + index++; + + /* ignore space at the end */ + current[index] = 0; + if (lstrcmpiW (current, paramStart) == 0) return; + } } WCMD_output (WCMD_LoadMessage(WCMD_NOTARGET)); } diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 375b7a1..2b117e4 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -88,3 +88,6 @@ echo goto with a leading space worked if c==c goto dest3 :dest3 echo goto with a leading tab worked +if d==d goto dest4 +:dest4(a)space@ +echo goto with a following space worked diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index dee2c5b..e4644d3 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -82,3 +82,4 @@ if /I seems to work goto with no leading space worked goto with a leading space worked goto with a leading tab worked +goto with a following space worked

1 0

Alexandre Julliard : winex11: Fix event coordinates mapping for the root window in the explorer process.
by Alexandre Julliard Dec. 13, 2010

Dec. 13, 2010

Module: wine Branch: master Commit: 10aa13a98e4346e8af5e95a20eaefec7223a8c76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10aa13a98e4346e8af5e95a20… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 13 12:42:47 2010 +0100 winex11: Fix event coordinates mapping for the root window in the explorer process. --- dlls/winex11.drv/event.c | 1 + dlls/winex11.drv/mouse.c | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 5447a40..be3033b 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -788,6 +788,7 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev ) flags |= RDW_ALLCHILDREN; } + else OffsetRect( &rect, virtual_screen_rect.left, virtual_screen_rect.top ); RedrawWindow( hwnd, &rect, 0, flags ); } diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 71b31cc..a763798 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -239,6 +239,11 @@ static HWND update_mouse_state( HWND hwnd, Window window, int x, int y, unsigned x += data->whole_rect.left - data->client_rect.left; y += data->whole_rect.top - data->client_rect.top; } + if (window == root_window) + { + x += virtual_screen_rect.left; + y += virtual_screen_rect.top; + } pt->x = x; pt->y = y; if (GetWindowLongW( data->hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL)

1 0

Alexandre Julliard : user32: Fix coordinates mapping for the desktop window in the explorer process.
by Alexandre Julliard Dec. 13, 2010

Dec. 13, 2010

Module: wine Branch: master Commit: ee44c7c0f4665af2d7f2f29d4ac85a0cdbfa465a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee44c7c0f4665af2d7f2f29d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 13 12:42:19 2010 +0100 user32: Fix coordinates mapping for the desktop window in the explorer process. --- dlls/user32/win.c | 7 +++++-- dlls/user32/winpos.c | 6 ++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index f1da48b..b61d183 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -740,8 +740,11 @@ BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWind goto other_process; } win = parent; - OffsetRect( &window_rect, win->rectClient.left, win->rectClient.top ); - OffsetRect( &client_rect, win->rectClient.left, win->rectClient.top ); + if (win->parent) + { + OffsetRect( &window_rect, win->rectClient.left, win->rectClient.top ); + OffsetRect( &client_rect, win->rectClient.left, win->rectClient.top ); + } } break; } diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 6b623d2..03c16c9 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -445,7 +445,7 @@ static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored ) mirror_from = TRUE; offset.x += wndPtr->rectClient.right - wndPtr->rectClient.left; } - for (;;) + while (wndPtr->parent) { offset.x += wndPtr->rectClient.left; offset.y += wndPtr->rectClient.top; @@ -460,6 +460,7 @@ static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored ) goto other_process; } } + if (wndPtr && wndPtr != WND_DESKTOP) WIN_ReleasePtr( wndPtr ); } } @@ -475,7 +476,7 @@ static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored ) mirror_to = TRUE; offset.x -= wndPtr->rectClient.right - wndPtr->rectClient.left; } - for (;;) + while (wndPtr->parent) { offset.x -= wndPtr->rectClient.left; offset.y -= wndPtr->rectClient.top; @@ -490,6 +491,7 @@ static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored ) goto other_process; } } + if (wndPtr && wndPtr != WND_DESKTOP) WIN_ReleasePtr( wndPtr ); } }

1 0

Michael Stefaniuc : clock: Add the Telugu translation.
by Alexandre Julliard Dec. 13, 2010

Dec. 13, 2010

Module: wine Branch: master Commit: f845a7f05fde1388cefe14c6be96e4d6bca58da3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f845a7f05fde1388cefe14c6b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 12 23:48:27 2010 +0100 clock: Add the Telugu translation. Translation by Krishnababu Krothapalli. --- programs/clock/Makefile.in | 1 + programs/clock/Te.rc | 51 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/programs/clock/Makefile.in b/programs/clock/Makefile.in index dc89086..74d730b 100644 --- a/programs/clock/Makefile.in +++ b/programs/clock/Makefile.in @@ -34,6 +34,7 @@ RC_SRCS = \ Sk.rc \ Sr.rc \ Sv.rc \ + Te.rc \ Th.rc \ Tr.rc \ Uk.rc \ diff --git a/programs/clock/Te.rc b/programs/clock/Te.rc new file mode 100644 index 0000000..ed90884 --- /dev/null +++ b/programs/clock/Te.rc @@ -0,0 +1,51 @@ +/* + * Copyright 1998 Marcel Baur <mbaur(a)g26.ethz.ch> + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Copyright 2010 Krishnababu Krothapalli + * Michael Stefaniuc + * + * 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 "clock_res.h" + +#pragma code_page(65001) + +LANGUAGE LANG_TELUGU, SUBLANG_DEFAULT + +MAIN_MENU MENU +{ + POPUP "సమాచారము (&o)" { + MENUITEM "ఎనలాగ్ (&l)", IDM_ANALOG + MENUITEM "డిజిటల్ (&t)", IDM_DIGITAL + MENUITEM SEPARATOR + MENUITEM "ఫాంట్... (&F)", IDM_FONT + MENUITEM SEPARATOR + MENUITEM "శీర్షికపట్టీ లేకుండా (&W)", IDM_NOTITLE + MENUITEM SEPARATOR + MENUITEM "క్షణాలు (&S)", IDM_SECONDS + MENUITEM "తేది (&D)", IDM_DATE + MENUITEM SEPARATOR + MENUITEM "ఎల్లప్పుడూ పైన (&A)", IDM_ONTOP + } + POPUP "సమాచారము (&o)" { + MENUITEM "గడియారం గురించి... (&A)", IDM_ABOUT + } +} + +STRINGTABLE +{ + IDS_CLOCK, "గడియారం" +}

1 0

Andrew Bogott : winemenubuilder: In InvokeShellLinkerForURL, better replicate the deferral behavior in InvokeShellLinker.
by Alexandre Julliard Dec. 13, 2010

Dec. 13, 2010

Module: wine Branch: master Commit: 4c386998b08f18226d5ac1f5b159bf1e1abd9cae URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c386998b08f18226d5ac1f5b… Author: Andrew Bogott <Andrew(a)CodeWeavers.com> Date: Sat Dec 11 11:58:04 2010 -0600 winemenubuilder: In InvokeShellLinkerForURL, better replicate the deferral behavior in InvokeShellLinker. This gives us a second chance, if the icon file doesn't exist yet during the first call. --- programs/winemenubuilder/winemenubuilder.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index af1aa56..bb045a4 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2700,6 +2700,19 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link IPropertySetStorage_Release(pPropSetStg); } + /* fail - try once again after parent process exit */ + if( !icon_name ) + { + if (bWait) + { + WINE_WARN("Unable to extract icon, deferring.\n"); + ret = FALSE; + goto cleanup; + } + WINE_ERR("failed to extract icon from %s\n", + wine_dbgstr_w( pv[0].pwszVal )); + } + hSem = CreateSemaphoreA( NULL, 1, 1, "winemenubuilder_semaphore"); if( WAIT_OBJECT_0 != MsgWaitForMultipleObjects( 1, &hSem, FALSE, INFINITE, QS_ALLINPUT ) ) {

1 0

Jacek Caban : mshtml: Fixed tests on IEs not supporting INewWindowManager.
by Alexandre Julliard Dec. 13, 2010

Dec. 13, 2010

Module: wine Branch: master Commit: 47bb0de4bca4e51b5945635c26f9927a6512a91a URL: http://source.winehq.org/git/wine.git/?a=commit;h=47bb0de4bca4e51b5945635c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 12 18:13:43 2010 +0100 mshtml: Fixed tests on IEs not supporting INewWindowManager. --- dlls/mshtml/tests/htmldoc.c | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 9801d68..ed322ba 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -3572,22 +3572,31 @@ static void test_open_window(IHTMLDocument2 *doc) SET_EXPECT(EvaluateNewWindow); hres = IHTMLWindow2_open(window, url, name, NULL, VARIANT_FALSE, &new_window); - todo_wine - ok(hres == S_OK, "open failed: %08x\n", hres); - todo_wine - ok(new_window == NULL, "new_window != NULL\n"); + open_call = FALSE; + SysFreeString(url); + SysFreeString(name); todo_wine CHECK_CALLED(TranslateUrl); + + if(!called_EvaluateNewWindow) { + todo_wine + win_skip("INewWindowManager not supported\n"); + if(SUCCEEDED(hres) && new_window) + IHTMLWindow2_Release(new_window); + IHTMLWindow2_Release(window); + return; + } + todo_wine CHECK_CALLED(EvaluateNewWindow); - open_call = FALSE; - SysFreeString(url); - SysFreeString(name); + todo_wine + ok(hres == S_OK, "open failed: %08x\n", hres); + todo_wine + ok(new_window == NULL, "new_window != NULL\n"); IHTMLWindow2_Release(window); - SysFreeString(name); } static void test_clear(IHTMLDocument2 *doc)

1 0

Michael Stefaniuc : clock: Add the Malayalam translation.
by Alexandre Julliard Dec. 13, 2010

Dec. 13, 2010

Module: wine Branch: master Commit: 1cd20f8c48ac9b548ecdf1d81649b93742cd23a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cd20f8c48ac9b548ecdf1d81… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 12 23:47:42 2010 +0100 clock: Add the Malayalam translation. Translation by Ani Peter. --- programs/clock/Makefile.in | 1 + programs/clock/Ml.rc | 51 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/programs/clock/Makefile.in b/programs/clock/Makefile.in index 757b304..dc89086 100644 --- a/programs/clock/Makefile.in +++ b/programs/clock/Makefile.in @@ -23,6 +23,7 @@ RC_SRCS = \ Ja.rc \ Ko.rc \ Lt.rc \ + Ml.rc \ Nl.rc \ No.rc \ Pl.rc \ diff --git a/programs/clock/Ml.rc b/programs/clock/Ml.rc new file mode 100644 index 0000000..f20b54e --- /dev/null +++ b/programs/clock/Ml.rc @@ -0,0 +1,51 @@ +/* + * Copyright 1998 Marcel Baur <mbaur(a)g26.ethz.ch> + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Copyright 2010 Ani Peter + * Michael Stefaniuc + * + * 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 "clock_res.h" + +#pragma code_page(65001) + +LANGUAGE LANG_MALAYALAM, SUBLANG_NEUTRAL + +MAIN_MENU MENU +{ + POPUP "വി_വരം" { + MENUITEM "_അനലോഗ്", IDM_ANALOG + MENUITEM "_ഡിജിറ്റല്‍", IDM_DIGITAL + MENUITEM SEPARATOR + MENUITEM "_അക്ഷരസഞ്ചയം...", IDM_FONT + MENUITEM SEPARATOR + MENUITEM "റ്റൈറ്റില്‍ബാര്‍ _ഇല്ലാതെ", IDM_NOTITLE + MENUITEM SEPARATOR + MENUITEM "_സെക്കന്‍ഡുകള്‍", IDM_SECONDS + MENUITEM "_തീയതി", IDM_DATE + MENUITEM SEPARATOR + MENUITEM "_എപ്പോഴും മുകളില്‍", IDM_ONTOP + } + POPUP "വി_വരം" { + MENUITEM "ക്ലോക്കിനെപ്പറ്റി _അറിയുക...", IDM_ABOUT + } +} + +STRINGTABLE +{ + IDS_CLOCK, "ക്ലോക്ക്" +}

1 0