August 2021 - Wine-Commits - list.winehq.org

Jacek Caban : gdi32: Merge enhmetafiledrv.h into emfdc.c.
by Alexandre Julliard Aug. 24, 2021

Aug. 24, 2021

Module: wine Branch: master Commit: 7e67cc996f33c735deada95159f28f2fba5d119c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e67cc996f33c735deada951… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 24 13:40:52 2021 +0200 gdi32: Merge enhmetafiledrv.h into emfdc.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/emfdc.c | 35 ++++++++++++++++++-------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 49 ------------------------------------ 2 files changed, 25 insertions(+), 59 deletions(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index 477d0445bc7..479e0caa6b6 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -22,7 +22,8 @@ #include <assert.h> -#include "enhmfdrv/enhmetafiledrv.h" +#include "gdi_private.h" +#include "ntgdi_private.h" #include "winnls.h" #include "wine/debug.h" @@ -30,6 +31,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile); +struct emf +{ + ENHMETAHEADER *emh; + DC_ATTR *dc_attr; + UINT handles_size, cur_handles; + HGDIOBJ *handles; + HANDLE file; + HBRUSH dc_brush; + HPEN dc_pen; + BOOL path; +}; + +#define HANDLE_LIST_INC 20 static const RECTL empty_bounds = { 0, 0, -1, -1 }; static BOOL emfdc_record( struct emf *emf, EMR *emr ) @@ -1880,7 +1894,7 @@ void EMFDC_DeleteDC( DC_ATTR *dc_attr ) HeapFree( GetProcessHeap(), 0, emf->emh ); for (index = 0; index < emf->handles_size; index++) if (emf->handles[index]) - GDI_hdc_not_using_object( emf->handles[index], dc_attr->hdc ); + GDI_hdc_not_using_object( emf->handles[index], emf->dc_attr->hdc ); HeapFree( GetProcessHeap(), 0, emf->handles ); } @@ -1970,6 +1984,7 @@ HDC WINAPI CreateEnhMetaFileW( HDC hdc, const WCHAR *filename, const RECT *rect, return 0; } + emf->dc_attr = dc_attr; dc_attr->emf = emf; if (description) /* App name\0Title\0\0 */ @@ -1992,7 +2007,7 @@ HDC WINAPI CreateEnhMetaFileW( HDC hdc, const WCHAR *filename, const RECT *rect, HANDLE_LIST_INC * sizeof(emf->handles[0]) ); emf->handles_size = HANDLE_LIST_INC; emf->cur_handles = 1; - emf->hFile = 0; + emf->file = 0; emf->dc_brush = 0; emf->dc_pen = 0; emf->path = FALSE; @@ -2052,7 +2067,7 @@ HDC WINAPI CreateEnhMetaFileW( HDC hdc, const WCHAR *filename, const RECT *rect, DeleteDC( ret ); return 0; } - emf->hFile = file; + emf->file = file; } TRACE( "returning %p\n", ret ); @@ -2103,23 +2118,23 @@ HENHMETAFILE WINAPI CloseEnhMetaFile( HDC hdc ) emf->emh->szlMillimeters.cy * 100 / emf->emh->szlDevice.cy; } - if (emf->hFile) /* disk based metafile */ + if (emf->file) /* disk based metafile */ { - if (!WriteFile( emf->hFile, emf->emh, emf->emh->nBytes, NULL, NULL )) + if (!WriteFile( emf->file, emf->emh, emf->emh->nBytes, NULL, NULL )) { - CloseHandle( emf->hFile ); + CloseHandle( emf->file ); return 0; } HeapFree( GetProcessHeap(), 0, emf->emh ); - mapping = CreateFileMappingA( emf->hFile, NULL, PAGE_READONLY, 0, 0, NULL ); + mapping = CreateFileMappingA( emf->file, NULL, PAGE_READONLY, 0, 0, NULL ); TRACE( "mapping = %p\n", mapping ); emf->emh = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 0 ); TRACE( "view = %p\n", emf->emh ); CloseHandle( mapping ); - CloseHandle( emf->hFile ); + CloseHandle( emf->file ); } - hmf = EMF_Create_HENHMETAFILE( emf->emh, emf->emh->nBytes, emf->hFile != 0 ); + hmf = EMF_Create_HENHMETAFILE( emf->emh, emf->emh->nBytes, emf->file != 0 ); emf->emh = NULL; /* So it won't be deleted */ DeleteDC( hdc ); return hmf; diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h deleted file mode 100644 index f9f9e1a1a93..00000000000 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Enhanced MetaFile driver definitions - * - * Copyright 1999 Huw D M Davies - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __WINE_ENHMETAFILEDRV_H -#define __WINE_ENHMETAFILEDRV_H - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "ntgdi_private.h" -#include "gdi_private.h" - -/* Enhanced Metafile driver physical DC */ - -struct emf -{ - ENHMETAHEADER *emh; /* Pointer to enhanced metafile header */ - DC_ATTR *dc_attr; - UINT handles_size, cur_handles; - HGDIOBJ *handles; - HANDLE hFile; /* Handle for disk based MetaFile */ - HBRUSH dc_brush; - HPEN dc_pen; - BOOL path; -}; - -#define HANDLE_LIST_INC 20 - - -#endif /* __WINE_METAFILEDRV_H */

1 0

Eric Pouech : winedump: Add support for dumping S_LOCAL symbol record.
by Alexandre Julliard Aug. 24, 2021

Aug. 24, 2021

Module: wine Branch: master Commit: 5c9c3428588865bcded2f6a4eca8e65d7dea3889 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c9c3428588865bcded2f6a4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Aug 24 11:11:31 2021 +0200 winedump: Add support for dumping S_LOCAL symbol record. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/mscvpdb.h | 9 +++++++++ tools/winedump/msc.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 9e544108bdd..4d4b8166473 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1727,6 +1727,15 @@ union codeview_symbol unsigned short inst_len; unsigned int index; } heap_alloc_site; + + struct + { + unsigned short int len; + unsigned short int id; + cv_typ_t symtype; + unsigned short varflags; + char name[1]; + } local_v3; }; #define S_COMPILE 0x0001 diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index c7ca3eea77a..6d463c0ee1b 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -288,6 +288,33 @@ static const char* get_funcattr(unsigned attr) return tmp; } +static const char* get_varflags(unsigned flags) +{ + static char tmp[1024]; + unsigned pos = 0; + + if (!flags) return "none"; +#define X(s) {if (pos) tmp[pos++] = ';'; strcpy(tmp + pos, s); pos += strlen(s);} + if (flags & 0x0001) X("param"); + if (flags & 0x0002) X("addr-taken"); + if (flags & 0x0004) X("compiler-gen"); + if (flags & 0x0008) X("aggregated"); + if (flags & 0x0010) X("in-aggreate"); + if (flags & 0x0020) X("aliased"); + if (flags & 0x0040) X("alias"); + if (flags & 0x0080) X("retval"); + if (flags & 0x0100) X("optimized-out"); + if (flags & 0x0200) X("enreg-global"); + if (flags & 0x0400) X("enreg-static"); + if (flags & 0xf800) pos += sprintf(tmp, "unk:%x", flags & 0xf800); +#undef X + + tmp[pos] = '\0'; + assert(pos < sizeof(tmp)); + + return tmp; +} + static const char* get_machine(unsigned m) { const char* machine; @@ -1564,6 +1591,13 @@ BOOL codeview_dump_symbols(const void* root, unsigned long size) sym->thread_v3.segment, sym->thread_v3.offset, sym->thread_v3.symtype); break; + case S_LOCAL: + printf("\tS-Local V3 '%s' type=%x flags=%s\n", + sym->local_v3.name, sym->local_v3.symtype, + get_varflags(sym->local_v3.varflags)); + + break; + default: printf(">>> Unsupported symbol-id %x sz=%d\n", sym->generic.id, sym->generic.len + 2); dump_data((const void*)sym, sym->generic.len + 2, " ");

1 0

Jacek Caban : gdi32: Merge enhmfdrv/init.c into emfdc.c.
by Alexandre Julliard Aug. 24, 2021

Aug. 24, 2021

Module: wine Branch: master Commit: 67bbaaf9216ce9e3cf1d0b8935f2b5d561dc2d69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67bbaaf9216ce9e3cf1d0b89… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 24 13:39:59 2021 +0200 gdi32: Merge enhmfdrv/init.c into emfdc.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/Makefile.in | 1 - dlls/gdi32/emfdc.c | 291 +++++++++++++++++++++++++++++++++++++++ dlls/gdi32/enhmfdrv/init.c | 333 --------------------------------------------- 3 files changed, 291 insertions(+), 334 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=67bbaaf9216ce9e3cf1d…

1 0

Eric Pouech : winedump: Add support for buildinfo codeview record.
by Alexandre Julliard Aug. 24, 2021

Aug. 24, 2021

Module: wine Branch: master Commit: 45d4021ff59c2c4d66d99deda153e2dcf0ba335f URL: https://source.winehq.org/git/wine.git/?a=commit;h=45d4021ff59c2c4d66d99ded… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Aug 24 11:12:01 2021 +0200 winedump: Add support for buildinfo codeview record. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/mscvpdb.h | 7 +++++++ tools/winedump/msc.c | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 4ab83ef1f02..3c3ef487b63 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1821,6 +1821,13 @@ union codeview_symbol struct cv_addr_gap gaps[0]; } defrange_registerrel_v3; + struct + { + unsigned short int len; + unsigned short int id; + cv_itemid_t itemid; + } build_info_v3; + struct { unsigned short int len; diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 8948428427b..0fa96205e20 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1743,6 +1743,10 @@ BOOL codeview_dump_symbols(const void* root, unsigned long size) sym->callsiteinfo_v3.sect, sym->callsiteinfo_v3.off, sym->callsiteinfo_v3.typind); break; + case S_BUILDINFO: + printf("Build-info V3 item:%04x\n", sym->build_info_v3.itemid); + break; + case S_INLINESITE: printf("Inline-site V3 parent:%x end:%x inlinee:%x\n", sym->inline_site_v3.pParent, sym->inline_site_v3.pEnd, sym->inline_site_v3.inlinee);

1 0

Eric Pouech : winedump: Add support for dumping trampoline codeview records.
by Alexandre Julliard Aug. 24, 2021

Aug. 24, 2021

Module: wine Branch: master Commit: 872c61ff9779257b71e2f9916d1ee9617229bdb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=872c61ff9779257b71e2f991… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Aug 24 11:12:08 2021 +0200 winedump: Add support for dumping trampoline codeview records. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/mscvpdb.h | 12 ++++++++++++ tools/winedump/msc.c | 10 ++++++++++ 2 files changed, 22 insertions(+) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 3c3ef487b63..42455cbd0fe 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1497,6 +1497,18 @@ union codeview_symbol char name[1]; } block_v3; + struct + { + unsigned short int len; + unsigned short int id; + unsigned short trampType; /* 0: incremental, 1: branchisland */ + unsigned short cbThunk; + unsigned int offThunk; + unsigned int offTarget; + unsigned short sectThunk; + unsigned short sectTarget; + } trampoline_v3; + struct { unsigned short int len; diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 0fa96205e20..f5d2d15774d 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1566,6 +1566,16 @@ BOOL codeview_dump_symbols(const void* root, unsigned long size) sym->objname_v1.signature, p_string(&sym->objname_v1.p_name)); break; + case S_TRAMPOLINE: + printf("Trampoline V3 kind:%u %04x:%08x#%x -> %04x:%08x\n", + sym->trampoline_v3.trampType, + sym->trampoline_v3.sectThunk, + sym->trampoline_v3.offThunk, + sym->trampoline_v3.cbThunk, + sym->trampoline_v3.sectTarget, + sym->trampoline_v3.offTarget); + break; + case S_LABEL32_ST: printf("Label V1 '%s' in '%s' (%04x:%08x)\n", p_string(&sym->label_v1.p_name),

1 0

Alexandre Julliard : ntdll: Consistently fixup the machine type for IL-only binaries.
by Alexandre Julliard Aug. 24, 2021

Aug. 24, 2021

Module: wine Branch: master Commit: 88c5184b4d1ba4f230b0248f974974bb6a314371 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88c5184b4d1ba4f230b0248f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 24 17:39:58 2021 +0200 ntdll: Consistently fixup the machine type for IL-only binaries. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51668 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 2 -- dlls/ntdll/unix/loader.c | 6 +++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index a30db6dda8b..ae1afb2797b 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -2148,8 +2148,6 @@ static RTL_USER_PROCESS_PARAMETERS *build_initial_params( void **module ) if (!status) { if (main_image_info.ImageCharacteristics & IMAGE_FILE_DLL) status = STATUS_INVALID_IMAGE_FORMAT; - if (main_image_info.ImageFlags & IMAGE_FLAGS_ComPlusNativeReady) - main_image_info.Machine = native_machine; if (main_image_info.Machine != current_machine) status = STATUS_INVALID_IMAGE_FORMAT; } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 2dde2332a6a..8a5314a1117 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1569,7 +1569,11 @@ static NTSTATUS open_main_image( WCHAR *image, void **module, SECTION_IMAGE_INFO *module = NULL; status = NtMapViewOfSection( mapping, NtCurrentProcess(), module, 0, 0, NULL, &size, ViewShare, 0, PAGE_EXECUTE_READ ); - if (!status) NtQuerySection( mapping, SectionImageInformation, info, sizeof(*info), NULL ); + if (!status) + { + NtQuerySection( mapping, SectionImageInformation, info, sizeof(*info), NULL ); + if (info->u.s.ComPlusNativeReady) info->Machine = native_machine; + } NtClose( mapping ); } else if (status == STATUS_INVALID_IMAGE_NOT_MZ && loadorder != LO_NATIVE)

1 0

Jacek Caban : gdi32: Merge enhmfdrv/graphics.c into emfdc.c.
by Alexandre Julliard Aug. 24, 2021

Aug. 24, 2021

Module: wine Branch: master Commit: b793a8a2da7db12c3dd13c05b78a596e7fcce9a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b793a8a2da7db12c3dd13c05… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 24 13:40:30 2021 +0200 gdi32: Merge enhmfdrv/graphics.c into emfdc.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/Makefile.in | 1 - dlls/gdi32/emfdc.c | 699 ++++++++++++++++++++++++++++- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/graphics.c | 834 ----------------------------------- 4 files changed, 698 insertions(+), 837 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b793a8a2da7db12c3dd1…

1 0

Jacek Caban : gdi32: Merge enhmfdrv/bitblt.c into emfdc.c.
by Alexandre Julliard Aug. 24, 2021

Aug. 24, 2021

Module: wine Branch: master Commit: 580099aae868e576689719c8012ca80a3ffe6a2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=580099aae868e576689719c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 24 13:40:41 2021 +0200 gdi32: Merge enhmfdrv/bitblt.c into emfdc.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/Makefile.in | 1 - dlls/gdi32/emfdc.c | 297 ++++++++++++++++++++++++++++++- dlls/gdi32/enhmfdrv/bitblt.c | 326 ----------------------------------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 3 - 4 files changed, 295 insertions(+), 332 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=580099aae868e5766897…

1 0

Akihiro Sagawa : ws2_32/tests: Add socket option validity tests for a file handle.
by Alexandre Julliard Aug. 24, 2021

Aug. 24, 2021

Module: wine Branch: master Commit: 2a45917ae264108f1a4ddd8adb1c65af0b73aaee URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a45917ae264108f1a4ddd8a… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Aug 24 21:50:35 2021 +0900 ws2_32/tests: Add socket option validity tests for a file handle. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index a8d415c3cea..d3f2459aa3a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -11691,6 +11691,15 @@ static void test_sockopt_validity(void) { IPV6_USER_MTU, 0, 0, TRUE }, {} }; + static const struct sockopt_validity_test file_handle_tests[] = + { + { -1, WSAENOTSOCK, 0, TRUE }, + { SO_TYPE, WSAENOTSOCK, 0, TRUE }, + { SO_OPENTYPE }, + {} + }; + char path[MAX_PATH]; + HANDLE file; SOCKET sock; sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); @@ -11736,6 +11745,12 @@ static void test_sockopt_validity(void) do_sockopt_validity_tests("IPv6 raw", sock, IPPROTO_IPV6, ipv6_raw_tests); closesocket(sock); } + + GetSystemWindowsDirectoryA(path, ARRAY_SIZE(path)); + strcat(path, "\\system.ini"); + file = CreateFileA(path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_ALWAYS, 0x0, NULL); + do_sockopt_validity_tests("file", (SOCKET)file, SOL_SOCKET, file_handle_tests); + CloseHandle(file); } START_TEST( sock )

1 0

Akihiro Sagawa : ws2_32: Disallow NULL in socket lookups.
by Alexandre Julliard Aug. 24, 2021

Aug. 24, 2021

Module: wine Branch: master Commit: ee2e5c0242462b0a1538253cc69c6c3043027790 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee2e5c0242462b0a1538253c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Aug 24 21:50:39 2021 +0900 ws2_32: Disallow NULL in socket lookups. NULL means an unused slot, not a valid socket. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f58f7cea5cc..bf87e7824e5 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -379,6 +379,8 @@ static BOOL socket_list_find( SOCKET socket ) { unsigned int i; + if (!socket) return FALSE; + EnterCriticalSection( &cs_socket_list ); for (i = 0; i < socket_list_size; ++i) { @@ -397,6 +399,8 @@ static BOOL socket_list_remove( SOCKET socket ) { unsigned int i; + if (!socket) return FALSE; + EnterCriticalSection(&cs_socket_list); for (i = 0; i < socket_list_size; ++i) {

1 0