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

Gerald Pfeifer : dsound/tests: Fix two broken conditions.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 94203b5ddb4b1d988465a68320d43b23db9b303d URL: http://source.winehq.org/git/wine.git/?a=commit;h=94203b5ddb4b1d988465a6832… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Jun 19 19:17:22 2009 +0200 dsound/tests: Fix two broken conditions. --- dlls/dsound/tests/dsound8.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index a52f653..a2b16d8 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -759,7 +759,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfxe.Format.cbSize = sizeof(wfxe) - sizeof(wfx) + 1; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); - ok(((rc==DSERR_CONTROLUNAVAIL || DSERR_INVALIDCALL /* 2003 */) && !secondary) + ok(((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL /* 2003 */) && !secondary) || rc==DS_OK /* driver dependent? */, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); @@ -805,7 +805,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfxe.Format.cbSize = sizeof(wfxe) + 1; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); - ok(((rc==DSERR_CONTROLUNAVAIL || DSERR_INVALIDCALL /* 2003 */) && !secondary) + ok(((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL /* 2003 */) && !secondary) || rc==DS_OK /* driver dependent? */, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary);

1 0

Gerald Pfeifer : d3d9/tests: Fix three incorrect logic conditions.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 9b043744cd468752666a761e8c079e3d159d7dea URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b043744cd468752666a761e8… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Jun 19 19:22:48 2009 +0200 d3d9/tests: Fix three incorrect logic conditions. --- dlls/d3d9/tests/query.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/query.c b/dlls/d3d9/tests/query.c index 51a8668..8fc66e9 100644 --- a/dlls/d3d9/tests/query.c +++ b/dlls/d3d9/tests/query.c @@ -105,7 +105,7 @@ static void test_query_support(IDirect3D9 *pD3d, HWND hwnd) for(i = 0; i < sizeof(queries) / sizeof(queries[0]); i++) { hr = IDirect3DDevice9_CreateQuery(pDevice, queries[i].type, NULL); - ok(hr == D3D_OK || D3DERR_NOTAVAILABLE, + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3DDevice9_CreateQuery returned unexpected return value %08x for query %s\n", hr, queryName(queries[i].type)); supported = (hr == D3D_OK ? TRUE : FALSE); @@ -119,7 +119,7 @@ static void test_query_support(IDirect3D9 *pD3d, HWND hwnd) queryName(queries[i].type)); hr = IDirect3DDevice9_CreateQuery(pDevice, queries[i].type, &pQuery); - ok(hr == D3D_OK || D3DERR_NOTAVAILABLE, + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3DDevice9_CreateQuery returned unexpected return value %08x for query %s\n", hr, queryName(queries[i].type)); ok(!(supported && !pQuery), "Query %s was claimed to be supported, but can't be created\n", queryName(queries[i].type)); ok(!(!supported && pQuery), "Query %s was claimed not to be supported, but can be created\n", queryName(queries[i].type)); @@ -163,7 +163,7 @@ static void test_occlusion_query_states(IDirect3D9 *pD3d, HWND hwnd) } hr = IDirect3DDevice9_CreateQuery(pDevice, D3DQUERYTYPE_OCCLUSION, &pQuery); - ok(hr == D3D_OK || D3DERR_NOTAVAILABLE, + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3DDevice9_CreateQuery returned unexpected return value %08x\n", hr); if(!pQuery) { skip("Occlusion queries not supported\n");

1 0

Jaime Rave : notepad: Update Spanish translation.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: e1f1774498f8c13a3843a86a07c1ec98a011c3d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1f1774498f8c13a3843a86a0… Author: Jaime Rave <jaimerave(a)gmail.com> Date: Sun Jun 21 12:29:29 2009 -0500 notepad: Update Spanish translation. --- programs/notepad/Es.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Es.rc b/programs/notepad/Es.rc index dd19927..ae1e0f7 100644 --- a/programs/notepad/Es.rc +++ b/programs/notepad/Es.rc @@ -55,6 +55,7 @@ POPUP "&Editar" { POPUP "&Buscar" { MENUITEM "&Buscar...\tCtrl+F", CMD_SEARCH MENUITEM "Buscar &siguiente\tF3", CMD_SEARCH_NEXT + MENUITEM "&Reemplazar...\tCtrl+H", CMD_REPLACE } POPUP "A&yuda" { MENUITEM "�&ndice", CMD_HELP_CONTENTS

1 0

Aric Stewart : browseui: Add Japanese translation.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 43f6c4cb70f7488aa12ee2bb0e25fc3e4a4e7b8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=43f6c4cb70f7488aa12ee2bb0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 22 10:21:34 2009 +0900 browseui: Add Japanese translation. --- dlls/browseui/rsrc.rc | 1 + dlls/browseui/rsrc_Ja.rc | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/browseui/rsrc.rc b/dlls/browseui/rsrc.rc index c16391f..e593c38 100644 --- a/dlls/browseui/rsrc.rc +++ b/dlls/browseui/rsrc.rc @@ -28,6 +28,7 @@ #include "rsrc_En.rc" #include "rsrc_Es.rc" #include "rsrc_Fr.rc" +#include "rsrc_Ja.rc" #include "rsrc_Ko.rc" #include "rsrc_Lt.rc" #include "rsrc_Nl.rc" diff --git a/dlls/browseui/rsrc_Ja.rc b/dlls/browseui/rsrc_Ja.rc new file mode 100644 index 0000000..ee78414 --- /dev/null +++ b/dlls/browseui/rsrc_Ja.rc @@ -0,0 +1,42 @@ +/* + * Copyright 2009 Aric Stewart, CodeWeavers + * + * 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 + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_CANCELLING "キャンセル…" +} + +IDD_PROGRESS_DLG DIALOG 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 + PUSHBUTTON "キャンセル(&C)", IDCANCEL, 205, 65, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX +} + +#pragma code_page(default)

1 0

Alexandre Julliard : winebuild: Add possibility to generate a global resource file without running it through windres .
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 6cf96bf9400c320a77581066abb698b32f683d98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cf96bf9400c320a77581066a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 22 11:46:33 2009 +0200 winebuild: Add possibility to generate a global resource file without running it through windres. --- tools/winebuild/main.c | 2 +- tools/winebuild/res32.c | 35 +++++++++++++++++++++++------------ 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 9419231..77cfc45 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -244,7 +244,7 @@ static const char usage_str[] = " --def Build a .def file from a .spec file\n" " --exe Build a .c file for an executable\n" " --relay16 Build the 16-bit relay assembly routines\n" -" --relay32 Build the 32-bit relay assembly routines\n\n" +" --relay32 Build the 32-bit relay assembly routines\n" " --resources Build a .o file for the resource files\n\n" "The mode options are mutually exclusive; you must specify one and only one.\n\n"; diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index ed902bb..93d9c3c 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -541,8 +541,7 @@ void output_res_o_file( DLLSPEC *spec ) { unsigned int i, total_size; unsigned char *data; - char *res_file, *cmd; - const char *prog; + char *res_file = NULL; int fd, err; if (!spec->nb_resources) fatal_error( "--resources mode needs at least one resource file as input\n" ); @@ -593,20 +592,32 @@ void output_res_o_file( DLLSPEC *spec ) } assert( file_out_pos == file_out_end ); - res_file = get_temp_file_name( output_file_name, ".res" ); - if ((fd = open( res_file, O_WRONLY|O_CREAT|O_TRUNC, 0600 )) == -1) - fatal_error( "Cannot create %s\n", res_file ); + /* if the output file name is a .res too, don't run the results through windres */ + if (strendswith( output_file_name, ".res")) + { + if ((fd = open( output_file_name, O_WRONLY|O_CREAT|O_TRUNC, 0666 )) == -1) + fatal_error( "Cannot create %s\n", output_file_name ); + } + else + { + res_file = get_temp_file_name( output_file_name, ".res" ); + if ((fd = open( res_file, O_WRONLY|O_CREAT|O_TRUNC, 0600 )) == -1) + fatal_error( "Cannot create %s\n", res_file ); + } if (write( fd, data, total_size ) != total_size) fatal_error( "Error writing to %s\n", res_file ); close( fd ); free( data ); - prog = get_windres_command(); - cmd = xmalloc( strlen(prog) + strlen(res_file) + strlen(output_file_name) + 9 ); - sprintf( cmd, "%s -i %s -o %s", prog, res_file, output_file_name ); - if (verbose) fprintf( stderr, "%s\n", cmd ); - err = system( cmd ); - if (err) fatal_error( "%s failed with status %d\n", prog, err ); - free( cmd ); + if (res_file) + { + const char *prog = get_windres_command(); + char *cmd = xmalloc( strlen(prog) + strlen(res_file) + strlen(output_file_name) + 9 ); + sprintf( cmd, "%s -i %s -o %s", prog, res_file, output_file_name ); + if (verbose) fprintf( stderr, "%s\n", cmd ); + err = system( cmd ); + if (err) fatal_error( "%s failed with status %d\n", prog, err ); + free( cmd ); + } output_file_name = NULL; /* so we don't try to assemble it */ }

1 0

Alexandre Julliard : wrc: Add support for loading multiple input files at once.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: e25bc79da1fb69faa9815caac2f093bb47ff968a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e25bc79da1fb69faa9815caac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 22 12:05:57 2009 +0200 wrc: Add support for loading multiple input files at once. --- tools/wrc/parser.h | 1 + tools/wrc/parser.l | 2 + tools/wrc/parser.y | 20 +++++-- tools/wrc/wrc.c | 154 ++++++++++++++++++++++++++----------------------- tools/wrc/wrc.man.in | 4 +- 5 files changed, 102 insertions(+), 79 deletions(-) diff --git a/tools/wrc/parser.h b/tools/wrc/parser.h index b9e2045..e9fc8e6 100644 --- a/tools/wrc/parser.h +++ b/tools/wrc/parser.h @@ -34,5 +34,6 @@ extern char *parser_text; extern int yy_flex_debug; int parser_lex(void); +int parser_lex_destroy(void); #endif diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index bddc309..e706100 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -121,6 +121,8 @@ cident [a-zA-Z_][0-9a-zA-Z_]* /* Always update the current character position within a line */ #define YY_USER_ACTION char_number+=yyleng; wanted_id = want_id; want_id = 0; +#define YY_USER_INIT current_codepage = -1; + static void addcchar(char c); static void addwchar(WCHAR s); static string_t *get_buffered_cstring(void); diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index 512d272..f891f24 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -169,12 +169,12 @@ int want_nl = 0; /* Signal flex that we need the next newline */ int want_id = 0; /* Signal flex that we need the next identifier */ -stringtable_t *tagstt; /* Stringtable tag. +static stringtable_t *tagstt; /* Stringtable tag. * It is set while parsing a stringtable to one of * the stringtables in the sttres list or a new one * if the language was not parsed before. */ -stringtable_t *sttres; /* Stringtable resources. This holds the list of +static stringtable_t *sttres; /* Stringtable resources. This holds the list of * stringtables with different lanuages */ static int dont_want_id = 0; /* See language parsing for details */ @@ -358,7 +358,7 @@ static int rsrcid_to_token(int lookahead); resource_file : resources { - resource_t *rsc; + resource_t *rsc, *head; /* First add stringtables to the resource-list */ rsc = build_stt_resources(sttres); /* 'build_stt_resources' returns a head and $1 is a tail */ @@ -384,8 +384,18 @@ resource_file } else $1 = rsc; - /* Final statement before were done */ - resource_top = get_resource_head($1); + + /* Final statements before were done */ + head = get_resource_head($1); + if (resource_top) /* append to existing resources */ + { + resource_t *tail = resource_top; + while (tail->next) tail = tail->next; + tail->next = head; + head->prev = tail; + } + else resource_top = head; + sttres = NULL; } ; diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 05bd3f8..833d602 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -232,6 +232,68 @@ static void exit_on_signal( int sig ) exit(1); /* this will call the atexit functions */ } +/* load a single input file */ +static int load_file( const char *input_name, const char *output_name ) +{ + int ret; + + /* Run the preprocessor on the input */ + if(!no_preprocess) + { + /* + * Preprocess the input to a temp-file, or stdout if + * no output was given. + */ + + chat("Starting preprocess\n"); + + if (!preprocess_only) + { + ret = wpp_parse_temp( input_name, output_name, &temp_name ); + } + else if (output_name) + { + FILE *output; + + if (!(output = fopen( output_name, "w" ))) + fatal_perror( "Could not open %s for writing", output_name ); + ret = wpp_parse( input_name, output ); + fclose( output ); + } + else + { + ret = wpp_parse( input_name, stdout ); + } + + if (ret) return ret; + + if(preprocess_only) + { + output_name = NULL; + exit(0); + } + + input_name = temp_name; + } + + /* Go from .rc to .res */ + chat("Starting parse\n"); + + if(!(parser_in = fopen(input_name, "rb"))) + fatal_perror("Could not open %s for input", input_name); + + ret = parser_parse(); + fclose(parser_in); + parser_lex_destroy(); + if (temp_name) + { + unlink( temp_name ); + temp_name = NULL; + } + return ret; +} + + int main(int argc,char *argv[]) { extern char* optarg; @@ -240,7 +302,6 @@ int main(int argc,char *argv[]) int opti = 0; int stdinc = 1; int lose = 0; - int ret; int i; int cmdlen; @@ -402,20 +463,6 @@ int main(int argc,char *argv[]) wpp_add_include_path(INCLUDEDIR"/msvcrt"); wpp_add_include_path(INCLUDEDIR"/windows"); } - - /* Check for input file on command-line */ - if(optind < argc) - { - if (!input_name) input_name = argv[optind++]; - else error("Too many input files.\n"); - } - - /* Check for output file on command-line */ - if(optind < argc) - { - if (!output_name) output_name = argv[optind++]; - else error("Too many output files.\n"); - } /* Kill io buffering when some kind of debuglevel is enabled */ if(debuglevel) @@ -435,65 +482,28 @@ int main(int argc,char *argv[]) if(!currentlanguage) currentlanguage = new_language(0, 0); - /* Generate appropriate outfile names */ - if(!output_name && !preprocess_only) - { - output_name = dup_basename(input_name, ".rc"); - strcat(output_name, ".res"); - } atexit(cleanup_files); - /* Run the preprocessor on the input */ - if(!no_preprocess) - { - /* - * Preprocess the input to a temp-file, or stdout if - * no output was given. - */ - - chat("Starting preprocess\n"); - - if (!preprocess_only) - { - ret = wpp_parse_temp( input_name, output_name, &temp_name ); - } - else if (output_name) - { - FILE *output; - - if (!(output = fopen( output_name, "w" ))) - fatal_perror( "Could not open %s for writing", output_name ); - ret = wpp_parse( input_name, output ); - fclose( output ); - } - else - { - ret = wpp_parse( input_name, stdout ); - } - - if(ret) - exit(1); /* Error during preprocess */ - - if(preprocess_only) - { - output_name = NULL; - exit(0); - } - - input_name = temp_name; - } - - /* Go from .rc to .res */ - chat("Starting parse\n"); - - if(!(parser_in = fopen(input_name, "rb"))) - fatal_perror("Could not open %s for input", input_name); - - ret = parser_parse(); - - if(input_name) fclose(parser_in); - - if(ret) exit(1); /* Error during parse */ + if (input_name) /* specified with -i option */ + { + if(!output_name && !preprocess_only) + { + output_name = dup_basename(input_name, ".rc"); + strcat(output_name, ".res"); + } + if (load_file( input_name, output_name )) exit(1); + } + + while (optind < argc) + { + input_name = argv[optind++]; + if(!output_name && !preprocess_only) + { + output_name = dup_basename(input_name, ".rc"); + strcat(output_name, ".res"); + } + if (load_file( input_name, output_name )) exit(1); + } if(debuglevel & DEBUGLEVEL_DUMP) dump_resources(resource_top); diff --git a/tools/wrc/wrc.man.in b/tools/wrc/wrc.man.in index 7dfefc0..5c8d0c0 100644 --- a/tools/wrc/wrc.man.in +++ b/tools/wrc/wrc.man.in @@ -3,7 +3,7 @@ .SH NAME wrc \- Wine Resource Compiler .SH SYNOPSIS -.BI "wrc " "[options] " "[inputfile]" +.BI "wrc " "[options] " "[inputfiles]" .SH DESCRIPTION .B wrc compiles resources from \fBinputfile\fR @@ -14,7 +14,7 @@ preprocessor before the resources are compiled. See \fBPREPROCESSOR\fR below. .PP .B wrc -takes only one \fBinputfile\fR as argument. The resources are read from +takes a series of \fBinputfile\fR as argument. The resources are read from standard input if no inputfile is given. If the output file is not specified with \fI-o\fR, then \fBwrc\fR will write the output to \fBinputfile.res\fR with \fB.rc\fR stripped, or to \fBwrc.tab.res\fR if

1 0

Aric Stewart : mshtml: Update Japanese resources.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 2f0546a3249ec8de8818c8399120b52329bc9cbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f0546a3249ec8de8818c8399… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sun Jun 21 16:55:11 2009 +0900 mshtml: Update Japanese resources. --- dlls/mshtml/Ja.rc | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/Ja.rc b/dlls/mshtml/Ja.rc index 81bf8f8..4e060d7 100644 --- a/dlls/mshtml/Ja.rc +++ b/dlls/mshtml/Ja.rc @@ -56,4 +56,14 @@ FONT 9, "MS Shell Dlg" PUSHBUTTON "キャンセル", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP } +ID_PROMPT_DIALOG DIALOG 0, 0, 200, 90 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", ID_PROMPT_PROMPT, 10, 10, 180, 30 + EDITTEXT ID_PROMPT_EDIT, 10, 45, 180, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "キャンセル", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP +} #pragma code_page(default)

1 0

Stefan Dösinger : wined3d: Advertise SM 3. 0 in ARB if the extensions are available.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 3845b37a213eef7b903dc0a7d3823f5882ee946b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3845b37a213eef7b903dc0a7d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 18 18:28:41 2009 +0200 wined3d: Advertise SM 3.0 in ARB if the extensions are available. --- dlls/wined3d/arb_program_shader.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index fbd56a0..affc2ae 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4124,9 +4124,14 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, const WineD3D_GL_Info *g none_shader_backend.shader_get_caps(devtype, gl_info, pCaps); if(GL_SUPPORT(ARB_VERTEX_PROGRAM)) { - /* Shader Model 2.0 requires at least 256 vertex shader constants */ - if(GL_LIMITS(vshader_constantsF) >= 256) + if(GL_SUPPORT(NV_VERTEX_PROGRAM3)) { + pCaps->VertexShaderVersion = WINED3DVS_VERSION(3,0); + TRACE_(d3d_caps)("Hardware vertex shader version 3.0 enabled (NV_VERTEX_PROGRAM3)\n"); + } + else if(GL_LIMITS(vshader_constantsF) >= 256) + { + /* Shader Model 2.0 requires at least 256 vertex shader constants */ pCaps->VertexShaderVersion = WINED3DVS_VERSION(2,0); TRACE_(d3d_caps)("Hardware vertex shader version 2.0 enabled (ARB_PROGRAM)\n"); } @@ -4139,9 +4144,14 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, const WineD3D_GL_Info *g } if(GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) { - /* Shader Model 2.0 requires at least 32 pixel shader constants */ - if(GL_LIMITS(vshader_constantsF) >= 32) + if(GL_SUPPORT(NV_FRAGMENT_PROGRAM2)) + { + pCaps->PixelShaderVersion = WINED3DPS_VERSION(3,0); + TRACE_(d3d_caps)("Hardware pixel shader version 3.0 enabled (NV_FRAGMENT_PROGRAM2)\n"); + } + else if(GL_LIMITS(vshader_constantsF) >= 32) { + /* Shader Model 2.0 requires at least 32 pixel shader constants */ pCaps->PixelShaderVersion = WINED3DPS_VERSION(2,0); TRACE_(d3d_caps)("Hardware pixel shader version 2.0 enabled (ARB_PROGRAM)\n"); }

1 0

Stefan Dösinger : wined3d: GLSL 1. 20 includes gl_FragData[] syntax.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 95788401af0f299ba7189b8a3f412a74b18b0713 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95788401af0f299ba7189b8a3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 18 18:17:45 2009 +0200 wined3d: GLSL 1.20 includes gl_FragData[] syntax. This means we don't have to enable ARB_draw_buffers explicitly. --- dlls/wined3d/glsl_shader.c | 20 +++----------------- 1 files changed, 3 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e065296..035844a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -189,10 +189,8 @@ static void print_glsl_info_log(const WineD3D_GL_Info *gl_info, GLhandleARB obj) "Vertex shader(s) linked, no fragment shader(s) defined. \n ", /* fglrx, with \n */ "Vertex shader(s) linked, no fragment shader(s) defined.", /* fglrx, no \n */ "Fragment shader was successfully compiled to run on hardware.\n" - "WARNING: 0:2: extension 'GL_ARB_draw_buffers' is not supported", "Fragment shader(s) linked, no vertex shader(s) defined.", /* fglrx, no \n */ "Fragment shader(s) linked, no vertex shader(s) defined. \n ", /* fglrx, with \n */ - "WARNING: 0:2: extension 'GL_ARB_draw_buffers' is not supported\n" /* MacOS ati */ }; if (!TRACE_ON(d3d_shader) && !FIXME_ON(d3d_shader)) return; @@ -1258,9 +1256,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * if (reg->idx >= GL_LIMITS(buffers)) WARN("Write to render target %u, only %d supported\n", reg->idx, GL_LIMITS(buffers)); - if (GL_SUPPORT(ARB_DRAW_BUFFERS)) sprintf(register_name, "gl_FragData[%u]", reg->idx); - /* On older cards with GLSL support like the GeforceFX there's only one buffer. */ - else sprintf(register_name, "gl_FragColor"); + sprintf(register_name, "gl_FragData[%u]", reg->idx); break; case WINED3DSPR_RASTOUT: @@ -3647,9 +3643,6 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShaderImpl *This, shader_addline(buffer, "#version 120\n"); - if (GL_SUPPORT(ARB_DRAW_BUFFERS)) { - shader_addline(buffer, "#extension GL_ARB_draw_buffers : enable\n"); - } if(GL_SUPPORT(ARB_SHADER_TEXTURE_LOD) && reg_maps->usestexldd) { shader_addline(buffer, "#extension GL_ARB_shader_texture_lod : enable\n"); } @@ -3676,17 +3669,10 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShaderImpl *This, if (reg_maps->shader_version.major < 2) { /* Some older cards like GeforceFX ones don't support multiple buffers, so also not gl_FragData */ - if(GL_SUPPORT(ARB_DRAW_BUFFERS)) - shader_addline(buffer, "gl_FragData[0] = R0;\n"); - else - shader_addline(buffer, "gl_FragColor = R0;\n"); + shader_addline(buffer, "gl_FragData[0] = R0;\n"); } - if(GL_SUPPORT(ARB_DRAW_BUFFERS)) { - fragcolor = "gl_FragData[0]"; - } else { - fragcolor = "gl_FragColor"; - } + fragcolor = "gl_FragData[0]"; if(args->srgb_correction) { shader_addline(buffer, "tmp0.xyz = pow(%s.xyz, vec3(%f, %f, %f)) * vec3(%f, %f, %f) - vec3(%f, %f, %f);\n", fragcolor, srgb_pow, srgb_pow, srgb_pow, srgb_mul_high, srgb_mul_high, srgb_mul_high,

1 0

Aurimas Fišeras : mpr: Add Lithuanian translation.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: d7434fea990b61394bbf4347ad46eb6ec8b2613e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7434fea990b61394bbf4347a… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Fri Jun 19 20:36:25 2009 +0300 mpr: Add Lithuanian translation. --- dlls/mpr/mpr.rc | 1 + dlls/mpr/mpr_Lt.rc | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/mpr/mpr.rc b/dlls/mpr/mpr.rc index e9f0cfb..adc0d72 100644 --- a/dlls/mpr/mpr.rc +++ b/dlls/mpr/mpr.rc @@ -36,6 +36,7 @@ #include "mpr_It.rc" #include "mpr_Ja.rc" #include "mpr_Ko.rc" +#include "mpr_Lt.rc" #include "mpr_Nl.rc" #include "mpr_No.rc" #include "mpr_Pl.rc" diff --git a/dlls/mpr/mpr_Lt.rc b/dlls/mpr/mpr_Lt.rc new file mode 100644 index 0000000..aa5dd14 --- /dev/null +++ b/dlls/mpr/mpr_Lt.rc @@ -0,0 +1,51 @@ +/* + * MPR dll resources + * + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * 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 + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "Visas tinklas" +} + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Įveskite tinklo slaptažodį" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Įveskite savo naudotojo vardą ir slaptažodį:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Įgaliot. serv.", -1, 40, 26, 50, 10 +/* LTEXT "Sritis", -1, 40, 46, 50, 10 */ + LTEXT "Naudotojas", -1, 40, 66, 50, 10 + LTEXT "Slaptažodis", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "Į&rašyti šį slaptažodį (nesaugu)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Gerai", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Atsisakyti", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + +#pragma code_page(default)

1 0