October 2006 - Wine-Commits

Ivan Gyurdiev : wined3d: Move D3DSP source modifier-related items into the WINED3D namespace.
by Alexandre Julliard Oct. 10, 2006

Oct. 10, 2006

Module: wine Branch: master Commit: 76b571cb4817099dca28303730f025ed935b3ab3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76b571cb4817099dca2830373… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Mon Oct 9 19:47:42 2006 -0400 wined3d: Move D3DSP source modifier-related items into the WINED3D namespace. --- dlls/wined3d/arb_program_shader.c | 34 +++++++++++---------- dlls/wined3d/baseshader.c | 52 ++++++++++++++++----------------- dlls/wined3d/glsl_shader.c | 36 +++++++++++------------ dlls/wined3d/vertexshader.c | 6 ++-- dlls/wined3d/wined3d_private_types.h | 54 ++++++++++++++++++++++++++++++++++ 5 files changed, 118 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=76b571cb4817099dca283…

1 0

Ivan Gyurdiev : wined3d: Move D3DSP_REG structures into the WINED3D namespace.
by Alexandre Julliard Oct. 10, 2006

Oct. 10, 2006

Module: wine Branch: master Commit: 17c9d9588a5a6d0ed87f86d82262820a260e2d64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17c9d9588a5a6d0ed87f86d82… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Mon Oct 9 19:47:12 2006 -0400 wined3d: Move D3DSP_REG structures into the WINED3D namespace. --- dlls/wined3d/arb_program_shader.c | 40 ++++++++++++++------------- dlls/wined3d/baseshader.c | 26 +++++++++--------- dlls/wined3d/glsl_shader.c | 50 +++++++++++++++++----------------- dlls/wined3d/vertexshader.c | 4 +-- dlls/wined3d/wined3d_private.h | 4 +-- dlls/wined3d/wined3d_private_types.h | 11 +++++++ 6 files changed, 72 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=17c9d9588a5a6d0ed87f8…

1 0

Ivan Gyurdiev : wined3d: Move D3DSP DCL-related structures into WINED3D namespace.
by Alexandre Julliard Oct. 10, 2006

Oct. 10, 2006

Module: wine Branch: master Commit: e8137632c7b3d462ee0a6652cae3b2b5815a69b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8137632c7b3d462ee0a6652c… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Mon Oct 9 19:46:35 2006 -0400 wined3d: Move D3DSP DCL-related structures into WINED3D namespace. --- dlls/wined3d/baseshader.c | 4 ++-- dlls/wined3d/glsl_shader.c | 8 ++++---- dlls/wined3d/vertexshader.c | 10 +++++----- dlls/wined3d/wined3d_private_types.h | 20 ++++++++++++++++++++ include/wine/wined3d_types.h | 13 ------------- 5 files changed, 31 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 2a6b739..49d17a2 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -409,8 +409,8 @@ static void shader_dump_decl_usage( } else { - DWORD usage = decl & D3DSP_DCL_USAGE_MASK; - DWORD idx = (decl & D3DSP_DCL_USAGEINDEX_MASK) >> D3DSP_DCL_USAGEINDEX_SHIFT; + DWORD usage = decl & WINED3DSP_DCL_USAGE_MASK; + DWORD idx = (decl & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; /* Pixel shaders 3.0 don't have usage semantics */ char pshader = shader_is_pshader_version(This->baseShader.hex_version); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 29149f8..89a26e1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1809,8 +1809,8 @@ void pshader_glsl_input_pack( /* Uninitialized */ if (!usage_token) continue; - usage = (usage_token & D3DSP_DCL_USAGE_MASK) >> D3DSP_DCL_USAGE_SHIFT; - usage_idx = (usage_token & D3DSP_DCL_USAGEINDEX_MASK) >> D3DSP_DCL_USAGEINDEX_SHIFT; + usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; + usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; shader_glsl_get_output_register_swizzle(register_token, reg_mask); switch(usage) { @@ -1864,8 +1864,8 @@ void vshader_glsl_output_unpack( /* Uninitialized */ if (!usage_token) continue; - usage = (usage_token & D3DSP_DCL_USAGE_MASK) >> D3DSP_DCL_USAGE_SHIFT; - usage_idx = (usage_token & D3DSP_DCL_USAGEINDEX_MASK) >> D3DSP_DCL_USAGEINDEX_SHIFT; + usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; + usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; shader_glsl_get_output_register_swizzle(register_token, reg_mask); switch(usage) { diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index d109168..e95f9c0 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -623,7 +623,7 @@ static void vshader_set_input( /* Fake usage: set reserved bit, usage, usage_idx */ DWORD usage_token = (0x1 << 31) | - (usage << D3DSP_DCL_USAGE_SHIFT) | (usage_idx << D3DSP_DCL_USAGEINDEX_SHIFT); + (usage << WINED3DSP_DCL_USAGE_SHIFT) | (usage_idx << WINED3DSP_DCL_USAGEINDEX_SHIFT); /* Fake register; set reserved bit, regnum, type: input, wmask: all */ DWORD reg_token = (0x1 << 31) | @@ -643,8 +643,8 @@ BOOL vshader_get_input( for (i = 0; i < MAX_ATTRIBS; i++) { DWORD usage_token = This->semantics_in[i].usage; - DWORD usage = (usage_token & D3DSP_DCL_USAGE_MASK) >> D3DSP_DCL_USAGE_SHIFT; - DWORD usage_idx = (usage_token & D3DSP_DCL_USAGEINDEX_MASK) >> D3DSP_DCL_USAGEINDEX_SHIFT; + DWORD usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; + DWORD usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; if (usage_token && (usage == usage_req && usage_idx == usage_idx_req)) { *regnum = i; @@ -662,8 +662,8 @@ BOOL vshader_input_is_color( IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; DWORD usage_token = This->semantics_in[regnum].usage; - DWORD usage = (usage_token & D3DSP_DCL_USAGE_MASK) >> D3DSP_DCL_USAGE_SHIFT; - DWORD usage_idx = (usage_token & D3DSP_DCL_USAGEINDEX_MASK) >> D3DSP_DCL_USAGEINDEX_SHIFT; + DWORD usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; + DWORD usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; IWineD3DVertexDeclarationImpl *vertexDeclaration = NULL; if (This->vertexDeclaration) { diff --git a/dlls/wined3d/wined3d_private_types.h b/dlls/wined3d/wined3d_private_types.h index da083f4..2ae78c6 100644 --- a/dlls/wined3d/wined3d_private_types.h +++ b/dlls/wined3d/wined3d_private_types.h @@ -23,6 +23,26 @@ #ifndef __WINE_WINED3D_TYPES_INTERNAL_H #define __WINE_WINED3D_TYPES_INTERNAL_H +/** DCL usage masks **/ +#define WINED3DSP_DCL_USAGE_SHIFT 0 +#define WINED3DSP_DCL_USAGE_MASK 0x0000000f +#define WINED3DSP_DCL_USAGEINDEX_SHIFT 16 +#define WINED3DSP_DCL_USAGEINDEX_MASK 0x000f0000 + +/** DCL sampler texture type **/ +#define WINED3DSP_TEXTURETYPE_SHIFT 27 +#define WINED3DSP_TEXTURETYPE_MASK 0x78000000 + +typedef enum _WINED3DSAMPLER_TEXTURE_TYPE { + WINED3DSTT_UNKNOWN = 0 << WINED3DSP_TEXTURETYPE_SHIFT, + WINED3DSTT_1D = 1 << WINED3DSP_TEXTURETYPE_SHIFT, + WINED3DSTT_2D = 2 << WINED3DSP_TEXTURETYPE_SHIFT, + WINED3DSTT_CUBE = 3 << WINED3DSP_TEXTURETYPE_SHIFT, + WINED3DSTT_VOLUME = 4 << WINED3DSP_TEXTURETYPE_SHIFT, + + WINED3DSTT_FORCE_DWORD = 0x7FFFFFFF +} WINED3DSAMPLER_TEXTURE_TYPE; + /** register types for PS and VS */ typedef enum _WINED3DSHADER_PARAM_REGISTER_TYPE { WINED3DSPR_TEMP = 0, diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 278e7d7..bfcd4ed 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -1028,19 +1028,6 @@ typedef enum _WINED3DDECLUSAGE { WINED3DSHADERDECLUSAGE_MAX_USAGE } WINED3DSHADERDECLUSAGE; -#define WINED3DSP_TEXTURETYPE_SHIFT 27 -#define WINED3DSP_TEXTURETYPE_MASK 0x78000000 - -typedef enum _WINED3DSAMPLER_TEXTURE_TYPE { - WINED3DSTT_UNKNOWN = 0 << WINED3DSP_TEXTURETYPE_SHIFT, - WINED3DSTT_1D = 1 << WINED3DSP_TEXTURETYPE_SHIFT, - WINED3DSTT_2D = 2 << WINED3DSP_TEXTURETYPE_SHIFT, - WINED3DSTT_CUBE = 3 << WINED3DSP_TEXTURETYPE_SHIFT, - WINED3DSTT_VOLUME = 4 << WINED3DSP_TEXTURETYPE_SHIFT, - - WINED3DSTT_FORCE_DWORD = 0x7FFFFFFF -} WINED3DSAMPLER_TEXTURE_TYPE; - #define WINED3DUSAGE_RENDERTARGET 0x00000001L #define WINED3DUSAGE_DEPTHSTENCIL 0x00000002L #define WINED3DUSAGE_WRITEONLY 0x00000008L

1 0

Ivan Gyurdiev : wined3d: Move D3DSPR structure into the WINED3D namespace.
by Alexandre Julliard Oct. 10, 2006

Oct. 10, 2006

Module: wine Branch: master Commit: 7259b9d8b6c738217d6ba6c1ef6ed889aace796b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7259b9d8b6c738217d6ba6c1e… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Mon Oct 9 19:45:55 2006 -0400 wined3d: Move D3DSPR structure into the WINED3D namespace. --- dlls/wined3d/arb_program_shader.c | 32 +++++++++--------- dlls/wined3d/baseshader.c | 62 +++++++++++++++++----------------- dlls/wined3d/glsl_shader.c | 30 ++++++++-------- dlls/wined3d/vertexshader.c | 20 +++++------ dlls/wined3d/wined3d_private_types.h | 28 +++++++++++++++ 5 files changed, 100 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7259b9d8b6c738217d6ba…

1 0

Ivan Gyurdiev : wined3d: Move D3DSIO structure into WINED3D namespace.
by Alexandre Julliard Oct. 10, 2006

Oct. 10, 2006

Module: wine Branch: master Commit: 062541c026bfa77d5d1bbd9819979a7736b7fa7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=062541c026bfa77d5d1bbd981… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Mon Oct 9 19:45:12 2006 -0400 wined3d: Move D3DSIO structure into WINED3D namespace. --- dlls/wined3d/arb_program_shader.c | 24 ++--- dlls/wined3d/baseshader.c | 54 +++++------ dlls/wined3d/glsl_shader.c | 110 +++++++++++----------- dlls/wined3d/pixelshader.c | 168 +++++++++++++++++----------------- dlls/wined3d/vertexshader.c | 114 ++++++++++++----------- dlls/wined3d/wined3d_private.h | 3 - dlls/wined3d/wined3d_private_types.h | 119 ++++++++++++++++++++++++ 7 files changed, 356 insertions(+), 236 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=062541c026bfa77d5d1bb…

1 0

Frank Richter : kernel32: Fix typos in English messages.
by Alexandre Julliard Oct. 10, 2006

Oct. 10, 2006

Module: wine Branch: master Commit: ffe966f37d79732f91d21b9faf0d8067c40af0d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffe966f37d79732f91d21b9fa… Author: Frank Richter <frank.richter(a)gmail.com> Date: Tue Oct 10 01:06:11 2006 +0200 kernel32: Fix typos in English messages. --- dlls/kernel32/nls/winerr_enu.mc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/nls/winerr_enu.mc b/dlls/kernel32/nls/winerr_enu.mc index 1ce2d9c..c615e2a 100644 --- a/dlls/kernel32/nls/winerr_enu.mc +++ b/dlls/kernel32/nls/winerr_enu.mc @@ -511,7 +511,7 @@ Child process has not completed MessageId=130 SymbolicName=ERROR_DIRECT_ACCESS_HANDLE Language=ENU -Invalid use of direct acess handle +Invalid use of direct access handle . MessageId=131 SymbolicName=ERROR_NEGATIVE_SEEK @@ -831,7 +831,7 @@ Invalid signal number MessageId=210 SymbolicName=ERROR_THREAD_1_INACTIVE Language=ENU -Erros setting signal handler +Error setting signal handler . MessageId=212 SymbolicName=ERROR_LOCKED @@ -1866,7 +1866,7 @@ Already initialised MessageId=1248 SymbolicName=ERROR_NO_MORE_DEVICES Language=ENU -No more local devics +No more local devices . MessageId=1249 SymbolicName=ERROR_NO_SUCH_SITE @@ -3281,7 +3281,7 @@ Character translation table open failed MessageId=1774 SymbolicName=RPC_X_SS_CHAR_TRANS_SHORT_FILE Language=ENU -Character translation tble file too small +Character translation table file too small . MessageId=1775 SymbolicName=RPC_X_SS_IN_NULL_CONTEXT

1 0

Michael Ploujnikov : msi/tests: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 10, 2006

Oct. 10, 2006

Module: wine Branch: master Commit: e86296a47f540ecb8a12589592c815100f4d72c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e86296a47f540ecb8a1258959… Author: Michael Ploujnikov <ploujj(a)gmail.com> Date: Mon Oct 9 23:11:38 2006 -0400 msi/tests: Win64 printf format warning fixes. --- dlls/msi/tests/Makefile.in | 1 dlls/msi/tests/db.c | 58 ++++++++-------- dlls/msi/tests/format.c | 156 ++++++++++++++++++++++---------------------- dlls/msi/tests/install.c | 10 +-- dlls/msi/tests/package.c | 8 +- 5 files changed, 116 insertions(+), 117 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e86296a47f540ecb8a125…

1 0

Michael Ploujnikov : setupapi/tests: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 10, 2006

Oct. 10, 2006

Module: wine Branch: master Commit: 8e302e15d291382fb0201378102f0bfab554e571 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e302e15d291382fb02013781… Author: Michael Ploujnikov <ploujj(a)gmail.com> Date: Mon Oct 9 18:35:04 2006 -0400 setupapi/tests: Win64 printf format warning fixes. --- dlls/setupapi/tests/Makefile.in | 1 - dlls/setupapi/tests/devinst.c | 14 +++++++------- dlls/setupapi/tests/parser.c | 32 ++++++++++++++++---------------- dlls/setupapi/tests/query.c | 12 ++++++------ dlls/setupapi/tests/stringtable.c | 12 ++++++------ 5 files changed, 35 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8e302e15d291382fb0201…

1 0

Michael Ploujnikov : uxtheme: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 10, 2006

Oct. 10, 2006

Module: wine Branch: master Commit: 551216886985049d0df85ebb91898759ed824f53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=551216886985049d0df85ebb9… Author: Michael Ploujnikov <ploujj(a)gmail.com> Date: Mon Oct 9 18:19:02 2006 -0400 uxtheme: Win64 printf format warning fixes. --- dlls/uxtheme/tests/Makefile.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/uxtheme/tests/Makefile.in b/dlls/uxtheme/tests/Makefile.in index de773bc..58e986e 100644 --- a/dlls/uxtheme/tests/Makefile.in +++ b/dlls/uxtheme/tests/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = uxtheme.dll IMPORTS = user32 kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT CTESTS = \ system.c

1 0

Michael Stefaniuc : janitorial: Remove remaining NULL checks before free() (found by Smatch).
by Alexandre Julliard Oct. 10, 2006

Oct. 10, 2006

Module: wine Branch: master Commit: 173f7bd26cb4e91a62e9675b847b4722dc6ef572 URL: http://source.winehq.org/git/wine.git/?a=commit;h=173f7bd26cb4e91a62e9675b8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 9 23:35:08 2006 +0200 janitorial: Remove remaining NULL checks before free() (found by Smatch). --- dlls/itss/chm_lib.c | 3 +-- dlls/itss/lzx.c | 3 +-- dlls/msvcrt/tests/file.c | 6 +++--- dlls/oleaut32/ungif.c | 9 +++------ dlls/winmm/winenas/audio.c | 3 +-- libs/wpp/ppl.l | 14 +++++--------- libs/wpp/wpp.c | 4 ++-- programs/taskmgr/perfdata.c | 8 ++------ 8 files changed, 18 insertions(+), 32 deletions(-) diff --git a/dlls/itss/chm_lib.c b/dlls/itss/chm_lib.c index 190dea7..8e3a75e 100644 --- a/dlls/itss/chm_lib.c +++ b/dlls/itss/chm_lib.c @@ -805,8 +805,7 @@ void chm_close(struct chmFile *h) h->cache_blocks = NULL; } - if (h->cache_block_indices) - free(h->cache_block_indices); + free(h->cache_block_indices); h->cache_block_indices = NULL; free(h); diff --git a/dlls/itss/lzx.c b/dlls/itss/lzx.c index 927199a..cfafea0 100644 --- a/dlls/itss/lzx.c +++ b/dlls/itss/lzx.c @@ -208,8 +208,7 @@ void LZXteardown(struct LZXstate *pState { if (pState) { - if (pState->window) - free(pState->window); + free(pState->window); free(pState); } } diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index fad6ff5..3a89b3d 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -384,8 +384,8 @@ #define LLEN 512 } ok(!(diff_found), "fgetwc difference found in BINARY mode\n"); ok(*wptr == '\n', "Should get newline\n"); - - if(mytextW) free (mytextW); + + free(mytextW); fclose(tempfh); unlink(tempf); } @@ -481,7 +481,7 @@ static void test_file_put_get( void ) diff_found |= (*aptr != *wptr); } ok(!(diff_found), "fgetwc doesn't strip CR in TEXT mode\n"); - if(mytextW) free (mytextW); + free(mytextW); fclose(tempfh); unlink(tempf); } diff --git a/dlls/oleaut32/ungif.c b/dlls/oleaut32/ungif.c index 7ee6e83..c630522 100644 --- a/dlls/oleaut32/ungif.c +++ b/dlls/oleaut32/ungif.c @@ -231,8 +231,7 @@ FreeSavedImages(GifFileType * GifFile) { sp->ImageDesc.ColorMap = NULL; } - if (sp->RasterBits) - free(sp->RasterBits); + free(sp->RasterBits); if (sp->ExtensionBlocks) FreeExtension(sp); @@ -962,10 +961,8 @@ DGifCloseFile(GifFileType * GifFile) { GifFile->SColorMap = NULL; } - if (Private) { - free(Private); - Private = NULL; - } + free(Private); + Private = NULL; if (GifFile->SavedImages) { FreeSavedImages(GifFile); diff --git a/dlls/winmm/winenas/audio.c b/dlls/winmm/winenas/audio.c index 4b8eb1b..73b6b88 100644 --- a/dlls/winmm/winenas/audio.c +++ b/dlls/winmm/winenas/audio.c @@ -1379,8 +1379,7 @@ buffer_resize(WINE_WAVEOUT* wwo, int len void *oldbuf = wwo->SoundBuffer; memcpy(newbuf, oldbuf, wwo->BufferUsed); wwo->SoundBuffer = newbuf; - if (oldbuf != NULL) - free(oldbuf); + free(oldbuf); } static int nas_add_buffer(WINE_WAVEOUT* wwo) { diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 6b251a8..58fda7b 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -1249,11 +1249,10 @@ static bufferstackentry_t *pop_buffer(vo if(pp_status.debug) fprintf(stderr, "pop_buffer: %s:%d: includelogic added, include_ppp='%s', file='%s'\n", pp_status.input, pp_status.line_number, pp_incl_state.ppp, iep->filename); } - else if(bufferstack[bufferstackidx].include_filename) + else free(bufferstack[bufferstackidx].include_filename); } - if(pp_incl_state.ppp) - free(pp_incl_state.ppp); + free(pp_incl_state.ppp); pp_incl_state = bufferstack[bufferstackidx].incl; pass_data = bufferstack[bufferstackidx].pass_data; @@ -1320,12 +1319,9 @@ static void free_macro(macexpstackentry_ for(i = 0; i < mep->nargs; i++) free(mep->args[i]); - if(mep->args) - free(mep->args); - if(mep->nnls) - free(mep->nnls); - if(mep->curarg) - free(mep->curarg); + free(mep->args); + free(mep->nnls); + free(mep->curarg); free(mep); } diff --git a/libs/wpp/wpp.c b/libs/wpp/wpp.c index 59429c7..7b87c36 100644 --- a/libs/wpp/wpp.c +++ b/libs/wpp/wpp.c @@ -80,7 +80,7 @@ void wpp_add_define( const char *name, c { if (!strcmp( def->name, name )) { - if (def->value) free( def->value ); + free( def->value ); def->value = pp_xstrdup(value); return; } @@ -103,7 +103,7 @@ void wpp_del_define( const char *name ) { if (!strcmp( def->name, name )) { - if (def->value) free( def->value ); + free( def->value ); def->value = NULL; return; } diff --git a/programs/taskmgr/perfdata.c b/programs/taskmgr/perfdata.c index 2b4a101..6a88fa3 100644 --- a/programs/taskmgr/perfdata.c +++ b/programs/taskmgr/perfdata.c @@ -178,9 +178,7 @@ void PerfDataRefresh(void) /* * Save system processor time info */ - if (SystemProcessorTimeInfo) { - free(SystemProcessorTimeInfo); - } + free(SystemProcessorTimeInfo); SystemProcessorTimeInfo = SysProcessorTimeInfo; /* @@ -231,9 +229,7 @@ void PerfDataRefresh(void) } /* Now alloc a new PERFDATA array and fill in the data */ - if (pPerfDataOld) { - free(pPerfDataOld); - } + free(pPerfDataOld); pPerfDataOld = pPerfData; pPerfData = (PPERFDATA)malloc(sizeof(PERFDATA) * ProcessCount); pSPI = (PSYSTEM_PROCESS_INFORMATION)pBuffer;

1 0