November 2013 - Wine-Commits

Francois Gouget : libport: Add an isfinite() implementation for Solaris.
by Alexandre Julliard Nov. 29, 2013

Nov. 29, 2013

Module: wine Branch: master Commit: e4856dbb705b89add4936b6c17a27e6f3a395744 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4856dbb705b89add4936b6c1… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 29 15:06:33 2013 +0100 libport: Add an isfinite() implementation for Solaris. --- configure | 36 ++++++++++++++++++++++++++++- configure.ac | 11 ++++++++- dlls/msvcrt/math.c | 61 +++++++++++++++++++++---------------------------- include/config.h.in | 6 ++-- include/wine/port.h | 4 +++ libs/port/Makefile.in | 1 + libs/port/isfinite.c | 46 +++++++++++++++++++++++++++++++++++++ 7 files changed, 125 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e4856dbb705b89add4936…

1 0

Alexandre Julliard : makefiles: Make sure config. h is updated before building anything.
by Alexandre Julliard Nov. 29, 2013

Nov. 29, 2013

Module: wine Branch: master Commit: 4aea18bdc3cc634df7f7eca8a69cd8c0eb86779f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aea18bdc3cc634df7f7eca8a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 29 17:58:22 2013 +0100 makefiles: Make sure config.h is updated before building anything. --- Makefile.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index 045d708..eb4d0da 100644 --- a/Makefile.in +++ b/Makefile.in @@ -67,6 +67,7 @@ libs/wine: libs/port tools/wmc tools/wrc: tools tools tools/wmc tools/wrc: libs/wine tools/widl tools/wmc tools/wrc: libs/wpp +libs/port libs/wine libs/wpp: include/config.h # Misc rules

1 0

Frédéric Delanoy : twain_32: Ensure FreeLibrary is called on error case (coverity).
by Alexandre Julliard Nov. 29, 2013

Nov. 29, 2013

Module: wine Branch: master Commit: 8e262f87361b7d864c1d98b06fcc7dc478cbaf0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e262f87361b7d864c1d98b06… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 27 13:50:35 2013 +0100 twain_32: Ensure FreeLibrary is called on error case (coverity). --- dlls/twain_32/dsm_ctrl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c index 09e49c8..9bbd0fa 100644 --- a/dlls/twain_32/dsm_ctrl.c +++ b/dlls/twain_32/dsm_ctrl.c @@ -75,7 +75,7 @@ twain_add_onedriver(const char *dsname) { ret = dsEntry (&fakeOrigin, DG_CONTROL, DAT_IDENTITY, MSG_GET, &sourceId); if (ret != TWRC_SUCCESS) { ERR("Source->(DG_CONTROL,DAT_IDENTITY,MSG_GET) failed!\n"); - return; + break; } TRACE("Manufacturer: %s\n", debugstr_a(sourceId.Manufacturer)); TRACE("ProductFamily: %s\n", debugstr_a(sourceId.ProductFamily));

1 0

Francois Gouget : xcopy: Add tests to show that the / D option only accepts dates in the m-d-y format.
by Alexandre Julliard Nov. 29, 2013

Nov. 29, 2013

Module: wine Branch: master Commit: 61358d04a4ba93410589b2bc8c2530c488f3cfbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=61358d04a4ba93410589b2bc8… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 29 15:14:42 2013 +0100 xcopy: Add tests to show that the /D option only accepts dates in the m-d-y format. --- configure | 1 + configure.ac | 1 + programs/xcopy/tests/Makefile.in | 6 ++ programs/xcopy/tests/xcopy.c | 96 ++++++++++++++++++++++++++++++++++++++ programs/xcopy/xcopy.c | 7 ++- 5 files changed, 108 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 5ec15e9..80348f3 100755 --- a/configure +++ b/configure @@ -17459,6 +17459,7 @@ wine_fn_config_program wscript enable_wscript clean,install wine_fn_config_test programs/wscript/tests wscript.exe_test wine_fn_config_program wusa enable_wusa install wine_fn_config_program xcopy enable_xcopy install,po +wine_fn_config_test programs/xcopy/tests xcopy.exe_test wine_fn_config_makefile server enable_server clean,install-lib,manpage wine_fn_config_tool tools clean,install-dev,install-lib,manpage wine_fn_config_tool tools/widl clean,install-dev,manpage diff --git a/configure.ac b/configure.ac index 7f3165b..81b7027 100644 --- a/configure.ac +++ b/configure.ac @@ -3414,6 +3414,7 @@ WINE_CONFIG_PROGRAM(wscript,,[clean,install]) WINE_CONFIG_TEST(programs/wscript/tests) WINE_CONFIG_PROGRAM(wusa,,[install]) WINE_CONFIG_PROGRAM(xcopy,,[install,po]) +WINE_CONFIG_TEST(programs/xcopy/tests) WINE_CONFIG_MAKEFILE([server],,[clean,install-lib,manpage]) WINE_CONFIG_TOOL(tools,[clean,install-dev,install-lib,manpage]) WINE_CONFIG_TOOL(tools/widl,[clean,install-dev,manpage]) diff --git a/programs/xcopy/tests/Makefile.in b/programs/xcopy/tests/Makefile.in new file mode 100644 index 0000000..40a53b9 --- /dev/null +++ b/programs/xcopy/tests/Makefile.in @@ -0,0 +1,6 @@ +TESTDLL = xcopy.exe + +C_SRCS = \ + xcopy.c + +(a)MAKE_TEST_RULES@ diff --git a/programs/xcopy/tests/xcopy.c b/programs/xcopy/tests/xcopy.c new file mode 100644 index 0000000..4cd6b1a --- /dev/null +++ b/programs/xcopy/tests/xcopy.c @@ -0,0 +1,96 @@ +/* + * Copyright 2013 Francois Gouget + * + * 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 + */ + +#include <windows.h> + +#include "wine/test.h" + + +static DWORD runcmd(const char* cmd) +{ + STARTUPINFOA si = {sizeof(STARTUPINFOA)}; + PROCESS_INFORMATION pi; + char* wcmd; + DWORD rc; + + /* Create a writable copy for CreateProcessA() */ + wcmd = HeapAlloc(GetProcessHeap(), 0, strlen(cmd) + 1); + strcpy(wcmd, cmd); + rc = CreateProcessA(NULL, wcmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + HeapFree(GetProcessHeap(), 0, wcmd); + if (!rc) + return 260; + + rc = WaitForSingleObject(pi.hProcess, 5000); + if (rc == WAIT_OBJECT_0) + GetExitCodeProcess(pi.hProcess, &rc); + else + TerminateProcess(pi.hProcess, 1); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + + return rc; +} + +static void test_date_format(void) +{ + DWORD rc; + + rc = runcmd("xcopy /D:20-01-2000 xcopy1 xcopytest"); + ok(rc == 4, "xcopy /D:d-m-y test returned rc=%u\n", rc); + ok(GetFileAttributesA("xcopytest\\xcopy1") == INVALID_FILE_ATTRIBUTES, + "xcopy should not have created xcopytest\\xcopy1\n"); + + rc = runcmd("xcopy /D:01-20-2000 xcopy1 xcopytest"); + ok(rc == 0, "xcopy /D:m-d-y test failed rc=%u\n", rc); + ok(GetFileAttributesA("xcopytest\\xcopy1") != INVALID_FILE_ATTRIBUTES, + "xcopy did not create xcopytest\\xcopy1\n"); + DeleteFileA("xcopytest\\xcopy1"); + + rc = runcmd("xcopy /D:1-20-2000 xcopy1 xcopytest"); + ok(rc == 0, "xcopy /D:m-d-y test failed rc=%u\n", rc); + ok(GetFileAttributesA("xcopytest\\xcopy1") != INVALID_FILE_ATTRIBUTES, + "xcopy did not create xcopytest\\xcopy1\n"); + DeleteFileA("xcopytest\\xcopy1"); +} + +START_TEST(xcopy) +{ + char tmpdir[MAX_PATH]; + HANDLE hfile; + + GetTempPathA(MAX_PATH, tmpdir); + SetCurrentDirectoryA(tmpdir); + trace("%s\n", tmpdir); + + CreateDirectoryA("xcopytest", NULL); + hfile = CreateFileA("xcopy1", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(hfile != INVALID_HANDLE_VALUE, "Failed to create xcopy1 file\n"); + if (hfile == INVALID_HANDLE_VALUE) + { + skip("skipping xcopy tests\n"); + return; + } + CloseHandle(hfile); + + test_date_format(); + + DeleteFileA("xcopy1"); + RemoveDirectoryA("xcopytest"); +} diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 3967b18..e424eea 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -778,19 +778,20 @@ static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, BOOL isError = FALSE; memset(&st, 0x00, sizeof(st)); - /* Parse the arg : Month */ + /* Microsoft's xcopy's usage implies that the date + * format depends on the locale but that false. + * It is hardcoded to month-day-year + */ st.wMonth = _wtol(pos); while (*pos && isdigit(*pos)) pos++; if (*pos++ != '-') isError = TRUE; - /* Parse the arg : Day */ if (!isError) { st.wDay = _wtol(pos); while (*pos && isdigit(*pos)) pos++; if (*pos++ != '-') isError = TRUE; } - /* Parse the arg : Year */ if (!isError) { st.wYear = _wtol(pos); while (*pos && isdigit(*pos)) pos++;

1 0

Jacek Caban : sspi.h: Added some missing declarations.
by Alexandre Julliard Nov. 29, 2013

Nov. 29, 2013

Module: wine Branch: master Commit: 17027a60b09bb3da226df6381dc36fa1e9491b22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17027a60b09bb3da226df6381… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 29 13:16:47 2013 +0100 sspi.h: Added some missing declarations. --- include/sspi.h | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/include/sspi.h b/include/sspi.h index 15adb59..b8761a5 100644 --- a/include/sspi.h +++ b/include/sspi.h @@ -204,6 +204,17 @@ typedef SECURITY_STATUS (SEC_ENTRY *QUERY_CREDENTIALS_ATTRIBUTES_FN_W) (PCredHandle, ULONG, PVOID); #define QUERY_CREDENTIALS_ATTRIBUTES_FN WINELIB_NAME_AW(QUERY_CREDENTIALS_ATTRIBUTES_FN_) +typedef struct _SEC_CHANNEL_BINDINGS { + ULONG dwInitiatorAddrType; + ULONG cbInitiatorLength; + ULONG dwInitiatorOffset; + ULONG dwAcceptorAddrType; + ULONG cbAcceptorLength; + ULONG dwAcceptorOffset; + ULONG cbApplicationDataLength; + ULONG dwApplicationDataOffset; +} SEC_CHANNEL_BINDINGS, *PSEC_CHANNEL_BINDINGS; + /* values for QueryCredentialsAttributes ulAttribute */ #define SECPKG_CRED_ATTR_NAMES 1 @@ -436,6 +447,20 @@ typedef SECURITY_STATUS (SEC_ENTRY *QUERY_CONTEXT_ATTRIBUTES_FN_W)(PCtxtHandle, #define SECPKG_ATTR_ACCESS_TOKEN 18 #define SECPKG_ATTR_TARGET 19 #define SECPKG_ATTR_AUTHENTICATION_ID 20 +#define SECPKG_ATTR_LOGOFF_TIME 21 +#define SECPKG_ATTR_NEGO_KEYS 22 +#define SECPKG_ATTR_PROMPTING_NEEDED 24 +#define SECPKG_ATTR_UNIQUE_BINDINGS 25 +#define SECPKG_ATTR_ENDPOINT_BINDINGS 26 +#define SECPKG_ATTR_CLIENT_SPECIFIED_TARGET 27 +#define SECPKG_ATTR_LAST_CLIENT_TOKEN_STATUS 30 +#define SECPKG_ATTR_NEGO_PKG_INFO 31 +#define SECPKG_ATTR_NEGO_STATUS 32 +#define SECPKG_ATTR_CONTEXT_DELETED 33 + +#define SECPKG_ATTR_SUBJECT_SECURITY_ATTRIBUTES 128 +#define SECPKG_ATTR_NEGO_INFO_FLAG_NO_KERBEROS 0x1 +#define SECPKG_ATTR_NEGO_INFO_FLAG_NO_NTLM 0x2 /* types for QueryContextAttributes/SetContextAttributes */ @@ -641,6 +666,12 @@ typedef struct _SecPkgContext_Target char *Target; } SecPkgContext_Target, *PSecPkgContext_Target; +typedef struct _SecPkgContext_Bindings +{ + ULONG BindingsLength; + SEC_CHANNEL_BINDINGS *Bindings; +} SecPkgContext_Bindings, *PSecPkgContext_Bindings; + SECURITY_STATUS SEC_ENTRY ImpersonateSecurityContext(PCtxtHandle phContext); typedef SECURITY_STATUS (SEC_ENTRY *IMPERSONATE_SECURITY_CONTEXT_FN)

1 0

Jacek Caban : mshtml: Use uri_nofrag instead of full URI in navigate_anchor .
by Alexandre Julliard Nov. 29, 2013

Nov. 29, 2013

Module: wine Branch: master Commit: fc73f4726e49db16942c096a1a3fc8f28320f5c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc73f4726e49db16942c096a1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 29 12:58:41 2013 +0100 mshtml: Use uri_nofrag instead of full URI in navigate_anchor. --- dlls/mshtml/htmlanchor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 32b39cb..97ef900 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -121,7 +121,7 @@ static HRESULT navigate_anchor(HTMLAnchorElement *This) if(*href) { if(!window) window = This->element.node.doc->basedoc.window; - hres = navigate_url(window, href, window->uri, BINDING_NAVIGATED); + hres = navigate_url(window, href, window->uri_nofrag, BINDING_NAVIGATED); }else { TRACE("empty href\n"); hres = S_OK;

1 0

Jacek Caban : mshtml: Strip hash part before combining URIs.
by Alexandre Julliard Nov. 29, 2013

Nov. 29, 2013

Module: wine Branch: master Commit: 8c6d9482bcb298053ba70b18027976a6d71a11b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c6d9482bcb298053ba70b180… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 29 12:58:25 2013 +0100 mshtml: Strip hash part before combining URIs. --- dlls/mshtml/nsio.c | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index da7d930..d63e61e 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -141,6 +141,23 @@ static BOOL compare_ignoring_frag(IUri *uri1, IUri *uri2) return ret; } +static HRESULT combine_url(IUri *base_uri, const WCHAR *rel_url, IUri **ret) +{ + IUri *uri_nofrag; + HRESULT hres; + + uri_nofrag = get_uri_nofrag(base_uri); + if(!uri_nofrag) + return E_FAIL; + + hres = CoInternetCombineUrlEx(uri_nofrag, rel_url, URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, + ret, 0); + IUri_Release(uri_nofrag); + if(FAILED(hres)) + WARN("CoInternetCombineUrlEx failed: %08x\n", hres); + return hres; +} + static nsresult create_nsuri(IUri*,HTMLOuterWindow*,NSContainer*,const char*,nsWineURI**); static const char *debugstr_nsacstr(const nsACString *nsstr) @@ -2407,12 +2424,10 @@ static nsresult NSAPI nsURI_Resolve(nsIFileURL *iface, const nsACString *aRelati if(!path) return NS_ERROR_OUT_OF_MEMORY; - hres = CoInternetCombineUrlEx(This->uri, path, URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, &new_uri, 0); + hres = combine_url(This->uri, path, &new_uri); heap_free(path); - if(FAILED(hres)) { - ERR("CoIntenetCombineUrlEx failed: %08x\n", hres); + if(FAILED(hres)) return NS_ERROR_FAILURE; - } hres = IUri_GetDisplayUri(new_uri, &ret); IUri_Release(new_uri); @@ -3317,10 +3332,7 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * MultiByteToWideChar(CP_ACP, 0, spec, -1, new_spec, sizeof(new_spec)/sizeof(WCHAR)); if(base_wine_uri) { - hres = CoInternetCombineUrlEx(base_wine_uri->uri, new_spec, URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, - &urlmon_uri, 0); - if(FAILED(hres)) - WARN("CoInternetCombineUrlEx failed: %08x\n", hres); + hres = combine_url(base_wine_uri->uri, new_spec, &urlmon_uri); }else { hres = create_uri(new_spec, 0, &urlmon_uri); if(FAILED(hres))

1 0

Frédéric Delanoy : winex11.drv: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 29, 2013

Nov. 29, 2013

Module: wine Branch: master Commit: 323bec99b37ee5279956eac7dfb6c83fd3fcbd89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=323bec99b37ee5279956eac7d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 29 12:33:09 2013 +0100 winex11.drv: Use BOOL type where appropriate. --- dlls/winex11.drv/desktop.c | 2 +- dlls/winex11.drv/event.c | 5 +++-- dlls/winex11.drv/mouse.c | 4 ++-- dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/x11drv.h | 34 +++++++++++++++++----------------- dlls/winex11.drv/x11drv_main.c | 40 ++++++++++++++++++++-------------------- dlls/winex11.drv/xvidmode.c | 6 +++--- 7 files changed, 47 insertions(+), 46 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 7a1bb92..603e19f 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -117,7 +117,7 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) RECT primary_rect = get_primary_monitor_rect(); root_window = win; - managed_mode = 0; /* no managed windows in desktop mode */ + managed_mode = FALSE; /* no managed windows in desktop mode */ max_width = primary_rect.right - primary_rect.left; max_height = primary_rect.bottom - primary_rect.top; xinerama_init( width, height ); diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 767c003..f60e845 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -925,7 +925,7 @@ static void X11DRV_MapNotify( HWND hwnd, XEvent *event ) if (event->xany.window == x11drv_thread_data()->clip_window) { - clipping_cursor = 1; + clipping_cursor = TRUE; return; } if (!(data = get_win_data( hwnd ))) return; @@ -945,7 +945,8 @@ static void X11DRV_MapNotify( HWND hwnd, XEvent *event ) */ static void X11DRV_UnmapNotify( HWND hwnd, XEvent *event ) { - if (event->xany.window == x11drv_thread_data()->clip_window) clipping_cursor = 0; + if (event->xany.window == x11drv_thread_data()->clip_window) + clipping_cursor = FALSE; } diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 2300f30..f1e58fe 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -400,7 +400,7 @@ static BOOL grab_clipping_window( const RECT *clip ) if (!XGrabPointer( data->display, clip_window, False, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, clip_window, None, CurrentTime )) - clipping_cursor = 1; + clipping_cursor = TRUE; if (!clipping_cursor) { @@ -430,7 +430,7 @@ void ungrab_clipping_window(void) TRACE( "no longer clipping\n" ); XUnmapWindow( display, clip_window ); - clipping_cursor = 0; + clipping_cursor = FALSE; SendMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR, 0, 0 ); } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index e78f226..4da361a 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -68,7 +68,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); #define SWP_AGG_NOPOSCHANGE (SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_NOZORDER) /* is cursor clipping active? */ -int clipping_cursor = 0; +BOOL clipping_cursor = FALSE; /* X context to associate a hwnd to an X window */ XContext winContext = 0; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 98386ce..9008db6 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -216,9 +216,9 @@ extern INT X11DRV_YWStoDS( HDC hdc, INT height ) DECLSPEC_HIDDEN; extern const int X11DRV_XROPfunction[]; -extern int client_side_graphics DECLSPEC_HIDDEN; -extern int client_side_with_render DECLSPEC_HIDDEN; -extern int shape_layered_windows DECLSPEC_HIDDEN; +extern BOOL client_side_graphics DECLSPEC_HIDDEN; +extern BOOL client_side_with_render DECLSPEC_HIDDEN; +extern BOOL shape_layered_windows DECLSPEC_HIDDEN; extern const struct gdi_dc_funcs *X11DRV_XRender_Init(void) DECLSPEC_HIDDEN; extern struct opengl_funcs *get_glx_driver(UINT) DECLSPEC_HIDDEN; @@ -363,22 +363,22 @@ extern XVisualInfo argb_visual DECLSPEC_HIDDEN; extern Colormap default_colormap DECLSPEC_HIDDEN; extern XPixmapFormatValues **pixmap_formats DECLSPEC_HIDDEN; extern Window root_window DECLSPEC_HIDDEN; -extern int clipping_cursor DECLSPEC_HIDDEN; +extern BOOL clipping_cursor DECLSPEC_HIDDEN; extern unsigned int screen_bpp DECLSPEC_HIDDEN; -extern int use_xkb DECLSPEC_HIDDEN; -extern int usexrandr DECLSPEC_HIDDEN; -extern int usexvidmode DECLSPEC_HIDDEN; +extern BOOL use_xkb DECLSPEC_HIDDEN; +extern BOOL usexrandr DECLSPEC_HIDDEN; +extern BOOL usexvidmode DECLSPEC_HIDDEN; extern BOOL ximInComposeMode DECLSPEC_HIDDEN; -extern int use_take_focus DECLSPEC_HIDDEN; -extern int use_primary_selection DECLSPEC_HIDDEN; -extern int use_system_cursors DECLSPEC_HIDDEN; -extern int show_systray DECLSPEC_HIDDEN; -extern int grab_pointer DECLSPEC_HIDDEN; -extern int grab_fullscreen DECLSPEC_HIDDEN; -extern int usexcomposite DECLSPEC_HIDDEN; -extern int managed_mode DECLSPEC_HIDDEN; -extern int decorated_mode DECLSPEC_HIDDEN; -extern int private_color_map DECLSPEC_HIDDEN; +extern BOOL use_take_focus DECLSPEC_HIDDEN; +extern BOOL use_primary_selection DECLSPEC_HIDDEN; +extern BOOL use_system_cursors DECLSPEC_HIDDEN; +extern BOOL show_systray DECLSPEC_HIDDEN; +extern BOOL grab_pointer DECLSPEC_HIDDEN; +extern BOOL grab_fullscreen DECLSPEC_HIDDEN; +extern BOOL usexcomposite DECLSPEC_HIDDEN; +extern BOOL managed_mode DECLSPEC_HIDDEN; +extern BOOL decorated_mode DECLSPEC_HIDDEN; +extern BOOL private_color_map DECLSPEC_HIDDEN; extern int primary_monitor DECLSPEC_HIDDEN; extern int copy_default_colors DECLSPEC_HIDDEN; extern int alloc_system_colors DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index a6572ba..85c69bf 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -62,23 +62,23 @@ Colormap default_colormap = None; XPixmapFormatValues **pixmap_formats; unsigned int screen_bpp; Window root_window; -int usexvidmode = 1; -int usexrandr = 1; -int usexcomposite = 1; -int use_xkb = 1; -int use_take_focus = 1; -int use_primary_selection = 0; -int use_system_cursors = 1; -int show_systray = 1; -int grab_pointer = 1; -int grab_fullscreen = 0; -int managed_mode = 1; -int decorated_mode = 1; -int private_color_map = 0; +BOOL usexvidmode = TRUE; +BOOL usexrandr = TRUE; +BOOL usexcomposite = TRUE; +BOOL use_xkb = TRUE; +BOOL use_take_focus = TRUE; +BOOL use_primary_selection = FALSE; +BOOL use_system_cursors = TRUE; +BOOL show_systray = TRUE; +BOOL grab_pointer = TRUE; +BOOL grab_fullscreen = FALSE; +BOOL managed_mode = TRUE; +BOOL decorated_mode = TRUE; +BOOL private_color_map = FALSE; int primary_monitor = 0; -int client_side_graphics = 1; -int client_side_with_render = 1; -int shape_layered_windows = 1; +BOOL client_side_graphics = TRUE; +BOOL client_side_with_render = TRUE; +BOOL shape_layered_windows = TRUE; int copy_default_colors = 128; int alloc_system_colors = 256; DWORD thread_data_tls_index = TLS_OUT_OF_INDEXES; @@ -91,7 +91,7 @@ static void *err_callback_arg; /* error callback argument */ static int err_callback_result; /* error callback result */ static unsigned long err_serial; /* serial number of first request */ static int (*old_error_handler)( Display *, XErrorEvent * ); -static int use_xim = 1; +static BOOL use_xim = TRUE; static char input_style[20]; #define IS_OPTION_TRUE(ch) \ @@ -439,7 +439,7 @@ static void X11DRV_XComposite_Init(void) if (!xcomposite_handle) { TRACE("Unable to open %s, XComposite disabled\n", SONAME_LIBXCOMPOSITE); - usexcomposite = 0; + usexcomposite = FALSE; return; } @@ -462,7 +462,7 @@ static void X11DRV_XComposite_Init(void) TRACE("XComposite extension could not be queried; disabled\n"); wine_dlclose(xcomposite_handle, NULL, 0); xcomposite_handle = NULL; - usexcomposite = 0; + usexcomposite = FALSE; return; } TRACE("XComposite is up and running error_base = %d\n", xcomp_error_base); @@ -472,7 +472,7 @@ sym_not_found: TRACE("Unable to load function pointers from %s, XComposite disabled\n", SONAME_LIBXCOMPOSITE); wine_dlclose(xcomposite_handle, NULL, 0); xcomposite_handle = NULL; - usexcomposite = 0; + usexcomposite = FALSE; } #endif /* defined(SONAME_LIBXCOMPOSITE) */ diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index a4e20f3..0020b08 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(xvidmode); #ifdef SONAME_LIBXXF86VM -extern int usexvidmode; +extern BOOL usexvidmode; static int xf86vm_event, xf86vm_error, xf86vm_major, xf86vm_minor; @@ -163,7 +163,7 @@ void X11DRV_XF86VM_Init(void) if (!xvidmode_handle) { TRACE("Unable to open %s, XVidMode disabled\n", SONAME_LIBXXF86VM); - usexvidmode = 0; + usexvidmode = FALSE; return; } @@ -242,7 +242,7 @@ sym_not_found: TRACE("Unable to load function pointers from %s, XVidMode disabled\n", SONAME_LIBXXF86VM); wine_dlclose(xvidmode_handle, NULL, 0); xvidmode_handle = NULL; - usexvidmode = 0; + usexvidmode = FALSE; } /***** GAMMA CONTROL *****/

1 0

Frédéric Delanoy : winemac.drv: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 29, 2013

Nov. 29, 2013

Module: wine Branch: master Commit: 69d35a01cf4c1a17422fcafc33f7f5b6b8da6711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69d35a01cf4c1a17422fcafc3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Nov 28 23:09:12 2013 +0100 winemac.drv: Use BOOL type where appropriate. --- dlls/winemac.drv/window.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index f8e30ca..6360c32 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -62,23 +62,23 @@ static void get_cocoa_window_features(struct macdrv_win_data *data, if ((style & WS_CAPTION) == WS_CAPTION && !(ex_style & WS_EX_LAYERED)) { - wf->shadow = 1; + wf->shadow = TRUE; if (!data->shaped) { - wf->title_bar = 1; - if (style & WS_SYSMENU) wf->close_button = 1; - if (style & WS_MINIMIZEBOX) wf->minimize_button = 1; - if (style & WS_MAXIMIZEBOX) wf->resizable = 1; - if (ex_style & WS_EX_TOOLWINDOW) wf->utility = 1; + wf->title_bar = TRUE; + if (style & WS_SYSMENU) wf->close_button = TRUE; + if (style & WS_MINIMIZEBOX) wf->minimize_button = TRUE; + if (style & WS_MAXIMIZEBOX) wf->resizable = TRUE; + if (ex_style & WS_EX_TOOLWINDOW) wf->utility = TRUE; } } - if (ex_style & WS_EX_DLGMODALFRAME) wf->shadow = 1; + if (ex_style & WS_EX_DLGMODALFRAME) wf->shadow = TRUE; else if (style & WS_THICKFRAME) { - wf->shadow = 1; - if (!data->shaped) wf->resizable = 1; + wf->shadow = TRUE; + if (!data->shaped) wf->resizable = TRUE; } - else if ((style & (WS_DLGFRAME|WS_BORDER)) == WS_DLGFRAME) wf->shadow = 1; + else if ((style & (WS_DLGFRAME|WS_BORDER)) == WS_DLGFRAME) wf->shadow = TRUE; }

1 0

Henri Verbeet : ddraw: Get rid of copy_to_surfacedesc2().
by Alexandre Julliard Nov. 29, 2013

Nov. 29, 2013

Module: wine Branch: master Commit: 82d5f36c8bdb6eb07e87113630e9b2d077070c6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=82d5f36c8bdb6eb07e8711363… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 28 09:55:43 2013 +0100 ddraw: Get rid of copy_to_surfacedesc2(). --- dlls/ddraw/ddraw_private.h | 12 ------------ dlls/ddraw/surface.c | 2 +- 2 files changed, 1 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index b6f5170..74e11db 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -608,18 +608,6 @@ struct member_info #define DD_STRUCT_COPY_BYSIZE(to,from) DD_STRUCT_COPY_BYSIZE_(to,from,(from)->dwSize) -#define SIZEOF_END_PADDING(type, last_field) \ - (sizeof(type) - offsetof(type, last_field) - sizeof(((type *)0)->last_field)) - -static inline void copy_to_surfacedesc2(DDSURFACEDESC2 *to, const DDSURFACEDESC2 *from) -{ - DWORD from_size = from->dwSize; - if (from_size == sizeof(DDSURFACEDESC)) - from_size -= SIZEOF_END_PADDING(DDSURFACEDESC, ddsCaps); - to->dwSize = sizeof(DDSURFACEDESC2); /* for struct copy */ - DD_STRUCT_COPY_BYSIZE_(to, from, from_size); -} - HRESULT hr_ddraw_from_wined3d(HRESULT hr) DECLSPEC_HIDDEN; #endif diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d6a948d..e94876f 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5620,7 +5620,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ return E_OUTOFMEMORY; texture->version = version; - copy_to_surfacedesc2(&texture->surface_desc, surface_desc); + texture->surface_desc = *surface_desc; desc = &texture->surface_desc; /* Ensure DDSD_CAPS is always set. */

1 0