October 2007 - Wine-commits

Dan Hipschman : widl: Fix problems with variable-size user types.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: ff8930f2bfdfd5a16924422fcd9e2730593952fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff8930f2bfdfd5a16924422fc… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Oct 19 15:30:12 2007 -0700 widl: Fix problems with variable-size user types. --- dlls/rpcrt4/tests/server.c | 48 ++++++++++++++++++++++++++++++++++++++++++ dlls/rpcrt4/tests/server.idl | 9 +++++++ tools/widl/typegen.c | 22 +++++++++++++++++- 3 files changed, 77 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 97f2e23..d0f4eef 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -459,6 +459,18 @@ s_make_pyramid_doub_carr(unsigned char n, doub_carr_t **dc) *dc = t; } +unsigned +s_hash_bstr(bstr_t b) +{ + short n = b[-1]; + short *s = b; + unsigned hash = 0; + short i; + for (i = 0; i < n; ++i) + hash = 5 * hash + (unsigned) s[i]; + return hash; +} + void s_stop(void) { @@ -744,6 +756,38 @@ us_t_UserFree(ULONG *flags, us_t *pus) HeapFree(GetProcessHeap(), 0, pus->x); } +ULONG __RPC_USER +bstr_t_UserSize(ULONG *flags, ULONG start, bstr_t *b) +{ + return start + FIELD_OFFSET(wire_bstr_t, data[(*b)[-1]]); +} + +unsigned char * __RPC_USER +bstr_t_UserMarshal(ULONG *flags, unsigned char *buffer, bstr_t *b) +{ + wire_bstr_t *wb = (wire_bstr_t *) buffer; + wb->n = (*b)[-1]; + memcpy(&wb->data, *b, wb->n * sizeof wb->data[0]); + return buffer + FIELD_OFFSET(wire_bstr_t, data[wb->n]); +} + +unsigned char * __RPC_USER +bstr_t_UserUnmarshal(ULONG *flags, unsigned char *buffer, bstr_t *b) +{ + wire_bstr_t *wb = (wire_bstr_t *) buffer; + short *data = HeapAlloc(GetProcessHeap(), 0, (wb->n + 1) * sizeof *data); + data[0] = wb->n; + memcpy(&data[1], wb->data, wb->n * sizeof data[1]); + *b = &data[1]; + return buffer + FIELD_OFFSET(wire_bstr_t, data[wb->n]); +} + +void __RPC_USER +bstr_t_UserFree(ULONG *flags, bstr_t *b) +{ + HeapFree(GetProcessHeap(), 0, &((*b)[-1])); +} + static void pointer_tests(void) { @@ -754,6 +798,8 @@ pointer_tests(void) int *pa[4]; puints_t pus; cpuints_t cpus; + short bstr_data[] = { 5, 'H', 'e', 'l', 'l', 'o' }; + bstr_t bstr = &bstr_data[1]; ok(test_list_length(list) == 3, "RPC test_list_length\n"); ok(square_puint(p1) == 121, "RPC square_puint\n"); @@ -794,6 +840,8 @@ pointer_tests(void) pa[3] = &a[3]; ok(sum_pcarr(pa, 4) == 10, "RPC sum_pcarr\n"); + ok(hash_bstr(bstr) == s_hash_bstr(bstr), "RPC hash_bstr_data\n"); + free_list(list); } diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 807bf44..fa1ea15 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -281,5 +281,14 @@ cpp_quote("#endif") int sum_doub_carr(doub_carr_t *dc); void make_pyramid_doub_carr(unsigned char n, [out] doub_carr_t **dc); + typedef struct + { + short n; + [size_is(n)] short data[]; + } wire_bstr_t; + + typedef [wire_marshal(wire_bstr_t)] short *bstr_t; + unsigned hash_bstr(bstr_t s); + void stop(void); } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 6f194b7..dd21fe4 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -907,13 +907,31 @@ static int processed(const type_t *type) return type->typestring_offset && !type->tfswrite; } +static int user_type_has_variable_size(const type_t *t) +{ + if (is_ptr(t)) + return TRUE; + else + switch (t->type) + { + case RPC_FC_PSTRUCT: + case RPC_FC_CSTRUCT: + case RPC_FC_CPSTRUCT: + case RPC_FC_CVSTRUCT: + return TRUE; + } + /* Note: Since this only applies to user types, we can't have a conformant + array here, and strings should get filed under pointer in this case. */ + return FALSE; +} + static void write_user_tfs(FILE *file, type_t *type, unsigned int *tfsoff) { unsigned int start, absoff, flags; unsigned int align = 0, ualign = 0; const char *name; type_t *utype = get_user_type(type, &name); - size_t usize = type_memsize(utype, &ualign); + size_t usize = user_type_has_variable_size(utype) ? 0 : type_memsize(utype, &ualign); size_t size = type_memsize(type, &align); unsigned short funoff = user_type_offset(name); short reloff; @@ -949,8 +967,8 @@ static void write_user_tfs(FILE *file, type_t *type, unsigned int *tfsoff) print_file(file, 2, "0x%x,\t/* Alignment= %d, Flags= %02x */\n", flags | (align - 1), align - 1, flags); print_file(file, 2, "NdrFcShort(0x%hx),\t/* Function offset= %hu */\n", funoff, funoff); - print_file(file, 2, "NdrFcShort(0x%lx),\t/* %lu */\n", usize, usize); print_file(file, 2, "NdrFcShort(0x%lx),\t/* %lu */\n", size, size); + print_file(file, 2, "NdrFcShort(0x%lx),\t/* %lu */\n", usize, usize); *tfsoff += 8; reloff = absoff - *tfsoff; print_file(file, 2, "NdrFcShort(0x%hx),\t/* Offset= %hd (%lu) */\n", reloff, reloff, absoff);

1 0

Dan Hipschman : widl: Update the manpage.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: fd6a276f4c93adcc3afe02a0e190b2454a13ef46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd6a276f4c93adcc3afe02a0e… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Sat Oct 20 15:59:08 2007 -0700 widl: Update the manpage. --- tools/widl/widl.man.in | 83 +++++++++++++++++++++++++++++++---------------- 1 files changed, 55 insertions(+), 28 deletions(-) diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in index be53445..61749d8 100644 --- a/tools/widl/widl.man.in +++ b/tools/widl/widl.man.in @@ -1,29 +1,43 @@ .\" -*- nroff -*- -.TH WIDL 1 "October 2005" "@PACKAGE_STRING@" "Wine Developers Manual" +.TH WIDL 1 "October 2007" "@PACKAGE_STRING@" "Wine Developers Manual" .SH NAME -widl \- Wine Interface Definition Language Compiler +widl \- Wine Interface Definition Language (IDL) compiler .SH SYNOPSIS -.BR "widl "\fI[options]\fR " \fIinfile.idl\fR" +.B widl +[\fIoptions\fR] \fIinfile\fR.idl +.br +.B widl +[\fIoptions\fR] \fB--dlldata-only\fR \fIname1\fR [\fIname2\fR ...] .SH DESCRIPTION -.B widl -is a Wine tool which purpose is to compile Interface Definition Language (IDL) files. +When no options are used the program will generate a header file, and possibly +client and server stubs, proxy and dlldata files, a typelib, and a UUID file, +depending on the contents of the IDL file. If any of the options \fB-c\fR, +\fB-h\fR, \fB-p\fR, \fB-s\fR, \fB-t\fR, or \fB-u\fR are given, +.B widl +will only generate the requested files, and no others. When run with +\fB--dlldata-only\fR, widl will only generate a dlldata file, and it will +contain a list of the names passed as arguments. Usually the way this file +is updated is that each time +.B widl +is run, it reads any existing dlldata file, and if necessary regenerates it +with the same list of names, but with the present proxy file included. +.PP +When run without any arguments, +.B widl +will print a help message. .PP .SH OPTIONS -.B Help mode: -.nf -No options are used. -The program prints the help info and then exits. .PP .B General options: .IP "\fB-V\fR" -Print version number and exits from the program. +Print version number and exit. .PP .B Header options: .IP "\fB-h\fR" Generate header files. .IP "\fB-H \fIfile\fR" Name of header file to generate. The default header -filename is infile.h. +filename is \fIinfile\fR.h. .IP "\fB--oldnames\fR" Use old naming conventions. .PP @@ -32,35 +46,45 @@ Use old naming conventions. Generate a type library. .IP "\fB-T \fIfile\fR" Define the name of the type library to be generated. -The default filename is infile.tlb. +The default filename is \fIinfile\fR.tlb. .PP .B UUID file options: .IP "\fB-u\fR" Generate a UUID file. .IP "\fB-U \fIfile\fR" Define the name of the UUID file to be generated. -The default filename is infile_i.c. +The default filename is \fIinfile\fR_i.c. .PP .B Proxy/stub generation options: .IP "\fB-c\fR" Generate client stub. .IP "\fB-C \fIfile\fR" -Name of client stub file (default is infile_c.c) +Name of client stub file (default is \fIinfile\fR_c.c) .IP "\fB-p\fR" Generate proxy. .IP "\fB-P \fIfile\fR" -Name of proxy file (default is infile_p.c) +Name of proxy file (default is \fIinfile\fR_p.c) +.IP "\fB--prefix-all=\fIprefix\fR" +Prefix to put on the name of both client and server stubs. +.IP "\fB--prefix-client=\fIprefix\fR" +Prefix to put on the name of client stubs. +.IP "\fB--prefix-server=\fIprefix\fR" +Prefix to put on the name of server stubs. .IP "\fB-s\fR" Generate server stub. .IP "\fB-S \fIfile\fR" -Name of server stub file (default is infile_s.c) +Name of server stub file (default is \fIinfile\fR_s.c) +.PP +.B Dlldata file options: +.IP "\fB--dlldata=\fIfile\fR" +Name of the dlldata file (default is dlldata.c) .PP .B Preprocessor options: .IP "\fB-I \fIpath\fR" -Add a header search dir to path. Multiple search -dirs are allowed. -.IP "\fB-D \fIid[=val]\fR" -Define preprocessor identifier id value. +Add a header search directory to path. Multiple search +directories are allowed. +.IP "\fB-D \fIid\fR[=\fIval\fR]" +Define preprocessor macro \fIid\fR with value \fIval\fR. .IP "\fB-E\fR" Preprocess only. .IP "\fB-N\fR" @@ -70,13 +94,12 @@ Do not preprocess input. .IP "\fB-W\fR" Enable pedantic warnings. .IP "\fB-d \fIn\fR" -.nf -Set debug level to n. -n may be '0x01', '0x02', '0x04', '0x08', '0x10' or '0x20'. -(See section \fBDebug\fR) +Set debug level to the nonnegative integer \fIn\fR. If +prefixed with \fB0x\fR, it will be interpretted as a hexidecimal +number. For the meaning of values, see the \fBDebug\fR section. .PP .SH Debug -Debug level 'n' is a bitmask with the following meaning: +Debug level \fIn\fR is a bitmask with the following meaning: * 0x01 Tell which resource is parsed (verbose mode) * 0x02 Dump internal structures * 0x04 Create a parser trace (yydebug=1) @@ -84,11 +107,15 @@ Debug level 'n' is a bitmask with the following meaning: * 0x10 Preprocessor lex messages * 0x20 Preprocessor yacc trace .SH BUGS -Typelib generation doesn't work at the moment. It is still under development. +.B widl +is incomplete. Please file bug reports for this application at +.I http://bugs.winehq.org. .SH AUTHORS .B widl -was written by Ove Kaaven. This man page was written by Hannu -Valtonen. +was originally written by Ove Kaaven. It has been improved by Rob Shearman, +Dan Hipschman, and others. For a complete list, see the git commit logs. +This man page was originally written by Hannu Valtonen and then updated by +Dan Hipschman. .SH "SEE ALSO" The Winelib User Guide .nf

1 0

Roderick Colenbrander : wined3d: Rebind the 2D texture corresponding to the p8 surface. In some programs this caused nothing to show up.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: e1a3e9a6efe4863eeafa3a6e75408278024fd857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1a3e9a6efe4863eeafa3a6e7… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Oct 20 20:20:19 2007 +0200 wined3d: Rebind the 2D texture corresponding to the p8 surface. In some programs this caused nothing to show up. --- dlls/wined3d/surface.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8c14288..f729b39 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2031,6 +2031,9 @@ static void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, CONVERT_TYPES conve /* Switch back to unit 0 in which the 2D texture will be stored. */ GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0)); + + /* Rebind the texture because it isn't bound anymore */ + glBindTexture(This->glDescription.target, This->glDescription.textureName); } }

1 0

Jacek Caban : mshtml: Fixed spaces handling in range object.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: cf19259a0381341e56facee6808e0f0ebeefff14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf19259a0381341e56facee68… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 21 15:47:53 2007 +0200 mshtml: Fixed spaces handling in range object. --- dlls/mshtml/tests/dom.c | 4 +- dlls/mshtml/txtrange.c | 262 ++++++++++++++++++++++++++++++++++------------- 2 files changed, 193 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf19259a0381341e56fac…

1 0

Gerald Pfeifer : ntdll: #include <sys/types.h> to get dev_t.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: 68ddc722ee63a9d23e6ad7fdb0801e4e550b5662 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68ddc722ee63a9d23e6ad7fdb… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Oct 20 16:56:44 2007 +0200 ntdll: #include <sys/types.h> to get dev_t. --- dlls/ntdll/ntdll_misc.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 4f64421..fa08491 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -21,6 +21,7 @@ #include <stdarg.h> #include <signal.h> +#include <sys/types.h> #include "windef.h" #include "winnt.h"

1 0

Michael Stefaniuc : mshtml/tests: Move the 'const' after REFIID as REFIID is a macro that already starts with 'const'.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: f02a01574beb9e791003ed2e15286c62d45708d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f02a01574beb9e791003ed2e1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Oct 21 01:13:52 2007 +0200 mshtml/tests: Move the 'const' after REFIID as REFIID is a macro that already starts with 'const'. --- dlls/mshtml/tests/dom.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 3933ac8..d49e1f0 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -58,33 +58,33 @@ typedef enum { ET_OPTION } elem_type_t; -static const REFIID none_iids[] = { +static REFIID const none_iids[] = { &IID_IUnknown, NULL }; -static const REFIID html_iids[] = { +static REFIID const html_iids[] = { &IID_IHTMLDOMNode, &IID_IHTMLElement, &IID_IHTMLElement2, NULL }; -static const REFIID head_iids[] = { +static REFIID const head_iids[] = { &IID_IHTMLDOMNode, &IID_IHTMLElement, &IID_IHTMLElement2, NULL }; -static const REFIID title_iids[] = { +static REFIID const title_iids[] = { &IID_IHTMLDOMNode, &IID_IHTMLElement, &IID_IHTMLElement2, NULL }; -static const REFIID body_iids[] = { +static REFIID const body_iids[] = { &IID_IHTMLDOMNode, &IID_IHTMLElement, &IID_IHTMLElement2, @@ -93,7 +93,7 @@ static const REFIID body_iids[] = { NULL }; -static const REFIID anchor_iids[] = { +static REFIID const anchor_iids[] = { &IID_IHTMLDOMNode, &IID_IHTMLElement, &IID_IHTMLElement2, @@ -101,7 +101,7 @@ static const REFIID anchor_iids[] = { NULL }; -static const REFIID input_iids[] = { +static REFIID const input_iids[] = { &IID_IHTMLDOMNode, &IID_IHTMLElement, &IID_IHTMLElement2, @@ -110,7 +110,7 @@ static const REFIID input_iids[] = { NULL }; -static const REFIID select_iids[] = { +static REFIID const select_iids[] = { &IID_IHTMLDOMNode, &IID_IHTMLElement, &IID_IHTMLElement2, @@ -118,7 +118,7 @@ static const REFIID select_iids[] = { NULL }; -static const REFIID textarea_iids[] = { +static REFIID const textarea_iids[] = { &IID_IHTMLDOMNode, &IID_IHTMLElement, &IID_IHTMLElement2, @@ -126,7 +126,7 @@ static const REFIID textarea_iids[] = { NULL }; -static const REFIID option_iids[] = { +static REFIID const option_iids[] = { &IID_IHTMLDOMNode, &IID_IHTMLElement, &IID_IHTMLElement2,

1 0

Jacek Caban : mshtml: Added IHTMLTxtRange::expand("TextEdit") implementation.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: 11d62d7fcbfbf0031957a0abb752406f02dedc23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11d62d7fcbfbf0031957a0abb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 19 15:14:35 2007 +0200 mshtml: Added IHTMLTxtRange::expand("TextEdit") implementation. --- dlls/mshtml/tests/dom.c | 3 +++ dlls/mshtml/txtrange.c | 38 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index d49e1f0..dd46b8a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -43,6 +43,7 @@ static const char doc_str3[] = static const WCHAR noneW[] = {'N','o','n','e',0}; static WCHAR characterW[] = {'c','h','a','r','a','c','t','e','r',0}; +static WCHAR texteditW[] = {'t','e','x','t','e','d','i','t',0}; static WCHAR wordW[] = {'w','o','r','d',0}; typedef enum { @@ -873,6 +874,8 @@ static void test_txtrange(IHTMLDocument2 *doc) test_range_moveend(range, characterW, 3, 3); test_range_text(range, "wor"); test_range_parent(range, ET_BODY); + test_range_expand(range, texteditW, VARIANT_TRUE, "wordabc 123\r\nit's text"); + test_range_expand(range, texteditW, VARIANT_TRUE, "wordabc 123\r\nit's text"); IHTMLTxtRange_Release(range); } diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 7156d9a..df37753 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -1073,12 +1073,12 @@ static HRESULT WINAPI HTMLTxtRange_expand(IHTMLTxtRange *iface, BSTR Unit, VARIA if(unit == RU_UNKNOWN) return E_INVALIDARG; + *Success = VARIANT_FALSE; + switch(unit) { case RU_WORD: { dompos_t end_pos, start_pos, new_pos; - *Success = VARIANT_FALSE; - get_cur_pos(This, TRUE, &start_pos); get_cur_pos(This, FALSE, &end_pos); if(find_next_space(&end_pos, TRUE, &new_pos)) { @@ -1097,6 +1097,40 @@ static HRESULT WINAPI HTMLTxtRange_expand(IHTMLTxtRange *iface, BSTR Unit, VARIA break; } + + case RU_TEXTEDIT: { + nsIDOMDocument *nsdoc; + nsIDOMHTMLDocument *nshtmldoc; + nsIDOMHTMLElement *nsbody = NULL; + nsresult nsres; + + nsres = nsIWebNavigation_GetDocument(This->doc->nscontainer->navigation, &nsdoc); + if(NS_FAILED(nsres) || !nsdoc) { + ERR("GetDocument failed: %08x\n", nsres); + break; + } + + nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMHTMLDocument, (void**)&nshtmldoc); + nsIDOMDocument_Release(nsdoc); + + nsres = nsIDOMHTMLDocument_GetBody(nshtmldoc, &nsbody); + nsIDOMHTMLDocument_Release(nshtmldoc); + if(NS_FAILED(nsres) || !nsbody) { + ERR("Could not get body: %08x\n", nsres); + break; + } + + nsres = nsIDOMRange_SelectNodeContents(This->nsrange, (nsIDOMNode*)nsbody); + nsIDOMHTMLElement_Release(nsbody); + if(NS_FAILED(nsres)) { + ERR("Collapse failed: %08x\n", nsres); + break; + } + + *Success = VARIANT_TRUE; + break; + } + default: FIXME("Unimplemented unit %s\n", debugstr_w(Unit)); }

1 0

Michael Stefaniuc : wpp: Remove redundant NULL check before free(). Found by Smatch.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: cc4b9656b909baf8cb51515d594ad08a2a3fb709 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc4b9656b909baf8cb51515d5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Oct 21 01:14:06 2007 +0200 wpp: Remove redundant NULL check before free(). Found by Smatch. --- libs/wpp/ppy.y | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/wpp/ppy.y b/libs/wpp/ppy.y index 3209ee2..fc94bb5 100644 --- a/libs/wpp/ppy.y +++ b/libs/wpp/ppy.y @@ -282,10 +282,10 @@ preprocessor | 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); } | tGCCLINE tNL /* The null-token */ - | tERROR opt_text tNL { ppy_error("#error directive: '%s'", $2); if($2) free($2); } - | tWARNING opt_text tNL { ppy_warning("#warning directive: '%s'", $2); if($2) free($2); } - | tPRAGMA opt_text tNL { fprintf(ppy_out, "#pragma %s\n", $2 ? $2 : ""); if ($2) free($2); } - | tPPIDENT opt_text tNL { if(pp_status.pedantic) ppy_warning("#ident ignored (arg: '%s')", $2); if($2) free($2); } + | tERROR opt_text tNL { ppy_error("#error directive: '%s'", $2); free($2); } + | tWARNING opt_text tNL { ppy_warning("#warning directive: '%s'", $2); free($2); } + | tPRAGMA opt_text tNL { fprintf(ppy_out, "#pragma %s\n", $2 ? $2 : ""); free($2); } + | tPPIDENT opt_text tNL { if(pp_status.pedantic) ppy_warning("#ident ignored (arg: '%s')", $2); free($2); } | tRCINCLUDE tRCINCLUDEPATH { int nl=strlen($2) +3; char *fn=pp_xmalloc(nl);

1 0

Michael Stefaniuc : wrc: Remove redundant NULL check before free(). Found by Smatch.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: e01e8a019268509f435ec12188cb6ccf354a54c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e01e8a019268509f435ec1218… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Oct 21 01:14:38 2007 +0200 wrc: Remove redundant NULL check before free(). Found by Smatch. --- tools/wrc/parser.y | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index 1c4cdaa..0af5330 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -1376,16 +1376,16 @@ itemex_options $$->gotid = TRUE; $$->gottype = TRUE; $$->gotstate = TRUE; - if($2) free($2); - if($4) free($4); + free($2); + free($4); } | ',' e_expr ',' e_expr ',' expr { $$ = new_itemex_opt($2 ? *($2) : 0, $4 ? *($4) : 0, $6, 0); $$->gotid = TRUE; $$->gottype = TRUE; $$->gotstate = TRUE; - if($2) free($2); - if($4) free($4); + free($2); + free($4); } ; @@ -1397,23 +1397,23 @@ itemex_p_options } | ',' e_expr ',' expr { $$ = new_itemex_opt($2 ? *($2) : 0, $4, 0, 0); - if($2) free($2); + free($2); $$->gotid = TRUE; $$->gottype = TRUE; } | ',' e_expr ',' e_expr ',' expr { $$ = new_itemex_opt($2 ? *($2) : 0, $4 ? *($4) : 0, $6, 0); - if($2) free($2); - if($4) free($4); + free($2); + free($4); $$->gotid = TRUE; $$->gottype = TRUE; $$->gotstate = TRUE; } | ',' e_expr ',' e_expr ',' e_expr ',' expr { $$ = new_itemex_opt($2 ? *($2) : 0, $4 ? *($4) : 0, $6 ? *($6) : 0, $8); - if($2) free($2); - if($4) free($4); - if($6) free($6); + free($2); + free($4); + free($6); $$->gotid = TRUE; $$->gottype = TRUE; $$->gotstate = TRUE;

1 0

Michael Stefaniuc : winex11.drv: Fix two missing unlocks on error paths. Found by Smatch.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: 4e2eef2b25a5350d91f76a09625c845195cc709b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e2eef2b25a5350d91f76a096… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Oct 21 01:15:53 2007 +0200 winex11.drv: Fix two missing unlocks on error paths. Found by Smatch. --- dlls/winex11.drv/window.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 20ffe06..7348f2a 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -238,7 +238,11 @@ BOOL X11DRV_set_win_format( HWND hwnd, XID fbconfig_id ) wine_tsx11_lock(); vis = visual_from_fbconfig_id(fbconfig_id); - if(!vis) return FALSE; + if(!vis) + { + wine_tsx11_unlock(); + return FALSE; + } if(data->whole_window && vis->visualid == XVisualIDFromVisual(visual)) { @@ -384,7 +388,11 @@ static void update_gl_drawable(Display *display, struct x11drv_win_data *data, c wine_tsx11_lock(); vis = visual_from_fbconfig_id(data->fbconfig_id); - if(!vis) return; + if(!vis) + { + wine_tsx11_unlock(); + return; + } pix = XCreatePixmap(display, parent, w, h, vis->depth); if(!pix)

1 0