December 2013 - Wine-commits

Frédéric Delanoy : krnl386.exe16: Use BOOL type where appropriate.
by Alexandre Julliard 17 Dec '13

17 Dec '13

Module: wine Branch: master Commit: 5605db6b946c58d5b2fc883acba5f4006dd43d09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5605db6b946c58d5b2fc883ac… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Dec 16 23:26:08 2013 +0100 krnl386.exe16: Use BOOL type where appropriate. --- dlls/krnl386.exe16/int31.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/krnl386.exe16/int31.c b/dlls/krnl386.exe16/int31.c index 5eddcca..e7413cc 100644 --- a/dlls/krnl386.exe16/int31.c +++ b/dlls/krnl386.exe16/int31.c @@ -702,7 +702,7 @@ FARPROC16 DPMI_AllocInternalRMCB( RMCBPROC proc ) } -static int DPMI_FreeRMCB( DWORD address ) +static BOOL DPMI_FreeRMCB( DWORD address ) { RMCB *CurrRMCB = FirstRMCB; RMCB *PrevRMCB = NULL; @@ -720,9 +720,9 @@ static int DPMI_FreeRMCB( DWORD address ) FirstRMCB = CurrRMCB->next; DOSMEM_FreeBlock(PTR_REAL_TO_LIN(SELECTOROF(CurrRMCB->address),OFFSETOF(CurrRMCB->address))); HeapFree(GetProcessHeap(), 0, CurrRMCB); - return 0; + return TRUE; } - return 1; + return FALSE; } @@ -823,7 +823,7 @@ static void DOSVM_FreeRMCB( CONTEXT *context ) FIXME("callback address: %04x:%04x\n", CX_reg(context), DX_reg(context)); - if (DPMI_FreeRMCB(MAKELONG(DX_reg(context), CX_reg(context)))) { + if (!DPMI_FreeRMCB(MAKELONG(DX_reg(context), CX_reg(context)))) { SET_AX( context, 0x8024 ); /* invalid callback address */ SET_CFLAG(context); }

1 0

Frédéric Delanoy : inetcomm: Constify some character strings.
by Alexandre Julliard 17 Dec '13

17 Dec '13

Module: wine Branch: master Commit: c4ba190ba3a28db477e79a3a91318d35f3892624 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4ba190ba3a28db477e79a3a9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Dec 16 23:26:09 2013 +0100 inetcomm: Constify some character strings. --- dlls/inetcomm/pop3transport.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/inetcomm/pop3transport.c b/dlls/inetcomm/pop3transport.c index d275f21..1c8bc91 100644 --- a/dlls/inetcomm/pop3transport.c +++ b/dlls/inetcomm/pop3transport.c @@ -633,7 +633,7 @@ static void POP3Transport_CallbackRecvPASSResp(IInternetTransport *iface, char * static void POP3Transport_CallbackProcessUSERResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) { - static char pass[] = "PASS "; + static const char pass[] = "PASS "; POP3Transport *This = (POP3Transport *)iface; POP3RESPONSE response; char *command; @@ -674,7 +674,7 @@ static void POP3Transport_CallbackRecvUSERResp(IInternetTransport *iface, char * static void POP3Transport_CallbackSendUSERCmd(IInternetTransport *iface, char *pBuffer, int cbBuffer) { - static char user[] = "USER "; + static const char user[] = "USER "; POP3Transport *This = (POP3Transport *)iface; char *command; int len; @@ -870,7 +870,7 @@ static HRESULT WINAPI POP3Transport_CommandAUTH(IPOP3Transport *iface, LPSTR psz static HRESULT WINAPI POP3Transport_CommandUSER(IPOP3Transport *iface, LPSTR username) { - static char user[] = "USER "; + static const char user[] = "USER "; POP3Transport *This = (POP3Transport *)iface; char *command; int len; @@ -893,7 +893,7 @@ static HRESULT WINAPI POP3Transport_CommandUSER(IPOP3Transport *iface, LPSTR use static HRESULT WINAPI POP3Transport_CommandPASS(IPOP3Transport *iface, LPSTR password) { - static char pass[] = "PASS "; + static const char pass[] = "PASS "; POP3Transport *This = (POP3Transport *)iface; char *command; int len; @@ -917,7 +917,7 @@ static HRESULT WINAPI POP3Transport_CommandPASS(IPOP3Transport *iface, LPSTR pas static HRESULT WINAPI POP3Transport_CommandLIST( IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId) { - static char list[] = "LIST %u\r\n"; + static const char list[] = "LIST %u\r\n"; static char list_all[] = "LIST\r\n"; POP3Transport *This = (POP3Transport *)iface; char *command; @@ -944,7 +944,7 @@ static HRESULT WINAPI POP3Transport_CommandLIST( static HRESULT WINAPI POP3Transport_CommandTOP( IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId, DWORD cPreviewLines) { - static char top[] = "TOP %u %u\r\n"; + static const char top[] = "TOP %u %u\r\n"; POP3Transport *This = (POP3Transport *)iface; char *command; int len; @@ -966,7 +966,7 @@ static HRESULT WINAPI POP3Transport_CommandTOP( static HRESULT WINAPI POP3Transport_CommandQUIT(IPOP3Transport *iface) { - static char command[] = "QUIT\r\n"; + static const char command[] = "QUIT\r\n"; POP3Transport *This = (POP3Transport *)iface; TRACE("()\n"); @@ -979,7 +979,7 @@ static HRESULT WINAPI POP3Transport_CommandQUIT(IPOP3Transport *iface) static HRESULT WINAPI POP3Transport_CommandSTAT(IPOP3Transport *iface) { - static char stat[] = "STAT\r\n"; + static const char stat[] = "STAT\r\n"; POP3Transport *This = (POP3Transport *)iface; TRACE("\n"); @@ -991,7 +991,7 @@ static HRESULT WINAPI POP3Transport_CommandSTAT(IPOP3Transport *iface) static HRESULT WINAPI POP3Transport_CommandNOOP(IPOP3Transport *iface) { - static char noop[] = "NOOP\r\n"; + static const char noop[] = "NOOP\r\n"; POP3Transport *This = (POP3Transport *)iface; TRACE("\n"); @@ -1003,7 +1003,7 @@ static HRESULT WINAPI POP3Transport_CommandNOOP(IPOP3Transport *iface) static HRESULT WINAPI POP3Transport_CommandRSET(IPOP3Transport *iface) { - static char rset[] = "RSET\r\n"; + static const char rset[] = "RSET\r\n"; POP3Transport *This = (POP3Transport *)iface; TRACE("\n"); @@ -1016,7 +1016,7 @@ static HRESULT WINAPI POP3Transport_CommandRSET(IPOP3Transport *iface) static HRESULT WINAPI POP3Transport_CommandUIDL( IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId) { - static char uidl[] = "UIDL %u\r\n"; + static const char uidl[] = "UIDL %u\r\n"; static char uidl_all[] = "UIDL\r\n"; POP3Transport *This = (POP3Transport *)iface; char *command; @@ -1043,7 +1043,7 @@ static HRESULT WINAPI POP3Transport_CommandUIDL( static HRESULT WINAPI POP3Transport_CommandDELE( IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId) { - static char dele[] = "DELE %u\r\n"; + static const char dele[] = "DELE %u\r\n"; POP3Transport *This = (POP3Transport *)iface; char *command; int len; @@ -1065,7 +1065,7 @@ static HRESULT WINAPI POP3Transport_CommandDELE( static HRESULT WINAPI POP3Transport_CommandRETR( IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId) { - static char retr[] = "RETR %u\r\n"; + static const char retr[] = "RETR %u\r\n"; POP3Transport *This = (POP3Transport *)iface; char *command; int len;

1 0

Frédéric Delanoy : joy.cpl: Constify some character strings.
by Alexandre Julliard 17 Dec '13

17 Dec '13

Module: wine Branch: master Commit: 37d1753a5d8b59ded8e8b2c1f640e8e11aeb52f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37d1753a5d8b59ded8e8b2c1f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Dec 16 23:26:10 2013 +0100 joy.cpl: Constify some character strings. --- dlls/joy.cpl/main.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index d294e35..53c0eae 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -39,6 +39,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(joycpl); DECLSPEC_HIDDEN HMODULE hcpl; +static const WCHAR button_class[] = {'B','u','t','t','o','n','\0'}; + /********************************************************************* * DllMain */ @@ -476,7 +478,6 @@ static void draw_joystick_buttons(HWND hwnd, struct JoystickData* data) int row = 0, col = 0; WCHAR button_label[3]; HINSTANCE hinst = (HINSTANCE) GetWindowLongPtrW(hwnd, GWLP_HINSTANCE); - static WCHAR button_class[] = {'B','u','t','t','o','n','\0'}; for (i = 0; i < TEST_MAX_BUTTONS; i++) { @@ -508,7 +509,6 @@ static void draw_joystick_axes(HWND hwnd, struct JoystickData* data) { int i; HINSTANCE hinst = (HINSTANCE) GetWindowLongPtrW(hwnd, GWLP_HINSTANCE); - static const WCHAR button_class[] = {'B','u','t','t','o','n','\0'}; static const WCHAR axes_names[TEST_MAX_AXES][7] = { {'X',',','Y','\0'}, {'R','x',',','R','y','\0'}, {'Z',',','R','z','\0'}, {'P','O','V','\0'} }; static const DWORD axes_idc[TEST_MAX_AXES] = { IDC_TESTGROUPXY, IDC_TESTGROUPRXRY, @@ -613,7 +613,6 @@ static INT_PTR CALLBACK test_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM static void draw_ff_axis(HWND hwnd, struct JoystickData *data) { HINSTANCE hinst = (HINSTANCE) GetWindowLongPtrW(hwnd, GWLP_HINSTANCE); - static WCHAR button_class[] = {'B','u','t','t','o','n','\0'}; RECT r; r.left = FF_AXIS_X;

1 0

Frédéric Delanoy : mscoree: Constify a character string.
by Alexandre Julliard 17 Dec '13

17 Dec '13

Module: wine Branch: master Commit: 3c6a4fe554f1b7f70b55cf97718a03f52710644f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c6a4fe554f1b7f70b55cf977… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Dec 16 23:26:11 2013 +0100 mscoree: Constify a character string. --- dlls/mscoree/metahost.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 3a7e109..6386122 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -1260,7 +1260,7 @@ HRESULT get_file_from_strongname(WCHAR* stringnameW, WCHAR* assemblies_path, int HRESULT hr=S_OK; IAssemblyCache *asmcache; ASSEMBLY_INFO info; - static WCHAR fusiondll[] = {'f','u','s','i','o','n',0}; + static const WCHAR fusiondll[] = {'f','u','s','i','o','n',0}; HMODULE hfusion=NULL; static HRESULT (WINAPI *pCreateAssemblyCache)(IAssemblyCache**,DWORD);

1 0

Frédéric Delanoy : mshtml: Constify a character string.
by Alexandre Julliard 17 Dec '13

17 Dec '13

Module: wine Branch: master Commit: ff9bbe372128eb42f921e393b80c7924468b70f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff9bbe372128eb42f921e393b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Dec 16 23:26:12 2013 +0100 mshtml: Constify a character string. --- dlls/mshtml/htmldoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 0df30da..a4a0fd7 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -460,7 +460,7 @@ static HRESULT WINAPI HTMLDocument_put_designMode(IHTMLDocument2 *iface, BSTR v) static HRESULT WINAPI HTMLDocument_get_designMode(IHTMLDocument2 *iface, BSTR *p) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - static WCHAR szOff[] = {'O','f','f',0}; + static const WCHAR szOff[] = {'O','f','f',0}; FIXME("(%p)->(%p) always returning Off\n", This, p); if(!p)

1 0

André Hentschel : ntdll: Trace NtFlushInstructionCache on x86_64.
by Alexandre Julliard 17 Dec '13

17 Dec '13

Module: wine Branch: master Commit: 2692b9d2cad156a28aa3ca6692691501f8e0ab51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2692b9d2cad156a28aa3ca669… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 16 20:28:36 2013 +0100 ntdll: Trace NtFlushInstructionCache on x86_64. --- dlls/ntdll/process.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 1c9286f..633a668 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -564,8 +564,8 @@ NTSTATUS WINAPI NtFlushInstructionCache( static int once; if (!once++) { -#ifdef __i386__ - TRACE("%p %p %ld - no-op on x86\n", ProcessHandle, BaseAddress, Size ); +#if defined(__x86_64__) || defined(__i386__) + TRACE("%p %p %ld - no-op on x86 and x86_64\n", ProcessHandle, BaseAddress, Size ); #else FIXME("%p %p %ld\n", ProcessHandle, BaseAddress, Size ); #endif

1 0

Ken Thomases : user32: In WINPOS_SysCommandSizeMove(), fix constraining a point to a rect's right and bottom edges.
by Alexandre Julliard 17 Dec '13

17 Dec '13

Module: wine Branch: master Commit: b423532f94efe9842d4c7e30166a4a2f2121fbbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b423532f94efe9842d4c7e301… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Dec 16 17:23:03 2013 -0600 user32: In WINPOS_SysCommandSizeMove(), fix constraining a point to a rect's right and bottom edges. --- dlls/user32/winpos.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 7cae0ad..57fefe3 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2747,9 +2747,9 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) } pt.x = max( pt.x, mouseRect.left ); - pt.x = min( pt.x, mouseRect.right ); + pt.x = min( pt.x, mouseRect.right - 1 ); pt.y = max( pt.y, mouseRect.top ); - pt.y = min( pt.y, mouseRect.bottom ); + pt.y = min( pt.y, mouseRect.bottom - 1 ); if (!parent) { @@ -2763,9 +2763,9 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) if (mon && GetMonitorInfoW( mon, &info )) { pt.x = max( pt.x, info.rcWork.left ); - pt.x = min( pt.x, info.rcWork.right ); + pt.x = min( pt.x, info.rcWork.right - 1 ); pt.y = max( pt.y, info.rcWork.top ); - pt.y = min( pt.y, info.rcWork.bottom ); + pt.y = min( pt.y, info.rcWork.bottom - 1 ); } }

1 0

Ken Thomases : winemac: When dragging an undecorated window, keep the title bar vertically within the work area.
by Alexandre Julliard 17 Dec '13

17 Dec '13

Module: wine Branch: master Commit: b877885400b9eb2f0d33a4f30bae19c3c43cf5eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b877885400b9eb2f0d33a4f30… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Dec 16 17:23:07 2013 -0600 winemac: When dragging an undecorated window, keep the title bar vertically within the work area. In particular, keep the title bar from moving behind the menu bar or Dock (when it's on the bottom). --- dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/window.c | 225 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 225 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b877885400b9eb2f0d33a…

1 0

Ken Thomases : winemac: When ClipCursor() is called redundantly, don' t warp the cursor or discard mouse move events.
by Alexandre Julliard 17 Dec '13

17 Dec '13

Module: wine Branch: master Commit: 77f0a63b4fce90e4a35393eb16468f11a922ea3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=77f0a63b4fce90e4a35393eb1… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Dec 16 19:42:22 2013 -0600 winemac: When ClipCursor() is called redundantly, don't warp the cursor or discard mouse move events. Fixes a problem in some games which repeatedly (re)establish the same cursor clipping rect, making it exceedingly difficult to move the camera with the mouse. --- dlls/winemac.drv/cocoa_app.m | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index ce43e27..c31bceb 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1353,6 +1353,10 @@ int macdrv_err_on; if (!cursorClippingEventTap && ![self installEventTap]) return FALSE; + if (clippingCursor && CGRectEqualToRect(rect, cursorClipRect) && + CGEventTapIsEnabled(cursorClippingEventTap)) + return TRUE; + err = CGAssociateMouseAndMouseCursorPosition(false); if (err != kCGErrorSuccess) return FALSE;

1 0

Alexandre Julliard : makedep: Add support for reading source variables directly from the makefile.
by Alexandre Julliard 17 Dec '13

17 Dec '13

Module: wine Branch: master Commit: 1928d611461f49421cb6367d6d59e4de8daa7ab1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1928d611461f49421cb6367d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 17 17:10:28 2013 +0100 makedep: Add support for reading source variables directly from the makefile. --- Make.rules.in | 6 +- aclocal.m4 | 4 +- configure | 4 +- tools/makedep.c | 316 +++++++++++++++++++++++++++++++++++++++++++++++++----- 4 files changed, 291 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1928d611461f49421cb63…

1 0