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

Caibin Chen : po: Update Simplified Chinese translation.
by Alexandre Julliard June 21, 2013

June 21, 2013

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 : Release 1.6-rc3.
by Alexandre Julliard June 21, 2013

June 21, 2013

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

Alexandre Julliard : po: Remove obsolete msgids from Dutch translation.
by Alexandre Julliard June 21, 2013

June 21, 2013

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

Tag wine-1.6-rc3 : Alexandre Julliard : Release 1.6-rc3
by Alexandre Julliard June 21, 2013

June 21, 2013

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

Piotr Caban : msvcrt: Don't forward memchr to ntdll.
by Alexandre Julliard June 21, 2013

June 21, 2013

Module: wine Branch: master Commit: bba1db09051f954e5eb0468c5e70b9ee8274b8b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bba1db09051f954e5eb0468c5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 21 15:39:23 2013 +0200 msvcrt: Don't forward memchr to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 55ebba9..afb12bf 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1367,7 +1367,7 @@ @ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s @ cdecl mbtowc(ptr str long) MSVCRT_mbtowc -@ cdecl memchr(ptr long long) ntdll.memchr +@ cdecl memchr(ptr long long) MSVCRT_memchr @ cdecl memcmp(ptr ptr long) ntdll.memcmp @ cdecl memcpy(ptr ptr long) MSVCRT_memcpy @ cdecl memcpy_s(ptr long ptr long) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index f2d1e20..c5d0e18 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1616,6 +1616,14 @@ char* __cdecl MSVCRT_strchr(const char *str, int c) } /********************************************************************* + * memchr (MSVCRT.@) + */ +void* __cdecl MSVCRT_memchr(const void *ptr, int c, MSVCRT_size_t n) +{ + return memchr(ptr, c, n); +} + +/********************************************************************* * strncmp (MSVCRT.@) */ int __cdecl MSVCRT_strncmp(const char *str1, const char *str2, MSVCRT_size_t len)

1 0

Piotr Caban : msvcrt: Add some _mbstok tests.
by Alexandre Julliard June 21, 2013

June 21, 2013

Module: wine Branch: master Commit: eb13a49de9e153a2a9e3b436198cf17313b0fb13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb13a49de9e153a2a9e3b4361… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 21 12:17:43 2013 +0200 msvcrt: Add some _mbstok tests. --- dlls/msvcr90/tests/msvcr90.c | 5 +++++ dlls/msvcrt/tests/string.c | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index fe3fa58..e4eee04 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -93,6 +93,7 @@ static __msvcrt_ulong* (__cdecl *p_doserrno)(void); static void (__cdecl *p_srand)(unsigned int); static char* (__cdecl *p_strtok)(char*, const char*); static wchar_t* (__cdecl *p_wcstok)(wchar_t*, const wchar_t*); +static unsigned char* (__cdecl *p__mbstok)(unsigned char*, const unsigned char*); static char* (__cdecl *p_strerror)(int); static wchar_t* (__cdecl *p_wcserror)(int); static char* (__cdecl *p_tmpnam)(char*); @@ -279,6 +280,7 @@ static BOOL init(void) SET(p_srand, "srand"); SET(p_strtok, "strtok"); SET(p_wcstok, "wcstok"); + SET(p__mbstok, "_mbstok"); SET(p_strerror, "strerror"); SET(p_wcserror, "_wcserror"); SET(p_tmpnam, "tmpnam"); @@ -1038,6 +1040,7 @@ static void test_getptd(void) DWORD tid = GetCurrentThreadId(); wchar_t testW[] = {'t','e','s','t',0}, tW[] = {'t',0}, *wp; char test[] = "test", *p; + unsigned char mbstok_test[] = "test", *up; struct tm time; __time64_t secs = 0; int dec, sign; @@ -1053,6 +1056,8 @@ static void test_getptd(void) ok(ptd->strtok_next == p+3, "ptd->strtok_next is incorrect\n"); wp = p_wcstok(testW, tW); ok(ptd->wcstok_next == wp+3, "ptd->wcstok_next is incorrect\n"); + up = p__mbstok(mbstok_test, (unsigned char*)"t"); + ok(ptd->mbstok_next == up+3, "ptd->mbstok_next is incorrect\n"); ok(p_strerror(0) == ptd->strerror_buffer, "ptd->strerror_buffer is incorrect\n"); ok(p_wcserror(0) == ptd->wcserror_buffer, "ptd->wcserror_buffer is incorrect\n"); ok(p_tmpnam(NULL) == ptd->tmpnam_buffer, "ptd->tmpnam_buffer is incorrect\n"); diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 6115377..15b6e4d 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2193,6 +2193,24 @@ static void test__mbslwr_s(void) buffer); } +static void test__mbstok(void) +{ + const unsigned char delim[] = "t"; + + char str[] = "!.!test"; + unsigned char *ret; + + strtok(str, "!"); + + ret = _mbstok(NULL, delim); + /* most versions of msvcrt use the same buffer for strtok and _mbstok */ + ok(!ret || broken((char*)ret==str+4), + "_mbstok(NULL, \"t\") = %p, expected NULL (%p)\n", ret, str); + + ret = _mbstok(NULL, delim); + ok(!ret, "_mbstok(NULL, \"t\") = %p, expected NULL\n", ret); +} + static void test__ultoa_s(void) { errno_t ret; @@ -2615,6 +2633,7 @@ START_TEST(string) test_mbctombb(); test_ismbclegal(); test_strtok(); + test__mbstok(); test_wcscpy_s(); test__wcsupr_s(); test_strtol();

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 June 21, 2013

June 21, 2013

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

Pavel Borecki : po: Update Czech translation.
by Alexandre Julliard June 21, 2013

June 21, 2013

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 June 21, 2013

June 21, 2013

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

Stefan Dösinger : wined3d: Fix the TMP_COLOR optimization with custom fog.
by Alexandre Julliard June 21, 2013

June 21, 2013

Module: wine Branch: master Commit: 248f4b74150b1517996396340cfe6c0c7d43cfcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=248f4b74150b1517996396340… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jun 21 12:06:50 2013 +0200 wined3d: Fix the TMP_COLOR optimization with custom fog. --- dlls/wined3d/arb_program_shader.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 8984e91..a9894da 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -278,7 +278,7 @@ struct shader_arb_ctx_priv BOOL muted; unsigned int num_loops, loop_depth, num_ifcs; int aL; - BOOL custom_linear_fog; + BOOL ps_post_process; unsigned int vs_clipplanes; BOOL footer_written; @@ -1161,8 +1161,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction break; case WINED3DSPR_COLOROUT: - if ((ctx->cur_ps_args->super.srgb_correction || ctx->custom_linear_fog) - && !reg->idx[0].offset) + if (ctx->ps_post_process && !reg->idx[0].offset) { strcpy(register_name, "TMP_COLOR"); } @@ -1852,9 +1851,9 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) } else if (ins->dst[0].reg.type == WINED3DSPR_COLOROUT && !ins->dst[0].reg.idx[0].offset && pshader) { - if (ctx->cur_ps_args->super.srgb_correction && shader->u.ps.color0_mov) + if (ctx->ps_post_process && shader->u.ps.color0_mov) { - shader_addline(buffer, "#mov handled in srgb write code\n"); + shader_addline(buffer, "#mov handled in srgb write or fog code\n"); return; } shader_hw_map2gl(ins); @@ -3585,6 +3584,7 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, struct arb_pshader_private *shader_priv = shader->backend_data; GLint errPos; DWORD map; + BOOL custom_linear_fog = FALSE; char srgbtmp[4][4]; unsigned int i, found = 0; @@ -3632,7 +3632,7 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, priv_ctx.cur_np2fixup_info = &compiled->np2fixup_info; init_ps_input(shader, args, &priv_ctx); list_init(&priv_ctx.control_frames); - priv_ctx.custom_linear_fog = FALSE; + priv_ctx.ps_post_process = args->super.srgb_correction; /* Avoid enabling NV_fragment_program* if we do not need it. * @@ -3687,7 +3687,8 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, case WINED3D_FFP_PS_FOG_LINEAR: if (gl_info->quirks & WINED3D_QUIRK_BROKEN_ARB_FOG) { - priv_ctx.custom_linear_fog = TRUE; + custom_linear_fog = TRUE; + priv_ctx.ps_post_process = TRUE; break; } shader_addline(buffer, "OPTION ARB_fog_linear;\n"); @@ -3719,7 +3720,7 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, } else { - if (args->super.srgb_correction || priv_ctx.custom_linear_fog) + if (priv_ctx.ps_post_process) { if (shader->u.ps.color0_mov) { @@ -3870,7 +3871,7 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, priv_ctx.target_version >= NV2); } - if (priv_ctx.custom_linear_fog) + if (custom_linear_fog) arbfp_add_linear_fog(buffer, fragcolor, "TA"); if(strcmp(fragcolor, "result.color")) {

1 0