wine-commits December 2013

wine-commits@winehq.org

3 participants
462 discussions

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

18 Dec '13

Module: wine Branch: master Commit: 44c1ba9f9ec3741b8a14830db35cf5c63855a8e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44c1ba9f9ec3741b8a14830db… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 17 22:17:40 2013 +0100 rpcrt4: Constify a character string. --- dlls/rpcrt4/rpc_transport.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index e8bdd49..c073a95 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -2383,7 +2383,7 @@ static RPC_STATUS rpcrt4_http_prepare_out_pipe(HINTERNET out_request, RpcHttpAsy static UINT encode_base64(const char *bin, unsigned int len, WCHAR *base64) { - static char enc[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + static const char enc[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; UINT i = 0, x; while (len > 0)

1 0

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

18 Dec '13

Module: wine Branch: master Commit: 1c972c598716cd06b6ff3d18af6505a3214379db URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c972c598716cd06b6ff3d18a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 17 22:17:39 2013 +0100 msxml3: Constify a character string. --- dlls/msxml3/text.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index fd8e33a..411f6eb 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -616,7 +616,7 @@ static HRESULT WINAPI domtext_put_data( BSTR data) { domtext *This = impl_from_IXMLDOMText( iface ); - static WCHAR rnW[] = {'\r','\n',0}; + static const WCHAR rnW[] = {'\r','\n',0}; TRACE("(%p)->(%s)\n", This, debugstr_w(data));

1 0

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

18 Dec '13

Module: wine Branch: master Commit: 198344894230ae982911824af54db4023b64c84c URL: http://source.winehq.org/git/wine.git/?a=commit;h=198344894230ae982911824af… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 17 22:17:37 2013 +0100 msi: Constify a character string. --- dlls/msi/msi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index c1f4fcc..f8a1874 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -359,7 +359,7 @@ static UINT MSI_ApplyPatchW(LPCWSTR szPatchPackage, LPCWSTR szProductCode, LPCWS BOOL succeeded = FALSE; static const WCHAR fmt[] = {'%','s',' ','P','A','T','C','H','=','"','%','s','"',0}; - static WCHAR empty[] = {0}; + static const WCHAR empty[] = {0}; if (!szPatchPackage || !szPatchPackage[0]) return ERROR_INVALID_PARAMETER;

1 0

Stefan Leichter : setupapi/tests: Test signature $Windows NT$ in SetupDiGetINFClassA too.
by Alexandre Julliard 18 Dec '13

18 Dec '13

Module: wine Branch: master Commit: adbc691d209ffcb198f8f2d3b7d04f83f97d91e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adbc691d209ffcb198f8f2d3b… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Dec 17 21:42:11 2013 +0100 setupapi/tests: Test signature $Windows NT$ in SetupDiGetINFClassA too. --- dlls/setupapi/tests/devinst.c | 154 +++++++++++++++++++++-------------------- 1 files changed, 80 insertions(+), 74 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index ccb6b68..319bb31 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -1370,6 +1370,7 @@ static void testSetupDiGetINFClassA(void) { static const char inffile[] = "winetest.inf"; static const char content[] = "[Version]\r\n\r\n"; + static const char* signatures[] = {"\"$CHICAGO$\"", "\"$Windows NT$\""}; char cn[MAX_PATH]; char filename[MAX_PATH]; @@ -1377,6 +1378,7 @@ static void testSetupDiGetINFClassA(void) BOOL retval; GUID guid; HANDLE h; + int i; if(!pSetupDiGetINFClassA) { @@ -1444,96 +1446,100 @@ static void testSetupDiGetINFClassA(void) retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - h = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, - FILE_ATTRIBUTE_NORMAL, NULL); - if(h == INVALID_HANDLE_VALUE) + for(i=0; i < sizeof(signatures)/sizeof(char*); i++) { - win_skip("failed to create file %s (error %u)\n", filename, GetLastError()); - return; - } - WriteFile( h, content, sizeof(content), &count, NULL); - CloseHandle( h); - - retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); - ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - - WritePrivateProfileStringA("Version", "Signature", "\"$CHICAGO$\"", filename); + trace("testing signarture %s\n", signatures[i]); + h = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + if(h == INVALID_HANDLE_VALUE) + { + win_skip("failed to create file %s (error %u)\n", filename, GetLastError()); + return; + } + WriteFile( h, content, sizeof(content), &count, NULL); + CloseHandle( h); - retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); - ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - WritePrivateProfileStringA("Version", "Class", "WINE", filename); + WritePrivateProfileStringA("Version", "Signature", signatures[i], filename); - count = 0xdeadbeef; - retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); - ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); - ok(count == 5, "expected count==5, got %u\n", count); + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - count = 0xdeadbeef; - retval = SetupDiGetINFClassA(filename, &guid, cn, 5, &count); - ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); - ok(count == 5, "expected count==5, got %u\n", count); + WritePrivateProfileStringA("Version", "Class", "WINE", filename); - count = 0xdeadbeef; - SetLastError(0xdeadbeef); - retval = SetupDiGetINFClassA(filename, &guid, cn, 4, &count); - ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), - "expected error ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); - ok(count == 5, "expected count==5, got %u\n", count); + count = 0xdeadbeef; + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); + ok(count == 5, "expected count==5, got %u\n", count); - /* invalid parameter */ - SetLastError(0xdeadbeef); - retval = SetupDiGetINFClassA(NULL, &guid, cn, MAX_PATH, &count); - ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(ERROR_INVALID_PARAMETER == GetLastError(), - "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + count = 0xdeadbeef; + retval = SetupDiGetINFClassA(filename, &guid, cn, 5, &count); + ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); + ok(count == 5, "expected count==5, got %u\n", count); - SetLastError(0xdeadbeef); - retval = SetupDiGetINFClassA(filename, NULL, cn, MAX_PATH, &count); - ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(ERROR_INVALID_PARAMETER == GetLastError(), - "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + count = 0xdeadbeef; + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, cn, 4, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), + "expected error ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); + ok(count == 5, "expected count==5, got %u\n", count); - SetLastError(0xdeadbeef); - retval = SetupDiGetINFClassA(filename, &guid, NULL, MAX_PATH, &count); - ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(ERROR_INVALID_PARAMETER == GetLastError(), - "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + /* invalid parameter */ + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(NULL, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); - SetLastError(0xdeadbeef); - retval = SetupDiGetINFClassA(filename, &guid, cn, 0, &count); - ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(ERROR_INSUFFICIENT_BUFFER == GetLastError() || - ERROR_INVALID_PARAMETER == GetLastError(), - "expected error ERROR_INSUFFICIENT_BUFFER or ERROR_INVALID_PARAMETER, " - "got %u\n", GetLastError()); + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, NULL, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); - DeleteFileA(filename); + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, NULL, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); - WritePrivateProfileStringA("Version", "Signature", "\"$CHICAGO$\"", filename); - WritePrivateProfileStringA("Version", "ClassGUID", "WINE", filename); + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, cn, 0, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INSUFFICIENT_BUFFER == GetLastError() || + ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INSUFFICIENT_BUFFER or ERROR_INVALID_PARAMETER, " + "got %u\n", GetLastError()); - SetLastError(0xdeadbeef); - retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); - ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(RPC_S_INVALID_STRING_UUID == GetLastError() || - ERROR_INVALID_PARAMETER == GetLastError(), - "expected error RPC_S_INVALID_STRING_UUID or ERROR_INVALID_PARAMETER, " - "got %u\n", GetLastError()); + DeleteFileA(filename); - /* network adapter guid */ - WritePrivateProfileStringA("Version", "ClassGUID", - "{4d36e972-e325-11ce-bfc1-08002be10318}", filename); + WritePrivateProfileStringA("Version", "Signature", signatures[i], filename); + WritePrivateProfileStringA("Version", "ClassGUID", "WINE", filename); - /* this test succeeds only if the guid is known to the system */ - count = 0xdeadbeef; - retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); - ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); - todo_wine - ok(count == 4, "expected count==4, got %u(%s)\n", count, cn); + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(RPC_S_INVALID_STRING_UUID == GetLastError() || + ERROR_INVALID_PARAMETER == GetLastError(), + "expected error RPC_S_INVALID_STRING_UUID or ERROR_INVALID_PARAMETER, " + "got %u\n", GetLastError()); + + /* network adapter guid */ + WritePrivateProfileStringA("Version", "ClassGUID", + "{4d36e972-e325-11ce-bfc1-08002be10318}", filename); + + /* this test succeeds only if the guid is known to the system */ + count = 0xdeadbeef; + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); + todo_wine + ok(count == 4, "expected count==4, got %u(%s)\n", count, cn); - DeleteFileA(filename); + DeleteFileA(filename); + } } START_TEST(devinst)

1 0

Stefan Leichter : setupapi: Support signature $Windows NT$ in SetupDiGetINFClassA/W too.
by Alexandre Julliard 18 Dec '13

18 Dec '13

Module: wine Branch: master Commit: 6aace3014d355d355e802299d62a34e8865951ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aace3014d355d355e802299d… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Dec 17 21:42:00 2013 +0100 setupapi: Support signature $Windows NT$ in SetupDiGetINFClassA/W too. --- dlls/setupapi/devinst.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index b1d6be0..5eaffd6 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -58,6 +58,7 @@ static const WCHAR NtPlatformExtension[] = {'.','N','T','x','8','6',0}; static const WCHAR Signature[] = {'S','i','g','n','a','t','u','r','e',0}; static const WCHAR Version[] = {'V','e','r','s','i','o','n',0}; static const WCHAR WinExtension[] = {'.','W','i','n',0}; +static const WCHAR WindowsNT[] = {'$','W','i','n','d','o','w','s',' ','N','T','$',0}; /* Registry key and value names */ static const WCHAR ControlClass[] = {'S','y','s','t','e','m','\\', @@ -4073,7 +4074,7 @@ BOOL WINAPI SetupDiGetINFClassW(PCWSTR inf, LPGUID class_guid, PWSTR class_name, if (!GetPrivateProfileStringW(Version, Signature, NULL, buffer, MAX_PATH, inf)) return FALSE; - if (lstrcmpiW(buffer, Chicago)) + if (lstrcmpiW(buffer, Chicago) && lstrcmpiW(buffer, WindowsNT)) return FALSE; buffer[0] = '\0';

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

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

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 : 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

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

← Newer
1
...
18
19
20
21
22
23
24
...
47
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 December 2013