wine-commits January 2013

wine-commits@winehq.org

2 participants
736 discussions

Alexandre Julliard : kernel32: Use the monotonic counter in GetTickCount64.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: fa9a883dbbd49117c2e53f5b3ea8cd49397bf520 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa9a883dbbd49117c2e53f5b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 25 17:28:48 2013 +0100 kernel32: Use the monotonic counter in GetTickCount64. --- dlls/kernel32/kernel_main.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index cf06765..2edfcbc 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -179,10 +179,10 @@ INT WINAPI MulDiv( INT nMultiplicand, INT nMultiplier, INT nDivisor) */ ULONGLONG WINAPI GetTickCount64(void) { - LARGE_INTEGER now; + LARGE_INTEGER counter, frequency; - NtQuerySystemTime( &now ); - return (now.QuadPart - server_start_time) / 10000; + NtQueryPerformanceCounter( &counter, &frequency ); + return counter.QuadPart * 1000 / frequency.QuadPart; } @@ -199,8 +199,6 @@ ULONGLONG WINAPI GetTickCount64(void) * * NOTES * The value returned will wrap around every 2^32 milliseconds. - * Under Windows, tick 0 is the moment at which the system is rebooted. - * Under Wine, tick 0 begins at the moment the wineserver process is started. */ DWORD WINAPI GetTickCount(void) {

1 0

Alexandre Julliard : ntdll: Use the monotonic counter for NtGetTickCount.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: 34a1426fc3e75f87a772ab52a12b3209ab2da70a URL: http://source.winehq.org/git/wine.git/?a=commit;h=34a1426fc3e75f87a772ab52a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 25 17:28:28 2013 +0100 ntdll: Use the monotonic counter for NtGetTickCount. --- dlls/ntdll/time.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index d3f4dab..2b810d4 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -492,10 +492,7 @@ NTSTATUS WINAPI NtQueryPerformanceCounter( LARGE_INTEGER *counter, LARGE_INTEGER */ ULONG WINAPI NtGetTickCount(void) { - LARGE_INTEGER now; - - NtQuerySystemTime( &now ); - return (now.QuadPart - server_start_time) / 10000; + return monotonic_counter() / TICKSPERMSEC; } /* calculate the mday of dst change date, so that for instance Sun 5 Oct 2007

1 0

Alexandre Julliard : ntdll: Add support for the monotonic time counter on Mac OS X.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: 04e14c7b46df95bf2a80ad04d497d3d927649afd URL: http://source.winehq.org/git/wine.git/?a=commit;h=04e14c7b46df95bf2a80ad04d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 28 17:11:25 2013 +0100 ntdll: Add support for the monotonic time counter on Mac OS X. --- dlls/ntdll/time.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index b9d3f03..d3f4dab 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -38,6 +38,9 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif +#ifdef __APPLE__ +# include <mach/mach_time.h> +#endif #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -111,6 +114,11 @@ static ULONGLONG monotonic_counter(void) #endif if (!clock_gettime( CLOCK_MONOTONIC, &ts )) return ts.tv_sec * (ULONGLONG)TICKSPERSEC + ts.tv_nsec / 100; +#elif defined(__APPLE__) + static mach_timebase_info_data_t timebase; + + if (!timebase.denom) mach_timebase_info( &timebase ); + return mach_absolute_time() * timebase.numer / timebase.denom / 100; #endif gettimeofday( &now, 0 );

1 0

Alexandre Julliard : ntdll: Use a monotonic time counter to implement NtQueryPerformanceCounter.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: 25598513dc98fd27d91c0f7c4460b733155c6bf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25598513dc98fd27d91c0f7c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 25 17:27:52 2013 +0100 ntdll: Use a monotonic time counter to implement NtQueryPerformanceCounter. --- configure | 64 ++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 7 +++++ dlls/ntdll/Makefile.in | 2 +- dlls/ntdll/time.c | 40 +++++++++++++++++------------ include/config.h.in | 3 ++ 5 files changed, 98 insertions(+), 18 deletions(-) diff --git a/configure b/configure index ccd0283..2e7c008 100755 --- a/configure +++ b/configure @@ -628,6 +628,7 @@ PORCFLAGS LINGUAS ALL_TEST_RESOURCES LDAPLIBS +LIBRT LIBPOLL LIBDL EXTRA_BINARIES @@ -13524,6 +13525,69 @@ fi done +ac_save_LIBS=$LIBS +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5 +$as_echo_n "checking for library containing clock_gettime... " >&6; } +if ${ac_cv_search_clock_gettime+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char clock_gettime (); +int +main () +{ +return clock_gettime (); + ; + return 0; +} +_ACEOF +for ac_lib in '' rt; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_clock_gettime=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_clock_gettime+:} false; then : + break +fi +done +if ${ac_cv_search_clock_gettime+:} false; then : + +else + ac_cv_search_clock_gettime=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5 +$as_echo "$ac_cv_search_clock_gettime" >&6; } +ac_res=$ac_cv_search_clock_gettime +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +$as_echo "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h + + test "$ac_res" = "none required" || LIBRT="$ac_res" + +fi + +LIBS=$ac_save_LIBS + LDAPLIBS="" if test "$ac_cv_header_ldap_h" = "yes" -a "$ac_cv_header_lber_h" = "yes" diff --git a/configure.ac b/configure.ac index dde896f..c93cd08 100644 --- a/configure.ac +++ b/configure.ac @@ -2080,6 +2080,13 @@ AC_CHECK_FUNCS(\ socketpair \ ) +dnl Check for clock_gettime which may be in -lrt +ac_save_LIBS=$LIBS +AC_SEARCH_LIBS(clock_gettime, rt, + [AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [Define to 1 if you have the `clock_gettime' function.]) + test "$ac_res" = "none required" || AC_SUBST(LIBRT,"$ac_res")]) +LIBS=$ac_save_LIBS + dnl **** Check for OpenLDAP *** AC_SUBST(LDAPLIBS,"") if test "$ac_cv_header_ldap_h" = "yes" -a "$ac_cv_header_lber_h" = "yes" diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index cd4fe0a..c961f70 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -D_NTSYSTEM_ MODULE = ntdll.dll IMPORTLIB = ntdll IMPORTS = winecrt0 -EXTRALIBS = @IOKITLIB@ @LIBPTHREAD@ +EXTRALIBS = @IOKITLIB@ @LIBRT@ @LIBPTHREAD@ EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x7bc00000 C_SRCS = \ diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index a8b1376..b9d3f03 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -85,8 +85,6 @@ static RTL_CRITICAL_SECTION TIME_tz_section = { &critsect_debug, -1, 0, 0, 0, 0 /* 1601 to 1980 is 379 years plus 91 leap days */ #define SECS_1601_TO_1980 ((379 * 365 + 91) * (ULONGLONG)SECSPERDAY) #define TICKS_1601_TO_1980 (SECS_1601_TO_1980 * TICKSPERSEC) -/* max ticks that can be represented as Unix time */ -#define TICKS_1601_TO_UNIX_MAX ((SECS_1601_TO_1970 + INT_MAX) * TICKSPERSEC) static const int MonthLengths[2][MONSPERYEAR] = @@ -100,6 +98,25 @@ static inline int IsLeapYear(int Year) return Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0) ? 1 : 0; } +/* return a monotonic time counter, in Win32 ticks */ +static ULONGLONG monotonic_counter(void) +{ + struct timeval now; + +#ifdef HAVE_CLOCK_GETTIME + struct timespec ts; +#ifdef CLOCK_MONOTONIC_RAW + if (!clock_gettime( CLOCK_MONOTONIC_RAW, &ts )) + return ts.tv_sec * (ULONGLONG)TICKSPERSEC + ts.tv_nsec / 100; +#endif + if (!clock_gettime( CLOCK_MONOTONIC, &ts )) + return ts.tv_sec * (ULONGLONG)TICKSPERSEC + ts.tv_nsec / 100; +#endif + + gettimeofday( &now, 0 ); + return now.tv_sec * (ULONGLONG)TICKSPERSEC + now.tv_usec * 10 + TICKS_1601_TO_1970 - server_start_time; +} + /****************************************************************************** * RtlTimeToTimeFields [NTDLL.@] * @@ -450,24 +467,13 @@ NTSTATUS WINAPI NtQuerySystemTime( PLARGE_INTEGER Time ) /****************************************************************************** * NtQueryPerformanceCounter [NTDLL.@] - * - * Note: Windows uses a timer clocked at a multiple of 1193182 Hz. There is a - * good number of applications that crash when the returned frequency is either - * lower or higher than what Windows gives. Also too high counter values are - * reported to give problems. */ -NTSTATUS WINAPI NtQueryPerformanceCounter( PLARGE_INTEGER Counter, PLARGE_INTEGER Frequency ) +NTSTATUS WINAPI NtQueryPerformanceCounter( LARGE_INTEGER *counter, LARGE_INTEGER *frequency ) { - LARGE_INTEGER now; - - if (!Counter) return STATUS_ACCESS_VIOLATION; + if (!counter) return STATUS_ACCESS_VIOLATION; - /* convert a counter that increments at a rate of 10 MHz - * to one of 1.193182 MHz, with some care for arithmetic - * overflow and good accuracy (21/176 = 0.11931818) */ - NtQuerySystemTime( &now ); - Counter->QuadPart = ((now.QuadPart - server_start_time) * 21) / 176; - if (Frequency) Frequency->QuadPart = 1193182; + counter->QuadPart = monotonic_counter(); + if (frequency) frequency->QuadPart = TICKSPERSEC; return STATUS_SUCCESS; } diff --git a/include/config.h.in b/include/config.h.in index 9a7d109..1a5652c 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -55,6 +55,9 @@ /* Define to 1 if you have the `chsize' function. */ #undef HAVE_CHSIZE +/* Define to 1 if you have the `clock_gettime' function. */ +#undef HAVE_CLOCK_GETTIME + /* Define to 1 if you have the <CL/cl.h> header file. */ #undef HAVE_CL_CL_H

1 0

André Hentschel : include: Add remaining checks for ARM64.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: 5c8da8080141977405153a08a864dacd674d37af URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c8da8080141977405153a08a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jan 26 12:10:23 2013 +0100 include: Add remaining checks for ARM64. --- include/msvcrt/crtdefs.h | 2 +- include/windef.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/crtdefs.h b/include/msvcrt/crtdefs.h index 06ce9c3..da278be 100644 --- a/include/msvcrt/crtdefs.h +++ b/include/msvcrt/crtdefs.h @@ -29,7 +29,7 @@ # error You cannot use both wine/port.h and msvcrt headers #endif -#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__sparc64__)) && !defined(_WIN64) +#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__sparc64__) || defined(__aarch64__)) && !defined(_WIN64) #define _WIN64 #endif diff --git a/include/windef.h b/include/windef.h index eb59353..17c0fba 100644 --- a/include/windef.h +++ b/include/windef.h @@ -37,7 +37,7 @@ extern "C" { /* Calling conventions definitions */ -#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__sparc64__)) && !defined(_WIN64) +#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__sparc64__) || defined(__aarch64__)) && !defined(_WIN64) #define _WIN64 #endif

1 0

Gerald Pfeifer : winex11: Push down variable attrib down in create_gl_drawable.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: e835f034fb1eb59ec6fe16e8ff05feccc2a656bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e835f034fb1eb59ec6fe16e8f… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jan 26 02:07:13 2013 +0100 winex11: Push down variable attrib down in create_gl_drawable. --- dlls/winex11.drv/opengl.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index dded333..ee62402 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1222,8 +1222,6 @@ static void free_gl_drawable( struct gl_drawable *gl ) */ static BOOL create_gl_drawable( HWND hwnd, HWND parent, struct gl_drawable *gl ) { - XSetWindowAttributes attrib; - gl->drawable = 0; if (GetAncestor( hwnd, GA_PARENT ) == GetDesktopWindow()) /* top-level window */ @@ -1241,6 +1239,7 @@ static BOOL create_gl_drawable( HWND hwnd, HWND parent, struct gl_drawable *gl ) else if(usexcomposite) { static Window dummy_parent; + XSetWindowAttributes attrib; attrib.override_redirect = True; if (!dummy_parent)

1 0

Jacek Caban : textstor.idl: Added TS_ATTR_FIND_* constants.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: 462d2129bd91b1bdecf8f5fc56196c442c9c016d URL: http://source.winehq.org/git/wine.git/?a=commit;h=462d2129bd91b1bdecf8f5fc5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 28 13:13:16 2013 +0100 textstor.idl: Added TS_ATTR_FIND_* constants. --- include/textstor.idl | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/include/textstor.idl b/include/textstor.idl index 5928569..7bd5289 100644 --- a/include/textstor.idl +++ b/include/textstor.idl @@ -109,6 +109,13 @@ typedef [uuid(2cc2b33f-1174-4507-b8d9-5bc0eb37c197)] struct TS_ATTRVAL VARIANT varValue; } TS_ATTRVAL; +const DWORD TS_ATTR_FIND_BACKWARDS = 0x0001; +const DWORD TS_ATTR_FIND_WANT_OFFSET = 0x0002; +const DWORD TS_ATTR_FIND_UPDATESTART = 0x0004; +const DWORD TS_ATTR_FIND_WANT_VALUE = 0x0008; +const DWORD TS_ATTR_FIND_WANT_END = 0x0010; +const DWORD TS_ATTR_FIND_HIDDEN = 0x0020; + typedef [uuid(7899d7c4-5f07-493c-a89a-fac8e777f476)] enum { TS_LC_CREATE, TS_LC_CHANGE, TS_LC_DESTROY } TsLayoutCode; typedef [uuid(1faf509e-44c1-458e-950a-38a96705a62b)] DWORD TsViewCookie;

1 0

Piotr Caban : msvcrt: Don't call invalid parameter handler in str{n, i}cmp functions.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: 6382bc521952cc5829b9b77e319984072ad17d33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6382bc521952cc5829b9b77e3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 28 11:40:36 2013 +0100 msvcrt: Don't call invalid parameter handler in str{n,i}cmp functions. --- dlls/msvcrt/string.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index d9ec353..e4e94ff 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1567,7 +1567,7 @@ int __cdecl MSVCRT__strnicmp_l(const char *s1, const char *s2, MSVCRT_pthreadlocinfo locinfo; char c1, c2; - if(!MSVCRT_CHECK_PMT(s1!=NULL && s2!=NULL)) + if(s1==NULL || s2==NULL) return MSVCRT__NLSCMPERROR; if(!count)

1 0

Jacek Caban : wininet: Moved WORKREQ_HTTPREADFILEEX out of WORKREQUEST.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: 023abdacdbab39936c2dc57fb1b560dcb4961e8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=023abdacdbab39936c2dc57fb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 28 11:23:58 2013 +0100 wininet: Moved WORKREQ_HTTPREADFILEEX out of WORKREQUEST. --- dlls/wininet/http.c | 28 +++++++++++++++++----------- dlls/wininet/internet.h | 8 -------- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index a3ca123..5ec4089 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2877,16 +2877,22 @@ static DWORD HTTPREQ_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DW return res; } -static void AsyncReadFileExProc(WORKREQUEST *workRequest) +typedef struct { + task_header_t hdr; + void *buf; + DWORD size; + DWORD *ret_read; +} read_file_ex_task_t; + +static void AsyncReadFileExProc(task_header_t *hdr) { - struct WORKREQ_HTTPREADFILEEX const *data = &workRequest->u.HttpReadFileEx; - http_request_t *req = (http_request_t*)workRequest->hdr; + read_file_ex_task_t *task = (read_file_ex_task_t*)hdr; + http_request_t *req = (http_request_t*)task->hdr.hdr; DWORD res; - TRACE("INTERNETREADFILEEXW %p\n", workRequest->hdr); - - res = HTTPREQ_Read(req, data->buf, data->size, data->ret_read, TRUE); + TRACE("INTERNETREADFILEEXW %p\n", task->hdr.hdr); + res = HTTPREQ_Read(req, task->buf, task->size, task->ret_read, TRUE); send_request_complete(req, res == ERROR_SUCCESS, res); } @@ -2904,7 +2910,7 @@ static DWORD HTTPREQ_ReadFileEx(object_header_t *hdr, void *buf, DWORD size, DWO if (hdr->dwFlags & INTERNET_FLAG_ASYNC) { - WORKREQUEST *task; + read_file_ex_task_t *task; if (TryEnterCriticalSection( &req->read_section )) { @@ -2918,11 +2924,11 @@ static DWORD HTTPREQ_ReadFileEx(object_header_t *hdr, void *buf, DWORD size, DWO } task = alloc_async_task(&req->hdr, AsyncReadFileExProc, sizeof(*task)); - task->u.HttpReadFileEx.buf = buf; - task->u.HttpReadFileEx.size = size; - task->u.HttpReadFileEx.ret_read = ret_read; + task->buf = buf; + task->size = size; + task->ret_read = ret_read; - INTERNET_AsyncCall(task); + INTERNET_AsyncCall(&task->hdr); return ERROR_IO_PENDING; } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 4b39070..a9c52e0 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -441,13 +441,6 @@ struct WORKREQ_SENDCALLBACK DWORD dwStatusInfoLength; }; -struct WORKREQ_HTTPREADFILEEX -{ - void *buf; - DWORD size; - DWORD *ret_read; -}; - typedef struct WORKREQ task_header_t; typedef void (*async_task_proc_t)(task_header_t*); @@ -470,7 +463,6 @@ typedef struct WORKREQ struct WORKREQ_FTPFINDNEXTW FtpFindNextW; struct WORKREQ_HTTPENDREQUESTW HttpEndRequestW; struct WORKREQ_SENDCALLBACK SendCallback; - struct WORKREQ_HTTPREADFILEEX HttpReadFileEx; } u; } WORKREQUEST, *LPWORKREQUEST;

1 0

Jacek Caban : wininet: Moved WORKREQ_INTERNETOPENURLW out of WORKREQUEST.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: df749512579d4810c89516fc5028dd2323b9883d URL: http://source.winehq.org/git/wine.git/?a=commit;h=df749512579d4810c89516fc5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 28 11:23:45 2013 +0100 wininet: Moved WORKREQ_INTERNETOPENURLW out of WORKREQUEST. --- dlls/wininet/internet.c | 42 ++++++++++++++++++++++++------------------ dlls/wininet/internet.h | 11 ----------- 2 files changed, 24 insertions(+), 29 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 1db1d32..dff24d9 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3497,17 +3497,25 @@ static HINTERNET INTERNET_InternetOpenUrlW(appinfo_t *hIC, LPCWSTR lpszUrl, * RETURNS * handle of connection or NULL on failure */ -static void AsyncInternetOpenUrlProc(WORKREQUEST *workRequest) +typedef struct { + task_header_t hdr; + WCHAR *url; + WCHAR *headers; + DWORD headers_len; + DWORD flags; + DWORD_PTR context; +} open_url_task_t; + +static void AsyncInternetOpenUrlProc(task_header_t *hdr) { - struct WORKREQ_INTERNETOPENURLW const *req = &workRequest->u.InternetOpenUrlW; - appinfo_t *hIC = (appinfo_t*) workRequest->hdr; + open_url_task_t *task = (open_url_task_t*)hdr; - TRACE("%p\n", hIC); + TRACE("%p\n", task->hdr.hdr); - INTERNET_InternetOpenUrlW(hIC, req->lpszUrl, - req->lpszHeaders, req->dwHeadersLength, req->dwFlags, req->dwContext); - heap_free(req->lpszUrl); - heap_free(req->lpszHeaders); + INTERNET_InternetOpenUrlW((appinfo_t*)task->hdr.hdr, task->url, task->headers, + task->headers_len, task->flags, task->context); + heap_free(task->url); + heap_free(task->headers); } HINTERNET WINAPI InternetOpenUrlW(HINTERNET hInternet, LPCWSTR lpszUrl, @@ -3536,19 +3544,17 @@ HINTERNET WINAPI InternetOpenUrlW(HINTERNET hInternet, LPCWSTR lpszUrl, } if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - WORKREQUEST *task; - struct WORKREQ_INTERNETOPENURLW *req; + open_url_task_t *task; task = alloc_async_task(&hIC->hdr, AsyncInternetOpenUrlProc, sizeof(*task)); - req = &task->u.InternetOpenUrlW; - req->lpszUrl = heap_strdupW(lpszUrl); - req->lpszHeaders = heap_strdupW(lpszHeaders); - req->dwHeadersLength = dwHeadersLength; - req->dwFlags = dwFlags; - req->dwContext = dwContext; + task->url = heap_strdupW(lpszUrl); + task->headers = heap_strdupW(lpszHeaders); + task->headers_len = dwHeadersLength; + task->flags = dwFlags; + task->context = dwContext; - INTERNET_AsyncCall(task); - SetLastError(ERROR_IO_PENDING); + INTERNET_AsyncCall(&task->hdr); + SetLastError(ERROR_IO_PENDING); } else { ret = INTERNET_InternetOpenUrlW(hIC, lpszUrl, lpszHeaders, dwHeadersLength, dwFlags, dwContext); } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 9e66dad..4b39070 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -441,16 +441,6 @@ struct WORKREQ_SENDCALLBACK DWORD dwStatusInfoLength; }; -struct WORKREQ_INTERNETOPENURLW -{ - HINTERNET hInternet; - LPWSTR lpszUrl; - LPWSTR lpszHeaders; - DWORD dwHeadersLength; - DWORD dwFlags; - DWORD_PTR dwContext; -}; - struct WORKREQ_HTTPREADFILEEX { void *buf; @@ -480,7 +470,6 @@ typedef struct WORKREQ struct WORKREQ_FTPFINDNEXTW FtpFindNextW; struct WORKREQ_HTTPENDREQUESTW HttpEndRequestW; struct WORKREQ_SENDCALLBACK SendCallback; - struct WORKREQ_INTERNETOPENURLW InternetOpenUrlW; struct WORKREQ_HTTPREADFILEEX HttpReadFileEx; } u; } WORKREQUEST, *LPWORKREQUEST;

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
74
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 2013