winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
November 2018
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
951 discussions
Start a n
N
ew thread
Jacek Caban : widl: Add -acf command line option.
by Alexandre Julliard
09 Nov '18
09 Nov '18
Module: wine Branch: master Commit: 1db0ad9798fe58450d298435eaeb80586b57dfac URL:
https://source.winehq.org/git/wine.git/?a=commit;h=1db0ad9798fe58450d298435…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 9 14:16:51 2018 +0100 widl: Add -acf command line option. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/widl.c | 17 ++++++++++++----- tools/widl/widl.h | 1 + tools/widl/widl.man.in | 2 ++ 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 3baebd0..410efb4 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -51,6 +51,7 @@ static const char usage[] = "Usage: widl [options...] infile.idl\n" " or: widl [options...] --dlldata-only name1 [name2...]\n" +" --acf=file Use ACF file\n" " -app_config Ignored, present for midl compatibility\n" " -b arch Set the target architecture\n" " -c Generate client stub\n" @@ -122,6 +123,7 @@ static enum stub_mode stub_mode = MODE_Os; char *input_name; char *input_idl_name; +char *acf_name; char *header_name; char *local_stubs_name; char *header_token; @@ -151,6 +153,8 @@ time_t now; enum { OLDNAMES_OPTION = CHAR_MAX + 1, + ACF_OPTION, + APP_CONFIG_OPTION, DLLDATA_OPTION, DLLDATA_ONLY_OPTION, LOCAL_STUBS_OPTION, @@ -160,17 +164,18 @@ enum { PRINT_HELP, RT_NS_PREFIX, RT_OPTION, + ROBUST_OPTION, WIN32_OPTION, WIN64_OPTION, WIN32_ALIGN_OPTION, - WIN64_ALIGN_OPTION, - APP_CONFIG_OPTION, - ROBUST_OPTION + WIN64_ALIGN_OPTION }; static const char short_options[] = "b:cC:d:D:EhH:I:m:No:O:pP:rsS:tT:uU:VW"; static const struct option long_options[] = { + { "acf", 1, NULL, ACF_OPTION }, + { "app_config", 0, NULL, APP_CONFIG_OPTION }, { "dlldata", 1, NULL, DLLDATA_OPTION }, { "dlldata-only", 0, NULL, DLLDATA_ONLY_OPTION }, { "help", 0, NULL, PRINT_HELP }, @@ -187,7 +192,6 @@ static const struct option long_options[] = { { "win64", 0, NULL, WIN64_OPTION }, { "win32-align", 1, NULL, WIN32_ALIGN_OPTION }, { "win64-align", 1, NULL, WIN64_ALIGN_OPTION }, - { "app_config", 0, NULL, APP_CONFIG_OPTION }, { NULL, 0, NULL, 0 } }; @@ -613,10 +617,13 @@ int main(int argc,char *argv[]) if(win64_packing != 2 && win64_packing != 4 && win64_packing != 8) error("Packing must be one of 2, 4 or 8\n"); break; + case ACF_OPTION: + acf_name = xstrdup(optarg); + break; case APP_CONFIG_OPTION: /* widl does not distinguish between app_mode and default mode, but we ignore this option for midl compatibility */ - break; + break; case ROBUST_OPTION: /* FIXME: Support robust option */ break; diff --git a/tools/widl/widl.h b/tools/widl/widl.h index 7530f9f..118e224 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -54,6 +54,7 @@ extern int use_abi_namespace; extern char *input_name; extern char *input_idl_name; +extern char *acf_name; extern char *header_name; extern char *header_token; extern char *local_stubs_name; diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in index d8b665e..7d89db3 100644 --- a/tools/widl/widl.man.in +++ b/tools/widl/widl.man.in @@ -121,6 +121,8 @@ number. For the meaning of values, see the \fBDEBUG\fR section. .B Miscellaneous options: .IP "\fB-app_config\fR" Ignored, present for midl compatibility. +.IP "\fB--acf=\fIfile\fR" +Use specified application configuration file. .IP "\fB--local-stubs=\fIfile\fR" Generate empty stubs for call_as/local methods in an object interface and write them to \fIfile\fR.
1
0
0
0
Jacek Caban : widl: Preprocess and attempt to parse provided ACF file.
by Alexandre Julliard
09 Nov '18
09 Nov '18
Module: wine Branch: master Commit: d6b76df314b8d7b265276a68ebeb1266933306ef URL:
https://source.winehq.org/git/wine.git/?a=commit;h=d6b76df314b8d7b265276a68…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 9 13:51:00 2018 +0100 widl: Preprocess and attempt to parse provided ACF file. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.l | 45 ++++++++++++++++++++++++++++++++++++++++++--- tools/widl/parser.y | 9 +++++++-- 2 files changed, 49 insertions(+), 5 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 342109e..3cbf4ff 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -76,6 +76,8 @@ static int cbufalloc = 0; static int kw_token(const char *kw); static int attr_token(const char *kw); +static void switch_to_acf(void); + static warning_list_t *disabled_warnings = NULL; #define MAX_IMPORT_DEPTH 20 @@ -225,9 +227,14 @@ SAFEARRAY{ws}*/\( return tSAFEARRAY; <INITIAL,ATTR>\.\.\. return ELLIPSIS; <INITIAL,ATTR>. return yytext[0]; <<EOF>> { - if (import_stack_ptr) - return aEOF; - else yyterminate(); + if (import_stack_ptr) + return aEOF; + if (acf_name) + { + switch_to_acf(); + return aACF; + } + yyterminate(); } %% @@ -563,6 +570,38 @@ void abort_import(void) unlink(import_stack[ptr].temp_name); } +static void switch_to_acf(void) +{ + int ptr = import_stack_ptr; + int ret, fd; + char *name; + FILE *f; + + assert(import_stack_ptr == 0); + + input_name = acf_name; + acf_name = NULL; + line_number = 1; + + name = xstrdup( "widl.XXXXXX" ); + if((fd = mkstemps( name, 0 )) == -1) + error("Could not generate a temp name from %s\n", name); + + temp_name = name; + if (!(f = fdopen(fd, "wt"))) + error("Could not open fd %s for writing\n", name); + + ret = wpp_parse(input_name, f); + fclose(f); + if (ret) exit(1); + + if((f = fopen(temp_name, "r")) == NULL) + error_loc("Unable to open %s\n", temp_name); + + import_stack[ptr].state = YY_CURRENT_BUFFER; + yy_switch_to_buffer(yy_create_buffer(f, YY_BUF_SIZE)); +} + static void warning_disable(int warning) { warning_t *warning_entry; diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 757d796..542ee43 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -173,7 +173,7 @@ static typelib_t *current_typelib; %token <dbl> aDOUBLE %token <str> aSTRING aWSTRING aSQSTRING %token <uuid> aUUID -%token aEOF +%token aEOF aACF %token SHL SHR %token MEMBERPTR %token EQUALITY INEQUALITY @@ -321,7 +321,7 @@ static typelib_t *current_typelib; %% -input: gbl_statements { fix_incomplete(); +input: gbl_statements m_acf { fix_incomplete(); check_statements($1, FALSE); check_all_user_types($1); write_header($1); @@ -336,6 +336,8 @@ input: gbl_statements { fix_incomplete(); } ; +m_acf: /* empty */ | aACF acf_statements + gbl_statements: { $$ = NULL; } | gbl_statements namespacedef '{' { push_namespace($2); } gbl_statements '}' { pop_namespace($2); $$ = append_statements($1, $5); } @@ -1150,6 +1152,9 @@ version: | aHEXNUM { $$ = $1; } ; +acf_statements + : /* empty */ + %% static void decl_builtin_basic(const char *name, enum type_basic_type type)
1
0
0
0
Jacek Caban : widl: Write type string for serialized types.
by Alexandre Julliard
09 Nov '18
09 Nov '18
Module: wine Branch: master Commit: ed1176566536e933c612cb561b1ad11f3623b2ba URL:
https://source.winehq.org/git/wine.git/?a=commit;h=ed1176566536e933c612cb56…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 9 13:51:10 2018 +0100 widl: Write type string for serialized types. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 55 +++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 42 insertions(+), 13 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 8b23c63..27ba60f 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3680,25 +3680,54 @@ static int write_embedded_types(FILE *file, const attr_list_t *attrs, type_t *ty static void process_tfs_iface(type_t *iface, FILE *file, int indent, unsigned int *offset) { - const statement_t *stmt_func; + const statement_list_t *stmts = type_iface_get_stmts(iface); + const statement_t *stmt; var_t *var; current_iface = iface; - STATEMENTS_FOR_EACH_FUNC( stmt_func, type_iface_get_stmts(iface) ) + if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, statement_t, entry ) { - const var_t *func = stmt_func->u.var; - current_func = func; - if (is_local(func->attrs)) continue; + switch(stmt->type) + { + case STMT_DECLARATION: + { + const var_t *func = stmt->u.var; + + if(stmt->u.var->stgclass != STG_NONE + || type_get_type_detect_alias(stmt->u.var->type) != TYPE_FUNCTION) + continue; - var = type_function_get_retval(func->type); - if (!is_void(var->type)) - var->typestring_offset = write_type_tfs( file, 2, func->attrs, var->type, func->name, - TYPE_CONTEXT_PARAM, offset); + current_func = func; + if (is_local(func->attrs)) continue; - if (type_get_function_args(func->type)) - LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), var_t, entry ) - var->typestring_offset = write_type_tfs( file, 2, var->attrs, var->type, var->name, - TYPE_CONTEXT_TOPLEVELPARAM, offset ); + var = type_function_get_retval(func->type); + if (!is_void(var->type)) + var->typestring_offset = write_type_tfs( file, 2, func->attrs, var->type, func->name, + TYPE_CONTEXT_PARAM, offset); + + if (type_get_function_args(func->type)) + LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), var_t, entry ) + var->typestring_offset = write_type_tfs( file, 2, var->attrs, var->type, var->name, + TYPE_CONTEXT_TOPLEVELPARAM, offset ); + break; + + } + case STMT_TYPEDEF: + { + const type_list_t *type_entry; + for (type_entry = stmt->u.type_list; type_entry; type_entry = type_entry->next) + { + if (is_attr(type_entry->type->attrs, ATTR_ENCODE) + || is_attr(type_entry->type->attrs, ATTR_DECODE)) + type_entry->type->typestring_offset = write_type_tfs( file, 2, + type_entry->type->attrs, type_entry->type, type_entry->type->name, + TYPE_CONTEXT_CONTAINER, offset); + } + break; + } + default: + break; + } } }
1
0
0
0
Jacek Caban : widl: Make MIDL_DEFINE_GUID more compatible with midl.
by Alexandre Julliard
09 Nov '18
09 Nov '18
Module: wine Branch: master Commit: 2ffd106b9b7feaeedde56e8859fe925b7f43f63a URL:
https://source.winehq.org/git/wine.git/?a=commit;h=2ffd106b9b7feaeedde56e88…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 9 13:55:30 2018 +0100 widl: Make MIDL_DEFINE_GUID more compatible with midl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/widl.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 96fb240..3baebd0 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -523,10 +523,15 @@ void write_id_data(const statement_list_t *stmts) fprintf(idfile, "#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \\\n"); fprintf(idfile, " DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8)\n\n"); + fprintf(idfile, "#elif defined(__cplusplus)\n\n"); + + fprintf(idfile, "#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \\\n"); + fprintf(idfile, " EXTERN_C const type DECLSPEC_SELECTANY name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}\n\n"); + fprintf(idfile, "#else\n\n"); fprintf(idfile, "#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \\\n"); - fprintf(idfile, " const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}\n\n"); + fprintf(idfile, " const type DECLSPEC_SELECTANY name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}\n\n"); fprintf(idfile, "#endif\n\n"); start_cplusplus_guard(idfile);
1
0
0
0
Henri Verbeet : d3d9: Do not specify WINED3D_TEXTURE_CREATE_MAPPABLE in d3d9_device_CreateDepthStencilSurfaceEx ().
by Alexandre Julliard
09 Nov '18
09 Nov '18
Module: wine Branch: master Commit: d7bb33becd9412ed9db618dc2fa313e3275a31ba URL:
https://source.winehq.org/git/wine.git/?a=commit;h=d7bb33becd9412ed9db618dc…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 9 16:13:10 2018 +0330 d3d9: Do not specify WINED3D_TEXTURE_CREATE_MAPPABLE in d3d9_device_CreateDepthStencilSurfaceEx(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 8bfe012..dd40dda 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3878,7 +3878,7 @@ static HRESULT WINAPI d3d9_device_CreateDepthStencilSurfaceEx(IDirect3DDevice9Ex BOOL discard, IDirect3DSurface9 **surface, HANDLE *shared_handle, DWORD usage) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - DWORD flags = WINED3D_TEXTURE_CREATE_MAPPABLE; + DWORD flags = 0; TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u, " "discard %#x, surface %p, shared_handle %p, usage %#x.\n",
1
0
0
0
Dmitry Timoshkov : server: Allow setting delete disposition on a read-only directory.
by Alexandre Julliard
09 Nov '18
09 Nov '18
Module: wine Branch: master Commit: 1affd75fcb20d6dac90add4d44c431441e139a17 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=1affd75fcb20d6dac90add4d…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 9 14:01:00 2018 +0300 server: Allow setting delete disposition on a read-only directory. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/fd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/fd.c b/server/fd.c index fa174f5..246b758 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2307,8 +2307,8 @@ static void set_fd_disposition( struct fd *fd, int unlink ) return; } - /* can't unlink files we don't have permission to access */ - if (unlink && !(st.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH))) + /* can't unlink files we don't have permission to write */ + if (unlink && !(st.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH)) && !S_ISDIR(st.st_mode)) { set_error( STATUS_CANNOT_DELETE ); return;
1
0
0
0
Henri Verbeet : d3d9: Do not specify WINED3D_TEXTURE_CREATE_MAPPABLE in texture_init().
by Alexandre Julliard
09 Nov '18
09 Nov '18
Module: wine Branch: master Commit: ee4c5bb3e3438ad6df5c33527b3bc6943a38d3fb URL:
https://source.winehq.org/git/wine.git/?a=commit;h=ee4c5bb3e3438ad6df5c3352…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 9 16:13:07 2018 +0330 d3d9: Do not specify WINED3D_TEXTURE_CREATE_MAPPABLE in texture_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/texture.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 5cb0b39..2c4287f 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1321,9 +1321,6 @@ HRESULT texture_init(struct d3d9_texture *texture, struct d3d9_device *device, desc.depth = 1; desc.size = 0; - if (pool != D3DPOOL_DEFAULT || (usage & D3DUSAGE_DYNAMIC)) - flags |= WINED3D_TEXTURE_CREATE_MAPPABLE; - if (is_gdi_compat_wined3dformat(desc.format)) flags |= WINED3D_TEXTURE_CREATE_GET_DC;
1
0
0
0
Henri Verbeet : d3d9: Do not specify WINED3D_TEXTURE_CREATE_MAPPABLE in cubetexture_init().
by Alexandre Julliard
09 Nov '18
09 Nov '18
Module: wine Branch: master Commit: 4ef181df6de4e07f935eeff3acc040680651d3f8 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=4ef181df6de4e07f935eeff3…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 9 16:13:08 2018 +0330 d3d9: Do not specify WINED3D_TEXTURE_CREATE_MAPPABLE in cubetexture_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/texture.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 2c4287f..4855985 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1405,9 +1405,6 @@ HRESULT cubetexture_init(struct d3d9_texture *texture, struct d3d9_device *devic desc.depth = 1; desc.size = 0; - if (pool != D3DPOOL_DEFAULT || (usage & D3DUSAGE_DYNAMIC)) - flags |= WINED3D_TEXTURE_CREATE_MAPPABLE; - if (is_gdi_compat_wined3dformat(desc.format)) flags |= WINED3D_TEXTURE_CREATE_GET_DC;
1
0
0
0
Dmitry Timoshkov : server: Track separately implicit and explicit file disposition.
by Alexandre Julliard
09 Nov '18
09 Nov '18
Module: wine Branch: master Commit: ee020079671fa88b4aceb9277448b2d79ce65798 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=ee020079671fa88b4aceb927…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 9 14:01:12 2018 +0300 server: Track separately implicit and explicit file disposition. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/fd.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/server/fd.c b/server/fd.c index 246b758..f2d83b4 100644 --- a/server/fd.c +++ b/server/fd.c @@ -166,7 +166,7 @@ struct closed_fd { struct list entry; /* entry in inode closed list */ int unix_fd; /* the unix file descriptor */ - int unlink; /* whether to unlink on close */ + int unlink; /* whether to unlink on close: -1 - implicit FILE_DELETE_ON_CLOSE, 1 - explicit disposition */ char *unix_name; /* name to unlink on close, points to parent fd unix_name */ }; @@ -1869,7 +1869,7 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, goto error; } - fd->closed->unlink = (options & FILE_DELETE_ON_CLOSE) != 0; + fd->closed->unlink = (options & FILE_DELETE_ON_CLOSE) ? -1 : 0; if (flags & O_TRUNC) { if (S_ISDIR(st.st_mode)) @@ -2314,7 +2314,9 @@ static void set_fd_disposition( struct fd *fd, int unlink ) return; } - fd->closed->unlink = unlink || (fd->options & FILE_DELETE_ON_CLOSE); + fd->closed->unlink = unlink ? 1 : 0; + if (fd->options & FILE_DELETE_ON_CLOSE) + fd->closed->unlink = -1; } /* set new name for the fd */
1
0
0
0
Henri Verbeet : d3d9: Do not specify WINED3D_TEXTURE_CREATE_MAPPABLE in d3d9_device_CreateDepthStencilSurface ().
by Alexandre Julliard
09 Nov '18
09 Nov '18
Module: wine Branch: master Commit: 719f0d7a3580f3cc34ae2708dacc27c103f3ef15 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=719f0d7a3580f3cc34ae2708…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 9 16:13:09 2018 +0330 d3d9: Do not specify WINED3D_TEXTURE_CREATE_MAPPABLE in d3d9_device_CreateDepthStencilSurface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 0cf2049..8bfe012 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1489,7 +1489,7 @@ static HRESULT WINAPI d3d9_device_CreateDepthStencilSurface(IDirect3DDevice9Ex * BOOL discard, IDirect3DSurface9 **surface, HANDLE *shared_handle) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - DWORD flags = WINED3D_TEXTURE_CREATE_MAPPABLE; + DWORD flags = 0; TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u.\n" "discard %#x, surface %p, shared_handle %p.\n",
1
0
0
0
← Newer
1
...
75
76
77
78
79
80
81
...
96
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
Results per page:
10
25
50
100
200