June 2013 - Wine-commits - list.winehq.org

Caibin Chen : po: Update Simplified Chinese translation.
by Alexandre Julliard 21 Jun '13

21 Jun '13

Module: wine Branch: master Commit: abfe8a5b9644b862fa8f5dfe58b7740b68fe4786 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abfe8a5b9644b862fa8f5dfe5… Author: Caibin Chen <tigersoldi(a)gmail.com> Date: Fri Jun 21 09:27:34 2013 -0700 po: Update Simplified Chinese translation. --- po/zh_CN.po | 375 ++++++++++++++++++++++++++++++----------------------------- 1 files changed, 192 insertions(+), 183 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=abfe8a5b9644b862fa8f5…

1 0

Alexandre Julliard : po: Remove obsolete msgids from Dutch translation.
by Alexandre Julliard 21 Jun '13

21 Jun '13

Module: wine Branch: master Commit: 1ac9815deb73d9992263a75ca1dc63dc00e22e34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ac9815deb73d9992263a75ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 19:50:06 2013 +0200 po: Remove obsolete msgids from Dutch translation. --- po/nl.po | 54 ------------------------------------------------------ 1 files changed, 0 insertions(+), 54 deletions(-) diff --git a/po/nl.po b/po/nl.po index 5f527b8..f1b533d 100644 --- a/po/nl.po +++ b/po/nl.po @@ -159,19 +159,10 @@ msgid "Cancel" msgstr "Annuleren" #: appwiz.rc:112 -#| msgid "Wine Gecko Installer" msgid "Wine Mono Installer" msgstr "Wine-Mono-Installatie" #: appwiz.rc:115 -#| msgid "" -#| "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 is recommended to use your distribution's packages instead. See " -#| "<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> " -#| "for details." msgid "" "Wine could not find a Mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" @@ -2221,12 +2212,10 @@ msgstr "" "certificaat terugroeplijst of certificaat vertrouwenslijst bevatten:" #: cryptui.rc:296 -#| msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (.p7b)" msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (*.p7b)" msgstr "Cryptographisch berichtsyntaxis standaard/PKCS #7 berichten (.p7b)" #: cryptui.rc:298 -#| msgid "Personal Information Exchange/PKCS #12 (.pfx, .p12)" msgid "Personal Information Exchange/PKCS #12 (*.pfx; *.p12)" msgstr "Persoonlijke informatie uitwisseling/PKCS #12 (.pfx, .p12)" @@ -2373,12 +2362,10 @@ msgid "Select the format you want to use:" msgstr "Selecteer het formaat dat u wilt gebruiken:" #: cryptui.rc:405 -#| msgid "&DER-encoded X.509 (.cer)" msgid "&DER-encoded X.509 (*.cer)" msgstr "&DER-geëncodeerde X.509 (.cer)" #: cryptui.rc:407 -#| msgid "Ba&se64-encoded X.509 (.cer):" msgid "Ba&se64-encoded X.509 (*.cer):" msgstr "Ba&se64-geëncodeerde X.509 (.cer):" @@ -3475,17 +3462,14 @@ msgid "&Disable" msgstr "&Uitzetten" #: joy.rc:37 -#| msgid "&enable" msgid "&Enable" msgstr "Activ&eren" #: joy.rc:38 -#| msgid "Disconnected" msgid "Connected" msgstr "Verbonden" #: joy.rc:40 -#| msgid "&Disable" msgid "Disabled" msgstr "Deactiveren" @@ -3510,7 +3494,6 @@ msgid "Test Force Feedback" msgstr "Test Force Feedback" #: joy.rc:64 -#| msgid "Available formats" msgid "Available Effects" msgstr "Beschikbare effecten" @@ -3523,7 +3506,6 @@ msgstr "" "richting van het effect kan veranderd worden met de assen van de controller." #: joy.rc:28 -#| msgid "Create Control" msgid "Game Controllers" msgstr "Spelbesturing" @@ -3576,7 +3558,6 @@ msgid "Expected ')'" msgstr "')' verwacht" #: jscript.rc:37 -#| msgid "Invalid parameter.\n" msgid "Invalid character" msgstr "Ongeldig teken" @@ -3661,12 +3642,10 @@ msgid "URI to be decoded is incorrect" msgstr "De te decoderen URI is niet correct" #: jscript.rc:58 -#| msgid "Enumeration value out of range.\n" msgid "Number of fraction digits is out of range" msgstr "Aantal getallen achter de komma buiten bereik." #: jscript.rc:59 -#| msgid "Subscript out of range" msgid "Precision is out of range" msgstr "Precisie is buiten bereik" @@ -8345,7 +8324,6 @@ msgid "Security Warning" msgstr "Veiligheidswaarschuwing" #: urlmon.rc:32 -#| msgid "Do you want to continue anyway?" msgid "Do you want to install this software?" msgstr "Wilt U deze software installeren?" @@ -8354,7 +8332,6 @@ msgid "Location:" msgstr "Locatie:" #: urlmon.rc:36 -#| msgid "Install/Uninstall" msgid "Don't install" msgstr "Niet installeren" @@ -8368,17 +8345,14 @@ msgstr "" "vertrouwt." #: urlmon.rc:48 -#| msgid "Installation transform failed to apply.\n" msgid "Installation of component failed: %08x" msgstr "Installatie van onderdeel mislukt: %08x" #: urlmon.rc:49 -#| msgid "&Install" msgid "Install (%d)" msgstr "Installeer (%d)" #: urlmon.rc:50 -#| msgid "&Install" msgid "Install" msgstr "Installeer" @@ -10225,7 +10199,6 @@ msgid "Wine Command Prompt" msgstr "Wine Command Prompt" #: cmd.rc:349 -#| msgid "CMD Version %1!S!\n" msgid "Wine CMD Version %1!S!\n" msgstr "Wine CMD versie %1!S!\n" @@ -10268,7 +10241,6 @@ msgid "Expected an operand.\n" msgstr "Verwacht een operand.\n" #: cmd.rc:359 -#| msgid "Unexpected network error.\n" msgid "Expected an operator.\n" msgstr "Verwacht een operator.\n" @@ -10333,7 +10305,6 @@ msgid "Connection-specific DNS suffix" msgstr "Verbindings-specifiek DNS-achtervoegsel" #: ipconfig.rc:33 -#| msgid "IP address" msgid "IPv4 address" msgstr "IPv4-adres" @@ -10378,7 +10349,6 @@ msgid "Default gateway" msgstr "Standaard gateway" #: ipconfig.rc:47 -#| msgid "IP address" msgid "IPv6 address" msgstr "IPv6-adres" @@ -10513,7 +10483,6 @@ msgid "The following services are running:\n" msgstr "De volgende services draaien:\n" #: netstat.rc:27 -#| msgid "LAN Connection" msgid "Active Connections" msgstr "Actieve verbindingen" @@ -10522,22 +10491,18 @@ msgid "Proto" msgstr "Proto" #: netstat.rc:29 -#| msgid "Email Address" msgid "Local Address" msgstr "Locaal adres" #: netstat.rc:30 -#| msgid "Street Address" msgid "Foreign Address" msgstr "Buitenlands adres" #: netstat.rc:31 -#| msgid "Status" msgid "State" msgstr "Staat" #: netstat.rc:32 -#| msgid "Interfaces" msgid "Interface Statistics" msgstr "Interface Statistieken" @@ -10550,7 +10515,6 @@ msgid "Received" msgstr "Ontvangen" #: netstat.rc:35 -#| msgid "bytes" msgid "Bytes" msgstr "Bytes" @@ -10563,17 +10527,14 @@ msgid "Non-unicast packets" msgstr "Niet-Unicast pakketten" #: netstat.rc:38 -#| msgid "Disclaimer" msgid "Discards" msgstr "Weggegooid" #: netstat.rc:39 -#| msgid "Error" msgid "Errors" msgstr "Fouten" #: netstat.rc:40 -#| msgid "Unknown port.\n" msgid "Unknown protocols" msgstr "Onbekende protocollen." @@ -10582,7 +10543,6 @@ msgid "TCP Statistics for IPv4" msgstr "TCP Statistieken voor IPv4" #: netstat.rc:42 -#| msgid "LAN Connection" msgid "Active Opens" msgstr "Actieve openingen" @@ -10591,27 +10551,22 @@ msgid "Passive Opens" msgstr "Passieve openingen" #: netstat.rc:44 -#| msgid "LAN Connection" msgid "Failed Connection Attempts" msgstr "Mislukte verbindingspogingen" #: netstat.rc:45 -#| msgid "LAN Connection" msgid "Reset Connections" msgstr "Opnieuw verbinden" #: netstat.rc:46 -#| msgid "LAN Connection" msgid "Current Connections" msgstr "Huidige verbindingen" #: netstat.rc:47 -#| msgid "Segment locked.\n" msgid "Segments Received" msgstr "Ontvangen Segmenten" #: netstat.rc:48 -#| msgid "Segment locked.\n" msgid "Segments Sent" msgstr "Verzonden Segmenten" @@ -10624,17 +10579,14 @@ msgid "UDP Statistics for IPv4" msgstr "UDP Statistieken voor IPv4" #: netstat.rc:51 -#| msgid "Segment locked.\n" msgid "Datagrams Received" msgstr "Ontvangen Datagrammen." #: netstat.rc:52 -#| msgid "Local Port" msgid "No Ports" msgstr "Geen poorten" #: netstat.rc:53 -#| msgid "Decoding Error" msgid "Receive Errors" msgstr "Ontvangstfouten" @@ -13825,17 +13777,14 @@ msgid "Not yet implemented" msgstr "Nog niet geimplementeerd" #: winefile.rc:106 -#| msgid "Creation failed.\n" msgid "Creation date" msgstr "Aanmaakdatum" #: winefile.rc:107 -#| msgid "Access denied.\n" msgid "Access date" msgstr "Toegangsdatum" #: winefile.rc:108 -#| msgid "Certification Path" msgid "Modification date" msgstr "Wijzigingsdatum" @@ -14047,17 +13996,14 @@ msgid "Help topics: " msgstr "Help-onderwerpen: " #: wmic.rc:25 -#| msgid "Error: Invalid command line parameters\n" msgid "Error: Command line not supported\n" msgstr "Fout: Commandoregel niet ondersteund\n" #: wmic.rc:26 -#| msgid "Property set not found.\n" msgid "Error: Alias not found\n" msgstr "Fout: Alias niet gevonden.\n" #: wmic.rc:27 -#| msgid "Error: Invalid key name\n" msgid "Error: Invalid query\n" msgstr "Fout: Foutieve zoekopdracht\n"

1 0

Alexandre Julliard : Release 1.6-rc3.
by Alexandre Julliard 21 Jun '13

21 Jun '13

Module: wine Branch: master Commit: cca4e123b2aa28cf72c60b41ad7f7c856f19af64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cca4e123b2aa28cf72c60b41a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 20:24:01 2013 +0200 Release 1.6-rc3. --- ANNOUNCE | 315 +++++++++++++++++++++++++++++++++---------------------------- VERSION | 2 +- configure | 18 ++-- 3 files changed, 179 insertions(+), 156 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cca4e123b2aa28cf72c60…

1 0

Tag wine-1.6-rc3 : Alexandre Julliard : Release 1.6-rc3
by Alexandre Julliard 21 Jun '13

21 Jun '13

Module: wine Branch: refs/tags/wine-1.6-rc3 Tag: 278b90d2a0c62a00bf1c1ab3a2465ce00ffe6a6f URL: http://source.winehq.org/git/wine.git/?a=tag;h=278b90d2a0c62a00bf1c1ab3a246… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 20:24:01 2013 +0200 Release 1.6-rc3

1 0

Marcus Meissner : wbemprox: Fixed leaking dirstack (Coverity).
by Alexandre Julliard 21 Jun '13

21 Jun '13

Module: wine Branch: master Commit: 7bf97430418dda0c84928fe624e116fab016c5f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bf97430418dda0c84928fe62… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Jun 20 22:44:00 2013 +0200 wbemprox: Fixed leaking dirstack (Coverity). --- dlls/wbemprox/builtin.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 3cf47f8..9e2369a 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1273,11 +1273,13 @@ static enum fill_status fill_directory( struct table *table, const struct expr * DWORD drives = GetLogicalDrives(); WIN32_FIND_DATAW data; HANDLE handle; - struct dirstack *dirstack = alloc_dirstack(2); + struct dirstack *dirstack; enum fill_status status = FILL_STATUS_UNFILTERED; if (!resize_table( table, 4, sizeof(*rec) )) return FILL_STATUS_FAILED; + dirstack = alloc_dirstack(2); + for (i = 0; i < sizeof(drives); i++) { if (!(drives & (1 << i))) continue;

1 0

Ken Thomases : winemac: Fix off-by-one errors when indexing into pixel_formats array with 1-based pixel format number .
by Alexandre Julliard 21 Jun '13

21 Jun '13

Module: wine Branch: master Commit: a8efa5271b5c4db9e1dc280cf37d9d199cb276bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8efa5271b5c4db9e1dc280cf… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jun 21 03:34:00 2013 -0500 winemac: Fix off-by-one errors when indexing into pixel_formats array with 1-based pixel format number. --- dlls/winemac.drv/opengl.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index b1d2c1e..931b9ee 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1555,7 +1555,7 @@ static BOOL macdrv_wglBindTexImageARB(struct wgl_pbuffer *pbuffer, int iBuffer) switch (iBuffer) { case WGL_FRONT_LEFT_ARB: - if (pixel_formats[pbuffer->format].stereo) + if (pixel_formats[pbuffer->format - 1].stereo) source = GL_FRONT_LEFT; else source = GL_FRONT; @@ -1564,7 +1564,7 @@ static BOOL macdrv_wglBindTexImageARB(struct wgl_pbuffer *pbuffer, int iBuffer) source = GL_FRONT_RIGHT; break; case WGL_BACK_LEFT_ARB: - if (pixel_formats[pbuffer->format].stereo) + if (pixel_formats[pbuffer->format - 1].stereo) source = GL_BACK_LEFT; else source = GL_BACK; @@ -1943,7 +1943,7 @@ static struct wgl_pbuffer *macdrv_wglCreatePbufferARB(HDC hdc, int iPixelFormat, TRACE("hdc %p iPixelFormat %d iWidth %d iHeight %d piAttribList %p\n", hdc, iPixelFormat, iWidth, iHeight, piAttribList); - if (!is_valid_pixel_format(iPixelFormat) || !pixel_formats[iPixelFormat].pbuffer) + if (!is_valid_pixel_format(iPixelFormat) || !pixel_formats[iPixelFormat - 1].pbuffer) { WARN("invalid pixel format %d\n", iPixelFormat); SetLastError(ERROR_INVALID_PIXEL_FORMAT);

1 0

Ken Thomases : winemac: Avoid overdriving single-buffered GL if possible; the system throttles us.
by Alexandre Julliard 21 Jun '13

21 Jun '13

Module: wine Branch: master Commit: 3c7bc8202c3fbf63b36572b9ac97f980d25152ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c7bc8202c3fbf63b36572b9a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jun 21 03:34:03 2013 -0500 winemac: Avoid overdriving single-buffered GL if possible; the system throttles us. Use glFlushRenderAPPLE(), if available, instead of glFlush() calls less than 1/60th of a second since the last. --- dlls/winemac.drv/opengl.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 931b9ee..904158b 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -66,6 +66,7 @@ struct wgl_context struct wgl_pbuffer *read_pbuffer; BOOL has_been_current; BOOL sharing; + DWORD last_flush_time; }; @@ -101,6 +102,8 @@ static const char *opengl_func_names[] = { ALL_WGL_FUNCS }; static void (*pglCopyColorTable)(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); static void (*pglCopyPixels)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type); +static void (*pglFlush)(void); +static void (*pglFlushRenderAPPLE)(void); static void (*pglReadPixels)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void *pixels); static void (*pglViewport)(GLint x, GLint y, GLsizei width, GLsizei height); @@ -1490,6 +1493,28 @@ static void macdrv_glCopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, } +static void macdrv_glFlush(void) +{ + struct wgl_context *context = NtCurrentTeb()->glContext; + const pixel_format *pf = &pixel_formats[context->format - 1]; + DWORD now = GetTickCount(); + + TRACE("double buffer %d last flush time %d now %d\n", (int)pf->double_buffer, + context->last_flush_time, now); + if (pglFlushRenderAPPLE && !pf->double_buffer && (now - context->last_flush_time) < 17) + { + TRACE("calling glFlushRenderAPPLE()\n"); + pglFlushRenderAPPLE(); + } + else + { + TRACE("calling glFlush()\n"); + pglFlush(); + context->last_flush_time = now; + } +} + + /********************************************************************** * macdrv_glReadPixels * @@ -3024,6 +3049,7 @@ static BOOL init_opengl(void) #define REDIRECT(func) \ do { p##func = opengl_funcs.gl.p_##func; opengl_funcs.gl.p_##func = macdrv_##func; } while(0) REDIRECT(glCopyPixels); + REDIRECT(glFlush); REDIRECT(glReadPixels); REDIRECT(glViewport); #undef REDIRECT @@ -3037,6 +3063,9 @@ static BOOL init_opengl(void) if (!init_gl_info()) goto failed; + if (gluCheckExtension((GLubyte*)"GL_APPLE_flush_render", (GLubyte*)gl_info.glExtensions)) + pglFlushRenderAPPLE = wine_dlsym(opengl_handle, "glFlushRenderAPPLE", NULL, 0); + load_extensions(); if (!init_pixel_formats()) goto failed;

1 0

Pavel Borecki : po: Update Czech translation.
by Alexandre Julliard 21 Jun '13

21 Jun '13

Module: wine Branch: master Commit: 0e171311ff304715cde67e50df3d0d252284f502 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e171311ff304715cde67e50d… Author: Pavel Borecki <pavel.borecki(a)gmail.com> Date: Fri Jun 21 10:42:28 2013 +0200 po: Update Czech translation. --- po/cs.po | 1073 +++++++++++++++++++++++++++----------------------------------- 1 files changed, 473 insertions(+), 600 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e171311ff304715cde67…

1 0

Roger Koot : po: Update Dutch translation.
by Alexandre Julliard 21 Jun '13

21 Jun '13

Module: wine Branch: master Commit: 537ec17aa65b1f63bb5e4caecd913cd54a23c4d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=537ec17aa65b1f63bb5e4caec… Author: Roger Koot <roger.koot(a)gmail.com> Date: Fri Jun 21 15:37:03 2013 +0200 po: Update Dutch translation. --- po/nl.po | 519 ++++++++++++++++++++++++++------------------------------------ 1 files changed, 216 insertions(+), 303 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=537ec17aa65b1f63bb5e4…

1 0

Hans Leidekker : wintrust/tests: Replace the self-signed certificate with one that expires in ten years.
by Alexandre Julliard 21 Jun '13

21 Jun '13

Module: wine Branch: master Commit: e1b4334f893f804c5d948f0461ef2f3573409bcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1b4334f893f804c5d948f046… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 21 15:21:04 2013 +0200 wintrust/tests: Replace the self-signed certificate with one that expires in ten years. --- dlls/wintrust/tests/softpub.c | 135 ++++++++++++++++++++++++++++++++++------- 1 files changed, 112 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e1b4334f893f804c5d948…

1 0