May 2013 - Wine-Commits - list.winehq.org

Jacek Caban : winegcc: Use gcc -shared instead of dllwrap to build DLLs.
by Alexandre Julliard May 8, 2013

May 8, 2013

Module: wine Branch: master Commit: c3b64d94b50744d0c17a57fa14873aaa7d4ba134 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3b64d94b50744d0c17a57fa1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 8 17:33:10 2013 +0200 winegcc: Use gcc -shared instead of dllwrap to build DLLs. --- tools/winegcc/winegcc.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 4b0d3e8..65f066c 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -798,6 +798,8 @@ static void build(struct options* opts) if (opts->win16_app) error( "Building 16-bit code is not supported for Windows\n" ); + strarray_addall(link_args, get_translator(opts)); + if (opts->shared) { /* run winebuild to generate the .def file */ @@ -814,16 +816,13 @@ static void build(struct options* opts) spawn(opts->prefix, spec_args, 0); strarray_free(spec_args); - if (opts->target) strarray_add(link_args, strmake("%s-dllwrap", opts->target)); - else strarray_add(link_args, "dllwrap"); + strarray_add(link_args, "-shared"); if (verbose) strarray_add(link_args, "-v"); - strarray_add(link_args, "-k"); - strarray_add(link_args, "--def"); + strarray_add(link_args, "-Wl,--kill-at"); strarray_add(link_args, spec_def_name); } else { - strarray_addall(link_args, get_translator(opts)); strarray_add(link_args, opts->gui_app ? "-mwindows" : "-mconsole"); if (opts->nodefaultlibs) strarray_add(link_args, "-nodefaultlibs"); }

1 0

Daniel Lehman : wininet: Free local proxyinfo in INTERNET_ConfigureProxy.
by Alexandre Julliard May 8, 2013

May 8, 2013

Module: wine Branch: master Commit: 2d89a140b2adf78dcec6db980265566121d9e791 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d89a140b2adf78dcec6db980… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon May 6 14:53:34 2013 -0700 wininet: Free local proxyinfo in INTERNET_ConfigureProxy. --- dlls/wininet/internet.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 12e4096..856eb73 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -663,7 +663,7 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) */ static BOOL INTERNET_ConfigureProxy( appinfo_t *lpwai ) { - proxyinfo_t wpi; + proxyinfo_t wpi = {0}; if (INTERNET_LoadProxySettings( &wpi )) return FALSE; @@ -705,6 +705,7 @@ static BOOL INTERNET_ConfigureProxy( appinfo_t *lpwai ) } TRACE("http proxy = %s bypass = %s\n", debugstr_w(lpwai->proxy), debugstr_w(lpwai->proxyBypass)); + FreeProxyInfo(&wpi); return TRUE; } else @@ -715,6 +716,7 @@ static BOOL INTERNET_ConfigureProxy( appinfo_t *lpwai ) } lpwai->accessType = INTERNET_OPEN_TYPE_DIRECT; + FreeProxyInfo(&wpi); return FALSE; }

1 0

Daniel Lehman : wininet: Copy should_bypass_proxy and domain_matches from winhttp.
by Alexandre Julliard May 8, 2013

May 8, 2013

Module: wine Branch: master Commit: cbeb11b5f83a47e57be851d5e9d1df5a82933023 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbeb11b5f83a47e57be851d5e… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon May 6 11:16:28 2013 -0700 wininet: Copy should_bypass_proxy and domain_matches from winhttp. --- dlls/wininet/http.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 83 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 188259d..7d5175e 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1698,6 +1698,88 @@ static WCHAR *build_proxy_path_url(http_request_t *req) return url; } +static BOOL HTTP_DomainMatches(LPCWSTR server, LPCWSTR domain) +{ + static const WCHAR localW[] = { '<','l','o','c','a','l','>',0 }; + BOOL ret = FALSE; + + if (!strcmpiW( domain, localW ) && !strchrW( server, '.' )) + ret = TRUE; + else if (*domain == '*') + { + if (domain[1] == '.') + { + LPCWSTR dot; + + /* For a hostname to match a wildcard, the last domain must match + * the wildcard exactly. E.g. if the wildcard is *.a.b, and the + * hostname is www.foo.a.b, it matches, but a.b does not. + */ + dot = strchrW( server, '.' ); + if (dot) + { + int len = strlenW( dot + 1 ); + + if (len > strlenW( domain + 2 )) + { + LPCWSTR ptr; + + /* The server's domain is longer than the wildcard, so it + * could be a subdomain. Compare the last portion of the + * server's domain. + */ + ptr = dot + len + 1 - strlenW( domain + 2 ); + if (!strcmpiW( ptr, domain + 2 )) + { + /* This is only a match if the preceding character is + * a '.', i.e. that it is a matching domain. E.g. + * if domain is '*.b.c' and server is 'www.ab.c' they + * do not match. + */ + ret = *(ptr - 1) == '.'; + } + } + else + ret = !strcmpiW( dot + 1, domain + 2 ); + } + } + } + else + ret = !strcmpiW( server, domain ); + return ret; +} + +static BOOL HTTP_ShouldBypassProxy(appinfo_t *lpwai, LPCWSTR server) +{ + LPCWSTR ptr; + BOOL ret = FALSE; + + if (!lpwai->proxyBypass) return FALSE; + ptr = lpwai->proxyBypass; + do { + LPCWSTR tmp = ptr; + + ptr = strchrW( ptr, ';' ); + if (!ptr) + ptr = strchrW( tmp, ' ' ); + if (ptr) + { + if (ptr - tmp < INTERNET_MAX_HOST_NAME_LENGTH) + { + WCHAR domain[INTERNET_MAX_HOST_NAME_LENGTH]; + + memcpy( domain, tmp, (ptr - tmp) * sizeof(WCHAR) ); + domain[ptr - tmp] = 0; + ret = HTTP_DomainMatches( server, domain ); + } + ptr += 1; + } + else if (*tmp) + ret = HTTP_DomainMatches( server, tmp ); + } while (ptr && !ret); + return ret; +} + /*********************************************************************** * HTTP_DealWithProxy */ @@ -3247,7 +3329,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, if (session->hostPort == INTERNET_INVALID_PORT_NUMBER) session->hostPort = INTERNET_DEFAULT_HTTP_PORT; - if (hIC->proxy && hIC->proxy[0]) + if (hIC->proxy && hIC->proxy[0] && !HTTP_ShouldBypassProxy(hIC, session->hostName)) HTTP_DealWithProxy( hIC, session, request ); INTERNET_SendCallback(&session->hdr, dwContext,

1 0

Daniel Lehman : wininet: Copy and pass along proxyBypass in INTERNET_ConfigureProxy.
by Alexandre Julliard May 8, 2013

May 8, 2013

Module: wine Branch: master Commit: 438be70838dabd23717a7d6b4d3cae27af1cf100 URL: http://source.winehq.org/git/wine.git/?a=commit;h=438be70838dabd23717a7d6b4… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon May 6 10:09:27 2013 -0700 wininet: Copy and pass along proxyBypass in INTERNET_ConfigureProxy. --- dlls/wininet/internet.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index f8c36f7..12e4096 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -697,13 +697,14 @@ static BOOL INTERNET_ConfigureProxy( appinfo_t *lpwai ) lpwai->accessType = INTERNET_OPEN_TYPE_PROXY; lpwai->proxy = heap_strdupW(proxyurl); + lpwai->proxyBypass = heap_strdupW(wpi.proxyBypass); if (UrlComponents.dwUserNameLength) { lpwai->proxyUsername = heap_strdupW(UrlComponents.lpszUserName); lpwai->proxyPassword = heap_strdupW(UrlComponents.lpszPassword); } - TRACE("http proxy = %s\n", debugstr_w(lpwai->proxy)); + TRACE("http proxy = %s bypass = %s\n", debugstr_w(lpwai->proxy), debugstr_w(lpwai->proxyBypass)); return TRUE; } else

1 0

Daniel Lehman : wininet: Remove old FIXME about bypassing proxy.
by Alexandre Julliard May 8, 2013

May 8, 2013

Module: wine Branch: master Commit: d853009ef835b00dbc927d0d05402b6f67b79072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d853009ef835b00dbc927d0d0… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon May 6 11:17:32 2013 -0700 wininet: Remove old FIXME about bypassing proxy. --- dlls/wininet/http.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 7d5175e..a0e4973 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -5753,10 +5753,6 @@ DWORD HTTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, session->appInfo = hIC; list_add_head( &hIC->hdr.children, &session->hdr.entry ); - if(hIC->proxy && hIC->accessType == INTERNET_OPEN_TYPE_PROXY) { - if(hIC->proxyBypass) - FIXME("Proxy bypass is ignored.\n"); - } session->hostName = heap_strdupW(lpszServerName); if (lpszUserName && lpszUserName[0]) session->userName = heap_strdupW(lpszUserName);

1 0

Daniel Lehman : wininet: Only accept proxy and proxy bypass if type is INTERNET_OPEN_TYPE_PROXY.
by Alexandre Julliard May 8, 2013

May 8, 2013

Module: wine Branch: master Commit: d3308e6f09245e905d02de55f352855b561e3d0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3308e6f09245e905d02de55f… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon May 6 09:52:37 2013 -0700 wininet: Only accept proxy and proxy bypass if type is INTERNET_OPEN_TYPE_PROXY. --- dlls/wininet/internet.c | 10 ++++++++-- dlls/wininet/tests/http.c | 10 +++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index b9f3e98..f8c36f7 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1015,6 +1015,11 @@ HINTERNET WINAPI InternetOpenW(LPCWSTR lpszAgent, DWORD dwAccessType, /* Clear any error information */ INTERNET_SetLastError(0); + if((dwAccessType == INTERNET_OPEN_TYPE_PROXY) && !lpszProxy) { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + lpwai = alloc_object(NULL, &APPINFOVtbl, sizeof(appinfo_t)); if (!lpwai) { SetLastError(ERROR_OUTOFMEMORY); @@ -1031,9 +1036,10 @@ HINTERNET WINAPI InternetOpenW(LPCWSTR lpszAgent, DWORD dwAccessType, lpwai->agent = heap_strdupW(lpszAgent); if(dwAccessType == INTERNET_OPEN_TYPE_PRECONFIG) INTERNET_ConfigureProxy( lpwai ); - else + else if(dwAccessType == INTERNET_OPEN_TYPE_PROXY) { lpwai->proxy = heap_strdupW(lpszProxy); - lpwai->proxyBypass = heap_strdupW(lpszProxyBypass); + lpwai->proxyBypass = heap_strdupW(lpszProxyBypass); + } TRACE("returning %p\n", lpwai); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 264aee7..bc3505f 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2170,7 +2170,7 @@ out: static void test_proxy_direct(int port) { HINTERNET hi, hc, hr; - DWORD r, sz; + DWORD r, sz, error; char buffer[0x40], *url; WCHAR bufferW[0x40]; static CHAR username[] = "mike", @@ -2181,6 +2181,14 @@ static void test_proxy_direct(int port) passwordW[] = {'1','1','0','1',0}, useragentW[] = {'w','i','n','e','t','e','s','t',0}; + /* specify proxy type without the proxy and bypass */ + SetLastError(0xdeadbeef); + hi = InternetOpen(NULL, INTERNET_OPEN_TYPE_PROXY, NULL, NULL, 0); + error = GetLastError(); + ok(error == ERROR_INVALID_PARAMETER || + broken(error == ERROR_SUCCESS) /* WinXPProSP2 */, "got %u\n", error); + ok(hi == NULL || broken(!!hi) /* WinXPProSP2 */, "open should have failed\n"); + sprintf(buffer, "localhost:%d\n", port); hi = InternetOpen(NULL, INTERNET_OPEN_TYPE_PROXY, buffer, NULL, 0); ok(hi != NULL, "open failed\n");

1 0

Jacek Caban : configure: Use gcc -shared instead of dllwrap to build libwine.dll.
by Alexandre Julliard May 8, 2013

May 8, 2013

Module: wine Branch: master Commit: 6c32033cdcd0e31744297e6f48eab769ce00540b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c32033cdcd0e31744297e6f4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 8 17:31:01 2013 +0200 configure: Use gcc -shared instead of dllwrap to build libwine.dll. --- Make.vars.in | 1 - configure | 98 +--------------------------------------------------------- configure.ac | 6 +--- 3 files changed, 2 insertions(+), 103 deletions(-) diff --git a/Make.vars.in b/Make.vars.in index 5400d4c..76436fa 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -35,7 +35,6 @@ FAKEEXT = $(DLLEXT:.so=.fake) TOOLSEXT = @TOOLSEXT@ IMPLIBEXT = @IMPLIBEXT@ DLLTOOL = @DLLTOOL@ -DLLWRAP = @DLLWRAP@ AR = @AR@ ARFLAGS = @ARFLAGS@ RANLIB = @RANLIB@ diff --git a/configure b/configure index 8829b5e..770fcde 100755 --- a/configure +++ b/configure @@ -696,7 +696,6 @@ IOKITLIB COREFOUNDATIONLIB LIBWINE_RULES SOCKETLIBS -DLLWRAP DLLTOOL READELF LDD @@ -6530,101 +6529,6 @@ else DLLTOOL="$ac_cv_prog_DLLTOOL" fi - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dllwrap", so it can be a program name with args. -set dummy ${ac_tool_prefix}dllwrap; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DLLWRAP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$DLLWRAP"; then - ac_cv_prog_DLLWRAP="$DLLWRAP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_DLLWRAP="${ac_tool_prefix}dllwrap" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -DLLWRAP=$ac_cv_prog_DLLWRAP -if test -n "$DLLWRAP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLWRAP" >&5 -$as_echo "$DLLWRAP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_DLLWRAP"; then - ac_ct_DLLWRAP=$DLLWRAP - # Extract the first word of "dllwrap", so it can be a program name with args. -set dummy dllwrap; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DLLWRAP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_DLLWRAP"; then - ac_cv_prog_ac_ct_DLLWRAP="$ac_ct_DLLWRAP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_DLLWRAP="dllwrap" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_DLLWRAP=$ac_cv_prog_ac_ct_DLLWRAP -if test -n "$ac_ct_DLLWRAP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLWRAP" >&5 -$as_echo "$ac_ct_DLLWRAP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_DLLWRAP" = x; then - DLLWRAP="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - DLLWRAP=$ac_ct_DLLWRAP - fi -else - DLLWRAP="$ac_cv_prog_DLLWRAP" -fi - - if test "$DLLWRAP" = "false"; then - as_fn_error $? "dllwrap is needed to build a dll for Windows" "$LINENO" 5 - fi LIBEXT="dll" IMPLIBEXT="a" STATIC_IMPLIBEXT="a" @@ -6653,7 +6557,7 @@ libwine.a: wine.def \$(DLLTOOL) -l \$@ -d \$(srcdir)/wine.def libwine.dll: \$(OBJS) wine.def Makefile.in - \$(DLLWRAP) --def \$(srcdir)/wine.def -o \$@ \$(OBJS) $crtlibs \$(EXTRALIBS) + \$(CC) -shared \$(srcdir)/wine.def -o \$@ \$(OBJS) $crtlibs \$(EXTRALIBS) install install-lib:: libwine.dll \$(DESTDIR)\$(libdir) dummy \$(INSTALL_DATA) libwine.dll \$(DESTDIR)\$(libdir)/libwine.dll diff --git a/configure.ac b/configure.ac index 98c3dd4..6dd2348 100644 --- a/configure.ac +++ b/configure.ac @@ -686,10 +686,6 @@ WINE_PATH_SONAME_TOOLS case $host_os in cygwin*|mingw32*) AC_CHECK_TOOL(DLLTOOL,dlltool,false) - AC_CHECK_TOOL(DLLWRAP,dllwrap,false) - if test "$DLLWRAP" = "false"; then - AC_MSG_ERROR([dllwrap is needed to build a dll for Windows]) - fi LIBEXT="dll" IMPLIBEXT="a" STATIC_IMPLIBEXT="a" @@ -720,7 +716,7 @@ libwine.a: wine.def \$(DLLTOOL) -l \$@ -d \$(srcdir)/wine.def libwine.dll: \$(OBJS) wine.def Makefile.in - \$(DLLWRAP) --def \$(srcdir)/wine.def -o \$@ \$(OBJS) $crtlibs \$(EXTRALIBS) + \$(CC) -shared \$(srcdir)/wine.def -o \$@ \$(OBJS) $crtlibs \$(EXTRALIBS) install install-lib:: libwine.dll \$(DESTDIR)\$(libdir) dummy \$(INSTALL_DATA) libwine.dll \$(DESTDIR)\$(libdir)/libwine.dll

1 0

Ken Thomases : winemac: Unminimize a window on activation if there are only minimized windows.
by Alexandre Julliard May 8, 2013

May 8, 2013

Module: wine Branch: master Commit: 08e940fb1d87a6f756a305a79f6cddd6dfdc8b8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=08e940fb1d87a6f756a305a79… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed May 8 10:46:02 2013 -0500 winemac: Unminimize a window on activation if there are only minimized windows. --- dlls/winemac.drv/cocoa_app.m | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 4e7cecc..f9363c1 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1613,6 +1613,10 @@ int macdrv_err_on; */ - (void)applicationDidBecomeActive:(NSNotification *)notification { + WineWindow* window; + WineWindow* firstMinimized; + BOOL anyShowing; + [self activateCursorClipping]; [orderedWineWindows enumerateObjectsWithOptions:NSEnumerationReverse usingBlock:^(id obj, NSUInteger idx, BOOL *stop){ @@ -1621,6 +1625,24 @@ int macdrv_err_on; [window setLevel:[window levelWhenActive]]; }]; + firstMinimized = nil; + anyShowing = FALSE; + for (window in orderedWineWindows) + { + if ([window isMiniaturized]) + { + if (!firstMinimized) + firstMinimized = window; + } + else if ([window isVisible]) + { + anyShowing = TRUE; + break; + } + } + if (!anyShowing && firstMinimized) + [firstMinimized deminiaturize:self]; + // If a Wine process terminates abruptly while it has the display captured // and switched to a different resolution, Mac OS X will uncapture the // displays and switch their resolutions back. However, the other Wine

1 0

Akihiro Sagawa : winedbg: Add x87 register support in gdb proxy.
by Alexandre Julliard May 8, 2013

May 8, 2013

Module: wine Branch: master Commit: f649ee599774303952606f78b4fe6bf985499879 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f649ee599774303952606f78b… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 8 21:11:18 2013 +0900 winedbg: Add x87 register support in gdb proxy. --- programs/winedbg/gdbproxy.c | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 47e3bbd..04d36f7 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -232,6 +232,22 @@ static struct cpu_register cpu_register_map[] = { REG(SegEs, 4, CONTEXT_SEGMENTS), REG(SegFs, 4, CONTEXT_SEGMENTS), REG(SegGs, 4, CONTEXT_SEGMENTS), + { FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[ 0]), 10, 10, CONTEXT_FLOATING_POINT }, + { FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[10]), 10, 10, CONTEXT_FLOATING_POINT }, + { FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[20]), 10, 10, CONTEXT_FLOATING_POINT }, + { FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[30]), 10, 10, CONTEXT_FLOATING_POINT }, + { FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[40]), 10, 10, CONTEXT_FLOATING_POINT }, + { FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[50]), 10, 10, CONTEXT_FLOATING_POINT }, + { FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[60]), 10, 10, CONTEXT_FLOATING_POINT }, + { FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[70]), 10, 10, CONTEXT_FLOATING_POINT }, + { FIELD_OFFSET(CONTEXT, FloatSave.ControlWord), 2, 4, CONTEXT_FLOATING_POINT }, + { FIELD_OFFSET(CONTEXT, FloatSave.StatusWord), 2, 4, CONTEXT_FLOATING_POINT }, + { FIELD_OFFSET(CONTEXT, FloatSave.TagWord), 2, 4, CONTEXT_FLOATING_POINT }, + { FIELD_OFFSET(CONTEXT, FloatSave.ErrorSelector), 2, 4, CONTEXT_FLOATING_POINT }, + REG(FloatSave.ErrorOffset, 4, CONTEXT_FLOATING_POINT ), + { FIELD_OFFSET(CONTEXT, FloatSave.DataSelector), 2, 4, CONTEXT_FLOATING_POINT }, + REG(FloatSave.DataOffset, 4, CONTEXT_FLOATING_POINT ), + { FIELD_OFFSET(CONTEXT, FloatSave.ErrorSelector)+2, 2, 4, CONTEXT_FLOATING_POINT }, }; #elif defined(__powerpc__) static const char target_xml[] = ""; @@ -480,7 +496,7 @@ static BOOL fetch_context(struct gdb_context* gdbctx, HANDLE h, CONTEXT* ctx) { ctx->ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER -#if defined(__powerpc__) +#if defined(__powerpc__) || defined(__i386__) | CONTEXT_FLOATING_POINT #endif #ifdef CONTEXT_SEGMENTS

1 0

Dmitry Timoshkov : include/commdlg.h: Fix definition of LPPRINTHOOKPROC and LPSETUPHOOKPROC.
by Alexandre Julliard May 8, 2013

May 8, 2013

Module: wine Branch: master Commit: 4986ba35c3a3fe13a03a77a34fc313761a3c64b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4986ba35c3a3fe13a03a77a34… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 8 18:15:34 2013 +0900 include/commdlg.h: Fix definition of LPPRINTHOOKPROC and LPSETUPHOOKPROC. --- dlls/comdlg32/printdlg.c | 2 +- include/commdlg.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index e3b89ea..3c3fab3 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -3987,7 +3987,7 @@ struct callback_data IObjectWithSite *object; }; -static UINT CALLBACK pdlgex_hook_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +static UINT_PTR CALLBACK pdlgex_hook_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { if (msg == WM_INITDIALOG) { diff --git a/include/commdlg.h b/include/commdlg.h index db5aaaa..df56c14 100644 --- a/include/commdlg.h +++ b/include/commdlg.h @@ -531,8 +531,8 @@ static const WCHAR HELPMSGSTRINGW[] = { 'c','o','m','m','d','l','g','_', (void)SNDMSG(_hdlg, CDM_SETDEFEXT, 0, (LPARAM)(LPSTR)_pszext) -typedef UINT (CALLBACK *LPPRINTHOOKPROC) (HWND, UINT, WPARAM, LPARAM); -typedef UINT (CALLBACK *LPSETUPHOOKPROC) (HWND, UINT, WPARAM, LPARAM); +typedef UINT_PTR (CALLBACK *LPPRINTHOOKPROC) (HWND, UINT, WPARAM, LPARAM); +typedef UINT_PTR (CALLBACK *LPSETUPHOOKPROC) (HWND, UINT, WPARAM, LPARAM); typedef struct tagPDA {

1 0