October 2009 - Wine-commits

Alexandre Julliard : tests: Build all tests with strict prototypes.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: 239265fd8b83b7047c85138a014d34b8f2f2ebbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=239265fd8b83b7047c85138a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 6 13:34:37 2009 +0200 tests: Build all tests with strict prototypes. --- dlls/Maketest.rules.in | 2 +- dlls/user32/tests/class.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/Maketest.rules.in b/dlls/Maketest.rules.in index aff002c..95f5c2b 100644 --- a/dlls/Maketest.rules.in +++ b/dlls/Maketest.rules.in @@ -10,7 +10,7 @@ # DLLFLAGS = @DLLFLAGS@ -DEFS = $(EXTRADEFS) +DEFS = -DWINE_STRICT_PROTOTYPES $(EXTRADEFS) MODULE = $(TESTDLL:%.dll=%)_test.exe TESTRESULTS = $(CTESTS:.c=.ok) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index f8a4cd8..0e7b0e4 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -598,8 +598,8 @@ static void test_builtinproc(void) HWND hwnd; int i; - pDefWindowProcA = GetProcAddress(GetModuleHandle("user32.dll"), "DefWindowProcA"); - pDefWindowProcW = GetProcAddress(GetModuleHandle("user32.dll"), "DefWindowProcW"); + pDefWindowProcA = (void *)GetProcAddress(GetModuleHandle("user32.dll"), "DefWindowProcA"); + pDefWindowProcW = (void *)GetProcAddress(GetModuleHandle("user32.dll"), "DefWindowProcW"); for (i = 0; i < 4; i++) {

1 0

Matteo Bruni : wpp: Handle remaining memory allocation failures.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: 9086c59d3265e160b1f935ac0578790231e0e398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9086c59d3265e160b1f935ac0… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Mon Sep 28 21:32:39 2009 +0200 wpp: Handle remaining memory allocation failures. --- include/wine/wpp.h | 7 +++-- libs/wpp/preproc.c | 51 ++++++++++++++++++++++++++++++++++++++++------- libs/wpp/wpp.c | 44 +++++++++++++++++++++++++++++++++------- libs/wpp/wpp_private.h | 2 +- 4 files changed, 84 insertions(+), 20 deletions(-) diff --git a/include/wine/wpp.h b/include/wine/wpp.h index 10b71e0..86575b1 100644 --- a/include/wine/wpp.h +++ b/include/wine/wpp.h @@ -23,12 +23,13 @@ #include <stdio.h> -extern void wpp_add_define( const char *name, const char *value ); +/* Return value == 0 means successful execution */ +extern int wpp_add_define( const char *name, const char *value ); extern void wpp_del_define( const char *name ); -extern void wpp_add_cmdline_define( const char *value ); +extern int wpp_add_cmdline_define( const char *value ); extern void wpp_set_debug( int lex_debug, int parser_debug, int msg_debug ); extern void wpp_set_pedantic( int on ); -extern void wpp_add_include_path( const char *path ); +extern int wpp_add_include_path( const char *path ); extern char *wpp_find_include( const char *name, const char *parent_name ); extern int wpp_parse( const char *input, FILE *output ); extern int wpp_parse_temp( const char *input, const char *output_base, char **output_name ); diff --git a/libs/wpp/preproc.c b/libs/wpp/preproc.c index 1d9aed6..cd46fc2 100644 --- a/libs/wpp/preproc.c +++ b/libs/wpp/preproc.c @@ -82,8 +82,8 @@ void *pp_xmalloc(size_t size) res = malloc(size); if(res == NULL) { - fprintf(stderr, "Virtual memory exhausted.\n"); - exit(2); + /* Set the error flag */ + pp_status.state = 1; } return res; } @@ -96,8 +96,8 @@ void *pp_xrealloc(void *p, size_t size) res = realloc(p, size); if(res == NULL) { - fprintf(stderr, "Virtual memory exhausted.\n"); - exit(2); + /* Set the error flag */ + pp_status.state = 1; } return res; } @@ -177,13 +177,16 @@ static void free_pp_entry( pp_entry_t *ppp, int idx ) } /* push a new (empty) define state */ -void pp_push_define_state(void) +int pp_push_define_state(void) { pp_def_state_t *state = pp_xmalloc( sizeof(*state) ); + if(!state) + return 1; memset( state->defines, 0, sizeof(state->defines) ); state->next = pp_def_state; pp_def_state = state; + return 0; } /* pop the current define state */ @@ -349,10 +352,12 @@ pp_entry_t *pp_add_macro(char *id, marg_t *args[], int nargs, mtext_t *exp) static char **includepath; static int nincludepath = 0; -void wpp_add_include_path(const char *path) +int wpp_add_include_path(const char *path) { char *tok; char *cpy = pp_xstrdup(path); + if(!cpy) + return 1; tok = strtok(cpy, INCLUDESEPARATOR); while(tok) @@ -360,7 +365,14 @@ void wpp_add_include_path(const char *path) if(*tok) { char *dir; char *cptr; + char **new_path; + dir = pp_xstrdup(tok); + if(!dir) + { + free(cpy); + return 1; + } for(cptr = dir; *cptr; cptr++) { /* Convert to forward slash */ @@ -372,13 +384,21 @@ void wpp_add_include_path(const char *path) *cptr = '\0'; /* Add to list */ + new_path = pp_xrealloc(includepath, (nincludepath+1) * sizeof(*includepath)); + if(!new_path) + { + free(dir); + free(cpy); + return 1; + } + includepath = new_path; + includepath[nincludepath] = dir; nincludepath++; - includepath = pp_xrealloc(includepath, nincludepath * sizeof(*includepath)); - includepath[nincludepath-1] = dir; } tok = strtok(NULL, INCLUDESEPARATOR); } free(cpy); + return 0; } char *wpp_find_include(const char *name, const char *parent_name) @@ -390,6 +410,8 @@ char *wpp_find_include(const char *name, const char *parent_name) int i, fd; cpy = pp_xmalloc(strlen(name)+1); + if(!cpy) + return NULL; cptr = cpy; for(ccptr = name; *ccptr; ccptr++) @@ -415,6 +437,11 @@ char *wpp_find_include(const char *name, const char *parent_name) if ((p = strrchr( parent_name, '/' ))) p++; else p = parent_name; path = pp_xmalloc( (p - parent_name) + strlen(cpy) + 1 ); + if(!path) + { + free(cpy); + return NULL; + } memcpy( path, parent_name, p - parent_name ); strcpy( path + (p - parent_name), cpy ); fd = open( path, O_RDONLY ); @@ -430,6 +457,11 @@ char *wpp_find_include(const char *name, const char *parent_name) for(i = 0; i < nincludepath; i++) { path = pp_xmalloc(strlen(includepath[i]) + strlen(cpy) + 2); + if(!path) + { + free(cpy); + return NULL; + } strcpy(path, includepath[i]); strcat(path, "/"); strcat(path, cpy); @@ -630,11 +662,14 @@ static void generic_msg(const char *s, const char *t, const char *n, va_list ap) if(n) { cpy = pp_xstrdup(n); + if(!cpy) + goto end; for (p = cpy; *p; p++) if(!isprint(*p)) *p = ' '; fprintf(stderr, " near '%s'", cpy); free(cpy); } } +end: #endif fprintf(stderr, "\n"); } diff --git a/libs/wpp/wpp.c b/libs/wpp/wpp.c index a7597ec..e3541fe 100644 --- a/libs/wpp/wpp.c +++ b/libs/wpp/wpp.c @@ -62,15 +62,17 @@ static void add_special_defines(void) pp_add_define( pp_xstrdup("__TIME__"), pp_xstrdup(buf) ); ppp = pp_add_define( pp_xstrdup("__FILE__"), pp_xstrdup("") ); - ppp->type = def_special; + if(ppp) + ppp->type = def_special; ppp = pp_add_define( pp_xstrdup("__LINE__"), pp_xstrdup("") ); - ppp->type = def_special; + if(ppp) + ppp->type = def_special; } /* add a define to the preprocessor list */ -void wpp_add_define( const char *name, const char *value ) +int wpp_add_define( const char *name, const char *value ) { struct define *def; @@ -80,17 +82,35 @@ void wpp_add_define( const char *name, const char *value ) { if (!strcmp( def->name, name )) { + char *new_value = pp_xstrdup(value); + if(!new_value) + return 1; free( def->value ); - def->value = pp_xstrdup(value); - return; + def->value = new_value; + + return 0; } } def = pp_xmalloc( sizeof(*def) ); + if(!def) + return 1; def->next = cmdline_defines; def->name = pp_xstrdup(name); + if(!def->name) + { + free(def); + return 1; + } def->value = pp_xstrdup(value); + if(!def->value) + { + free(def->name); + free(def); + return 1; + } cmdline_defines = def; + return 0; } @@ -112,13 +132,17 @@ void wpp_del_define( const char *name ) /* add a command-line define of the form NAME=VALUE */ -void wpp_add_cmdline_define( const char *value ) +int wpp_add_cmdline_define( const char *value ) { + char *p; char *str = pp_xstrdup(value); - char *p = strchr( str, '=' ); + if(!str) + return 1; + p = strchr( str, '=' ); if (p) *p++ = 0; wpp_add_define( str, p ); free( str ); + return 0; } @@ -146,7 +170,9 @@ int wpp_parse( const char *input, FILE *output ) pp_status.input = NULL; pp_status.state = 0; - pp_push_define_state(); + ret = pp_push_define_state(); + if(ret) + return ret; add_cmdline_defines(); add_special_defines(); @@ -182,6 +208,8 @@ int wpp_parse_temp( const char *input, const char *output_base, char **output_na if (!output_base || !output_base[0]) output_base = "wpptmp"; temp_name = pp_xmalloc( strlen(output_base) + 8 ); + if(!temp_name) + return 1; strcpy( temp_name, output_base ); strcat( temp_name, ".XXXXXX" ); diff --git a/libs/wpp/wpp_private.h b/libs/wpp/wpp_private.h index b485d70..c0b95a4 100644 --- a/libs/wpp/wpp_private.h +++ b/libs/wpp/wpp_private.h @@ -202,7 +202,7 @@ void *pp_xmalloc(size_t); void *pp_xrealloc(void *, size_t); char *pp_xstrdup(const char *str); pp_entry_t *pplookup(const char *ident); -void pp_push_define_state(void); +int pp_push_define_state(void); void pp_pop_define_state(void); pp_entry_t *pp_add_define(char *def, char *text); pp_entry_t *pp_add_macro(char *ident, marg_t *args[], int nargs, mtext_t *exp);

1 0

Matteo Bruni : wpp: get_string() now can return NULL, handle it.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: 28fb6a24b143bbbe70b497dedcbcb5688aac9f8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=28fb6a24b143bbbe70b497ded… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Sep 29 12:06:24 2009 +0200 wpp: get_string() now can return NULL, handle it. --- libs/wpp/ppl.l | 3 +++ libs/wpp/ppy.y | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 062ac22..48a6959 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -1514,6 +1514,9 @@ void pp_do_include(char *fname, int type) int n; includelogicentry_t *iep; + if(!fname) + return; + for(iep = pp_includelogiclist; iep; iep = iep->next) { if(!strcmp(iep->filename, fname)) diff --git a/libs/wpp/ppy.y b/libs/wpp/ppy.y index ba88320..b525e2f 100644 --- a/libs/wpp/ppy.y +++ b/libs/wpp/ppy.y @@ -279,16 +279,16 @@ preprocessor | tMACRO res_arg allmargs tMACROEND opt_mtexts tNL { pp_add_macro($1, macro_args, nmacro_args, $5); } - | tLINE tSINT tDQSTRING tNL { fprintf(ppy_out, "# %d %s\n", $2 , $3); free($3); } - | tGCCLINE tSINT tDQSTRING tNL { fprintf(ppy_out, "# %d %s\n", $2 , $3); free($3); } + | tLINE tSINT tDQSTRING tNL { if($3) fprintf(ppy_out, "# %d %s\n", $2 , $3); free($3); } + | tGCCLINE tSINT tDQSTRING tNL { if($3) fprintf(ppy_out, "# %d %s\n", $2 , $3); free($3); } | tGCCLINE tSINT tDQSTRING tSINT tNL - { fprintf(ppy_out, "# %d %s %d\n", $2, $3, $4); free($3); } + { if($3) fprintf(ppy_out, "# %d %s %d\n", $2, $3, $4); free($3); } | tGCCLINE tSINT tDQSTRING tSINT tSINT tNL - { fprintf(ppy_out, "# %d %s %d %d\n", $2 ,$3, $4, $5); free($3); } + { if($3) fprintf(ppy_out, "# %d %s %d %d\n", $2 ,$3, $4, $5); free($3); } | tGCCLINE tSINT tDQSTRING tSINT tSINT tSINT tNL - { fprintf(ppy_out, "# %d %s %d %d %d\n", $2 ,$3 ,$4 ,$5, $6); free($3); } + { if($3) fprintf(ppy_out, "# %d %s %d %d %d\n", $2 ,$3 ,$4 ,$5, $6); free($3); } | tGCCLINE tSINT tDQSTRING tSINT tSINT tSINT tSINT tNL - { fprintf(ppy_out, "# %d %s %d %d %d %d\n", $2 ,$3 ,$4 ,$5, $6, $7); free($3); } + { if($3) fprintf(ppy_out, "# %d %s %d %d %d %d\n", $2 ,$3 ,$4 ,$5, $6, $7); free($3); } | tGCCLINE tNL /* The null-token */ | tERROR opt_text tNL { ppy_error("#error directive: '%s'", $2); free($2); } | tWARNING opt_text tNL { ppy_warning("#warning directive: '%s'", $2); free($2); }

1 0

Matteo Bruni : wpp: Add error management callbacks.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: 29af4f9fa833a1f73f50bf68a3b5c02759a85464 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29af4f9fa833a1f73f50bf68a… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Sep 29 12:34:17 2009 +0200 wpp: Add error management callbacks. --- include/wine/wpp.h | 9 +++++++++ libs/wpp/preproc.c | 25 ++++++++++++++++++++++--- libs/wpp/wpp.c | 5 +++++ libs/wpp/wpp_private.h | 2 ++ 4 files changed, 38 insertions(+), 3 deletions(-) diff --git a/include/wine/wpp.h b/include/wine/wpp.h index 86575b1..dd341bd 100644 --- a/include/wine/wpp.h +++ b/include/wine/wpp.h @@ -22,6 +22,14 @@ #define __WINE_WPP_H #include <stdio.h> +#include <stdarg.h> + +struct wpp_callbacks +{ + /* Error callbacks */ + void (*error)( const char *file, int line, int col, const char *near, const char *msg, va_list ap ); + void (*warning)( const char *file, int line, int col, const char *near, const char *msg, va_list ap ); +}; /* Return value == 0 means successful execution */ extern int wpp_add_define( const char *name, const char *value ); @@ -33,5 +41,6 @@ extern int wpp_add_include_path( const char *path ); extern char *wpp_find_include( const char *name, const char *parent_name ); extern int wpp_parse( const char *input, FILE *output ); extern int wpp_parse_temp( const char *input, const char *output_base, char **output_name ); +extern void wpp_set_callbacks( const struct wpp_callbacks *callbacks ); #endif /* __WINE_WPP_H */ diff --git a/libs/wpp/preproc.c b/libs/wpp/preproc.c index cd46fc2..874e54c 100644 --- a/libs/wpp/preproc.c +++ b/libs/wpp/preproc.c @@ -674,13 +674,32 @@ end: fprintf(stderr, "\n"); } +static void wpp_default_error(const char *file, int line, int col, const char *near, const char *msg, va_list ap) +{ + generic_msg(msg, "Error", near, ap); + exit(1); +} + +static void wpp_default_warning(const char *file, int line, int col, const char *near, const char *msg, va_list ap) +{ + generic_msg(msg, "Warning", near, ap); +} + +static const struct wpp_callbacks default_callbacks = +{ + wpp_default_error, + wpp_default_warning, +}; + +const struct wpp_callbacks *wpp_callbacks = &default_callbacks; + int ppy_error(const char *s, ...) { va_list ap; va_start(ap, s); - generic_msg(s, "Error", ppy_text, ap); + wpp_callbacks->error(pp_status.input, pp_status.line_number, pp_status.char_number, ppy_text, s, ap); va_end(ap); - exit(1); + pp_status.state = 1; return 1; } @@ -688,7 +707,7 @@ int ppy_warning(const char *s, ...) { va_list ap; va_start(ap, s); - generic_msg(s, "Warning", ppy_text, ap); + wpp_callbacks->warning(pp_status.input, pp_status.line_number, pp_status.char_number, ppy_text, s, ap); va_end(ap); return 0; } diff --git a/libs/wpp/wpp.c b/libs/wpp/wpp.c index e3541fe..e6a1a83 100644 --- a/libs/wpp/wpp.c +++ b/libs/wpp/wpp.c @@ -230,3 +230,8 @@ int wpp_parse_temp( const char *input, const char *output_base, char **output_na fclose( output ); return ret; } + +void wpp_set_callbacks( const struct wpp_callbacks *callbacks ) +{ + wpp_callbacks = callbacks; +} diff --git a/libs/wpp/wpp_private.h b/libs/wpp/wpp_private.h index c0b95a4..e082213 100644 --- a/libs/wpp/wpp_private.h +++ b/libs/wpp/wpp_private.h @@ -218,6 +218,8 @@ int pp_get_if_depth(void); #define __attribute__(x) /*nothing*/ #endif +extern const struct wpp_callbacks *wpp_callbacks; + int ppy_error(const char *s, ...) __attribute__((format (printf, 1, 2))); int ppy_warning(const char *s, ...) __attribute__((format (printf, 1, 2))); void pp_internal_error(const char *file, int line, const char *s, ...) __attribute__((format (printf, 3, 4)));

1 0

Andrey Turkin : ntdll: Handle invalid pointers in NtQueryInformationProcess (ProcessDebugObjectHandle).
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: f2432a8bc2dddaa34cfca0abbaf8b0d1ac19b44b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2432a8bc2dddaa34cfca0abb… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Tue Oct 6 13:34:21 2009 +0400 ntdll: Handle invalid pointers in NtQueryInformationProcess(ProcessDebugObjectHandle). --- dlls/ntdll/process.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index cae3f79..ba51df5 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -304,7 +304,14 @@ NTSTATUS WINAPI NtQueryInformationProcess( * set it to 0 aka "no debugger" to satisfy copy protections */ len = sizeof(HANDLE); if (ProcessInformationLength == len) - memset(ProcessInformation, 0, ProcessInformationLength); + { + if (!ProcessInformation) + ret = STATUS_ACCESS_VIOLATION; + else if (!ProcessHandle) + ret = STATUS_INVALID_HANDLE; + else + memset(ProcessInformation, 0, ProcessInformationLength); + } else ret = STATUS_INFO_LENGTH_MISMATCH; break;

1 0

Andrey Turkin : ntdll: Add stub for NtSetInformationThread( ThreadHideFromDebugger).
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: be910d973a432495a8372476f3c9a5547feb8602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be910d973a432495a8372476f… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Tue Oct 6 13:34:48 2009 +0400 ntdll: Add stub for NtSetInformationThread(ThreadHideFromDebugger). --- dlls/ntdll/thread.c | 4 ++++ include/winternl.h | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index dab1c1d..30a299d 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1227,6 +1227,10 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, SERVER_END_REQ; } return status; + case ThreadHideFromDebugger: + /* pretend the call succeeded to satisfy some code protectors */ + return STATUS_SUCCESS; + case ThreadBasicInformation: case ThreadTimes: case ThreadPriority: diff --git a/include/winternl.h b/include/winternl.h index d35adea..a6fea7d 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -760,6 +760,7 @@ typedef enum _THREADINFOCLASS { ThreadPriorityBoost, ThreadSetTlsArrayAddress, ThreadIsIoPending, + ThreadHideFromDebugger, MaxThreadInfoClass } THREADINFOCLASS;

1 0

Henri Verbeet : d3d9: Make the individual stateblock tests responsible for checking data.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: 7d0d8c0245f66f09bbb6b7affa8f0b8948e4851d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d0d8c0245f66f09bbb6b7aff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 6 09:05:53 2009 +0200 d3d9: Make the individual stateblock tests responsible for checking data. --- dlls/d3d9/tests/stateblock.c | 735 ++++++++++++++++++++++++------------------ 1 files changed, 427 insertions(+), 308 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7d0d8c0245f66f09bbb6b…

1 0

Henri Verbeet : wined3d: Keep references to the textures initially captured by CreateStateBlock() as well.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: b5de2fcb1c331a22a5166bee00700516eb415a78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5de2fcb1c331a22a5166bee0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 6 09:05:54 2009 +0200 wined3d: Keep references to the textures initially captured by CreateStateBlock() as well. --- dlls/wined3d/stateblock.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index ef33a2a..01783c5 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1648,6 +1648,11 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * if (stateblock->streamSource[i]) IWineD3DBuffer_AddRef(stateblock->streamSource[i]); } + for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) + { + if (stateblock->textures[i]) IWineD3DBaseTexture_AddRef(stateblock->textures[i]); + } + if (stateblock->pIndexData) IWineD3DBuffer_AddRef(stateblock->pIndexData); if (stateblock->vertexShader) IWineD3DVertexShader_AddRef(stateblock->vertexShader); if (stateblock->pixelShader) IWineD3DPixelShader_AddRef(stateblock->pixelShader);

1 0

Henri Verbeet : wined3d: Keep a reference to the vertex declaration initially captured by CreateStateBlock () as well.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: 5c229715610532373525c1736090ff344d51e44d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c229715610532373525c1736… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 6 09:05:55 2009 +0200 wined3d: Keep a reference to the vertex declaration initially captured by CreateStateBlock() as well. --- dlls/wined3d/stateblock.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 01783c5..8bbde2f 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1653,6 +1653,7 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * if (stateblock->textures[i]) IWineD3DBaseTexture_AddRef(stateblock->textures[i]); } + if (stateblock->vertexDecl) IWineD3DVertexDeclaration_AddRef(stateblock->vertexDecl); if (stateblock->pIndexData) IWineD3DBuffer_AddRef(stateblock->pIndexData); if (stateblock->vertexShader) IWineD3DVertexShader_AddRef(stateblock->vertexShader); if (stateblock->pixelShader) IWineD3DPixelShader_AddRef(stateblock->pixelShader);

1 0

Henri Verbeet : wined3d: Move the SM1 opcode enum to shader_sm1.c.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: 92d22ce535a560ea203ed779b34458b77d5ca201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92d22ce535a560ea203ed779b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 6 09:05:56 2009 +0200 wined3d: Move the SM1 opcode enum to shader_sm1.c. --- dlls/wined3d/shader_sm1.c | 379 +++++++++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 91 ---------- 2 files changed, 235 insertions(+), 235 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=92d22ce535a560ea203ed…

1 0