August 2010 - Wine-Commits - list.winehq.org

Alexandre Goujon : msvcrt: Properly fix setlocale and clean up tests.
by Alexandre Julliard Aug. 31, 2010

Aug. 31, 2010

Module: wine Branch: master Commit: 2c08a3fbc7b7e4a3d16f1b0025447c2663a77833 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c08a3fbc7b7e4a3d16f1b002… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Mon Aug 30 14:07:30 2010 +0200 msvcrt: Properly fix setlocale and clean up tests. --- dlls/kernel32/nls/chs.nls | 2 +- dlls/kernel32/nls/cht.nls | 2 +- dlls/msvcrt/tests/locale.c | 34 ++++++++++++++++++---------------- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/nls/chs.nls b/dlls/kernel32/nls/chs.nls index c3e7bf8..65cf50c 100644 --- a/dlls/kernel32/nls/chs.nls +++ b/dlls/kernel32/nls/chs.nls @@ -97,7 +97,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED LOCALE_SDECIMAL "." LOCALE_SENGCOUNTRY "People's Republic of China" LOCALE_SENGCURRNAME "PRC Yuan Renminbi" - LOCALE_SENGLANGUAGE "Chinese" + LOCALE_SENGLANGUAGE "Chinese (Simplified)" LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "CNY" LOCALE_SISO3166CTRYNAME "CN" diff --git a/dlls/kernel32/nls/cht.nls b/dlls/kernel32/nls/cht.nls index b99fe42..129cd90 100644 --- a/dlls/kernel32/nls/cht.nls +++ b/dlls/kernel32/nls/cht.nls @@ -97,7 +97,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL LOCALE_SDECIMAL "." LOCALE_SENGCOUNTRY "Taiwan" LOCALE_SENGCURRNAME "New Taiwan Dollar" - LOCALE_SENGLANGUAGE "Chinese" + LOCALE_SENGLANGUAGE "Chinese (Traditional)" LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "TWD" LOCALE_SISO3166CTRYNAME "TW" diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 2496ebc..911bddd 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -110,32 +110,32 @@ static void test_setlocale(void) ret = setlocale(LC_ALL, "chinese"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - todo_wine ok(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936") + ok(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936") || broken(!strcmp(ret, "Chinese_Taiwan.950")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "chinese-simplified"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - todo_wine ok(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936") + ok(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936") || broken(!strcmp(ret, "Chinese_People's Republic of China.936")) || broken(!strcmp(ret, "Chinese_Taiwan.950")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "chinese-traditional"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - todo_wine ok(!strcmp(ret, "Chinese (Traditional)_Taiwan.950") + ok(!strcmp(ret, "Chinese (Traditional)_Taiwan.950") || broken(!strcmp(ret, "Chinese_Taiwan.950")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "chs"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - todo_wine ok(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936") + ok(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936") || broken(!strcmp(ret, "Chinese_People's Republic of China.936")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "cht"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - todo_wine ok(!strcmp(ret, "Chinese (Traditional)_Taiwan.950") + ok(!strcmp(ret, "Chinese (Traditional)_Taiwan.950") || broken(!strcmp(ret, "Chinese_Taiwan.950")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "csy"); @@ -390,12 +390,14 @@ static void test_setlocale(void) ret = setlocale(LC_ALL, "italian-swiss"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - ok(!strcmp(ret, "Italian_Switzerland.1252") || broken(!strcmp(ret, "Italian_Italy.1252")), "ret = %s\n", ret); + ok(!strcmp(ret, "Italian_Switzerland.1252") + || broken(!strcmp(ret, "Italian_Italy.1252")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "its"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - ok(!strcmp(ret, "Italian_Switzerland.1252") || broken(!strcmp(ret, "Italian_Italy.1252")), "ret = %s\n", ret); + ok(!strcmp(ret, "Italian_Switzerland.1252") + || broken(!strcmp(ret, "Italian_Italy.1252")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "japanese"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); @@ -431,31 +433,31 @@ static void test_setlocale(void) ret = setlocale(LC_ALL, "non"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - todo_wine ok((!strcmp( ret, "Norwegian-Nynorsk_Norway.1252")) + ok(!strcmp( ret, "Norwegian-Nynorsk_Norway.1252") + || !strcmp(ret, "Norwegian (Nynorsk)_Norway.1252") || broken(!strcmp(ret, "Norwegian (Bokm�l)_Norway.1252")) - || broken(!strcmp(ret, "Norwegian_Norway.1252")) - || broken(!strcmp(ret, "Norwegian (Nynorsk)_Norway.1252")), "ret = %s\n", ret); + || broken(!strcmp(ret, "Norwegian_Norway.1252")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "nor"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) ok(!strcmp(ret, "Norwegian (Bokm�l)_Norway.1252") - || broken(!strcmp(ret, "Norwegian (Bokmal)_Norway.1252")) + || !strcmp(ret, "Norwegian (Bokmal)_Norway.1252") || broken(!strcmp(ret, "Norwegian_Norway.1252")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "norwegian-bokmal"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) ok(!strcmp(ret, "Norwegian (Bokm�l)_Norway.1252") - || broken(!strcmp(ret, "Norwegian (Bokmal)_Norway.1252")) + || !strcmp(ret, "Norwegian (Bokmal)_Norway.1252") || broken(!strcmp(ret, "Norwegian_Norway.1252")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "norwegian-nynorsk"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - todo_wine ok(!strcmp(ret, "Norwegian-Nynorsk_Norway.1252") + ok(!strcmp(ret, "Norwegian-Nynorsk_Norway.1252") + || !strcmp(ret, "Norwegian (Nynorsk)_Norway.1252") || broken(!strcmp(ret, "Norwegian_Norway.1252")) - || broken(!strcmp(ret, "Norwegian (Nynorsk)_Norway.1252")) || broken(!strcmp(ret, "Norwegian (Bokmal)_Norway.1252")) || broken(!strcmp(ret, "Norwegian (Bokm�l)_Norway.1252")), "ret = %s\n", ret); @@ -524,8 +526,8 @@ static void test_setlocale(void) ret = setlocale(LC_ALL, "spanish-modern"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - todo_wine ok(!strcmp(ret, "Spanish - Modern Sort_Spain.1252") - || broken(!strcmp(ret, "Spanish_Spain.1252")), "ret = %s\n", ret); + ok(!strcmp(ret, "Spanish - Modern Sort_Spain.1252") + || !strcmp(ret, "Spanish_Spain.1252"), "ret = %s\n", ret); ret = setlocale(LC_ALL, "sve"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n");

1 0

Alexandre Julliard : configure: Make it a fatal error when some maintainer mode tools are not found.
by Alexandre Julliard Aug. 31, 2010

Aug. 31, 2010

Module: wine Branch: master Commit: 364559b0ef7c22f495106e2b235563cfa59b608e URL: http://source.winehq.org/git/wine.git/?a=commit;h=364559b0ef7c22f495106e2b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 31 16:50:17 2010 +0200 configure: Make it a fatal error when some maintainer mode tools are not found. --- configure | 11 ++++++----- configure.ac | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/configure b/configure index b2481f4..ad2824d 100755 --- a/configure +++ b/configure @@ -5116,12 +5116,12 @@ then MAINTAINER_MODE=\# else - if test "$FONTFORGE" = "false"; then as_fn_append wine_warnings "|fontforge is missing, fonts can't be rebuilt."; fi - if test "$RSVG" = "false"; then as_fn_append wine_warnings "|rsvg is missing, icons can't be rebuilt."; fi + if test "$FONTFORGE" = "false"; then as_fn_error "You need fontforge to rebuild fonts in maintainer mode." "$LINENO" 5; fi + if test "$RSVG" = "false"; then as_fn_error "You need rsvg to rebuild icons in maintainer mode." "$LINENO" 5; fi if test "$CONVERT" = false then - as_fn_append wine_warnings "|imagemagick is missing, icons can't be rebuilt." + as_fn_error "You need imagemagick to rebuild icons in maintainer mode." "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for recent enough imagemagick" >&5 $as_echo_n "checking for recent enough imagemagick... " >&6; } @@ -5133,13 +5133,13 @@ $as_echo_n "checking for recent enough imagemagick... " >&6; } if test "$convert_version_major" -eq 6 -a "$convert_version_minor" -lt 6 then CONVERT=false - as_fn_append wine_warnings "|imagemagick version 6.6 or newer is needed to rebuild icons." fi fi if test "$CONVERT" = false then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no ($convert_version_major.$convert_version_minor)" >&5 $as_echo "no ($convert_version_major.$convert_version_minor)" >&6; } + as_fn_error "You need imagemagick version 6.6 or newer to rebuild icons in maintainer mode." "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($convert_version_major.$convert_version_minor)" >&5 $as_echo "yes ($convert_version_major.$convert_version_minor)" >&6; } @@ -5148,7 +5148,7 @@ $as_echo "yes ($convert_version_major.$convert_version_minor)" >&6; } if test "$ICOTOOL" = false then - as_fn_append wine_warnings "|icotool is missing, icons can't be rebuilt." + as_fn_error "You need icotool to rebuild icons in maintainer mode." "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for recent enough icotool" >&5 $as_echo_n "checking for recent enough icotool... " >&6; } @@ -5167,6 +5167,7 @@ $as_echo_n "checking for recent enough icotool... " >&6; } then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no ($icotool_version_major.$icotool_version_minor)" >&5 $as_echo "no ($icotool_version_major.$icotool_version_minor)" >&6; } + as_fn_error "You need icotool version 0.29.0 or newer to rebuild icons in maintainer mode." "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($icotool_version_major.$icotool_version_minor)" >&5 $as_echo "yes ($icotool_version_major.$icotool_version_minor)" >&6; } diff --git a/configure.ac b/configure.ac index 9133f5d..0fe8ebe 100644 --- a/configure.ac +++ b/configure.ac @@ -295,13 +295,13 @@ if test "x$enable_maintainer_mode" != "xyes" then AC_SUBST([MAINTAINER_MODE],[\#]) else - if test "$FONTFORGE" = "false"; then WINE_WARNING([fontforge is missing, fonts can't be rebuilt.]); fi - if test "$RSVG" = "false"; then WINE_WARNING([rsvg is missing, icons can't be rebuilt.]); fi + if test "$FONTFORGE" = "false"; then AC_MSG_ERROR([You need fontforge to rebuild fonts in maintainer mode.]); fi + if test "$RSVG" = "false"; then AC_MSG_ERROR([You need rsvg to rebuild icons in maintainer mode.]); fi dnl Check the imagemagick version if test "$CONVERT" = false then - WINE_WARNING([imagemagick is missing, icons can't be rebuilt.]) + AC_MSG_ERROR([You need imagemagick to rebuild icons in maintainer mode.]) else AC_MSG_CHECKING([for recent enough imagemagick]) convert_version=`convert --version | head -n1` @@ -312,12 +312,12 @@ else if test "$convert_version_major" -eq 6 -a "$convert_version_minor" -lt 6 then CONVERT=false - WINE_WARNING([imagemagick version 6.6 or newer is needed to rebuild icons.]) fi fi if test "$CONVERT" = false then AC_MSG_RESULT([no ($convert_version_major.$convert_version_minor)]) + AC_MSG_ERROR([You need imagemagick version 6.6 or newer to rebuild icons in maintainer mode.]) else AC_MSG_RESULT([yes ($convert_version_major.$convert_version_minor)]) fi @@ -326,7 +326,7 @@ else dnl Check the icotool version if test "$ICOTOOL" = false then - WINE_WARNING([icotool is missing, icons can't be rebuilt.]) + AC_MSG_ERROR([You need icotool to rebuild icons in maintainer mode.]) else AC_MSG_CHECKING([for recent enough icotool]) icotool_version=`icotool --version | head -n1` @@ -343,6 +343,7 @@ else if test "$ICOTOOL" = false then AC_MSG_RESULT([no ($icotool_version_major.$icotool_version_minor)]) + AC_MSG_ERROR([You need icotool version 0.29.0 or newer to rebuild icons in maintainer mode.]) else AC_MSG_RESULT([yes ($icotool_version_major.$icotool_version_minor)]) fi

1 0

Mike Kaplinskiy : server: Allow queuing async reads on listening sockets.
by Alexandre Julliard Aug. 31, 2010

Aug. 31, 2010

Module: wine Branch: master Commit: 333313aa2be3e56c07c535da6e1ab503f0879d91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=333313aa2be3e56c07c535da6… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sun Aug 29 18:09:55 2010 -0400 server: Allow queuing async reads on listening sockets. --- server/sock.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/server/sock.c b/server/sock.c index 886872d..4f54c46 100644 --- a/server/sock.c +++ b/server/sock.c @@ -492,15 +492,12 @@ static int sock_get_poll_events( struct fd *fd ) if (sock->state & FD_CONNECT) /* connecting, wait for writable */ return POLLOUT; - if (sock->state & FD_WINE_LISTENING) - /* listening, wait for readable */ - return (mask & FD_ACCEPT) ? POLLIN : 0; if ( async_queued( sock->read_q ) ) { if ( async_waiting( sock->read_q ) ) ev |= POLLIN | POLLPRI; } - else if (smask & FD_READ) + else if (smask & FD_READ || (sock->state & FD_WINE_LISTENING && mask & FD_ACCEPT)) ev |= POLLIN | POLLPRI; /* We use POLLIN with 0 bytes recv() as FD_CLOSE indication for stream sockets. */ else if ( sock->type == SOCK_STREAM && sock->state & FD_READ && mask & FD_CLOSE && @@ -545,7 +542,7 @@ static void sock_queue_async( struct fd *fd, const async_data_t *data, int type, return; } - if ( ( !( sock->state & (FD_READ|FD_CONNECT) ) && type == ASYNC_TYPE_READ ) || + if ( ( !( sock->state & (FD_READ|FD_CONNECT|FD_WINE_LISTENING) ) && type == ASYNC_TYPE_READ ) || ( !( sock->state & (FD_WRITE|FD_CONNECT) ) && type == ASYNC_TYPE_WRITE ) ) { set_error( STATUS_PIPE_DISCONNECTED );

1 0

Paul Bolle : winedbg: gdbproxy: Quietly handle qSupported and qTStatus.
by Alexandre Julliard Aug. 31, 2010

Aug. 31, 2010

Module: wine Branch: master Commit: f942cb33ab30902ad6bf746b003f53246b1f6de4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f942cb33ab30902ad6bf746b0… Author: Paul Bolle <pebolle(a)tiscali.nl> Date: Mon Aug 30 13:34:37 2010 +0200 winedbg: gdbproxy: Quietly handle qSupported and qTStatus. --- programs/winedbg/gdbproxy.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 4f12481..bb2cdbe 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1831,8 +1831,9 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) case 'S': if (strncmp(gdbctx->in_packet, "Symbol::", gdbctx->in_packet_len) == 0) return packet_ok; - if (strncmp(gdbctx->in_packet, "Supported", gdbctx->in_packet_len) == 0) + if (strncmp(gdbctx->in_packet, "Supported", 9) == 0) { + /* no features supported */ packet_reply_open(gdbctx); packet_reply_close(gdbctx); return packet_done; @@ -1855,6 +1856,13 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) packet_reply_close(gdbctx); return packet_done; } + if (strncmp(gdbctx->in_packet, "TStatus", 7) == 0) + { + /* Tracepoints not supported */ + packet_reply_open(gdbctx); + packet_reply_close(gdbctx); + return packet_done; + } break; } if (gdbctx->trace & GDBPXY_TRC_COMMAND_ERROR)

1 0

Mike Kaplinskiy : server: Add accept_into_socket to accept into an initialized socket.
by Alexandre Julliard Aug. 31, 2010

Aug. 31, 2010

Module: wine Branch: master Commit: ae5ad61fa8cf6e5f9fcda078868c972cb77c9da8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae5ad61fa8cf6e5f9fcda0788… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sun Aug 29 18:09:53 2010 -0400 server: Add accept_into_socket to accept into an initialized socket. --- include/wine/server_protocol.h | 19 +++++- server/fd.c | 24 ++----- server/protocol.def | 7 ++ server/request.h | 5 + server/sock.c | 162 +++++++++++++++++++++++++++++++--------- server/trace.c | 9 ++ 6 files changed, 170 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ae5ad61fa8cf6e5f9fcda…

1 0

Mike Kaplinskiy : server: Don't cache sockets until they are pollable.
by Alexandre Julliard Aug. 31, 2010

Aug. 31, 2010

Module: wine Branch: master Commit: 92b83ddffb1bbd51a929003afe6c875f77be0bad URL: http://source.winehq.org/git/wine.git/?a=commit;h=92b83ddffb1bbd51a929003af… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sun Aug 29 18:09:49 2010 -0400 server: Don't cache sockets until they are pollable. --- server/sock.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 02f4a6d..7e1cd7e 100644 --- a/server/sock.c +++ b/server/sock.c @@ -248,6 +248,7 @@ static int sock_reselect( struct sock *sock ) if (!(sock->state & ~FD_WINE_NONBLOCKING)) return 0; /* ok, it is, attach it to the wineserver's main poll loop */ sock->polling = 1; + allow_fd_caching( sock->fd ); } /* update condition mask */ set_fd_events( sock->fd, ev ); @@ -646,7 +647,6 @@ static struct object *create_socket( int family, int type, int protocol, unsigne release_object( sock ); return NULL; } - allow_fd_caching( sock->fd ); sock_reselect( sock ); clear_error(); return &sock->obj; @@ -719,7 +719,6 @@ static struct sock *accept_socket( obj_handle_t handle ) release_object( sock ); return NULL; } - allow_fd_caching( acceptsock->fd ); } clear_error(); sock->pmask &= ~FD_ACCEPT;

1 0

Akihiro Sagawa : jscript: Update Japanese translation.
by Alexandre Julliard Aug. 31, 2010

Aug. 31, 2010

Module: wine Branch: master Commit: 0f8acb8d463578fd2abcac85c50d1c59c0ce6475 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f8acb8d463578fd2abcac85c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Aug 30 23:08:12 2010 +0900 jscript: Update Japanese translation. --- dlls/jscript/jscript_Ja.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Ja.rc b/dlls/jscript/jscript_Ja.rc index b95e4aa..d1949e3 100644 --- a/dlls/jscript/jscript_Ja.rc +++ b/dlls/jscript/jscript_Ja.rc @@ -30,6 +30,7 @@ STRINGTABLE IDS_INVALID_CALL_ARG "手続き呼び出しまたは引数が無効です" IDS_CREATE_OBJ_ERROR "オートメーションサーバはオブジェクトを生成できません" IDS_NO_PROPERTY "オブジェクトはこのプロパティまたはメソッドをサポートしていません" + IDS_UNSUPPORTED_ACTION "オブジェクトはこの操作をサポートしていません" IDS_ARG_NOT_OPT "引数は省略できません" IDS_SYNTAX_ERROR "文法エラー" IDS_SEMICOLON "';'を期待していました"

1 0

Jacek Caban : mshtml: Use LONGLONG/ULONGLONG for PRInt64/PRUint64.
by Alexandre Julliard Aug. 31, 2010

Aug. 31, 2010

Module: wine Branch: master Commit: 890a5e3e1947fdd173070b5eca9c1a3e0d7ddda8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=890a5e3e1947fdd173070b5ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 31 13:22:35 2010 +0200 mshtml: Use LONGLONG/ULONGLONG for PRInt64/PRUint64. --- dlls/mshtml/nsiface.idl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index a344899..d4ab0b7 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -49,8 +49,8 @@ typedef WORD PRUint16; typedef INT16 PRInt16; typedef BYTE PRUint8; typedef BOOL PRBool; -typedef LARGE_INTEGER PRInt64; -typedef ULARGE_INTEGER PRUint64; +typedef LONGLONG PRInt64; +typedef ULONGLONG PRUint64; typedef PRUint64 DOMTimeStamp; typedef PRUint32 nsLoadFlags;

1 0

Akihiro Sagawa : mshtml: Update Japanese translation.
by Alexandre Julliard Aug. 31, 2010

Aug. 31, 2010

Module: wine Branch: master Commit: b2ca3feb3dd426bedeeacddc4a7039e00661d744 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2ca3feb3dd426bedeeacddc4… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Aug 30 23:08:19 2010 +0900 mshtml: Update Japanese translation. --- dlls/mshtml/Ja.rc | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/Ja.rc b/dlls/mshtml/Ja.rc index f8c0e44..3d2a5eb 100644 --- a/dlls/mshtml/Ja.rc +++ b/dlls/mshtml/Ja.rc @@ -25,6 +25,12 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT STRINGTABLE { + IDS_STATUS_DONE "完了" + IDS_STATUS_DOWNLOADINGFROM "%s からダウンロード中..." +} + +STRINGTABLE +{ IDS_HTMLDISABLED "HTML レンダリングは現在、無効です。" IDS_HTMLDOCUMENT "HTML 文書" IDS_DOWNLOADING "ダウンロードしています..." @@ -36,9 +42,11 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Wine Gecko インストーラ" FONT 9, "MS Shell Dlg" { - LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML " \ - "to work correctly. Wine can automatically download and install it for you.\n\n" \ - "Note: it's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.", + LTEXT "Gecko パッケージが見つかりません。このパッケージは、HTML を組み込んだ" \ + "アプリケーションが正しく動作するために必要です。 " \ + "Wine で Gecko パッケージを自動的にダウンロードし、インストールできます。\n\n" \ + "注意: 代わりにディストリビューションのパッケージを利用することをおすすめします。" \ + "詳しくは、http://wiki.winehq.org/Gecko を参照ください。", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "Progress", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 DEFPUSHBUTTON "インストール(&I)", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP

1 0

Jacek Caban : mshtml: Marked invalid test as broken.
by Alexandre Julliard Aug. 31, 2010

Aug. 31, 2010

Module: wine Branch: master Commit: 551d98dd201c9ada20378222174a2d451b176e89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=551d98dd201c9ada203782221… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 31 13:10:29 2010 +0200 mshtml: Marked invalid test as broken. --- dlls/mshtml/tests/dom.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b19822e..8f4c66c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6834,8 +6834,7 @@ static void run_domtest(const char *str, domtest_t test) test(doc); ref = IHTMLDocument2_Release(doc); - ok(!ref || - ref == 1, /* Vista */ + ok(!ref || broken(ref == 1), /* Vista */ "ref = %d\n", ref); }

1 0