December 2020 - Wine-Commits

Gabriel Ivăncescu : iphlpapi/tests: Close the ICMP handle when done.
by Alexandre Julliard Dec. 3, 2020

Dec. 3, 2020

Module: wine Branch: master Commit: 7d451c339634e3306be780337044b878940efc5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d451c339634e3306be78033… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Nov 23 15:47:39 2020 +0200 iphlpapi/tests: Close the ICMP handle when done. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 6965ae84570..1465e26bea5 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1027,6 +1027,8 @@ static void testIcmpSendEcho(void) ok(reply->Status == IP_SUCCESS, "Expect status:0x%08x, got:0x%08x\n", IP_SUCCESS, reply->Status); ok(reply->DataSize == sizeof(senddata), "Got size:%d\n", reply->DataSize); ok(!memcmp(senddata, reply->Data, min(sizeof(senddata), reply->DataSize)), "Data mismatch\n"); + + IcmpCloseHandle(icmp); } /*

1 0

Michael Stefaniuc : mapi32: Use wide-char string literals.
by Alexandre Julliard Dec. 3, 2020

Dec. 3, 2020

Module: wine Branch: master Commit: 7ae2a7cbcda0179e8f316781d1b4414a7f0bb5a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ae2a7cbcda0179e8f316781… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Dec 3 00:32:51 2020 +0100 mapi32: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mapi32/tests/prop.c | 10 +++++----- dlls/mapi32/util.c | 20 ++++++-------------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/dlls/mapi32/tests/prop.c b/dlls/mapi32/tests/prop.c index 5bbddb3809c..61ec5f16a9f 100644 --- a/dlls/mapi32/tests/prop.c +++ b/dlls/mapi32/tests/prop.c @@ -102,7 +102,7 @@ static ULONG ptTypes[] = { static void test_PropCopyMore(void) { static char szHiA[] = "Hi!"; - static WCHAR szHiW[] = { 'H', 'i', '!', '\0' }; + static WCHAR szHiW[] = L"Hi!"; SPropValue *lpDest = NULL, *lpSrc = NULL; ULONG i; SCODE scode; @@ -182,7 +182,7 @@ static void test_PropCopyMore(void) static void test_UlPropSize(void) { static char szHiA[] = "Hi!"; - static WCHAR szHiW[] = { 'H', 'i', '!', '\0' }; + static WCHAR szHiW[] = L"Hi!"; LPSTR buffa[2]; LPWSTR buffw[2]; SBinary buffbin[2]; @@ -702,7 +702,7 @@ static void test_PpropFindProp(void) static void test_ScCountProps(void) { static char szHiA[] = "Hi!"; - static WCHAR szHiW[] = { 'H', 'i', '!', '\0' }; + static WCHAR szHiW[] = L"Hi!"; static const ULONG ULHILEN = 4; /* chars in szHiA/W incl. NUL */ LPSTR buffa[3]; LPWSTR buffw[3]; @@ -971,7 +971,7 @@ static void test_FBadRglpszA(void) static void test_FBadRglpszW(void) { LPWSTR lpStrs[4]; - static WCHAR szString[] = { 'A',' ','S','t','r','i','n','g','\0' }; + static WCHAR szString[] = L"A String"; BOOL bRet; if (!pFBadRglpszW) @@ -1063,7 +1063,7 @@ static void test_FBadRow(void) static void test_FBadProp(void) { - static WCHAR szEmpty[] = { '\0' }; + static WCHAR szEmpty[] = L""; GUID iid; ULONG pt, res; SPropValue pv; diff --git a/dlls/mapi32/util.c b/dlls/mapi32/util.c index 7e324a0e650..8f0036e6873 100644 --- a/dlls/mapi32/util.c +++ b/dlls/mapi32/util.c @@ -966,8 +966,6 @@ static HMODULE mapi_ex_provider; */ static void load_mapi_provider(HKEY hkeyMail, LPCWSTR valueName, HMODULE *mapi_provider) { - static const WCHAR mapi32_dll[] = {'m','a','p','i','3','2','.','d','l','l',0 }; - DWORD dwType, dwLen = 0; LPWSTR dllPath; @@ -982,7 +980,7 @@ static void load_mapi_provider(HKEY hkeyMail, LPCWSTR valueName, HMODULE *mapi_p RegQueryValueExW(hkeyMail, valueName, NULL, NULL, (LPBYTE)dllPath, &dwLen); /* Check that this value doesn't refer to mapi32.dll (eg, as Outlook does) */ - if (lstrcmpiW(dllPath, mapi32_dll) != 0) + if (lstrcmpiW(dllPath, L"mapi32.dll") != 0) { if (dwType == REG_EXPAND_SZ) { @@ -1022,13 +1020,7 @@ static void load_mapi_provider(HKEY hkeyMail, LPCWSTR valueName, HMODULE *mapi_p */ void load_mapi_providers(void) { - static const WCHAR regkey_mail[] = { - 'S','o','f','t','w','a','r','e','\\','C','l','i','e','n','t','s','\\', - 'M','a','i','l',0 }; - - static const WCHAR regkey_dllpath[] = {'D','L','L','P','a','t','h',0 }; - static const WCHAR regkey_dllpath_ex[] = {'D','L','L','P','a','t','h','E','x',0 }; - static const WCHAR regkey_backslash[] = { '\\', 0 }; + static const WCHAR regkey_mail[] = L"Software\\Clients\\Mail"; HKEY hkeyMail; DWORD dwType, dwLen = 0; @@ -1056,13 +1048,13 @@ void load_mapi_providers(void) TRACE("appName: %s\n", debugstr_w(appName)); appKey = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * (lstrlenW(regkey_mail) + - lstrlenW(regkey_backslash) + lstrlenW(appName) + 1)); + lstrlenW(L"\\") + lstrlenW(appName) + 1)); if (!appKey) goto cleanUp; lstrcpyW(appKey, regkey_mail); - lstrcatW(appKey, regkey_backslash); + lstrcatW(appKey, L"\\"); lstrcatW(appKey, appName); RegCloseKey(hkeyMail); @@ -1074,8 +1066,8 @@ void load_mapi_providers(void) goto cleanUp; /* Try to load the providers */ - load_mapi_provider(hkeyMail, regkey_dllpath, &mapi_provider); - load_mapi_provider(hkeyMail, regkey_dllpath_ex, &mapi_ex_provider); + load_mapi_provider(hkeyMail, L"DLLPath", &mapi_provider); + load_mapi_provider(hkeyMail, L"DLLPathEx", &mapi_ex_provider); /* Now try to load our function pointers */ ZeroMemory(&mapiFunctions, sizeof(mapiFunctions));

1 0

Francois Gouget : mscoree/tests: The comtest registry tests may require elevated privileges.
by Alexandre Julliard Dec. 3, 2020

Dec. 3, 2020

Module: wine Branch: master Commit: 4c6b675198ed43a7660c81486033c19804f8bce4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c6b675198ed43a7660c8148… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Dec 2 06:54:40 2020 +0100 mscoree/tests: The comtest registry tests may require elevated privileges. On Windows Vista and 7 run_registry_test() requires having elevated privileges. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/tests/comtest.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c index b62d527bb95..4b2183bac3a 100644 --- a/dlls/mscoree/tests/comtest.c +++ b/dlls/mscoree/tests/comtest.c @@ -168,6 +168,12 @@ static void run_registry_test(run_type run) sprintf(buffer, "CLSID\\%s", wine_dbgstr_guid(&CLSID_Test), ""); ret = RegCreateKeyA( HKEY_CLASSES_ROOT, buffer, &hkey ); + if (ret == ERROR_ACCESS_DENIED && !IsUserAnAdmin()) + { + win_skip("cannot run the registry tests due to user not being admin\n"); + RegCloseKey(hkey); + return; + } ok(ret == ERROR_SUCCESS, "RegCreateKeyA returned %x\n", ret); ret = RegSetKeyValueA(hkey, "InprocServer32", NULL, REG_SZ, "mscoree.dll", 11);

1 0

Gabriel Ivăncescu : include/icmpapi: Add missing function declarations.
by Alexandre Julliard Dec. 3, 2020

Dec. 3, 2020

Module: wine Branch: master Commit: f5b0663c6f035dc7e2be5055c1bdbb703db81047 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5b0663c6f035dc7e2be5055… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Nov 23 15:47:38 2020 +0200 include/icmpapi: Add missing function declarations. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/icmpapi.h | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/include/icmpapi.h b/include/icmpapi.h index 102851a5c87..e27d0556c4f 100644 --- a/include/icmpapi.h +++ b/include/icmpapi.h @@ -30,10 +30,24 @@ HANDLE WINAPI IcmpCreateFile( VOID ); +HANDLE WINAPI Icmp6CreateFile( + VOID + ); + BOOL WINAPI IcmpCloseHandle( HANDLE IcmpHandle ); +DWORD WINAPI IcmpParseReplies( + LPVOID ReplyBuffer, + DWORD ReplySize + ); + +DWORD WINAPI Icmp6ParseReplies( + LPVOID ReplyBuffer, + DWORD ReplySize + ); + DWORD WINAPI IcmpSendEcho( HANDLE IcmpHandle, IPAddr DestinationAddress, @@ -45,6 +59,62 @@ DWORD WINAPI IcmpSendEcho( DWORD Timeout ); +DWORD WINAPI IcmpSendEcho2( + HANDLE IcmpHandle, + HANDLE Event, +#ifdef __WINE_WINTERNL_H + PIO_APC_ROUTINE ApcRoutine, +#else + FARPROC ApcRoutine, +#endif + PVOID ApcContext, + IPAddr DestinationAddress, + LPVOID RequestData, + WORD RequestSize, + PIP_OPTION_INFORMATION RequestOptions, + LPVOID ReplyBuffer, + DWORD ReplySize, + DWORD Timeout + ); + +DWORD WINAPI IcmpSendEcho2Ex( + HANDLE IcmpHandle, + HANDLE Event, +#ifdef __WINE_WINTERNL_H + PIO_APC_ROUTINE ApcRoutine, +#else + FARPROC ApcRoutine, +#endif + PVOID ApcContext, + IPAddr SourceAddress, + IPAddr DestinationAddress, + LPVOID RequestData, + WORD RequestSize, + PIP_OPTION_INFORMATION RequestOptions, + LPVOID ReplyBuffer, + DWORD ReplySize, + DWORD Timeout + ); + +DWORD WINAPI Icmp6SendEcho2( + HANDLE IcmpHandle, + HANDLE Event, +#ifdef __WINE_WINTERNL_H + PIO_APC_ROUTINE ApcRoutine, +#else + FARPROC ApcRoutine, +#endif + PVOID ApcContext, + struct sockaddr_in6* SourceAddress, + struct sockaddr_in6* DestinationAddress, + LPVOID RequestData, + WORD RequestSize, + PIP_OPTION_INFORMATION RequestOptions, + LPVOID ReplyBuffer, + DWORD ReplySize, + DWORD Timeout + ); + #ifdef __cplusplus }

1 0

Alexandre Julliard : wpp: Merge preproc.c into wpp.c.
by Alexandre Julliard Dec. 3, 2020

Dec. 3, 2020

Module: wine Branch: master Commit: 9442c45c805479f02792691ebd51bc36b05aa4c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9442c45c805479f02792691e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 3 15:01:54 2020 +0100 wpp: Merge preproc.c into wpp.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wpp/Makefile.in | 4 +- libs/wpp/preproc.c | 579 --------------------------------------------------- libs/wpp/wpp.c | 556 ++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 556 insertions(+), 583 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9442c45c805479f02792…

1 0

Michael Stefaniuc : qcap: Use wide-char string literals.
by Alexandre Julliard Dec. 3, 2020

Dec. 3, 2020

Module: wine Branch: master Commit: ab234b54469b14153c8a365965daa59d0339fc0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab234b54469b14153c8a3659… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Nov 27 23:48:40 2020 +0100 qcap: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/capturegraph.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index b1569bbc3a3..e3f047b9957 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -371,9 +371,6 @@ static HRESULT match_smart_tee_pin(CaptureGraphImpl *This, IUnknown *pSource, IPin **source_out) { - static const WCHAR inputW[] = {'I','n','p','u','t',0}; - static const WCHAR captureW[] = {'C','a','p','t','u','r','e',0}; - static const WCHAR previewW[] = {'P','r','e','v','i','e','w',0}; IPin *capture = NULL; IPin *preview = NULL; IPin *peer = NULL; @@ -439,7 +436,7 @@ static HRESULT match_smart_tee_pin(CaptureGraphImpl *This, hr = IGraphBuilder_AddFilter(This->mygraph, smartTee, NULL); if (SUCCEEDED(hr)) { IPin *smartTeeInput = NULL; - hr = IBaseFilter_FindPin(smartTee, inputW, &smartTeeInput); + hr = IBaseFilter_FindPin(smartTee, L"Input", &smartTeeInput); if (SUCCEEDED(hr)) { hr = IGraphBuilder_ConnectDirect(This->mygraph, capture, smartTeeInput, NULL); IPin_Release(smartTeeInput); @@ -456,9 +453,9 @@ static HRESULT match_smart_tee_pin(CaptureGraphImpl *This, goto end; } if (IsEqualIID(pCategory, &PIN_CATEGORY_CAPTURE)) - hr = IBaseFilter_FindPin(smartTee, captureW, source_out); + hr = IBaseFilter_FindPin(smartTee, L"Capture", source_out); else { - hr = IBaseFilter_FindPin(smartTee, previewW, source_out); + hr = IBaseFilter_FindPin(smartTee, L"Preview", source_out); if (SUCCEEDED(hr)) hr = VFW_S_NOPREVIEWPIN; }

1 0

Michael Stefaniuc : regsvr32: Use a string literal for an empty string.
by Alexandre Julliard Dec. 3, 2020

Dec. 3, 2020

Module: wine Branch: master Commit: 24ac30d2a07de4ba134eeed10829ea791bf392e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24ac30d2a07de4ba134eeed1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Dec 3 00:32:50 2020 +0100 regsvr32: Use a string literal for an empty string. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regsvr32/regsvr32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 885f0ff7833..ecfd95234dd 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -315,7 +315,7 @@ int __cdecl wmain(int argc, WCHAR* argv[]) BOOL Unregister = FALSE; BOOL DllFound = FALSE; WCHAR* wsCommandLine = NULL; - WCHAR EmptyLine[1] = {0}; + WCHAR EmptyLine[] = L""; OleInitialize(NULL);

1 0

Alexandre Julliard : wpp: Don't try to recover from memory allocation errors.
by Alexandre Julliard Dec. 3, 2020

Dec. 3, 2020

Module: wine Branch: master Commit: de2f4ceeb82fa1f4376db97f94dd0c0169ba6fcd URL: https://source.winehq.org/git/wine.git/?a=commit;h=de2f4ceeb82fa1f4376db97f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 3 13:23:45 2020 +0100 wpp: Don't try to recover from memory allocation errors. wpp is only used in short-lived tools. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/wpp.h | 8 ++--- libs/wpp/ppl.l | 55 ++++++++++----------------------- libs/wpp/ppy.y | 55 ++++++++------------------------- libs/wpp/preproc.c | 83 ++++++-------------------------------------------- libs/wpp/wpp.c | 49 +++++------------------------ libs/wpp/wpp_private.h | 3 +- 6 files changed, 50 insertions(+), 203 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=de2f4ceeb82fa1f4376d…

1 0

Alexandre Julliard : wpp: Remove some dead code.
by Alexandre Julliard Dec. 3, 2020

Dec. 3, 2020

Module: wine Branch: master Commit: 107103e2bd97bba41ddc5cb0f29da952db4ce11d URL: https://source.winehq.org/git/wine.git/?a=commit;h=107103e2bd97bba41ddc5cb0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 3 14:17:14 2020 +0100 wpp: Remove some dead code. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/wpp.h | 1 - libs/wpp/ppl.l | 20 +++------------ libs/wpp/ppy.y | 35 ++++++++----------------- libs/wpp/preproc.c | 70 ++++++++------------------------------------------ libs/wpp/wpp.c | 27 +++---------------- libs/wpp/wpp_private.h | 46 ++++++--------------------------- tools/widl/widl.c | 13 +++------- 7 files changed, 39 insertions(+), 173 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=107103e2bd97bba41ddc…

1 0

Alexandre Julliard : wpp: Use standard Wine lists where possible.
by Alexandre Julliard Dec. 3, 2020

Dec. 3, 2020

Module: wine Branch: master Commit: 506bdf4249025e6d786c976e88b06a66a442dfa5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=506bdf4249025e6d786c976e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 3 13:27:15 2020 +0100 wpp: Use standard Wine lists where possible. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wpp/ppl.l | 10 +++---- libs/wpp/preproc.c | 72 ++++++++++++++++---------------------------------- libs/wpp/wpp.c | 15 +++++------ libs/wpp/wpp_private.h | 9 +++---- 4 files changed, 37 insertions(+), 69 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index a1d54029c7c..4fc23384dff 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -302,7 +302,7 @@ include_state_t pp_incl_state = 0 /* seen_junk */ }; -includelogicentry_t *pp_includelogiclist = NULL; +struct list pp_includelogiclist = LIST_INIT( pp_includelogiclist ); #define YY_INPUT(buf,result,max_size) \ { \ @@ -1350,11 +1350,7 @@ static bufferstackentry_t *pop_buffer(void) iep->ppp = ppp; ppp->iep = iep; iep->filename = bufferstack[bufferstackidx].include_filename; - iep->prev = NULL; - iep->next = pp_includelogiclist; - if(iep->next) - iep->next->prev = iep; - pp_includelogiclist = iep; + list_add_head( &pp_includelogiclist, &iep->entry ); if(pp_status.debug) fprintf(stderr, "pop_buffer: %s:%d: includelogic added, include_ppp='%s', file='%s'\n", bufferstack[bufferstackidx].filename, bufferstack[bufferstackidx].line_number, pp_incl_state.ppp, iep->filename); @@ -1557,7 +1553,7 @@ void pp_do_include(char *fname, int type) if(!fname) return; - for(iep = pp_includelogiclist; iep; iep = iep->next) + LIST_FOR_EACH_ENTRY( iep, &pp_includelogiclist, includelogicentry_t, entry ) { if(!strcmp(iep->filename, fname)) { diff --git a/libs/wpp/preproc.c b/libs/wpp/preproc.c index 8b9b8b05375..2106b811e83 100644 --- a/libs/wpp/preproc.c +++ b/libs/wpp/preproc.c @@ -39,10 +39,11 @@ struct pp_status pp_status; typedef struct pp_def_state { - struct pp_def_state *next; - pp_entry_t *defines[HASHKEY]; + struct list entry; + struct list defines[HASHKEY]; } pp_def_state_t; +static struct list pp_states = LIST_INIT( pp_states ); static pp_def_state_t *pp_def_state; #define MAXIFSTACK 64 @@ -56,14 +57,11 @@ void pp_print_status(void) int i; int sum; int total = 0; - pp_entry_t *ppp; fprintf(stderr, "Defines statistics:\n"); for(i = 0; i < HASHKEY; i++) { - sum = 0; - for(ppp = pp_def_state->defines[i]; ppp; ppp = ppp->next) - sum++; + sum = list_count( &pp_def_state->defines[i] ); total += sum; if (sum) fprintf(stderr, "%4d, %3d\n", i, sum); } @@ -188,7 +186,7 @@ pp_entry_t *pplookup(const char *ident) if(!ident) return NULL; idx = pphash(ident); - for(ppp = pp_def_state->defines[idx]; ppp; ppp = ppp->next) + LIST_FOR_EACH_ENTRY( ppp, &pp_def_state->defines[idx], pp_entry_t, entry ) { if(!strcmp(ident, ppp->ident)) return ppp; @@ -200,35 +198,11 @@ static void free_pp_entry( pp_entry_t *ppp, int idx ) { if(ppp->iep) { - if(ppp->iep == pp_includelogiclist) - { - pp_includelogiclist = ppp->iep->next; - if(pp_includelogiclist) - pp_includelogiclist->prev = NULL; - } - else - { - ppp->iep->prev->next = ppp->iep->next; - if(ppp->iep->next) - ppp->iep->next->prev = ppp->iep->prev; - } + list_remove( &ppp->iep->entry ); free(ppp->iep->filename); free(ppp->iep); } - - if(pp_def_state->defines[idx] == ppp) - { - pp_def_state->defines[idx] = ppp->next; - if(pp_def_state->defines[idx]) - pp_def_state->defines[idx]->prev = NULL; - } - else - { - ppp->prev->next = ppp->next; - if(ppp->next) - ppp->next->prev = ppp->prev; - } - + list_remove( &ppp->entry ); free(ppp); } @@ -236,9 +210,10 @@ static void free_pp_entry( pp_entry_t *ppp, int idx ) void pp_push_define_state(void) { pp_def_state_t *state = pp_xmalloc( sizeof(*state) ); + int i; - memset( state->defines, 0, sizeof(state->defines) ); - state->next = pp_def_state; + for (i = 0; i < HASHKEY; i++) list_init( &state->defines[i] ); + list_add_head( &pp_states, &state->entry ); pp_def_state = state; } @@ -246,16 +221,22 @@ void pp_push_define_state(void) void pp_pop_define_state(void) { int i; - pp_entry_t *ppp; - pp_def_state_t *state; + pp_entry_t *ppp, *ppp2; + pp_def_state_t *state = pp_def_state; for (i = 0; i < HASHKEY; i++) { - while ((ppp = pp_def_state->defines[i]) != NULL) pp_del_define( ppp->ident ); + LIST_FOR_EACH_ENTRY_SAFE( ppp, ppp2, &state->defines[i], pp_entry_t, entry ) + { + free( ppp->ident ); + free( ppp->subst.text ); + free( ppp->filename ); + free_pp_entry( ppp, i ); + } } - state = pp_def_state; - pp_def_state = state->next; + list_remove( &state->entry ); free( state ); + pp_def_state = LIST_ENTRY( list_head( &pp_states ), pp_def_state_t, entry ); } void pp_del_define(const char *name) @@ -300,10 +281,7 @@ pp_entry_t *pp_add_define(const char *def, const char *text) ppp->subst.text = text ? pp_xstrdup(text) : NULL; ppp->filename = pp_xstrdup(pp_status.input ? pp_status.input : "<internal or cmdline>"); ppp->linenumber = pp_status.input ? pp_status.line_number : 0; - ppp->next = pp_def_state->defines[idx]; - pp_def_state->defines[idx] = ppp; - if(ppp->next) - ppp->next->prev = ppp; + list_add_head( &pp_def_state->defines[idx], &ppp->entry ); if(ppp->subst.text) { /* Strip trailing white space from subst text */ @@ -345,11 +323,7 @@ pp_entry_t *pp_add_macro(char *id, marg_t *args[], int nargs, mtext_t *exp) ppp->subst.mtext= exp; ppp->filename = pp_xstrdup(pp_status.input ? pp_status.input : "<internal or cmdline>"); ppp->linenumber = pp_status.input ? pp_status.line_number : 0; - ppp->next = pp_def_state->defines[idx]; - pp_def_state->defines[idx] = ppp; - if(ppp->next) - ppp->next->prev = ppp; - + list_add_head( &pp_def_state->defines[idx], &ppp->entry ); if(pp_status.debug) { fprintf(stderr, "Added macro (%s, %d) <%s(%d)> to <", pp_status.input, pp_status.line_number, ppp->ident, nargs); diff --git a/libs/wpp/wpp.c b/libs/wpp/wpp.c index c17289c8923..de7f7f761a2 100644 --- a/libs/wpp/wpp.c +++ b/libs/wpp/wpp.c @@ -32,18 +32,18 @@ int ppy_debug, pp_flex_debug; struct define { - struct define *next; + struct list entry; char *name; char *value; }; -static struct define *cmdline_defines; +static struct list cmdline_defines = LIST_INIT( cmdline_defines ); static void add_cmdline_defines(void) { struct define *def; - for (def = cmdline_defines; def; def = def->next) + LIST_FOR_EACH_ENTRY( def, &cmdline_defines, struct define, entry ) { if (def->value) pp_add_define( def->name, def->value ); } @@ -53,7 +53,7 @@ static void del_cmdline_defines(void) { struct define *def; - for (def = cmdline_defines; def; def = def->next) + LIST_FOR_EACH_ENTRY( def, &cmdline_defines, struct define, entry ) { if (def->value) pp_del_define( def->name ); } @@ -94,7 +94,7 @@ void wpp_add_define( const char *name, const char *value ) if (!value) value = ""; - for (def = cmdline_defines; def; def = def->next) + LIST_FOR_EACH_ENTRY( def, &cmdline_defines, struct define, entry ) { if (!strcmp( def->name, name )) { @@ -105,10 +105,9 @@ void wpp_add_define( const char *name, const char *value ) } def = pp_xmalloc( sizeof(*def) ); - def->next = cmdline_defines; def->name = pp_xstrdup(name); def->value = pp_xstrdup(value); - cmdline_defines = def; + list_add_head( &cmdline_defines, &def->entry ); } @@ -117,7 +116,7 @@ void wpp_del_define( const char *name ) { struct define *def; - for (def = cmdline_defines; def; def = def->next) + LIST_FOR_EACH_ENTRY( def, &cmdline_defines, struct define, entry ) { if (!strcmp( def->name, name )) { diff --git a/libs/wpp/wpp_private.h b/libs/wpp/wpp_private.h index 3f395e528bb..2598ad77223 100644 --- a/libs/wpp/wpp_private.h +++ b/libs/wpp/wpp_private.h @@ -22,6 +22,7 @@ #include <stdio.h> #include <string.h> +#include "wine/list.h" struct pp_entry; /* forward */ /* @@ -30,8 +31,7 @@ struct pp_entry; /* forward */ * are protected in the #ifndef/#endif way. */ typedef struct includelogicentry { - struct includelogicentry *next; - struct includelogicentry *prev; + struct list entry; struct pp_entry *ppp; /* The define which protects the file */ char *filename; /* The filename of the include */ } includelogicentry_t; @@ -81,8 +81,7 @@ typedef enum { } def_type_t; typedef struct pp_entry { - struct pp_entry *next; - struct pp_entry *prev; + struct list entry; def_type_t type; /* Define or macro */ char *ident; /* The key */ marg_t **margs; /* Macro arguments array or NULL if none */ @@ -217,7 +216,7 @@ struct pp_status extern struct pp_status pp_status; extern include_state_t pp_incl_state; -extern includelogicentry_t *pp_includelogiclist; +extern struct list pp_includelogiclist; /* * From ppl.l

1 0