wine-commits April 2011

wine-commits@winehq.org

3 participants
937 discussions

Alexander Law : programs/notepad: Correct sharing mode for opening file in notepad.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: a6e083b9d7ecf302b5cc93cc7f8605a8be093c02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6e083b9d7ecf302b5cc93cc7… Author: Alexander Law <exclusion(a)gmail.com> Date: Fri Jan 28 08:34:23 2011 +0300 programs/notepad: Correct sharing mode for opening file in notepad. (cherry picked from commit a8308dd017541e9dd2ceca3d07a9ba8a566d8b3d) --- programs/notepad/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index ff5df75..0c4b716 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -356,7 +356,7 @@ void DoOpenFile(LPCWSTR szFileName, ENCODING enc) if (!DoCloseFile()) return; - hFile = CreateFileW(szFileName, GENERIC_READ, FILE_SHARE_READ, NULL, + hFile = CreateFileW(szFileName, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if(hFile == INVALID_HANDLE_VALUE) {

1 0

Jörg Höhle : msvcrt: sizeof(long double) is 12 with MS, but not necessarily so on UNIX.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 0dca7f478f1ca3d4f8dc82b5c0aed3668f740264 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dca7f478f1ca3d4f8dc82b5c… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Dec 1 22:26:26 2010 +0100 msvcrt: sizeof(long double) is 12 with MS, but not necessarily so on UNIX. (cherry picked from commit c6d67fad8f6d0ac199d0945314564e39aa64644f) --- dlls/msvcrt/msvcrt.h | 2 +- dlls/msvcrt/string.c | 20 +++++++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index f68790b..9064fd0 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -80,7 +80,7 @@ typedef unsigned int (__stdcall *MSVCRT__beginthreadex_start_routine_t)(void *); typedef int (*__cdecl MSVCRT__onexit_t)(void); typedef void (__cdecl *MSVCRT_invalid_parameter_handler)(const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, unsigned, MSVCRT_uintptr_t); -typedef struct {long double x;} MSVCRT__LDOUBLE; +typedef struct {ULONG x80[3];} MSVCRT__LDOUBLE; /* Intel 80 bit FP format has sizeof() 12 */ struct MSVCRT_tm { int tm_sec; diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 8c99399..7086e12 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -381,8 +381,10 @@ int CDECL MSVCRT__atoldbl(MSVCRT__LDOUBLE *value, const char *str) { /* FIXME needs error checking for huge/small values */ #ifdef HAVE_STRTOLD + long double ld; TRACE("str %s value %p\n",str,value); - value->x = strtold(str,0); + ld = strtold(str,0); + memcpy(value, &ld, 10); #else FIXME("stub, str %s value %p\n",str,value); #endif @@ -395,8 +397,10 @@ int CDECL MSVCRT__atoldbl(MSVCRT__LDOUBLE *value, const char *str) int CDECL __STRINGTOLD( MSVCRT__LDOUBLE *value, char **endptr, const char *str, int flags ) { #ifdef HAVE_STRTOLD + long double ld; FIXME("%p %p %s %x partial stub\n", value, endptr, str, flags ); - value->x = strtold(str,endptr); + ld = strtold(str,0); + memcpy(value, &ld, 10); #else FIXME("%p %p %s %x stub\n", value, endptr, str, flags ); #endif @@ -682,7 +686,7 @@ struct _I10_OUTPUT_DATA { /********************************************************************* * $I10_OUTPUT (MSVCRT.@) - * ld - long double to be printed to data + * ld80 - long double (Intel 80 bit FP in 12 bytes) to be printed to data * prec - precision of part, we're interested in * flag - 0 for first prec digits, 1 for fractional part * data - data to be populated @@ -695,16 +699,22 @@ struct _I10_OUTPUT_DATA { * Native sets last byte of data->str to '0' or '9', I don't know what * it means. Current implementation sets it always to '0'. */ -int CDECL MSVCRT_I10_OUTPUT(MSVCRT__LDOUBLE ld, int prec, int flag, struct _I10_OUTPUT_DATA *data) +int CDECL MSVCRT_I10_OUTPUT(MSVCRT__LDOUBLE ld80, int prec, int flag, struct _I10_OUTPUT_DATA *data) { static const char inf_str[] = "1#INF"; static const char nan_str[] = "1#QNAN"; - double d = ld.x; + /* MS' long double type wants 12 bytes for Intel's 80 bit FP format. + * Some UNIX have sizeof(long double) == 16, yet only 80 bit are used. + * Assume long double uses 80 bit FP, never seen 128 bit FP. */ + long double ld = 0; + double d; char format[8]; char buf[I10_OUTPUT_MAX_PREC+9]; /* 9 = strlen("0.e+0000") + '\0' */ char *p; + memcpy(&ld, &ld80, 10); + d = ld; TRACE("(%lf %d %x %p)\n", d, prec, flag, data); if(d<0) {

1 0

Ken Thomases : iphlpapi: Enable non-privileged ICMP (ping) on Mac OS X.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 85f3c4cdf8d149cbf617ebada31de523035abdb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85f3c4cdf8d149cbf617ebada… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Feb 11 16:02:02 2011 -0600 iphlpapi: Enable non-privileged ICMP (ping) on Mac OS X. (cherry picked from commit d52f95cec83eb9da252df431fd93c4682ff4ec0c) --- dlls/iphlpapi/icmp.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index d8ee101..2b76041 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -153,6 +153,11 @@ HANDLE WINAPI IcmpCreateFile(VOID) icmp_t* icp; int sid=socket(AF_INET,SOCK_RAW,IPPROTO_ICMP); + if (sid < 0) + { + /* Mac OS X supports non-privileged ICMP via SOCK_DGRAM type. */ + sid=socket(AF_INET,SOCK_DGRAM,IPPROTO_ICMP); + } if (sid < 0) { ERR_(winediag)("Failed to use ICMP (network ping), this requires special permissions.\n"); SetLastError(ERROR_ACCESS_DENIED);

1 0

Nicholas Niro : winex11.drv: Add proper initialization for border_pixel.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: d8a4de2f303c47de6b0134692af14d861a10bf13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8a4de2f303c47de6b0134692… Author: Nicholas Niro <nik_89(a)neuroponic.com> Date: Mon Feb 14 23:28:18 2011 -0500 winex11.drv: Add proper initialization for border_pixel. (cherry picked from commit 7aff865e8e1890929c15bc91a39f4fb11a46d9eb) --- dlls/winex11.drv/opengl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 3869619..fec5cd9 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -311,6 +311,7 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) attr.override_redirect = True; attr.colormap = None; + attr.border_pixel = 0; wine_tsx11_lock(); @@ -337,7 +338,7 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) if (vis->visual != DefaultVisual( gdi_display, vis->screen )) attr.colormap = XCreateColormap( gdi_display, root, vis->visual, AllocNone ); if ((win = XCreateWindow( gdi_display, root, -1, -1, 1, 1, 0, vis->depth, InputOutput, - vis->visual, CWOverrideRedirect | CWColormap, &attr ))) + vis->visual, CWBorderPixel | CWOverrideRedirect | CWColormap, &attr ))) XMapWindow( gdi_display, win ); else win = root;

1 0

Alexandre Julliard : configure: Print a notice if zlib isn't found.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 851bc356a9baf2426ae042698d53ff76ae047ac1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=851bc356a9baf2426ae042698… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 18 13:07:27 2011 +0100 configure: Print a notice if zlib isn't found. (cherry picked from commit ba6a41a4f7256fcf34932cbea385ab24549d5ce4) --- configure | 16 ++++++++++++++++ configure.ac | 3 +++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 638d7ba..35c1226 100755 --- a/configure +++ b/configure @@ -805,6 +805,7 @@ with_xshape with_xshm with_xslt with_xxf86vm +with_zlib with_wine_tools with_wine64 enable_largefile @@ -1493,6 +1494,7 @@ Optional Packages: --without-xshm do not use XShm (shared memory extension) --without-xslt do not use XSLT --without-xxf86vm do not use XFree video mode extension + --without-zlib do not use Zlib (data compression) --with-wine-tools=DIR use Wine tools from directory DIR --with-wine64=DIR use the 64-bit Wine in DIR for a Wow64 build --with-x use the X Window System @@ -2740,6 +2742,12 @@ if test "${with_xxf86vm+set}" = set; then : fi +# Check whether --with-zlib was given. +if test "${with_zlib+set}" = set; then : + withval=$with_zlib; if test "x$withval" = "xno"; then ac_cv_header_zlib_h=no; fi +fi + + # Check whether --with-wine-tools was given. if test "${with_wine_tools+set}" = set; then : @@ -10330,6 +10338,14 @@ $as_echo "#define HAVE_ZLIB 1" >>confdefs.h fi fi +if test "x$ZLIB" = "x"; then : + case "x$with_zlib" in + x) as_fn_append wine_notices "|libz ${notice_platform}development files not found, data compression won't be supported." ;; + xno) ;; + *) as_fn_error $? "libz ${notice_platform}development files not found, data compression won't be supported. +This is an error since --with-zlib was requested." "$LINENO" 5 ;; +esac +fi if test "x$with_esd" != xno then diff --git a/configure.ac b/configure.ac index 3372e87..cab92ef 100644 --- a/configure.ac +++ b/configure.ac @@ -100,6 +100,8 @@ AC_ARG_WITH(xshm, AS_HELP_STRING([--without-xshm],[do not use XShm (shared AC_ARG_WITH(xslt, AS_HELP_STRING([--without-xslt],[do not use XSLT])) AC_ARG_WITH(xxf86vm, AS_HELP_STRING([--without-xxf86vm],[do not use XFree video mode extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no; ac_cv_header_X11_extensions_xf86vmproto_h=no; fi]) +AC_ARG_WITH(zlib, AS_HELP_STRING([--without-zlib],[do not use Zlib (data compression)]), + [if test "x$withval" = "xno"; then ac_cv_header_zlib_h=no; fi]) AC_ARG_WITH(wine-tools,AS_HELP_STRING([--with-wine-tools=DIR],[use Wine tools from directory DIR])) AC_ARG_WITH(wine64, AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine in DIR for a Wow64 build])) @@ -1362,6 +1364,7 @@ then AC_CHECK_LIB(z,inflate,[AC_DEFINE(HAVE_ZLIB,1,[Define to 1 if you have the `z' library (-lz).]) AC_SUBST(ZLIB,"-lz")]) fi +WINE_NOTICE_WITH(zlib,[test "x$ZLIB" = "x"],[libz ${notice_platform}development files not found, data compression won't be supported.]) dnl **** Check for EsounD **** if test "x$with_esd" != xno

1 0

Andrew Nguyen : include: Add an extern C++ block around the property key equality operators.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: efb4805e3c90c985f98c39730702ec9664f96537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efb4805e3c90c985f98c39730… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jan 21 04:58:23 2011 -0600 include: Add an extern C++ block around the property key equality operators. (cherry picked from commit 2d12be7df9dd695794a71b246336b299207f8fcb) --- include/propkeydef.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/propkeydef.h b/include/propkeydef.h index b3a2559..4aaa23a 100644 --- a/include/propkeydef.h +++ b/include/propkeydef.h @@ -58,6 +58,9 @@ #ifndef _PROPERTYKEY_EQUALITY_OPERATORS_ #define _PROPERTYKEY_EQUALITY_OPERATORS_ #ifdef __cplusplus +extern "C++" +{ + inline bool operator==(REFPROPERTYKEY guidOne, REFPROPERTYKEY guidOther) { return IsEqualPropertyKey(guidOne, guidTwo); @@ -66,5 +69,7 @@ inline bool operator!=(REFPROPERTYKEY guidOne, REFPROPERTYKEY guidOther) { return !(guidOne == guidOther); } + +} #endif #endif

1 0

Alexandre Julliard : makefiles: Generate . res files directly from message files.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: e279c6e2577c8c259d6dda3a1cfb1a7efa5f9db2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e279c6e2577c8c259d6dda3a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 18 16:56:02 2011 +0100 makefiles: Generate .res files directly from message files. (cherry picked from commit 9771ad8ca79220b0892c1e1f20cf8dd37804c13f) --- .gitignore | 16 ---------------- Make.rules.in | 12 ++++++------ tools/make_makefiles | 1 - tools/makedep.c | 2 +- 4 files changed, 7 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index 4dd2cd7..5303a0c 100644 --- a/.gitignore +++ b/.gitignore @@ -53,22 +53,6 @@ dlls/dxdiagn/fil_data.h dlls/jscript/jsglobal.tlb dlls/jscript/parser.tab.c dlls/jscript/parser.tab.h -dlls/kernel32/nls/winerr_dan.mc.rc -dlls/kernel32/nls/winerr_deu.mc.rc -dlls/kernel32/nls/winerr_enu.mc.rc -dlls/kernel32/nls/winerr_fra.mc.rc -dlls/kernel32/nls/winerr_ita.mc.rc -dlls/kernel32/nls/winerr_jpn.mc.rc -dlls/kernel32/nls/winerr_kor.mc.rc -dlls/kernel32/nls/winerr_lth.mc.rc -dlls/kernel32/nls/winerr_nld.mc.rc -dlls/kernel32/nls/winerr_nor.mc.rc -dlls/kernel32/nls/winerr_plk.mc.rc -dlls/kernel32/nls/winerr_ptb.mc.rc -dlls/kernel32/nls/winerr_ptg.mc.rc -dlls/kernel32/nls/winerr_rus.mc.rc -dlls/kernel32/nls/winerr_sve.mc.rc -dlls/kernel32/nls/winerr_ukr.mc.rc dlls/libd3dx9.def dlls/libkernel.def dlls/libwinspool.def diff --git a/Make.rules.in b/Make.rules.in index 3f5d18e..2796800 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -117,10 +117,10 @@ IDL_GEN_HEADERS = $(IDL_H_SRCS:.idl=.h) $(IDL_C_SRCS:.idl=.h) $(IDL_I_SRCS:.idl= $(IDL_P_SRCS:.idl=.h) $(IDL_S_SRCS:.idl=.h) CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) $(IDL_TLB_SRCS:.idl=.tlb) $(IDL_P_SRCS:%=dlldata.c) \ - $(BISON_SRCS:.y=.tab.c) $(BISON_SRCS:.y=.tab.h) $(LEX_SRCS:.l=.yy.c) $(MC_SRCS:.mc=.mc.rc) + $(BISON_SRCS:.y=.tab.c) $(BISON_SRCS:.y=.tab.h) $(LEX_SRCS:.l=.yy.c) OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) \ - $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.mc.res) $(EXTRA_OBJS) + $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.res) $(EXTRA_OBJS) CROSSOBJS = $(OBJS:.o=.cross.o) LINTS = $(C_SRCS:.c=.ln) @@ -136,7 +136,7 @@ filter: dummy # Implicit rules -.SUFFIXES: .mc .rc .mc.rc .res .idl .tlb .h .y .l .tab.c .tab.h .yy.c .ok .man.in .man _c.c _i.c _p.c _s.c .cross.o @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp +.SUFFIXES: .mc .rc .res .idl .tlb .h .y .l .tab.c .tab.h .yy.c .ok .man.in .man _c.c _i.c _p.c _s.c .cross.o @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp .c.o: $(CC) -c $(ALLCFLAGS) -o $@ $< @@ -153,8 +153,8 @@ filter: dummy .l.yy.c: $(FLEX) $(LEXFLAGS) -o$@ $< -.mc.mc.rc: - $(LDPATH) $(WMC) -i -U -H /dev/null -o $@ $< +.mc.res: + $(LDPATH) $(WMC) -U -O res -o $@ $< .rc.res: $(LDPATH) $(RC) $(RCFLAGS) -fo$@ $< @@ -253,7 +253,7 @@ install install-lib install-dev uninstall:: # Misc. rules -$(MC_SRCS:.mc=.mc.rc): $(WMC) +$(MC_SRCS:.mc=.res): $(WMC) $(IDL_GEN_HEADERS) $(IDL_GEN_C_SRCS) $(IDL_TLB_SRCS:.idl=.tlb): $(WIDL) diff --git a/tools/make_makefiles b/tools/make_makefiles index 6806edc..5583c68 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -106,7 +106,6 @@ my @ignore_srcs = ( [ 'BISON_SRCS', '\.y', '.tab.c' ], [ 'BISON_SRCS', '\.y', '.tab.h' ], [ 'LEX_SRCS', '\.l', '.yy.c' ], - [ 'MC_SRCS', '\.mc', '.mc.rc' ], [ 'IDL_TLB_SRCS', '\.idl', '.tlb' ], [ 'IDL_H_SRCS', '\.idl', '.h' ], [ 'IDL_C_SRCS', '\.idl', '.h' ], diff --git a/tools/makedep.c b/tools/makedep.c index 4fb1ac5..1bff4fb 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -857,7 +857,7 @@ static int output_src( FILE *file, INCL_FILE *pFile, int *column ) } else if (!strcmp( ext, "mc" )) /* message file */ { - *column += fprintf( file, "%s.mc.rc: %s", obj, pFile->filename ); + *column += fprintf( file, "%s.res: %s", obj, pFile->filename ); } else if (!strcmp( ext, "idl" )) /* IDL file */ {

1 0

Alexandre Julliard : wmc: Add support for creating resource and plain binary files.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: a8571ba0fdc2c4dd21b7dba787e19dc5c1dcca82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8571ba0fdc2c4dd21b7dba78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 18 16:55:37 2011 +0100 wmc: Add support for creating resource and plain binary files. (cherry picked from commit ecd144b40dc5b06c42e77a7f7d88c023397e89eb) --- tools/wmc/utils.c | 73 +++++++++++++++++++++++++++++++++++ tools/wmc/utils.h | 15 +++++++ tools/wmc/wmc.c | 38 ++++++++++++++++-- tools/wmc/wmc.man.in | 30 ++++++++------ tools/wmc/write.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++++- tools/wmc/write.h | 1 + 6 files changed, 243 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a8571ba0fdc2c4dd21b7d…

1 0

Alexandre Julliard : comctl32/imagelist: Don' t change destination size in ImageList_Duplicate without corresponding allocation .
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 17bc2fc68d3426003ae8350edca9f9e8419ce11d URL: http://source.winehq.org/git/wine.git/?a=commit;h=17bc2fc68d3426003ae8350ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 10 11:16:23 2011 +0100 comctl32/imagelist: Don't change destination size in ImageList_Duplicate without corresponding allocation. (cherry picked from commit cca319d5943ca01a564335473a9ac3ee949d342d) --- dlls/comctl32/imagelist.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 47279c9..c80236f 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -1519,7 +1519,6 @@ ImageList_Duplicate (HIMAGELIST himlSrc) himlSrc->hdcMask, 0, 0, SRCCOPY); himlDst->cCurImage = himlSrc->cCurImage; - himlDst->cMaxImage = himlSrc->cMaxImage; if (himlSrc->has_alpha && himlDst->has_alpha) memcpy( himlDst->has_alpha, himlSrc->has_alpha, himlDst->cCurImage ); }

1 0

Vincent Povirk : wininet: Use LIST_FOR_EACH_SAFE in a loop where we can delete an entry.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 8861a7545fecee4a873a5de0d04f5abe33436e3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8861a7545fecee4a873a5de0d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jan 14 16:39:57 2011 -0600 wininet: Use LIST_FOR_EACH_SAFE in a loop where we can delete an entry. (cherry picked from commit 173b2c5b0f0d44adf7b946c9fbe2ad5f94b33d69) --- dlls/wininet/cookie.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 7dfd2a8..157ee8d 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -302,11 +302,11 @@ BOOL WINAPI InternetGetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, cookie_domain *cookiesDomain = LIST_ENTRY(cursor, cookie_domain, entry); if (COOKIE_matchDomain(hostName, path, cookiesDomain, TRUE)) { - struct list * cursor; + struct list * cursor, * cursor2; domain_count++; TRACE("found domain %p\n", cookiesDomain); - LIST_FOR_EACH(cursor, &cookiesDomain->cookie_list) + LIST_FOR_EACH_SAFE(cursor, cursor2, &cookiesDomain->cookie_list) { cookie *thisCookie = LIST_ENTRY(cursor, cookie, entry); /* check for expiry */

1 0

← Newer
1
...
69
70
71
72
73
74
75
...
94
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 April 2011