October 2013 - Wine-commits

Alexandre Julliard : user32: Don' t trigger a graphics driver load for functions that require an existing window .
by Alexandre Julliard 23 Oct '13

23 Oct '13

Module: wine Branch: master Commit: 11597d6b3cb9a0e2c27a275c58877cf8c30854f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11597d6b3cb9a0e2c27a275c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 23 16:13:17 2013 +0200 user32: Don't trigger a graphics driver load for functions that require an existing window. --- dlls/user32/driver.c | 127 +++++++------------------------------------------- 1 files changed, 17 insertions(+), 110 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 4cfc552..18778cd 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -553,11 +553,6 @@ static SHORT CDECL loaderdrv_VkKeyScanEx( WCHAR ch, HKL layout ) return load_driver()->pVkKeyScanEx( ch, layout ); } -static void CDECL loaderdrv_DestroyCursorIcon( HCURSOR cursor ) -{ - load_driver()->pDestroyCursorIcon( cursor ); -} - static void CDECL loaderdrv_SetCursor( HCURSOR cursor ) { load_driver()->pSetCursor( cursor ); @@ -649,116 +644,28 @@ static BOOL CDECL loaderdrv_CreateWindow( HWND hwnd ) return load_driver()->pCreateWindow( hwnd ); } -static void CDECL loaderdrv_DestroyWindow( HWND hwnd ) -{ - load_driver()->pDestroyWindow( hwnd ); -} - static void CDECL loaderdrv_GetDC( HDC hdc, HWND hwnd, HWND top_win, const RECT *win_rect, const RECT *top_rect, DWORD flags ) { load_driver()->pGetDC( hdc, hwnd, top_win, win_rect, top_rect, flags ); } -static DWORD CDECL loaderdrv_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout, - DWORD mask, DWORD flags ) -{ - return load_driver()->pMsgWaitForMultipleObjectsEx( count, handles, timeout, mask, flags ); -} - -static void CDECL loaderdrv_ReleaseDC( HWND hwnd, HDC hdc ) -{ - load_driver()->pReleaseDC( hwnd, hdc ); -} - -static BOOL CDECL loaderdrv_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update ) -{ - return load_driver()->pScrollDC( hdc, dx, dy, update ); -} - -static void CDECL loaderdrv_SetCapture( HWND hwnd, UINT flags ) -{ - load_driver()->pSetCapture( hwnd, flags ); -} - -static void CDECL loaderdrv_SetFocus( HWND hwnd ) -{ - load_driver()->pSetFocus( hwnd ); -} - static void CDECL loaderdrv_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWORD flags ) { load_driver()->pSetLayeredWindowAttributes( hwnd, key, alpha, flags ); } -static void CDECL loaderdrv_SetParent( HWND hwnd, HWND parent, HWND old_parent ) -{ - load_driver()->pSetParent( hwnd, parent, old_parent ); -} - static int CDECL loaderdrv_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) { return load_driver()->pSetWindowRgn( hwnd, hrgn, redraw ); } -static void CDECL loaderdrv_SetWindowIcon( HWND hwnd, UINT type, HICON icon ) -{ - load_driver()->pSetWindowIcon( hwnd, type, icon ); -} - -static void CDECL loaderdrv_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) -{ - load_driver()->pSetWindowStyle( hwnd, offset, style ); -} - -static void CDECL loaderdrv_SetWindowText( HWND hwnd, LPCWSTR text ) -{ - load_driver()->pSetWindowText( hwnd, text ); -} - -static UINT CDECL loaderdrv_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) -{ - return load_driver()->pShowWindow( hwnd, cmd, rect, swp ); -} - -static LRESULT CDECL loaderdrv_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) -{ - return load_driver()->pSysCommand( hwnd, wparam, lparam ); -} - static BOOL CDECL loaderdrv_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, const RECT *window_rect ) { return load_driver()->pUpdateLayeredWindow( hwnd, info, window_rect ); } -static LRESULT CDECL loaderdrv_WindowMessage( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) -{ - return load_driver()->pWindowMessage( hwnd, msg, wparam, lparam ); -} - -static void CDECL loaderdrv_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flags, - const RECT *window_rect, const RECT *client_rect, - RECT *visible_rect, struct window_surface **surface ) -{ - load_driver()->pWindowPosChanging( hwnd, insert_after, swp_flags, - window_rect, client_rect, visible_rect, surface ); -} - -static void CDECL loaderdrv_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, - const RECT *window_rect, const RECT *client_rect, - const RECT *visible_rect, const RECT *valid_rects, - struct window_surface *surface ) -{ - load_driver()->pWindowPosChanged( hwnd, insert_after, swp_flags, window_rect, - client_rect, visible_rect, valid_rects, surface ); -} - -static BOOL CDECL loaderdrv_SystemParametersInfo( UINT action, UINT int_param, void *ptr_param, UINT flags ) -{ - return FALSE; /* don't trigger a driver load */ -} - static USER_DRIVER lazy_load_driver = { /* keyboard functions */ @@ -776,7 +683,7 @@ static USER_DRIVER lazy_load_driver = loaderdrv_UnregisterHotKey, loaderdrv_VkKeyScanEx, /* cursor/icon functions */ - loaderdrv_DestroyCursorIcon, + nulldrv_DestroyCursorIcon, loaderdrv_SetCursor, loaderdrv_GetCursorPos, loaderdrv_SetCursorPos, @@ -798,25 +705,25 @@ static USER_DRIVER lazy_load_driver = /* windowing functions */ loaderdrv_CreateDesktopWindow, loaderdrv_CreateWindow, - loaderdrv_DestroyWindow, + nulldrv_DestroyWindow, loaderdrv_GetDC, - loaderdrv_MsgWaitForMultipleObjectsEx, - loaderdrv_ReleaseDC, - loaderdrv_ScrollDC, - loaderdrv_SetCapture, - loaderdrv_SetFocus, + nulldrv_MsgWaitForMultipleObjectsEx, + nulldrv_ReleaseDC, + nulldrv_ScrollDC, + nulldrv_SetCapture, + nulldrv_SetFocus, loaderdrv_SetLayeredWindowAttributes, - loaderdrv_SetParent, + nulldrv_SetParent, loaderdrv_SetWindowRgn, - loaderdrv_SetWindowIcon, - loaderdrv_SetWindowStyle, - loaderdrv_SetWindowText, - loaderdrv_ShowWindow, - loaderdrv_SysCommand, + nulldrv_SetWindowIcon, + nulldrv_SetWindowStyle, + nulldrv_SetWindowText, + nulldrv_ShowWindow, + nulldrv_SysCommand, loaderdrv_UpdateLayeredWindow, - loaderdrv_WindowMessage, - loaderdrv_WindowPosChanging, - loaderdrv_WindowPosChanged, + nulldrv_WindowMessage, + nulldrv_WindowPosChanging, + nulldrv_WindowPosChanged, /* system parameters */ - loaderdrv_SystemParametersInfo + nulldrv_SystemParametersInfo };

1 0

Stefan Dösinger : ddraw/tests: Add surface lockability tests.
by Alexandre Julliard 23 Oct '13

23 Oct '13

Module: wine Branch: master Commit: 9c456ef88ce71d174402b2f1840ff64c856d21ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c456ef88ce71d174402b2f18… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 23 12:05:37 2013 +0200 ddraw/tests: Add surface lockability tests. --- dlls/ddraw/tests/ddraw1.c | 116 ++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 115 ++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 140 ++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 196 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 567 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c456ef88ce71d174402b…

1 0

Stefan Dösinger : ddraw: Treat D3DTEXTUREMANAGE like TEXTUREMANAGE.
by Alexandre Julliard 23 Oct '13

23 Oct '13

Module: wine Branch: master Commit: db68ffcba180b6ca0591e3d4d1c0eec87cd2eacc URL: http://source.winehq.org/git/wine.git/?a=commit;h=db68ffcba180b6ca0591e3d4d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 23 12:05:38 2013 +0200 ddraw: Treat D3DTEXTUREMANAGE like TEXTUREMANAGE. Sim City 4 uses this flag. The main problem I noticed was with WINED3D_MAP_DISCARD handling introduced for surfaces in patches that aren't yet in the tree, but the difference already matters for older cards because of video memory accounting. --- dlls/ddraw/ddraw.c | 4 ++-- dlls/ddraw/surface.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index bdb375b..e01f923 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2962,7 +2962,7 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, } } - if (DDSD->ddsCaps.dwCaps2 & DDSCAPS2_TEXTUREMANAGE) + if (DDSD->ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE)) { if (!(DDSD->ddsCaps.dwCaps & DDSCAPS_TEXTURE)) { @@ -3001,7 +3001,7 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, } if (!(desc2.ddsCaps.dwCaps & (DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY)) - && !(desc2.ddsCaps.dwCaps2 & DDSCAPS2_TEXTUREMANAGE)) + && !(desc2.ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE))) { enum wined3d_format_id format = wined3dformat_from_ddrawformat(&desc2.u4.ddpfPixelFormat); enum wined3d_resource_type rtype; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 416c13f..e11b633 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5608,7 +5608,7 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surfac else layers = 1; - if (desc->ddsCaps.dwCaps2 & DDSCAPS2_TEXTUREMANAGE) + if (desc->ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE)) { wined3d_desc.usage = WINED3DUSAGE_TEXTURE; pool = WINED3D_POOL_MANAGED; @@ -5730,7 +5730,7 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, if (!(desc->ddsCaps.dwCaps & (DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY)) && !((desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE) - && (desc->ddsCaps.dwCaps2 & DDSCAPS2_TEXTUREMANAGE))) + && (desc->ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE)))) { /* Tests show surfaces without memory flags get these flags added * right after creation. */ @@ -5760,7 +5760,7 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, { pool = WINED3D_POOL_SYSTEM_MEM; } - else if (desc->ddsCaps.dwCaps2 & DDSCAPS2_TEXTUREMANAGE) + else if (desc->ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE)) { pool = WINED3D_POOL_MANAGED; /* Managed textures have the system memory flag set. */

1 0

Stefan Dösinger : ddraw/tests: Test DDSCAPS2_D3DTEXTUREMANAGE.
by Alexandre Julliard 23 Oct '13

23 Oct '13

Module: wine Branch: master Commit: a562af5acef646bd7b775f2b2ffce4bfe6d23e1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a562af5acef646bd7b775f2b2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 23 12:05:39 2013 +0200 ddraw/tests: Test DDSCAPS2_D3DTEXTUREMANAGE. --- dlls/ddraw/tests/ddraw4.c | 22 ++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index b0a70db..457eea0 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -3813,10 +3813,16 @@ static void test_texturemanage(void) { {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, ~0U, ~0U}, + {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, {DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, ~0U, ~0U}, + {DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, {DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DD_OK, DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE}, + {DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE, DD_OK, + DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE}, {DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, 0, DD_OK, DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE | DDSCAPS_LOCALVIDMEM, 0}, {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, 0, DD_OK, @@ -3824,10 +3830,16 @@ static void test_texturemanage(void) {0, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, ~0U, ~0U}, + {0, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, {DDSCAPS_SYSTEMMEMORY, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, ~0U, ~0U}, + {DDSCAPS_SYSTEMMEMORY, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, {DDSCAPS_VIDEOMEMORY, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, ~0U, ~0U}, + {DDSCAPS_VIDEOMEMORY, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, {DDSCAPS_VIDEOMEMORY, 0, DD_OK, DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY, 0}, {DDSCAPS_SYSTEMMEMORY, 0, DD_OK, @@ -4589,10 +4601,20 @@ static void test_surface_lock(void) }, { DDSCAPS_TEXTURE, + DDSCAPS2_D3DTEXTUREMANAGE, + "managed texture" + }, + { + DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_OPAQUE, "opaque managed texture" }, { + DDSCAPS_TEXTURE, + DDSCAPS2_D3DTEXTUREMANAGE | DDSCAPS2_OPAQUE, + "opaque managed texture" + }, + { DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, 0, "render target" diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 14a069e..6cf6b7f 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -3626,10 +3626,16 @@ static void test_texturemanage(void) { {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, ~0U, ~0U}, + {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, {DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, ~0U, ~0U}, + {DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, {DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DD_OK, DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE}, + {DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE, DD_OK, + DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE}, {DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, 0, DD_OK, DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE | DDSCAPS_LOCALVIDMEM, 0}, {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, 0, DD_OK, @@ -3637,10 +3643,16 @@ static void test_texturemanage(void) {0, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, ~0U, ~0U}, + {0, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, {DDSCAPS_SYSTEMMEMORY, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, ~0U, ~0U}, + {DDSCAPS_SYSTEMMEMORY, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, {DDSCAPS_VIDEOMEMORY, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, ~0U, ~0U}, + {DDSCAPS_VIDEOMEMORY, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, {DDSCAPS_VIDEOMEMORY, 0, DD_OK, DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY, 0}, {DDSCAPS_SYSTEMMEMORY, 0, DD_OK, @@ -4414,10 +4426,20 @@ static void test_surface_lock(void) }, { DDSCAPS_TEXTURE, + DDSCAPS2_D3DTEXTUREMANAGE, + "managed texture" + }, + { + DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_OPAQUE, "opaque managed texture" }, { + DDSCAPS_TEXTURE, + DDSCAPS2_D3DTEXTUREMANAGE | DDSCAPS2_OPAQUE, + "opaque managed texture" + }, + { DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, 0, "render target" @@ -4449,9 +4471,19 @@ static void test_surface_lock(void) }, { DDSCAPS_TEXTURE | DDSCAPS_COMPLEX, + DDSCAPS2_D3DTEXTUREMANAGE | DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_ALLFACES, + "managed cube" + }, + { + DDSCAPS_TEXTURE | DDSCAPS_COMPLEX, DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_ALLFACES | DDSCAPS2_OPAQUE, "opaque managed cube" }, + { + DDSCAPS_TEXTURE | DDSCAPS_COMPLEX, + DDSCAPS2_D3DTEXTUREMANAGE | DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_ALLFACES | DDSCAPS2_OPAQUE, + "opaque managed cube" + }, }; if (!(ddraw = create_ddraw()))

1 0

André Hentschel : ntdll: vm86 is not available on PowerPC.
by Alexandre Julliard 23 Oct '13

23 Oct '13

Module: wine Branch: master Commit: e0e7a0770b82c66ad9d14d7b400f7d091ca1bd02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0e7a0770b82c66ad9d14d7b4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 22 20:18:22 2013 +0200 ntdll: vm86 is not available on PowerPC. --- dlls/ntdll/signal_powerpc.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 3d461ee..ac8095a 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -43,10 +43,6 @@ # endif #endif -#ifdef HAVE_SYS_VM86_H -# include <sys/vm86.h> -#endif - #ifdef HAVE_SYS_SIGNAL_H # include <sys/signal.h> #endif

1 0

Frédéric Delanoy : user.exe16: Use BOOL type where appropriate.
by Alexandre Julliard 23 Oct '13

23 Oct '13

Module: wine Branch: master Commit: 1c4456f7a22a14fb657cbb7f9fc840fe75404a82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c4456f7a22a14fb657cbb7f9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 22 22:21:50 2013 +0200 user.exe16: Use BOOL type where appropriate. --- dlls/user.exe16/comm.c | 6 +++--- dlls/user.exe16/user.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user.exe16/comm.c b/dlls/user.exe16/comm.c index 9c99899..a9141db 100644 --- a/dlls/user.exe16/comm.c +++ b/dlls/user.exe16/comm.c @@ -83,7 +83,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(comm); struct DosDeviceStruct { HANDLE handle; - int suspended; + BOOL suspended; int unget,xmit; int evtchar; /* events */ @@ -577,7 +577,7 @@ INT16 WINAPI SetCommBreak16(INT16 cid) return -1; } - ptr->suspended = 1; + ptr->suspended = TRUE; ptr->commerror = 0; return 0; } @@ -594,7 +594,7 @@ INT16 WINAPI ClearCommBreak16(INT16 cid) FIXME("no cid=%d found!\n", cid); return -1; } - ptr->suspended = 0; + ptr->suspended = FALSE; ptr->commerror = 0; return 0; } diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index 9500f59..7a518b3 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -2792,7 +2792,7 @@ DWORD WINAPI DumpIcon16( SEGPTR pInfo, WORD *lpLen, */ static BOOL DRAG_QueryUpdate16( HWND hQueryWnd, SEGPTR spDragInfo ) { - BOOL bResult = 0; + BOOL bResult; WPARAM wParam; POINT pt, old_pt; LPDRAGINFO16 ptrDragInfo = MapSL(spDragInfo);

1 0

Frédéric Delanoy : comdlg32: Use BOOL type where appropriate.
by Alexandre Julliard 23 Oct '13

23 Oct '13

Module: wine Branch: master Commit: 3e3efd1e1bcfe0149cfa7e46f1d0ab71aa4e8b36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e3efd1e1bcfe0149cfa7e46f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 22 22:21:49 2013 +0200 comdlg32: Use BOOL type where appropriate. --- dlls/comdlg32/colordlg.c | 28 ++++++++++++------------ dlls/comdlg32/filedlg.c | 4 +- dlls/comdlg32/filedlg31.c | 2 +- dlls/comdlg32/fontdlg.c | 53 +++++++++++++++++++++++--------------------- 4 files changed, 45 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3e3efd1e1bcfe0149cfa7…

1 0

Frédéric Delanoy : wineboot: Use BOOL type where appropriate.
by Alexandre Julliard 23 Oct '13

23 Oct '13

Module: wine Branch: master Commit: 189ac56e6d673a505208ac6de9e741affc55d1c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=189ac56e6d673a505208ac6de… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 22 22:21:51 2013 +0200 wineboot: Use BOOL type where appropriate. --- programs/wineboot/shutdown.c | 4 ++-- programs/wineboot/wineboot.c | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/programs/wineboot/shutdown.c b/programs/wineboot/shutdown.c index ac3019c..a5f5f5a 100644 --- a/programs/wineboot/shutdown.c +++ b/programs/wineboot/shutdown.c @@ -335,14 +335,14 @@ static BOOL CALLBACK shutdown_one_desktop( LPWSTR name, LPARAM force ) if (hdesk == NULL) { WINE_ERR("Cannot open desktop %s, err=%i\n", wine_dbgstr_w(name), GetLastError()); - return 0; + return FALSE; } if (!SetThreadDesktop( hdesk )) { CloseDesktop( hdesk ); WINE_ERR("Cannot set thread desktop %s, err=%i\n", wine_dbgstr_w(name), GetLastError()); - return 0; + return FALSE; } CloseDesktop( hdesk ); diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 4f9adb0..a062d81 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -948,7 +948,7 @@ static HANDLE start_rundll32( const char *inf_path, BOOL wow64 ) } /* execute rundll32 on the wine.inf file if necessary */ -static void update_wineprefix( int force ) +static void update_wineprefix( BOOL force ) { const char *config_dir = wine_get_config_dir(); char *inf_path = get_wine_inf_path(); @@ -1123,11 +1123,12 @@ int main( int argc, char *argv[] ) /* First, set the current directory to SystemRoot */ int optc; - int end_session = 0, force = 0, init = 0, kill = 0, restart = 0, shutdown = 0, update = 0; + BOOL end_session, force, init, kill, restart, shutdown, update; HANDLE event; SECURITY_ATTRIBUTES sa; BOOL is_wow64; + end_session = force = init = kill = restart = shutdown = update = FALSE; GetWindowsDirectoryW( windowsdir, MAX_PATH ); if( !SetCurrentDirectoryW( windowsdir ) ) WINE_ERR("Cannot set the dir to %s (%d)\n", wine_dbgstr_w(windowsdir), GetLastError() ); @@ -1160,13 +1161,13 @@ int main( int argc, char *argv[] ) { switch(optc) { - case 'e': end_session = 1; break; - case 'f': force = 1; break; - case 'i': init = 1; break; - case 'k': kill = 1; break; - case 'r': restart = 1; break; - case 's': shutdown = 1; break; - case 'u': update = 1; break; + case 'e': end_session = TRUE; break; + case 'f': force = TRUE; break; + case 'i': init = TRUE; break; + case 'k': kill = TRUE; break; + case 'r': restart = TRUE; break; + case 's': shutdown = TRUE; break; + case 'u': update = TRUE; break; case 'h': usage(); return 0; case '?': usage(); return 1; }

1 0

Frédéric Delanoy : comdlg32/tests: Use BOOL type where appropriate.
by Alexandre Julliard 23 Oct '13

23 Oct '13

Module: wine Branch: master Commit: e5d954096bbac8b7b2a06d05d82d5afae9526994 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5d954096bbac8b7b2a06d05d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 22 22:21:52 2013 +0200 comdlg32/tests: Use BOOL type where appropriate. --- dlls/comdlg32/tests/filedlg.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index cfa964a..d96d976 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -111,7 +111,7 @@ static void test_DialogCancel(void) "expected CDERR_INITIALIZATION, got %d\n", CommDlgExtendedError()); result = GetOpenFileNameA(&ofn); - ok(0 == result, "expected 0, got %d\n", result); + ok(FALSE == result, "expected FALSE, got %d\n", result); ok(0 == CommDlgExtendedError(), "expected 0, got %d\n", CommDlgExtendedError()); @@ -120,7 +120,7 @@ static void test_DialogCancel(void) "expected CDERR_INITIALIZATION, got %d\n", CommDlgExtendedError()); result = GetSaveFileNameA(&ofn); - ok(0 == result, "expected 0, got %d\n", result); + ok(FALSE == result, "expected FALSE, got %d\n", result); ok(0 == CommDlgExtendedError(), "expected 0, got %d\n", CommDlgExtendedError()); @@ -143,7 +143,7 @@ static void test_DialogCancel(void) win_skip("GetOpenFileNameW is not implemented\n"); else { - ok(0 == result, "expected 0, got %d\n", result); + ok(FALSE == result, "expected FALSE, got %d\n", result); ok(0 == CommDlgExtendedError(), "expected 0, got %d\n", CommDlgExtendedError()); } @@ -153,7 +153,7 @@ static void test_DialogCancel(void) win_skip("GetSaveFileNameW is not implemented\n"); else { - ok(0 == result, "expected 0, got %d\n", result); + ok(FALSE == result, "expected FALSE, got %d\n", result); ok(0 == CommDlgExtendedError(), "expected 0, got %d\n", CommDlgExtendedError()); } } @@ -928,12 +928,12 @@ static void test_getfolderpath(void) ofn.lpstrInitialDir = szInitialDir; result = GetOpenFileNameA(&ofn); - ok(0 == result, "expected 0, got %d\n", result); + ok(FALSE == result, "expected FALSE, got %d\n", result); ok(0 == CommDlgExtendedError(), "expected 0, got %d\n", CommDlgExtendedError()); result = GetSaveFileNameA(&ofn); - ok(0 == result, "expected 0, got %d\n", result); + ok(FALSE == result, "expected FALSE, got %d\n", result); ok(0 == CommDlgExtendedError(), "expected 0, got %d\n", CommDlgExtendedError()); } @@ -956,7 +956,7 @@ static void test_resizable2(void) ofn.hInstance = GetModuleHandleA(NULL); ofn.lpTemplateName = "template1"; ofn.Flags = OFN_EXPLORER; -#define ISSIZABLE 1 +#define ISSIZABLE TRUE ret = GetOpenFileNameA(&ofn); ok( ret == ISSIZABLE, "File Dialog should have been sizable\n"); ret = CommDlgExtendedError();

1 0

Dmitry Timoshkov : user32/tests: Fix broadcast tests compilation with __WINESRC__ defined.
by Alexandre Julliard 23 Oct '13

23 Oct '13

Module: wine Branch: master Commit: 3c4d7f0d72383d45b2902785e741e2a480e9cf8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c4d7f0d72383d45b2902785e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 23 14:53:10 2013 +0900 user32/tests: Fix broadcast tests compilation with __WINESRC__ defined. --- dlls/user32/tests/broadcast.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/broadcast.c b/dlls/user32/tests/broadcast.c index daddf96..0476c99 100644 --- a/dlls/user32/tests/broadcast.c +++ b/dlls/user32/tests/broadcast.c @@ -59,7 +59,7 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR static BOOL init_procs(void) { WNDCLASSA cls; - HANDLE user32 = GetModuleHandle("user32"); + HANDLE user32 = GetModuleHandleA("user32.dll"); pBroadcastA = (PBROADCAST)GetProcAddress(user32, "BroadcastSystemMessageA"); if (!pBroadcastA) pBroadcastA = (PBROADCAST)GetProcAddress(user32, "BroadcastSystemMessage"); @@ -82,7 +82,7 @@ static BOOL init_procs(void) cls.cbWndExtra = 0; cls.hInstance = GetModuleHandleA(0); cls.hIcon = 0; - cls.hCursor = LoadCursorA(0, IDC_ARROW); + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszMenuName = NULL; cls.lpszClassName = "MainWindowClass"; @@ -92,7 +92,7 @@ static BOOL init_procs(void) if (!CreateWindowExA(0, "MainWindowClass", "Main window", WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP, 100, 100, 200, - 200, 0, 0, GetModuleHandle(0), NULL)) + 200, 0, 0, GetModuleHandleA(NULL), NULL)) return FALSE; return TRUE; }

1 0