November 2013 - Wine-Commits

Hans Leidekker : netapi32: Merge share.c into netapi32.c.
by Alexandre Julliard Nov. 12, 2013

Nov. 12, 2013

Module: wine Branch: master Commit: eb8264bac37e9b7b7b722d3ffb97d6514f5f0b38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb8264bac37e9b7b7b722d3ff… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 12 10:00:13 2013 +0100 netapi32: Merge share.c into netapi32.c. --- dlls/netapi32/Makefile.in | 1 - dlls/netapi32/netapi32.c | 107 +++++++++++++++++++++++++++++++++++++ dlls/netapi32/share.c | 128 --------------------------------------------- 3 files changed, 107 insertions(+), 129 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb8264bac37e9b7b7b722…

1 0

Hans Leidekker : netapi32: Move NetBios functions to netbios.c.
by Alexandre Julliard Nov. 12, 2013

Nov. 12, 2013

Module: wine Branch: master Commit: fe3669e823d2e815733d51da271954c6da5649d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe3669e823d2e815733d51da2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 12 09:59:03 2013 +0100 netapi32: Move NetBios functions to netbios.c. --- dlls/netapi32/netapi32.c | 47 +--------------------------------------------- dlls/netapi32/netbios.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index a5f1c03..6d3e913 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -23,7 +23,7 @@ #include "lmat.h" #include "netbios.h" -WINE_DEFAULT_DEBUG_CHANNEL(netbios); +WINE_DEFAULT_DEBUG_CHANNEL(netapi32); BOOL NETAPI_IsLocalComputer(LMCSTR ServerName); @@ -179,51 +179,6 @@ NET_API_STATUS WINAPI NetStatisticsGet(LMSTR server, LMSTR service, return NERR_InternalError; } -DWORD WINAPI NetpNetBiosStatusToApiStatus(DWORD nrc) -{ - DWORD ret; - - switch (nrc) - { - case NRC_GOODRET: - ret = NO_ERROR; - break; - case NRC_NORES: - ret = NERR_NoNetworkResource; - break; - case NRC_DUPNAME: - ret = NERR_AlreadyExists; - break; - case NRC_NAMTFUL: - ret = NERR_TooManyNames; - break; - case NRC_ACTSES: - ret = NERR_DeleteLater; - break; - case NRC_REMTFUL: - ret = ERROR_REM_NOT_LIST; - break; - case NRC_NOCALL: - ret = NERR_NameNotFound; - break; - case NRC_NOWILD: - ret = ERROR_INVALID_PARAMETER; - break; - case NRC_INUSE: - ret = NERR_DuplicateName; - break; - case NRC_NAMERR: - ret = ERROR_INVALID_PARAMETER; - break; - case NRC_NAMCONF: - ret = NERR_DuplicateName; - break; - default: - ret = NERR_NetworkError; - } - return ret; -} - NET_API_STATUS WINAPI NetUseEnum(LMSTR server, DWORD level, LPBYTE* bufptr, DWORD prefmaxsize, LPDWORD entriesread, LPDWORD totalentries, LPDWORD resumehandle) { diff --git a/dlls/netapi32/netbios.c b/dlls/netapi32/netbios.c index 94f0ae6..e16c5dc 100644 --- a/dlls/netapi32/netbios.c +++ b/dlls/netapi32/netbios.c @@ -858,3 +858,48 @@ UCHAR WINAPI Netbios(PNCB ncb) TRACE("returning 0x%02x\n", ret); return ret; } + +DWORD WINAPI NetpNetBiosStatusToApiStatus(DWORD nrc) +{ + DWORD ret; + + switch (nrc) + { + case NRC_GOODRET: + ret = NO_ERROR; + break; + case NRC_NORES: + ret = NERR_NoNetworkResource; + break; + case NRC_DUPNAME: + ret = NERR_AlreadyExists; + break; + case NRC_NAMTFUL: + ret = NERR_TooManyNames; + break; + case NRC_ACTSES: + ret = NERR_DeleteLater; + break; + case NRC_REMTFUL: + ret = ERROR_REM_NOT_LIST; + break; + case NRC_NOCALL: + ret = NERR_NameNotFound; + break; + case NRC_NOWILD: + ret = ERROR_INVALID_PARAMETER; + break; + case NRC_INUSE: + ret = NERR_DuplicateName; + break; + case NRC_NAMERR: + ret = ERROR_INVALID_PARAMETER; + break; + case NRC_NAMCONF: + ret = NERR_DuplicateName; + break; + default: + ret = NERR_NetworkError; + } + return ret; +}

1 0

Alexandre Julliard : msvcp80: Share the implementation with msvcp90.
by Alexandre Julliard Nov. 12, 2013

Nov. 12, 2013

Module: wine Branch: master Commit: 4c4a654552aed4ba64b6291c3620ef4e6fdc62e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c4a654552aed4ba64b6291c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 12 13:56:07 2013 +0100 msvcp80: Share the implementation with msvcp90. --- dlls/msvcp80/Makefile.in | 4 +- dlls/msvcp80/cxx.h | 447 - dlls/msvcp80/exception.c | 563 -- dlls/msvcp80/ios.c |13327 ------------------------- dlls/msvcp80/locale.c | 9621 ------------------ dlls/msvcp80/math.c | 2169 ---- dlls/msvcp80/memory.c | 338 - dlls/msvcp80/misc.c | 231 - dlls/msvcp80/msvcp.h | 483 - dlls/msvcp80/msvcp80.spec | 48 +- dlls/msvcp80/msvcp80_main.c | 124 - dlls/msvcp80/string.c | 4456 --------- dlls/msvcp90/Makefile.in | 3 +- dlls/msvcp90/locale.c | 148 + dlls/msvcp90/{msvcp90_main.c => msvcp_main.c} | 0 dlls/msvcp90/string.c | 34 +- 16 files changed, 209 insertions(+), 31787 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c4a654552aed4ba64b62…

1 0

Hans Leidekker : netapi32: Merge apibuf.c into netapi32.c.
by Alexandre Julliard Nov. 12, 2013

Nov. 12, 2013

Module: wine Branch: master Commit: a746b826f42754684e3ed2556fc89e1ca38308dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a746b826f42754684e3ed2556… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 12 09:59:42 2013 +0100 netapi32: Merge apibuf.c into netapi32.c. --- dlls/netapi32/Makefile.in | 1 - dlls/netapi32/apibuf.c | 99 --------------------------------------------- dlls/netapi32/netapi32.c | 69 +++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 100 deletions(-) diff --git a/dlls/netapi32/Makefile.in b/dlls/netapi32/Makefile.in index fd4e531..1b6b33c 100644 --- a/dlls/netapi32/Makefile.in +++ b/dlls/netapi32/Makefile.in @@ -5,7 +5,6 @@ IMPORTS = iphlpapi ws2_32 advapi32 C_SRCS = \ access.c \ - apibuf.c \ browsr.c \ ds.c \ local_group.c \ diff --git a/dlls/netapi32/apibuf.c b/dlls/netapi32/apibuf.c deleted file mode 100644 index a88c6f4..0000000 --- a/dlls/netapi32/apibuf.c +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright 2002 Andriy Palamarchuk - * - * Net API buffer calls - * - * 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 <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "lmcons.h" -#include "lmapibuf.h" -#include "lmerr.h" -#include "winerror.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(netapi32); - -/************************************************************ - * NetApiBufferAllocate (NETAPI32.@) - */ -NET_API_STATUS WINAPI NetApiBufferAllocate(DWORD ByteCount, LPVOID* Buffer) -{ - TRACE("(%d, %p)\n", ByteCount, Buffer); - - if (Buffer == NULL) return ERROR_INVALID_PARAMETER; - *Buffer = HeapAlloc(GetProcessHeap(), 0, ByteCount); - if (*Buffer) - return NERR_Success; - else - return GetLastError(); -} - -/************************************************************ - * NetApiBufferFree (NETAPI32.@) - */ -NET_API_STATUS WINAPI NetApiBufferFree(LPVOID Buffer) -{ - TRACE("(%p)\n", Buffer); - HeapFree(GetProcessHeap(), 0, Buffer); - return NERR_Success; -} - -/************************************************************ - * NetApiBufferReallocate (NETAPI32.@) - */ -NET_API_STATUS WINAPI NetApiBufferReallocate(LPVOID OldBuffer, DWORD NewByteCount, - LPVOID* NewBuffer) -{ - TRACE("(%p, %d, %p)\n", OldBuffer, NewByteCount, NewBuffer); - if (NewByteCount) - { - if (OldBuffer) - *NewBuffer = HeapReAlloc(GetProcessHeap(), 0, OldBuffer, NewByteCount); - else - *NewBuffer = HeapAlloc(GetProcessHeap(), 0, NewByteCount); - return *NewBuffer ? NERR_Success : GetLastError(); - } - else - { - if (!HeapFree(GetProcessHeap(), 0, OldBuffer)) return GetLastError(); - *NewBuffer = 0; - return NERR_Success; - } -} - -/************************************************************ - * NetApiBufferSize (NETAPI32.@) - */ -NET_API_STATUS WINAPI NetApiBufferSize(LPVOID Buffer, LPDWORD ByteCount) -{ - DWORD dw; - - TRACE("(%p, %p)\n", Buffer, ByteCount); - if (Buffer == NULL) - return ERROR_INVALID_PARAMETER; - dw = HeapSize(GetProcessHeap(), 0, Buffer); - TRACE("size: %d\n", dw); - if (dw != 0xFFFFFFFF) - *ByteCount = dw; - else - *ByteCount = 0; - - return NERR_Success; -} diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 6d3e913..6aa1e39 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -1,4 +1,5 @@ /* Copyright 2001 Mike McCormack + * Copyright 2002 Andriy Palamarchuk * Copyright 2003 Juan Lang * * This library is free software; you can redistribute it and/or @@ -208,3 +209,71 @@ NET_API_STATUS WINAPI NetUseGetInfo(LMSTR server, LMSTR name, DWORD level, LPBYT return ERROR_NOT_SUPPORTED; } + +/************************************************************ + * NetApiBufferAllocate (NETAPI32.@) + */ +NET_API_STATUS WINAPI NetApiBufferAllocate(DWORD ByteCount, LPVOID* Buffer) +{ + TRACE("(%d, %p)\n", ByteCount, Buffer); + + if (Buffer == NULL) return ERROR_INVALID_PARAMETER; + *Buffer = HeapAlloc(GetProcessHeap(), 0, ByteCount); + if (*Buffer) + return NERR_Success; + else + return GetLastError(); +} + +/************************************************************ + * NetApiBufferFree (NETAPI32.@) + */ +NET_API_STATUS WINAPI NetApiBufferFree(LPVOID Buffer) +{ + TRACE("(%p)\n", Buffer); + HeapFree(GetProcessHeap(), 0, Buffer); + return NERR_Success; +} + +/************************************************************ + * NetApiBufferReallocate (NETAPI32.@) + */ +NET_API_STATUS WINAPI NetApiBufferReallocate(LPVOID OldBuffer, DWORD NewByteCount, + LPVOID* NewBuffer) +{ + TRACE("(%p, %d, %p)\n", OldBuffer, NewByteCount, NewBuffer); + if (NewByteCount) + { + if (OldBuffer) + *NewBuffer = HeapReAlloc(GetProcessHeap(), 0, OldBuffer, NewByteCount); + else + *NewBuffer = HeapAlloc(GetProcessHeap(), 0, NewByteCount); + return *NewBuffer ? NERR_Success : GetLastError(); + } + else + { + if (!HeapFree(GetProcessHeap(), 0, OldBuffer)) return GetLastError(); + *NewBuffer = 0; + return NERR_Success; + } +} + +/************************************************************ + * NetApiBufferSize (NETAPI32.@) + */ +NET_API_STATUS WINAPI NetApiBufferSize(LPVOID Buffer, LPDWORD ByteCount) +{ + DWORD dw; + + TRACE("(%p, %p)\n", Buffer, ByteCount); + if (Buffer == NULL) + return ERROR_INVALID_PARAMETER; + dw = HeapSize(GetProcessHeap(), 0, Buffer); + TRACE("size: %d\n", dw); + if (dw != 0xFFFFFFFF) + *ByteCount = dw; + else + *ByteCount = 0; + + return NERR_Success; +}

1 0

Frédéric Delanoy : mscms: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 12, 2013

Nov. 12, 2013

Module: wine Branch: master Commit: 685b931c2a11219da3949cd1ad5a1fa9d7db26cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=685b931c2a11219da3949cd1a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 12 01:16:38 2013 +0100 mscms: Use BOOL type where appropriate. --- dlls/mscms/transform.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index 1bd4e02..aed7011 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -58,7 +58,7 @@ static DWORD from_profile( HPROFILE profile ) static DWORD from_bmformat( BMFORMAT format ) { - static int quietfixme = 0; + static BOOL quietfixme = FALSE; TRACE( "bitmap format: 0x%08x\n", format ); switch (format) @@ -69,10 +69,10 @@ static DWORD from_bmformat( BMFORMAT format ) case BM_xRGBQUADS: return TYPE_ARGB_8; case BM_xBGRQUADS: return TYPE_ABGR_8; default: - if (quietfixme == 0) + if (!quietfixme) { FIXME("unhandled bitmap format 0x%x\n", format); - quietfixme = 1; + quietfixme = TRUE; } return TYPE_RGB_8; }

1 0

Hans Leidekker : netapi32: Merge ds.c into netapi32.c.
by Alexandre Julliard Nov. 12, 2013

Nov. 12, 2013

Module: wine Branch: master Commit: 192cc0aca4f84d4eaed7e5406eb89e86c1abcb18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=192cc0aca4f84d4eaed7e5406… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 12 10:02:40 2013 +0100 netapi32: Merge ds.c into netapi32.c. --- dlls/netapi32/Makefile.in | 1 - dlls/netapi32/ds.c | 156 --------------------------------------------- dlls/netapi32/netapi32.c | 127 ++++++++++++++++++++++++++++++++++++- 3 files changed, 126 insertions(+), 158 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=192cc0aca4f84d4eaed7e…

1 0

Hans Leidekker : netapi32: Merge browsr.c into netapi32.c.
by Alexandre Julliard Nov. 12, 2013

Nov. 12, 2013

Module: wine Branch: master Commit: 01fb3a1b90658ce9e3ee425c7e2e10f684bdf283 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01fb3a1b90658ce9e3ee425c7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 12 10:02:02 2013 +0100 netapi32: Merge browsr.c into netapi32.c. --- dlls/netapi32/Makefile.in | 1 - dlls/netapi32/browsr.c | 48 --------------------------------------------- dlls/netapi32/netapi32.c | 21 +++++++++++++++++++ 3 files changed, 21 insertions(+), 49 deletions(-) diff --git a/dlls/netapi32/Makefile.in b/dlls/netapi32/Makefile.in index 9d8531f..7ea1adc 100644 --- a/dlls/netapi32/Makefile.in +++ b/dlls/netapi32/Makefile.in @@ -4,7 +4,6 @@ IMPORTLIB = netapi32 IMPORTS = iphlpapi ws2_32 advapi32 C_SRCS = \ - browsr.c \ ds.c \ local_group.c \ nbcmdqueue.c \ diff --git a/dlls/netapi32/browsr.c b/dlls/netapi32/browsr.c deleted file mode 100644 index 8b0a5ed..0000000 --- a/dlls/netapi32/browsr.c +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2002 Andriy Palamarchuk - * - * netapi32 browser functions - * - * 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 <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "lmcons.h" -#include "lmbrowsr.h" -#include "lmshare.h" - -/************************************************************ - * I_BrowserSetNetlogonState (NETAPI32.@) - */ -NET_API_STATUS WINAPI I_BrowserSetNetlogonState( - LPWSTR ServerName, LPWSTR DomainName, LPWSTR EmulatedServerName, - DWORD Role) -{ - return ERROR_NOT_SUPPORTED; -} - -/************************************************************ - * I_BrowserQueryEmulatedDomains (NETAPI32.@) - */ -NET_API_STATUS WINAPI I_BrowserQueryEmulatedDomains( - LPWSTR ServerName, PBROWSER_EMULATED_DOMAIN *EmulatedDomains, - LPDWORD EntriesRead) -{ - return ERROR_NOT_SUPPORTED; -} diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 857f5e0..9e9b478 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -37,6 +37,7 @@ #include "lmaccess.h" #include "lmat.h" #include "lmapibuf.h" +#include "lmbrowsr.h" #include "lmshare.h" #include "lmwksta.h" #include "netbios.h" @@ -1975,3 +1976,23 @@ NET_API_STATUS WINAPI NetUseDel(LMSTR servername, LMSTR usename, DWORD forcecond FIXME("%s %s %d stub\n", debugstr_w(servername), debugstr_w(usename), forcecond); return NERR_Success; } + +/************************************************************ + * I_BrowserSetNetlogonState (NETAPI32.@) + */ +NET_API_STATUS WINAPI I_BrowserSetNetlogonState( + LPWSTR ServerName, LPWSTR DomainName, LPWSTR EmulatedServerName, + DWORD Role) +{ + return ERROR_NOT_SUPPORTED; +} + +/************************************************************ + * I_BrowserQueryEmulatedDomains (NETAPI32.@) + */ +NET_API_STATUS WINAPI I_BrowserQueryEmulatedDomains( + LPWSTR ServerName, PBROWSER_EMULATED_DOMAIN *EmulatedDomains, + LPDWORD EntriesRead) +{ + return ERROR_NOT_SUPPORTED; +}

1 0

Frédéric Delanoy : mmdevapi: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 12, 2013

Nov. 12, 2013

Module: wine Branch: master Commit: e50dfb69ee151cc68aeaee8c583cb8d0394f220a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e50dfb69ee151cc68aeaee8c5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 12 01:16:37 2013 +0100 mmdevapi: Use BOOL type where appropriate. --- dlls/mmdevapi/devenum.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 6bb0d3f..e2a7cc5 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -1066,8 +1066,8 @@ static void notify_clients(EDataFlow flow, ERole role, const WCHAR *id) notify_clients(flow, eMultimedia, id); } -static int notify_if_changed(EDataFlow flow, ERole role, HKEY key, - const WCHAR *val_name, WCHAR *old_val, IMMDevice *def_dev) +static BOOL notify_if_changed(EDataFlow flow, ERole role, HKEY key, + const WCHAR *val_name, WCHAR *old_val, IMMDevice *def_dev) { WCHAR new_val[64], *id; DWORD size; @@ -1082,7 +1082,7 @@ static int notify_if_changed(EDataFlow flow, ERole role, HKEY key, hr = IMMDevice_GetId(def_dev, &id); if(FAILED(hr)){ ERR("GetId failed: %08x\n", hr); - return 0; + return FALSE; } }else id = NULL; @@ -1091,23 +1091,23 @@ static int notify_if_changed(EDataFlow flow, ERole role, HKEY key, old_val[0] = 0; CoTaskMemFree(id); - return 1; + return TRUE; } /* system default -> system default, noop */ - return 0; + return FALSE; } if(!lstrcmpW(old_val, new_val)){ /* set by user -> same value */ - return 0; + return FALSE; } if(new_val[0] != 0){ /* set by user -> different value */ notify_clients(flow, role, new_val); memcpy(old_val, new_val, sizeof(new_val)); - return 1; + return TRUE; } /* set by user -> system default */ @@ -1115,7 +1115,7 @@ static int notify_if_changed(EDataFlow flow, ERole role, HKEY key, hr = IMMDevice_GetId(def_dev, &id); if(FAILED(hr)){ ERR("GetId failed: %08x\n", hr); - return 0; + return FALSE; } }else id = NULL; @@ -1124,7 +1124,7 @@ static int notify_if_changed(EDataFlow flow, ERole role, HKEY key, old_val[0] = 0; CoTaskMemFree(id); - return 1; + return TRUE; } static DWORD WINAPI notif_thread_proc(void *user)

1 0

André Hentschel : user32/tests: Fix GetSystemMetrics test on Win8.
by Alexandre Julliard Nov. 12, 2013

Nov. 12, 2013

Module: wine Branch: master Commit: 2209fdbdd24380c09ea9be5e23834fce20aa843c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2209fdbdd24380c09ea9be5e2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 12 00:10:22 2013 +0100 user32/tests: Fix GetSystemMetrics test on Win8. --- dlls/user32/tests/sysparams.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index fb4c711..33c7a1c 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2786,10 +2786,12 @@ static void test_GetSystemMetrics( void) screen.cx = GetSystemMetrics( SM_CXSCREEN ); screen.cy = GetSystemMetrics( SM_CYSCREEN ); } - ok_gsm_2( SM_CXMAXTRACK, screen.cx + 4 + 2 * GetSystemMetrics(SM_CXFRAME), - screen.cx - 4 + 2 * GetSystemMetrics(SM_CXFRAME)); /* Vista */ - ok_gsm_2( SM_CYMAXTRACK, screen.cy + 4 + 2 * GetSystemMetrics(SM_CYFRAME), - screen.cy - 4 + 2 * GetSystemMetrics(SM_CYFRAME)); /* Vista */ + ok_gsm_3( SM_CXMAXTRACK, screen.cx + 4 + 2 * GetSystemMetrics(SM_CXFRAME), + screen.cx - 4 + 2 * GetSystemMetrics(SM_CXFRAME), /* Vista */ + screen.cx + 2 * GetSystemMetrics(SM_CXFRAME)); /* Win8 */ + ok_gsm_3( SM_CYMAXTRACK, screen.cy + 4 + 2 * GetSystemMetrics(SM_CYFRAME), + screen.cy - 4 + 2 * GetSystemMetrics(SM_CYFRAME), /* Vista */ + screen.cy + 2 * GetSystemMetrics(SM_CYFRAME)); /* Win8 */ /* the next two cannot really be tested as they depend on (application) * toolbars */ /* SM_CXMAXIMIZED */

1 0

Frédéric Delanoy : dbghelp: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 12, 2013

Nov. 12, 2013

Module: wine Branch: master Commit: 1d65efe50b7ac88a060defb301b4a5c10587b055 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d65efe50b7ac88a060defb30… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 12 01:16:36 2013 +0100 dbghelp: Use BOOL type where appropriate. --- dlls/dbghelp/cpu_arm.c | 4 ++-- dlls/dbghelp/cpu_arm64.c | 4 ++-- dlls/dbghelp/cpu_i386.c | 8 ++++---- dlls/dbghelp/cpu_ppc.c | 4 ++-- dlls/dbghelp/cpu_x86_64.c | 4 ++-- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/module.c | 2 +- dlls/dbghelp/msc.c | 18 +++++++++--------- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/dbghelp/cpu_arm.c b/dlls/dbghelp/cpu_arm.c index 740db0f..bd2c677 100644 --- a/dlls/dbghelp/cpu_arm.c +++ b/dlls/dbghelp/cpu_arm.c @@ -29,8 +29,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); -static unsigned arm_get_addr(HANDLE hThread, const CONTEXT* ctx, - enum cpu_addr ca, ADDRESS64* addr) +static BOOL arm_get_addr(HANDLE hThread, const CONTEXT* ctx, + enum cpu_addr ca, ADDRESS64* addr) { addr->Mode = AddrModeFlat; addr->Segment = 0; /* don't need segment */ diff --git a/dlls/dbghelp/cpu_arm64.c b/dlls/dbghelp/cpu_arm64.c index c816fe3..d80e608 100644 --- a/dlls/dbghelp/cpu_arm64.c +++ b/dlls/dbghelp/cpu_arm64.c @@ -29,8 +29,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); -static unsigned arm64_get_addr(HANDLE hThread, const CONTEXT* ctx, - enum cpu_addr ca, ADDRESS64* addr) +static BOOL arm64_get_addr(HANDLE hThread, const CONTEXT* ctx, + enum cpu_addr ca, ADDRESS64* addr) { addr->Mode = AddrModeFlat; addr->Segment = 0; /* don't need segment */ diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index c912a0a..87f833f 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -48,8 +48,8 @@ static ADDRESS_MODE get_selector_type(HANDLE hThread, const CONTEXT* ctx, WORD s return -1; } -static unsigned i386_build_addr(HANDLE hThread, const CONTEXT* ctx, ADDRESS64* addr, - unsigned seg, unsigned long offset) +static BOOL i386_build_addr(HANDLE hThread, const CONTEXT* ctx, ADDRESS64* addr, + unsigned seg, unsigned long offset) { addr->Mode = AddrModeFlat; addr->Segment = seg; @@ -73,8 +73,8 @@ static unsigned i386_build_addr(HANDLE hThread, const CONTEXT* ctx, ADDRESS64* a } #endif -static unsigned i386_get_addr(HANDLE hThread, const CONTEXT* ctx, - enum cpu_addr ca, ADDRESS64* addr) +static BOOL i386_get_addr(HANDLE hThread, const CONTEXT* ctx, + enum cpu_addr ca, ADDRESS64* addr) { #ifdef __i386__ switch (ca) diff --git a/dlls/dbghelp/cpu_ppc.c b/dlls/dbghelp/cpu_ppc.c index 56571c5..3b2a843 100644 --- a/dlls/dbghelp/cpu_ppc.c +++ b/dlls/dbghelp/cpu_ppc.c @@ -28,8 +28,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); -static unsigned ppc_get_addr(HANDLE hThread, const CONTEXT* ctx, - enum cpu_addr ca, ADDRESS64* addr) +static BOOL ppc_get_addr(HANDLE hThread, const CONTEXT* ctx, + enum cpu_addr ca, ADDRESS64* addr) { switch (ca) { diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index 29f4c6f..e0ffb11 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -91,8 +91,8 @@ typedef struct _UNWIND_INFO #define GetExceptionDataPtr(info) \ ((PVOID)((PULONG)GetLanguageSpecificData(info) + 1) -static unsigned x86_64_get_addr(HANDLE hThread, const CONTEXT* ctx, - enum cpu_addr ca, ADDRESS64* addr) +static BOOL x86_64_get_addr(HANDLE hThread, const CONTEXT* ctx, + enum cpu_addr ca, ADDRESS64* addr) { addr->Mode = AddrModeFlat; switch (ca) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 9390fab..74cba88 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -520,7 +520,7 @@ struct cpu DWORD frame_regno; /* address manipulation */ - unsigned (*get_addr)(HANDLE hThread, const CONTEXT* ctx, + BOOL (*get_addr)(HANDLE hThread, const CONTEXT* ctx, enum cpu_addr, ADDRESS64* addr); /* stack manipulation */ diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 38d4a58..15769e8 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -56,7 +56,7 @@ static int match_ext(const WCHAR* ptr, size_t len) for (e = ext; *e; e++) { l = strlenW(*e); - if (l >= len) return FALSE; + if (l >= len) return 0; if (strncmpiW(&ptr[len - l], *e, l)) continue; return l; } diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 4978acf..1e195f3 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -651,9 +651,9 @@ static struct symt* codeview_add_type_array(struct codeview_type_parse* ctp, return &symt_new_array(ctp->module, 0, -arr_len, elem, index)->symt; } -static int codeview_add_type_enum_field_list(struct module* module, - struct symt_enum* symt, - const union codeview_reftype* ref_type) +static BOOL codeview_add_type_enum_field_list(struct module* module, + struct symt_enum* symt, + const union codeview_reftype* ref_type) { const unsigned char* ptr = ref_type->fieldlist.list; const unsigned char* last = (const BYTE*)ref_type + ref_type->generic.len + 2; @@ -1327,12 +1327,12 @@ static struct symt* codeview_parse_one_type(struct codeview_type_parse* ctp, default: FIXME("Unsupported type-id leaf %x\n", type->generic.id); dump(type, 2 + type->generic.len); - return FALSE; + return NULL; } return codeview_add_type(curr_type, symt) ? symt : NULL; } -static int codeview_parse_type_table(struct codeview_type_parse* ctp) +static BOOL codeview_parse_type_table(struct codeview_type_parse* ctp) { unsigned int curr_type = FIRST_DEFINABLE_TYPE; const union codeview_type* type; @@ -1557,8 +1557,8 @@ static inline void codeview_add_variable(const struct msc_debug_info* msc_dbg, } } -static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root, - int offset, int size, BOOL do_globals) +static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root, + int offset, int size, BOOL do_globals) { struct symt_function* curr_func = NULL; int i, length; @@ -2004,8 +2004,8 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root return TRUE; } -static int codeview_snarf_public(const struct msc_debug_info* msc_dbg, const BYTE* root, - int offset, int size) +static BOOL codeview_snarf_public(const struct msc_debug_info* msc_dbg, const BYTE* root, + int offset, int size) { int i, length;

1 0