June 2014 - Wine-Commits - list.winehq.org

Piotr Caban : msvcrt: Support NULL buffer in setvbuf.
by Alexandre Julliard June 26, 2014

June 26, 2014

Module: wine Branch: master Commit: 18a416f7d5a7d900aaea784b8298cb8ad5d3d13e URL: http://source.winehq.org/git/wine.git/?a=commit;h=18a416f7d5a7d900aaea784b8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 26 12:29:59 2014 +0200 msvcrt: Support NULL buffer in setvbuf. --- dlls/msvcrt/file.c | 53 ++++++++++++++++++++++++++++++------------------ dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/tests/file.c | 4 ++++ 3 files changed, 38 insertions(+), 20 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index fe2d144..465a417 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4478,26 +4478,39 @@ int CDECL MSVCRT__wrename(const MSVCRT_wchar_t *oldpath,const MSVCRT_wchar_t *ne */ int CDECL MSVCRT_setvbuf(MSVCRT_FILE* file, char *buf, int mode, MSVCRT_size_t size) { - MSVCRT__lock_file(file); - if(file->_bufsiz) { - if(file->_flag & MSVCRT__IOMYBUF) - MSVCRT_free(file->_base); - file->_flag &= ~MSVCRT__IOMYBUF; - file->_base = file->_ptr = NULL; - file->_bufsiz = 0; - file->_cnt = 0; - } - if(mode == MSVCRT__IOFBF) { - file->_flag &= ~MSVCRT__IONBF; - file->_base = file->_ptr = buf; - if(buf) { - file->_bufsiz = size; - } - } else { - file->_flag |= MSVCRT__IONBF; - } - MSVCRT__unlock_file(file); - return 0; + if(!MSVCRT_CHECK_PMT(file != NULL)) return -1; + if(!MSVCRT_CHECK_PMT(mode==MSVCRT__IONBF || mode==MSVCRT__IOFBF || mode==MSVCRT__IOLBF)) return -1; + if(!MSVCRT_CHECK_PMT(mode==MSVCRT__IONBF || (size>=2 && size<=INT_MAX))) return -1; + + MSVCRT__lock_file(file); + + MSVCRT_fflush(file); + if(file->_flag & MSVCRT__IOMYBUF) + MSVCRT_free(file->_base); + file->_flag &= ~(MSVCRT__IONBF | MSVCRT__IOMYBUF | MSVCRT__USERBUF); + file->_cnt = 0; + + if(mode == MSVCRT__IONBF) { + file->_flag |= MSVCRT__IONBF; + file->_base = file->_ptr = (char*)&file->_charbuf; + file->_bufsiz = 2; + }else if(buf) { + file->_base = file->_ptr = buf; + file->_flag |= MSVCRT__USERBUF; + file->_bufsiz = size; + }else { + file->_base = file->_ptr = malloc(size); + if(!file->_base) { + file->_bufsiz = 0; + MSVCRT__unlock_file(file); + return -1; + } + + file->_flag |= MSVCRT__IOMYBUF; + file->_bufsiz = size; + } + MSVCRT__unlock_file(file); + return 0; } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 22ba0d4..3349c9f 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -740,6 +740,7 @@ struct MSVCRT__stat64 { #define MSVCRT__IOERR 0x0020 #define MSVCRT__IOSTRG 0x0040 #define MSVCRT__IORW 0x0080 +#define MSVCRT__USERBUF 0x0100 #define MSVCRT__IOCOMMIT 0x4000 #define MSVCRT__S_IEXEC 0x0040 diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 422e41d..2fd46f2 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -144,6 +144,9 @@ static void test_fileops( void ) fd = open ("fdopen.tst", O_RDONLY | O_BINARY); file = fdopen (fd, "rb"); setvbuf(file,NULL,bufmodes[bufmode],2048); + if(bufmodes[bufmode] == _IOFBF) + ok(file->_bufsiz == 2048, "file->_bufsiz = %d\n", file->_bufsiz); + ok(file->_base != NULL, "file->_base = NULL\n"); ok(strlen(outbuffer) == (sizeof(outbuffer)-1),"strlen/sizeof error for bufmode=%x\n", bufmodes[bufmode]); ok(fgets(buffer,sizeof(buffer),file) !=0,"fgets failed unexpected for bufmode=%x\n", bufmodes[bufmode]); ok(fgets(buffer,sizeof(buffer),file) ==0,"fgets didn't signal EOF for bufmode=%x\n", bufmodes[bufmode]); @@ -629,6 +632,7 @@ static void test_flsbuf( void ) ok(tempfh->_cnt == 0, "_cnt on freshly opened file was %d\n", tempfh->_cnt); setbuf(tempfh, NULL); ok(tempfh->_cnt == 0, "_cnt on unbuffered file was %d\n", tempfh->_cnt); + ok(tempfh->_bufsiz == 2, "_bufsiz = %d\n", tempfh->_bufsiz); /* Inlined putchar sets _cnt to -1. Native seems to ignore the value... */ tempfh->_cnt = 1234; ret = _flsbuf('Q',tempfh);

1 0

Alexandre Julliard : opengl32: Make sure the function table is initialized in all threads.
by Alexandre Julliard June 25, 2014

June 25, 2014

Module: wine Branch: master Commit: b72c8a7680ad2b5bc1963f63fd342f60ab445a41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b72c8a7680ad2b5bc1963f63f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 25 11:51:31 2014 +0200 opengl32: Make sure the function table is initialized in all threads. --- dlls/opengl32/wgl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 9255e34..3a5e148 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -1726,7 +1726,6 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) switch(reason) { case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinst); NtCurrentTeb()->glTable = &null_opengl_funcs; break; case DLL_THREAD_ATTACH:

1 0

Grazvydas Ignotas : msvcrt: Implement bufsiz block flushing behavior.
by Alexandre Julliard June 25, 2014

June 25, 2014

Module: wine Branch: master Commit: ad968be779fff244574eda83d101ab8393513bf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad968be779fff244574eda83d… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Wed Jun 18 13:55:53 2014 +0300 msvcrt: Implement bufsiz block flushing behavior. --- dlls/msvcrt/file.c | 12 ++++++++++++ dlls/msvcrt/tests/file.c | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 5a9edbe..b60e306 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3720,6 +3720,18 @@ MSVCRT_size_t CDECL MSVCRT_fwrite(const void *ptr, MSVCRT_size_t size, MSVCRT_si } written += wrcnt; wrcnt = 0; + } else if(file->_bufsiz && wrcnt >= file->_bufsiz) { + MSVCRT_size_t pcnt=(wrcnt / file->_bufsiz) * file->_bufsiz; + if(msvcrt_flush_buffer(file) == MSVCRT_EOF) + break; + + if(MSVCRT__write(file->_file, ptr, pcnt) <= 0) { + file->_flag |= MSVCRT__IOERR; + break; + } + written += pcnt; + wrcnt -= pcnt; + ptr = (const char*)ptr + pcnt; } else { if(MSVCRT__flsbuf(*(const char*)ptr, file) == MSVCRT_EOF) break; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index eb21697..422e41d 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -2243,7 +2243,7 @@ static void test_write_flush_size(FILE *file, int bufsize) fseek(file, 0, SEEK_SET); ok(fread(inbuffer, 1, bufsize, file) == bufsize, "read failed\n"); if (size == bufsize) - todo_wine ok(memcmp(outbuffer, inbuffer, bufsize) == 0, "missing flush by %d byte write\n", size); + ok(memcmp(outbuffer, inbuffer, bufsize) == 0, "missing flush by %d byte write\n", size); else ok(memcmp(outbuffer, inbuffer, bufsize) != 0, "unexpected flush by %d byte write\n", size); }

1 0

Grazvydas Ignotas : msvcrt: Clear _cnt on buffer flush.
by Alexandre Julliard June 25, 2014

June 25, 2014

Module: wine Branch: master Commit: c6a160691afc0c7123d505c9baf0382b56a4fb45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6a160691afc0c7123d505c9b… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Wed Jun 18 13:55:52 2014 +0300 msvcrt: Clear _cnt on buffer flush. --- dlls/msvcrt/file.c | 15 ++++++++------- dlls/msvcrt/tests/file.c | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c1d9d6e..5a9edbe 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -595,7 +595,7 @@ static int msvcrt_flush_buffer(MSVCRT_FILE* file) return MSVCRT_EOF; } file->_ptr=file->_base; - file->_cnt=file->_bufsiz; + file->_cnt=0; } return 0; } @@ -3659,14 +3659,15 @@ int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) if(file->_bufsiz) { int res = 0; - if(file->_cnt <= 0) + if(file->_cnt <= 0) { res = msvcrt_flush_buffer(file); - if(!res) { - *file->_ptr++ = c; - file->_cnt--; + if(res) + return res; + file->_cnt=file->_bufsiz; } - - return res ? res : c&0xff; + *file->_ptr++ = c; + file->_cnt--; + return c&0xff; } else { unsigned char cc=c; int len; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 97e70f0..eb21697 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -2239,7 +2239,7 @@ static void test_write_flush_size(FILE *file, int bufsize) */ lseek(fd, 1, SEEK_SET); fflush(file); - todo_wine ok(file->_cnt == 0, "_cnt should be 0 after fflush, but is %d\n", file->_cnt); + ok(file->_cnt == 0, "_cnt should be 0 after fflush, but is %d\n", file->_cnt); fseek(file, 0, SEEK_SET); ok(fread(inbuffer, 1, bufsize, file) == bufsize, "read failed\n"); if (size == bufsize)

1 0

Matteo Bruni : d3dcompiler/tests: Add a couple more checks for parent data values.
by Alexandre Julliard June 25, 2014

June 25, 2014

Module: wine Branch: master Commit: 342eec7f7de223ebb1d350bab4c6900d7bea3bc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=342eec7f7de223ebb1d350bab… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 24 22:25:30 2014 +0200 d3dcompiler/tests: Add a couple more checks for parent data values. --- dlls/d3dcompiler_43/compiler.c | 5 +++-- dlls/d3dcompiler_43/tests/asm.c | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index d09b5f6..114b4c1 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -145,11 +145,12 @@ static void wpp_warning(const char *file, int line, int col, const char *near, static char *wpp_lookup_mem(const char *filename, int type, const char *parent_name, char **include_path, int include_path_count) { - /* Here we return always ok. We will maybe fail on the next wpp_open_mem */ + /* We don't check for file existence here. We will potentially fail on + * the following wpp_open_mem(). */ char *path; int i; - TRACE("Looking for include %s.\n", debugstr_a(filename)); + TRACE("Looking for include %s, parent %s.\n", debugstr_a(filename), debugstr_a(parent_name)); parent_include = NULL; if (strcmp(parent_name, initial_filename)) diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c index 331b864..618a541 100644 --- a/dlls/d3dcompiler_43/tests/asm.c +++ b/dlls/d3dcompiler_43/tests/asm.c @@ -1446,12 +1446,14 @@ static HRESULT WINAPI testD3DInclude_open(ID3DInclude *iface, D3D_INCLUDE_TYPE i buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(include)); CopyMemory(buffer, include, sizeof(include)); *bytes = sizeof(include); + ok(!parent_data, "Wrong parent_data value.\n"); } else if (!strcmp(filename, "incl2.vsh")) { buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(include2)); CopyMemory(buffer, include2, sizeof(include2)); *bytes = sizeof(include2); + ok(!parent_data, "Wrong parent_data value.\n"); ok(include_type == D3D_INCLUDE_LOCAL, "Wrong include type %d.\n", include_type); } else if (!strcmp(filename, "incl3.vsh"))

1 0

Matteo Bruni : wpp: Free the include filename on error (Valgrind).
by Alexandre Julliard June 25, 2014

June 25, 2014

Module: wine Branch: master Commit: efcaad3911858be0a52a3b0606ef20ff75b8b0a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efcaad3911858be0a52a3b060… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 24 22:25:27 2014 +0200 wpp: Free the include filename on error (Valgrind). --- libs/wpp/ppl.l | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 70bd213..9655e34 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -1586,6 +1586,7 @@ void pp_do_include(char *fname, int type) * If the define was deleted, then this entry would have * been deleted too. */ + free(fname); return; } } @@ -1595,6 +1596,7 @@ void pp_do_include(char *fname, int type) if(n <= 2) { ppy_error("Empty include filename"); + free(fname); return; } @@ -1604,6 +1606,7 @@ void pp_do_include(char *fname, int type) if((fp = pp_open_include(fname+1, type, pp_status.input, &newpath)) == NULL) { ppy_error("Unable to open include file %s", fname+1); + free(fname); return; }

1 0

Bruno Jesus : bcrypt: Add a stub for BCryptCloseAlgorithmProvider.
by Alexandre Julliard June 25, 2014

June 25, 2014

Module: wine Branch: master Commit: c8c609b59dec2482abfe401414f06a80378834c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8c609b59dec2482abfe40141… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jun 24 23:53:42 2014 -0300 bcrypt: Add a stub for BCryptCloseAlgorithmProvider. --- dlls/bcrypt/bcrypt.spec | 2 +- dlls/bcrypt/bcrypt_main.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index 185f950..3b154f5 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -1,6 +1,6 @@ @ stub BCryptAddContextFunction @ stub BCryptAddContextFunctionProvider -@ stub BCryptCloseAlgorithmProvider +@ stdcall BCryptCloseAlgorithmProvider(ptr long) @ stub BCryptConfigureContext @ stub BCryptConfigureContextFunction @ stub BCryptCreateContext diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index ee203a6..5ccb9f1 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -90,3 +90,10 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider(BCRYPT_ALG_HANDLE *algorithm, LPCWST return STATUS_NOT_IMPLEMENTED; } + +NTSTATUS WINAPI BCryptCloseAlgorithmProvider(BCRYPT_ALG_HANDLE algorithm, DWORD flags) +{ + FIXME("%p, %08x - stub\n", algorithm, flags); + + return STATUS_NOT_IMPLEMENTED; +}

1 0

Huw Davies : fonts: Add some barb arrow glyphs.
by Alexandre Julliard June 25, 2014

June 25, 2014

Module: wine Branch: master Commit: 258942f28f4a5127789b5a443f20bec476c52141 URL: http://source.winehq.org/git/wine.git/?a=commit;h=258942f28f4a5127789b5a443… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 25 16:23:32 2014 +0100 fonts: Add some barb arrow glyphs. --- fonts/wingding.sfd | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++- fonts/wingding.ttf | Bin 6296 -> 6720 bytes 2 files changed, 103 insertions(+), 2 deletions(-) diff --git a/fonts/wingding.sfd b/fonts/wingding.sfd index f30ffec..55723b4 100644 --- a/fonts/wingding.sfd +++ b/fonts/wingding.sfd @@ -50,9 +50,9 @@ NameList: Adobe Glyph List DisplaySize: -48 AntiAlias: 1 FitToEm: 1 -WinInfo: 0 33 12 +WinInfo: 0 29 12 TeXData: 1 0 0 708670 354335 236222 1342177 -2147484 236222 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 -BeginChars: 256 30 +BeginChars: 256 38 StartChar: f020 Encoding: 0 61472 0 @@ -687,5 +687,106 @@ SplineSet 172 0 l 1,4,-1 EndSplineSet EndChar + +StartChar: barb2left +Encoding: 223 8659 30 +Width: 2006 +VWidth: 0 +LayerCount: 2 +Fore +SplineSet +1830 820 m 25,0,-1 + 550 820 l 25,1,-1 + 1190 1460 l 17,2,-1 + 900 1460 l 1,3,-1 + 170 730 l 1,4,-1 + 900 0 l 1,5,-1 + 1190 0 l 9,6,-1 + 550 640 l 25,7,-1 + 1830 640 l 25,8,-1 + 1830 820 l 25,0,-1 +EndSplineSet +EndChar + +StartChar: barb2right +Encoding: 224 8900 31 +Width: 2006 +VWidth: 0 +Flags: W +LayerCount: 2 +Fore +Refer: 30 8659 N -1 0 0 1 2006 0 2 +EndChar + +StartChar: barb2up +Encoding: 225 9001 32 +Width: 1825 +VWidth: 0 +Flags: W +LayerCount: 2 +Fore +Refer: 30 8659 N 0 -1 1 0 173 1653 2 +EndChar + +StartChar: barb2down +Encoding: 226 63720 33 +Width: 1825 +VWidth: 0 +Flags: W +LayerCount: 2 +Fore +Refer: 30 8659 N 0 1 -1 0 1653 -173 2 +EndChar + +StartChar: barb4left +Encoding: 231 63724 34 +Width: 2186 +VWidth: 0 +Flags: W +LayerCount: 2 +Fore +SplineSet +2010 940 m 25,0,-1 + 925 940 l 25,1,-1 + 1465 1480 l 17,2,-1 + 915 1480 l 1,3,-1 + 165 730 l 1,4,-1 + 915 0 l 1,5,-1 + 1465 0 l 9,6,-1 + 925 520 l 25,7,-1 + 2010 520 l 25,8,-1 + 2010 940 l 25,0,-1 +EndSplineSet +EndChar + +StartChar: barb4right +Encoding: 232 63725 35 +Width: 2186 +VWidth: 0 +Flags: W +LayerCount: 2 +Fore +Refer: 34 63724 N -1 0 0 1 2186 0 2 +EndChar + +StartChar: barb4up +Encoding: 233 63726 36 +Width: 1825 +VWidth: 0 +Flags: W +LayerCount: 2 +Fore +Refer: 34 63724 N 0 -1 1 0 173 1653 2 +EndChar + +StartChar: barb4down +Encoding: 234 63727 37 +Width: 1825 +VWidth: 0 +Flags: W +LayerCount: 2 +Fore +Refer: 34 63724 N 0 1 -1 0 1653 -173 2 +EndChar EndChars EndSplineFont diff --git a/fonts/wingding.ttf b/fonts/wingding.ttf index f867b97..b1e9d58 100644 Binary files a/fonts/wingding.ttf and b/fonts/wingding.ttf differ

1 0

Piotr Caban : kernel32: Fix typo in enum_locale_ex_proc.
by Alexandre Julliard June 25, 2014

June 25, 2014

Module: wine Branch: master Commit: 4eaa85ad560b0f9a921f2e78aa6285c2dcfff92d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eaa85ad560b0f9a921f2e78a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 25 14:40:55 2014 +0200 kernel32: Fix typo in enum_locale_ex_proc. --- dlls/kernel32/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index eca0e39..26c00f5 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2392,7 +2392,7 @@ static BOOL CALLBACK enum_locale_ex_proc( HMODULE module, LPCWSTR type, neutral = 0; flags = LOCALE_WINDOWS; flags |= neutral ? LOCALE_NEUTRALDATA : LOCALE_SPECIFICDATA; - if (data->flags && ~(data->flags & flags)) return TRUE; + if (data->flags && !(data->flags & flags)) return TRUE; return data->proc( buffer, flags, data->lparam ); }

1 0

Matteo Bruni : wpp: Properly free defines (Valgrind).
by Alexandre Julliard June 25, 2014

June 25, 2014

Module: wine Branch: master Commit: f91fa3722167f4ebefaa5fa9f856bd9a15ce7eb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f91fa3722167f4ebefaa5fa9f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 24 22:25:26 2014 +0200 wpp: Properly free defines (Valgrind). --- libs/wpp/preproc.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libs/wpp/preproc.c b/libs/wpp/preproc.c index 33f69c8..21830d6 100644 --- a/libs/wpp/preproc.c +++ b/libs/wpp/preproc.c @@ -292,7 +292,7 @@ void pp_pop_define_state(void) for (i = 0; i < HASHKEY; i++) { - while ((ppp = pp_def_state->defines[i]) != NULL) free_pp_entry( ppp, i ); + while ((ppp = pp_def_state->defines[i]) != NULL) pp_del_define( ppp->ident ); } state = pp_def_state; pp_def_state = state->next; @@ -302,6 +302,7 @@ void pp_pop_define_state(void) void pp_del_define(const char *name) { pp_entry_t *ppp; + int idx = pphash(name); if((ppp = pplookup(name)) == NULL) { @@ -310,13 +311,13 @@ void pp_del_define(const char *name) return; } + if(pp_status.debug) + printf("Deleting (%s, %d) <%s>\n", pp_status.input, pp_status.line_number, name); + free( ppp->ident ); free( ppp->subst.text ); free( ppp->filename ); - free_pp_entry( ppp, pphash(name) ); - - if(pp_status.debug) - printf("Deleted (%s, %d) <%s>\n", pp_status.input, pp_status.line_number, name); + free_pp_entry( ppp, idx ); } pp_entry_t *pp_add_define(const char *def, const char *text)

1 0