wine-commits January 2011

wine-commits@winehq.org

2 participants
879 discussions

Alexandre Julliard : wmc: Store input file location for each individual message.
by Alexandre Julliard 25 Jan '11

25 Jan '11

Module: wine Branch: master Commit: 45dc5bf6b2bcaf5fd882cf69fc65cab2e7196bc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45dc5bf6b2bcaf5fd882cf69f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 24 20:05:34 2011 +0100 wmc: Store input file location for each individual message. --- tools/wmc/mcy.y | 4 +++- tools/wmc/wmctypes.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tools/wmc/mcy.y b/tools/wmc/mcy.y index 5de67c9..54403d5 100644 --- a/tools/wmc/mcy.y +++ b/tools/wmc/mcy.y @@ -441,6 +441,8 @@ static lanmsg_t *new_lanmsg(lan_cp_t *lcp, WCHAR *msg) lmp->cp = lcp->codepage; lmp->msg = msg; lmp->len = unistrlen(msg) + 1; /* Include termination */ + lmp->file = input_name; + lmp->line = line_number; if(lmp->len > 4096) mcy_warning("Message exceptionally long; might be a missing termination\n"); return lmp; @@ -522,7 +524,7 @@ static void test_id(int id) static int check_languages(node_t *head) { - static const char err_missing[] = "Missing definition for language 0x%x; MessageID %d, facility 0x%x, severity 0x%x"; + static const char err_missing[] = "Missing definition for language 0x%x; MessageID %d, facility 0x%x, severity 0x%x\n"; node_t *ndp; int nm = 0; msg_t *msg = NULL; diff --git a/tools/wmc/wmctypes.h b/tools/wmc/wmctypes.h index 0b38089..483507a 100644 --- a/tools/wmc/wmctypes.h +++ b/tools/wmc/wmctypes.h @@ -73,6 +73,8 @@ typedef struct lanmsg { int cp; /* Codepage of message */ WCHAR *msg; /* Message text */ int len; /* Message length including trailing '\0' */ + const char *file; /* File location for definition */ + int line; } lanmsg_t; typedef struct msg {

1 0

Alexandre Julliard : wmc: Add a copy of the strmake utility function.
by Alexandre Julliard 25 Jan '11

25 Jan '11

Module: wine Branch: master Commit: 46ecc16deb1a3d2c2ffcf57085252796801759a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46ecc16deb1a3d2c2ffcf5708… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 24 20:05:00 2011 +0100 wmc: Add a copy of the strmake utility function. --- tools/wmc/utils.c | 21 +++++++++++++++++++-- tools/wmc/utils.h | 1 + 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/tools/wmc/utils.c b/tools/wmc/utils.c index 88dd45f..6f26da3 100644 --- a/tools/wmc/utils.c +++ b/tools/wmc/utils.c @@ -138,7 +138,6 @@ void *xmalloc(size_t size) void *res; assert(size > 0); - assert(size < 102400); res = malloc(size); if(res == NULL) { @@ -154,7 +153,6 @@ void *xrealloc(void *p, size_t size) void *res; assert(size > 0); - assert(size < 102400); res = realloc(p, size); if(res == NULL) { @@ -172,6 +170,25 @@ char *xstrdup(const char *str) return strcpy(s, str); } +char *strmake( const char* fmt, ... ) +{ + int n; + size_t size = 100; + va_list ap; + + for (;;) + { + char *p = xmalloc( size ); + va_start( ap, fmt ); + n = vsnprintf( p, size, fmt, ap ); + va_end( ap ); + if (n == -1) size *= 2; + else if ((size_t)n >= size) size = n + 1; + else return p; + free( p ); + } +} + int unistrlen(const WCHAR *s) { int n; diff --git a/tools/wmc/utils.h b/tools/wmc/utils.h index bef1abf..909cc99 100644 --- a/tools/wmc/utils.h +++ b/tools/wmc/utils.h @@ -33,6 +33,7 @@ char *xstrdup(const char *str); #define __attribute__(X) #endif +char *strmake(const char* fmt, ...) __attribute__((__format__ (__printf__, 1, 2 ))); int mcy_error(const char *s, ...) __attribute__((format (printf, 1, 2))); int xyyerror(const char *s, ...) __attribute__((format (printf, 1, 2))); int mcy_warning(const char *s, ...) __attribute__((format (printf, 1, 2)));

1 0

Hans Leidekker : wininet/tests: Trace errors from InternetReadFile in test_basic_request.
by Alexandre Julliard 24 Jan '11

24 Jan '11

Module: wine Branch: master Commit: 86eb9c24f14b3e44739ee8102c840ec9ccc77e60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86eb9c24f14b3e44739ee8102… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 24 15:22:31 2011 +0100 wininet/tests: Trace errors from InternetReadFile in test_basic_request. --- dlls/wininet/tests/http.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 8b4da71..4bced99 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1823,8 +1823,9 @@ static void test_basic_request(int port, const char *verb, const char *url) count = 0; memset(buffer, 0, sizeof buffer); + SetLastError(0xdeadbeef); r = InternetReadFile(hr, buffer, sizeof buffer, &count); - ok(r, "InternetReadFile failed\n"); + ok(r, "InternetReadFile failed %u\n", GetLastError()); ok(count == sizeof page1 - 1, "count was wrong\n"); ok(!memcmp(buffer, page1, sizeof page1), "http data wrong\n");

1 0

Hans Leidekker : msi: Implement the MsiPublishAssemblies and MsiUnpublishAssemblies standard actions .
by Alexandre Julliard 24 Jan '11

24 Jan '11

Module: wine Branch: master Commit: 92203f10530645792a1ad5964d00b4fefba04de4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92203f10530645792a1ad5964… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 24 15:22:11 2011 +0100 msi: Implement the MsiPublishAssemblies and MsiUnpublishAssemblies standard actions. --- dlls/msi/action.c | 7 -- dlls/msi/assembly.c | 239 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/msi/msipriv.h | 1 + dlls/msi/tests/action.c | 6 +- 4 files changed, 237 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=92203f10530645792a1ad…

1 0

Hans Leidekker : msi: Don't interpret assembly name attributes.
by Alexandre Julliard 24 Jan '11

24 Jan '11

Module: wine Branch: master Commit: 3eaf33fff7132db64ba0a27b0f1f86e0250551fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eaf33fff7132db64ba0a27b0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 24 15:21:45 2011 +0100 msi: Don't interpret assembly name attributes. --- dlls/msi/assembly.c | 126 +++++++++++++------------------------------------- 1 files changed, 33 insertions(+), 93 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index 539855c..f59d2eb 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -128,58 +128,31 @@ MSIRECORD *get_assembly_record( MSIPACKAGE *package, const WCHAR *comp ) struct assembly_name { - WCHAR *type; - WCHAR *name; - WCHAR *version; - WCHAR *culture; - WCHAR *token; - WCHAR *arch; + UINT count; + UINT index; + WCHAR **attrs; }; static UINT get_assembly_name_attribute( MSIRECORD *rec, LPVOID param ) { - static const WCHAR typeW[] = {'t','y','p','e',0}; + static const WCHAR fmtW[] = {'%','s','=','"','%','s','"',0}; static const WCHAR nameW[] = {'n','a','m','e',0}; - static const WCHAR versionW[] = {'v','e','r','s','i','o','n',0}; - static const WCHAR cultureW[] = {'c','u','l','t','u','r','e',0}; - static const WCHAR tokenW[] = {'p','u','b','l','i','c','K','e','y','T','o','k','e','n',0}; - static const WCHAR archW[] = {'p','r','o','c','e','s','s','o','r','A','r','c','h','i','t','e','c','t','u','r','e',0}; struct assembly_name *name = param; const WCHAR *attr = MSI_RecordGetString( rec, 2 ); - WCHAR *value = msi_dup_record_field( rec, 3 ); - - if (!strcmpiW( attr, typeW )) - name->type = value; - else if (!strcmpiW( attr, nameW )) - name->name = value; - else if (!strcmpiW( attr, versionW )) - name->version = value; - else if (!strcmpiW( attr, cultureW )) - name->culture = value; - else if (!strcmpiW( attr, tokenW )) - name->token = value; - else if (!strcmpiW( attr, archW )) - name->arch = value; - else - msi_free( value ); + const WCHAR *value = MSI_RecordGetString( rec, 3 ); + int len = strlenW( fmtW ) + strlenW( attr ) + strlenW( value ); + + if (!(name->attrs[name->index] = msi_alloc( len * sizeof(WCHAR) ))) + return ERROR_OUTOFMEMORY; + if (!strcmpiW( attr, nameW )) strcpyW( name->attrs[name->index++], value ); + else sprintfW( name->attrs[name->index++], fmtW, attr, value ); return ERROR_SUCCESS; } static WCHAR *get_assembly_display_name( MSIDATABASE *db, const WCHAR *comp, MSIASSEMBLY *assembly ) { - static const WCHAR fmt_netW[] = { - '%','s',',',' ','v','e','r','s','i','o','n','=','%','s',',',' ', - 'c','u','l','t','u','r','e','=','%','s',',',' ', - 'p','u','b','l','i','c','K','e','y','T','o','k','e','n','=','%','s',0}; - static const WCHAR fmt_sxsW[] = { - '%','s',',',' ','v','e','r','s','i','o','n','=','%','s',',',' ', - 'p','u','b','l','i','c','K','e','y','T','o','k','e','n','=','%','s',',',' ', - 'p','r','o','c','e','s','s','o','r','A','r','c','h','i','t','e','c','t','u','r','e','=','%','s',0}; - static const WCHAR fmt_sxs_localW[] = { - '%','s',',',' ','v','e','r','s','i','o','n','=','%','s',',',' ', - 'c','u','l','t','u','r','e','=','%','s',',',' ', - 'p','u','b','l','i','c','K','e','y','T','o','k','e','n','=','%','s',0}; + static const WCHAR commaW[] = {',',0}; static const WCHAR queryW[] = { 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', '`','M','s','i','A','s','s','e','m','b','l','y','N','a','m','e','`',' ', @@ -188,75 +161,42 @@ static WCHAR *get_assembly_display_name( MSIDATABASE *db, const WCHAR *comp, MSI struct assembly_name name; WCHAR *display_name = NULL; MSIQUERY *view; + UINT i, r; int len; - UINT r; - - memset( &name, 0, sizeof(name) ); r = MSI_OpenQuery( db, &view, queryW, comp ); if (r != ERROR_SUCCESS) return NULL; + name.count = 0; + name.index = 0; + name.attrs = NULL; + MSI_IterateRecords( view, &name.count, NULL, NULL ); + if (!name.count) goto done; + + name.attrs = msi_alloc( name.count * sizeof(WCHAR *) ); + if (!name.attrs) goto done; + MSI_IterateRecords( view, NULL, get_assembly_name_attribute, &name ); - msiobj_release( &view->hdr ); - if (assembly->attributes == msidbAssemblyAttributesWin32) - { - if (!assembly->application) - { - if (!name.type || !name.name || !name.version || !name.token || !name.arch) - { - WARN("invalid global win32 assembly name\n"); - goto done; - } - len = strlenW( fmt_sxsW ); - len += strlenW( name.name ); - len += strlenW( name.version ); - len += strlenW( name.token ); - len += strlenW( name.arch ); - if (!(display_name = msi_alloc( len * sizeof(WCHAR) ))) goto done; - sprintfW( display_name, fmt_sxsW, name.name, name.version, name.token, name.arch ); - } - else - { - if (!name.name || !name.version || !name.culture || !name.token) - { - WARN("invalid local win32 assembly name\n"); - goto done; - } - len = strlenW( fmt_sxs_localW ); - len += strlenW( name.name ); - len += strlenW( name.version ); - len += strlenW( name.culture ); - len += strlenW( name.token ); - if (!(display_name = msi_alloc( len * sizeof(WCHAR) ))) goto done; - sprintfW( display_name, fmt_sxs_localW, name.name, name.version, name.culture, name.token ); - } - } - else + len = 0; + for (i = 0; i < name.count; i++) len += strlenW( name.attrs[i] ) + 1; + + display_name = msi_alloc( (len + 1) * sizeof(WCHAR) ); + if (display_name) { - if (!name.name || !name.version || !name.culture || !name.token) + display_name[0] = 0; + for (i = 0; i < name.count; i++) { - WARN("invalid assembly name\n"); - goto done; + strcatW( display_name, name.attrs[i] ); + if (i < name.count - 1) strcatW( display_name, commaW ); } - len = strlenW( fmt_netW ); - len += strlenW( name.name ); - len += strlenW( name.version ); - len += strlenW( name.culture ); - len += strlenW( name.token ); - if (!(display_name = msi_alloc( len * sizeof(WCHAR) ))) goto done; - sprintfW( display_name, fmt_netW, name.name, name.version, name.culture, name.token ); } done: - msi_free( name.type ); - msi_free( name.name ); - msi_free( name.version ); - msi_free( name.culture ); - msi_free( name.token ); - msi_free( name.arch ); - + msiobj_release( &view->hdr ); + for (i = 0; i < name.count; i++) msi_free( name.attrs[i] ); + msi_free( name.attrs ); return display_name; }

1 0

Andrew Nguyen : server: Filter the WOW64 registry access flags before performing the access check.
by Alexandre Julliard 24 Jan '11

24 Jan '11

Module: wine Branch: master Commit: ed657182ee3a9f39a1093564eecaeb472423bc92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed657182ee3a9f39a1093564e… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Jan 24 07:09:41 2011 -0600 server: Filter the WOW64 registry access flags before performing the access check. --- dlls/advapi32/tests/registry.c | 173 ++++++++++++++++++++++++++++++++++++++++ server/registry.c | 4 +- 2 files changed, 176 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed657182ee3a9f39a1093…

1 0

Alexandre Julliard : dbghelp: Use Dwarf debug info even when part of it is missing.
by Alexandre Julliard 24 Jan '11

24 Jan '11

Module: wine Branch: master Commit: 9926ca771b7fb0d8f217f5115919e16d5f8c676b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9926ca771b7fb0d8f217f5115… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 24 15:52:42 2011 +0100 dbghelp: Use Dwarf debug info even when part of it is missing. --- dlls/dbghelp/dwarf.c | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index d60a5fd..e02e654 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -3174,31 +3174,29 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset, const struct elf_thunk_area* thunks, struct image_file_map* fmap) { - dwarf2_section_t section[section_max]; + dwarf2_section_t eh_frame, section[section_max]; dwarf2_traverse_context_t mod_ctx; struct image_section_map debug_sect, debug_str_sect, debug_abbrev_sect, - debug_line_sect, debug_ranges_sect; + debug_line_sect, debug_ranges_sect, eh_frame_sect; BOOL ret = TRUE; struct module_format* dwarf2_modfmt; - if (!dwarf2_init_section(&section[section_debug], fmap, ".debug_info", &debug_sect)) - /* no Dwarf debug info here */ - return FALSE; - + dwarf2_init_section(&eh_frame, fmap, ".eh_frame", &eh_frame_sect); + dwarf2_init_section(&section[section_debug], fmap, ".debug_info", &debug_sect); dwarf2_init_section(&section[section_abbrev], fmap, ".debug_abbrev", &debug_abbrev_sect); dwarf2_init_section(&section[section_string], fmap, ".debug_str", &debug_str_sect); dwarf2_init_section(&section[section_line], fmap, ".debug_line", &debug_line_sect); dwarf2_init_section(&section[section_ranges], fmap, ".debug_ranges", &debug_ranges_sect); - if (section[section_debug].address == IMAGE_NO_MAP || - section[section_abbrev].address == IMAGE_NO_MAP || - section[section_string].address == IMAGE_NO_MAP) + /* to do anything useful we need either .eh_frame or .debug_info */ + if ((!eh_frame.address || eh_frame.address == IMAGE_NO_MAP) && + (!section[section_debug].address || section[section_debug].address == IMAGE_NO_MAP)) { ret = FALSE; goto leave; } - if (fmap->modtype == DMT_ELF) + if (fmap->modtype == DMT_ELF && debug_sect.fmap) { /* debug info might have a different base address than .so file * when elf file is prelinked after splitting off debug info @@ -3232,7 +3230,7 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset, */ dwarf2_init_section(&dwarf2_modfmt->u.dwarf2_info->debug_loc, fmap, ".debug_loc", NULL); dwarf2_init_section(&dwarf2_modfmt->u.dwarf2_info->debug_frame, fmap, ".debug_frame", NULL); - dwarf2_init_section(&dwarf2_modfmt->u.dwarf2_info->eh_frame, fmap, ".eh_frame", NULL); + dwarf2_modfmt->u.dwarf2_info->eh_frame = eh_frame; while (mod_ctx.data < mod_ctx.end_data) { @@ -3252,6 +3250,7 @@ leave: image_unmap_section(&debug_str_sect); image_unmap_section(&debug_line_sect); image_unmap_section(&debug_ranges_sect); + if (!ret) image_unmap_section(&eh_frame_sect); return ret; }

1 0

Mike Kaplinskiy : server: Fix connect failures on newer kernels.
by Alexandre Julliard 24 Jan '11

24 Jan '11

Module: wine Branch: master Commit: f58c709b5f82ec6c850a723437933bbc21327da2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f58c709b5f82ec6c850a72343… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Mon Jan 24 00:21:15 2011 -0500 server: Fix connect failures on newer kernels. --- dlls/ws2_32/tests/sock.c | 2 +- server/sock.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index df6bff8..9d1de46 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4026,7 +4026,7 @@ static void test_ConnectEx(void) closesocket(listener); listener = INVALID_SOCKET; - address.sin_port = 1; + address.sin_port = htons(1); bret = pConnectEx(connector, (struct sockaddr*)&address, addrlen, NULL, 0, &bytesReturned, &overlapped); ok(bret == FALSE && GetLastError(), "ConnectEx to bad destination failed: " diff --git a/server/sock.c b/server/sock.c index d37a316..b0efc16 100644 --- a/server/sock.c +++ b/server/sock.c @@ -388,18 +388,18 @@ static void sock_poll_event( struct fd *fd, int event ) if (sock->state & FD_CONNECT) { - /* connecting */ - if (event & POLLOUT) + if (event & (POLLERR|POLLHUP)) { - /* we got connected */ - sock->state |= FD_WINE_CONNECTED|FD_READ|FD_WRITE; + /* we didn't get connected? */ sock->state &= ~FD_CONNECT; + event &= ~POLLOUT; + error = sock_error( fd ); } - else if (event & (POLLERR|POLLHUP)) + else if (event & POLLOUT) { - /* we didn't get connected? */ + /* we got connected */ + sock->state |= FD_WINE_CONNECTED|FD_READ|FD_WRITE; sock->state &= ~FD_CONNECT; - error = sock_error( fd ); } } else if (sock->state & FD_WINE_LISTENING)

1 0

Nikolay Sivov : oleaut32: Fix a couple of leaks on typeinfo release ( Valgrind).
by Alexandre Julliard 24 Jan '11

24 Jan '11

Module: wine Branch: master Commit: a6de06aa4c92cb1454b9c6b3d5a6a7e93b286368 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6de06aa4c92cb1454b9c6b3d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 24 07:27:43 2011 +0300 oleaut32: Fix a couple of leaks on typeinfo release (Valgrind). --- dlls/oleaut32/typelib.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index b1e3e4f..cc3497e 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5030,6 +5030,7 @@ static void ITypeInfoImpl_Destroy(ITypeInfoImpl *This) VariantClear(&elemdesc->u.paramdesc.pparamdescex->varDefaultValue); heap_free(elemdesc->u.paramdesc.pparamdescex); } + TLB_FreeCustData(pFInfo->pParamDesc[i].pCustData); SysFreeString(pFInfo->pParamDesc[i].Name); } heap_free(pFInfo->funcdesc.lprgelemdescParam); @@ -5052,6 +5053,7 @@ static void ITypeInfoImpl_Destroy(ITypeInfoImpl *This) } TLB_FreeCustData(pVInfo->pCustData); SysFreeString(pVInfo->Name); + SysFreeString(pVInfo->HelpString); pVInfoNext = pVInfo->next; heap_free(pVInfo); }

1 0

Mike Kaplinskiy : ws2_32: Finish an overlapped send only if we sent everything.
by Alexandre Julliard 24 Jan '11

24 Jan '11

Module: wine Branch: master Commit: 27b51ce6b06e5673259d6a4ac917c0847d49f4a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27b51ce6b06e5673259d6a4ac… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Mon Jan 24 00:19:25 2011 -0500 ws2_32: Finish an overlapped send only if we sent everything. --- dlls/ws2_32/socket.c | 10 +++++++--- dlls/ws2_32/tests/sock.c | 4 +--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 66def56..774481d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1806,7 +1806,11 @@ static NTSTATUS WS2_async_send(void* user, IO_STATUS_BLOCK* iosb, NTSTATUS statu if (result >= 0) { - status = STATUS_SUCCESS; + if (wsa->first_iovec < wsa->n_iovecs) + status = STATUS_PENDING; + else + status = STATUS_SUCCESS; + iosb->Information += result; } else if (errno == EINTR || errno == EAGAIN) @@ -3906,10 +3910,10 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, wsa->completion_func = lpCompletionRoutine; release_sock_fd( s, fd ); - if (n == -1) + if (n == -1 || n < totalLength) { iosb->u.Status = STATUS_PENDING; - iosb->Information = 0; + iosb->Information = n == -1 ? 0 : n; SERVER_START_REQ( register_async ) { diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 77925b5..df6bff8 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2848,10 +2848,8 @@ static void test_send(void) bytes_sent = 0; ret = WSASend(dst, &buf, 1, &bytes_sent, 0, &ov, NULL); - todo_wine ok((ret == SOCKET_ERROR && GetLastError() == ERROR_IO_PENDING) || broken(bytes_sent == buflen), + ok((ret == SOCKET_ERROR && GetLastError() == ERROR_IO_PENDING) || broken(bytes_sent == buflen), "Failed to start overlapped send %d - %d - %d/%d\n", ret, WSAGetLastError(), bytes_sent, buflen); - if ( (ret != SOCKET_ERROR || GetLastError() != ERROR_IO_PENDING) && bytes_sent < buflen ) - goto end; /* don't check for completion yet, we may need to drain the buffer while still sending */ set_blocking(src, FALSE);

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2011