May 2011 - Wine-Commits - list.winehq.org

Marcus Meissner : d3dx9_36: Mark internal symbols as hidden.
by Alexandre Julliard May 16, 2011

May 16, 2011

Module: wine Branch: master Commit: e550c537f3839e7f54f1c3cfc2ffcbf5e6192d74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e550c537f3839e7f54f1c3cfc… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 16:41:30 2011 +0200 d3dx9_36: Mark internal symbols as hidden. --- dlls/d3dx9_36/d3dx9_36_private.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index ccbef62..f770c62 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -44,14 +44,14 @@ typedef struct _PixelFormatDesc { FormatType type; } PixelFormatDesc; -HRESULT map_view_of_file(LPCWSTR filename, LPVOID *buffer, DWORD *length); -HRESULT load_resource_into_memory(HMODULE module, HRSRC resinfo, LPVOID *buffer, DWORD *length); +HRESULT map_view_of_file(LPCWSTR filename, LPVOID *buffer, DWORD *length) DECLSPEC_HIDDEN; +HRESULT load_resource_into_memory(HMODULE module, HRSRC resinfo, LPVOID *buffer, DWORD *length) DECLSPEC_HIDDEN; -const PixelFormatDesc *get_format_info(D3DFORMAT format); -const PixelFormatDesc *get_format_info_idx(int idx); +const PixelFormatDesc *get_format_info(D3DFORMAT format) DECLSPEC_HIDDEN; +const PixelFormatDesc *get_format_info_idx(int idx) DECLSPEC_HIDDEN; /* debug helpers */ -const char *debug_d3dxparameter_class(D3DXPARAMETER_CLASS c); -const char *debug_d3dxparameter_type(D3DXPARAMETER_TYPE t); +const char *debug_d3dxparameter_class(D3DXPARAMETER_CLASS c) DECLSPEC_HIDDEN; +const char *debug_d3dxparameter_type(D3DXPARAMETER_TYPE t) DECLSPEC_HIDDEN; #endif /* __WINE_D3DX9_36_PRIVATE_H */

1 0

Jacek Caban : kernel32: Moved GetWsChanges and InitializeProcessForWsWatch implementations to kernel32 .
by Alexandre Julliard May 16, 2011

May 16, 2011

Module: wine Branch: master Commit: 595521bc959294ead39e740db77313d7cd0ca345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=595521bc959294ead39e740db… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 16 15:19:29 2011 +0200 kernel32: Moved GetWsChanges and InitializeProcessForWsWatch implementations to kernel32. --- dlls/kernel32/kernel32.spec | 2 ++ dlls/kernel32/virtual.c | 29 +++++++++++++++++++++++++++++ dlls/psapi/psapi.spec | 4 ++-- dlls/psapi/psapi_main.c | 29 ----------------------------- 4 files changed, 33 insertions(+), 31 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 2650431..e144fd6 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -787,6 +787,8 @@ @ stdcall K32GetModuleFileNameExW(long long ptr long) @ stdcall K32GetModuleInformation(long long ptr long) @ stdcall K32GetProcessMemoryInfo(long ptr long) +@ stdcall K32GetWsChanges(long ptr long) +@ stdcall K32InitializeProcessForWsWatch(long) @ stdcall K32QueryWorkingSet(long ptr long) @ stdcall K32QueryWorkingSetEx(long ptr long) @ stdcall -i386 -private -register K32Thk1632Epilog() krnl386.exe16.K32Thk1632Epilog diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 655d47d..6328399 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -869,3 +869,32 @@ BOOL WINAPI K32EnumPageFilesW( PENUM_PAGE_FILE_CALLBACKW callback, LPVOID contex FIXME_(file)("(%p, %p) stub\n", callback, context ); return FALSE; } + +/*********************************************************************** + * K32GetWsChanges (KERNEL32.@) + */ +BOOL WINAPI K32GetWsChanges(HANDLE process, PPSAPI_WS_WATCH_INFORMATION watchinfo, DWORD size) +{ + NTSTATUS status; + + TRACE_(seh)("(%p, %p, %d)\n", process, watchinfo, size); + + status = NtQueryInformationProcess( process, ProcessWorkingSetWatch, watchinfo, size, NULL ); + + if (status) + { + SetLastError( RtlNtStatusToDosError( status ) ); + return FALSE; + } + return TRUE; +} + +/*********************************************************************** + * K32InitializeProcessForWsWatch (KERNEL32.@) + */ +BOOL WINAPI K32InitializeProcessForWsWatch(HANDLE process) +{ + FIXME_(seh)("(process=%p): stub\n", process); + + return TRUE; +} diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec index e179573..844c761 100644 --- a/dlls/psapi/psapi.spec +++ b/dlls/psapi/psapi.spec @@ -19,7 +19,7 @@ @ stdcall GetProcessImageFileNameA(long ptr long) kernel32.K32GetProcessImageFileNameA @ stdcall GetProcessImageFileNameW(long ptr long) kernel32.K32GetProcessImageFileNameW @ stdcall GetProcessMemoryInfo(long ptr long) kernel32.K32GetProcessMemoryInfo -@ stdcall GetWsChanges(long ptr long) -@ stdcall InitializeProcessForWsWatch(long) +@ stdcall GetWsChanges(long ptr long) kernel32.K32GetWsChanges +@ stdcall InitializeProcessForWsWatch(long) kernel32.K32InitializeProcessForWsWatch @ stdcall QueryWorkingSet(long ptr long) kernel32.K32QueryWorkingSet @ stdcall QueryWorkingSetEx(long ptr long) kernel32.K32QueryWorkingSetEx diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c index c4479b8..17f408d 100644 --- a/dlls/psapi/psapi_main.c +++ b/dlls/psapi/psapi_main.c @@ -53,32 +53,3 @@ BOOL WINAPI GetPerformanceInfo( PPERFORMANCE_INFORMATION info, DWORD size ) } return TRUE; } - -/*********************************************************************** - * GetWsChanges (PSAPI.@) - */ -BOOL WINAPI GetWsChanges( HANDLE process, PPSAPI_WS_WATCH_INFORMATION watchinfo, DWORD size ) -{ - NTSTATUS status; - - TRACE( "(%p, %p, %d)\n", process, watchinfo, size ); - - status = NtQueryInformationProcess( process, ProcessWorkingSetWatch, watchinfo, size, NULL ); - - if (status) - { - SetLastError( RtlNtStatusToDosError( status ) ); - return FALSE; - } - return TRUE; -} - -/*********************************************************************** - * InitializeProcessForWsWatch (PSAPI.@) - */ -BOOL WINAPI InitializeProcessForWsWatch(HANDLE hProcess) -{ - FIXME("(hProcess=%p): stub\n", hProcess); - - return TRUE; -}

1 0

Jacek Caban : kernel32: Moved EnumPageFiles[AW] implementation to kernel32.
by Alexandre Julliard May 16, 2011

May 16, 2011

Module: wine Branch: master Commit: 827e852166d6be0fe5293e6fc5883a5b443c524f URL: http://source.winehq.org/git/wine.git/?a=commit;h=827e852166d6be0fe5293e6fc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 16 15:19:18 2011 +0200 kernel32: Moved EnumPageFiles[AW] implementation to kernel32. --- dlls/kernel32/kernel32.spec | 2 ++ dlls/kernel32/virtual.c | 19 +++++++++++++++++++ dlls/psapi/psapi.spec | 4 ++-- dlls/psapi/psapi_main.c | 18 ------------------ 4 files changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 52ddb12..2650431 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -771,6 +771,8 @@ @ stdcall K32GetProcessImageFileNameA(long ptr long) @ stdcall K32GetProcessImageFileNameW(long ptr long) @ stdcall K32EnumDeviceDrivers(ptr long ptr) +@ stdcall K32EnumPageFilesA(ptr ptr) +@ stdcall K32EnumPageFilesW(ptr ptr) @ stdcall K32EnumProcessModules(long ptr long ptr) @ stdcall K32EnumProcesses(ptr long ptr) @ stdcall K32GetDeviceDriverBaseNameA(ptr ptr long) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index a901f85..655d47d 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -39,6 +39,7 @@ #include "winnls.h" #include "winternl.h" #include "winerror.h" +#include "psapi.h" #include "wine/exception.h" #include "wine/debug.h" @@ -850,3 +851,21 @@ DWORD WINAPI K32GetMappedFileNameW(HANDLE process, LPVOID lpv, LPWSTR file_name, return 0; } + +/*********************************************************************** + * K32EnumPageFilesA (KERNEL32.@) + */ +BOOL WINAPI K32EnumPageFilesA( PENUM_PAGE_FILE_CALLBACKA callback, LPVOID context ) +{ + FIXME_(file)("(%p, %p) stub\n", callback, context ); + return FALSE; +} + +/*********************************************************************** + * K32EnumPageFilesW (KERNEL32.@) + */ +BOOL WINAPI K32EnumPageFilesW( PENUM_PAGE_FILE_CALLBACKW callback, LPVOID context ) +{ + FIXME_(file)("(%p, %p) stub\n", callback, context ); + return FALSE; +} diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec index 835de4e..e179573 100644 --- a/dlls/psapi/psapi.spec +++ b/dlls/psapi/psapi.spec @@ -1,7 +1,7 @@ @ stdcall EmptyWorkingSet(long) kernel32.K32EmptyWorkingSet @ stdcall EnumDeviceDrivers(ptr long ptr) kernel32.K32EnumDeviceDrivers -@ stdcall EnumPageFilesA(ptr ptr) -@ stdcall EnumPageFilesW(ptr ptr) +@ stdcall EnumPageFilesA(ptr ptr) kernel32.K32EnumPageFilesA +@ stdcall EnumPageFilesW(ptr ptr) kernel32.K32EnumPageFilesW @ stdcall EnumProcessModules(long ptr long ptr) kernel32.K32EnumProcessModules @ stdcall EnumProcesses(ptr long ptr) kernel32.K32EnumProcesses @ stdcall GetDeviceDriverBaseNameA(ptr ptr long) kernel32.K32GetDeviceDriverBaseNameA diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c index ef2f23d..c4479b8 100644 --- a/dlls/psapi/psapi_main.c +++ b/dlls/psapi/psapi_main.c @@ -34,24 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(psapi); -/*********************************************************************** - * EnumPageFilesA (PSAPI.@) - */ -BOOL WINAPI EnumPageFilesA( PENUM_PAGE_FILE_CALLBACKA callback, LPVOID context ) -{ - FIXME("(%p, %p) stub\n", callback, context ); - return FALSE; -} - -/*********************************************************************** - * EnumPageFilesW (PSAPI.@) - */ -BOOL WINAPI EnumPageFilesW( PENUM_PAGE_FILE_CALLBACKW callback, LPVOID context ) -{ - FIXME("(%p, %p) stub\n", callback, context ); - return FALSE; -} - /*********************************************************************** * GetPerformanceInfo (PSAPI.@)

1 0

Piotr Caban : msvcrt: Fix return values in wcstombs and wcsrtombs functions .
by Alexandre Julliard May 16, 2011

May 16, 2011

Module: wine Branch: master Commit: ddad22d037c23271a59e3a977e786136be852b5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddad22d037c23271a59e3a977… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 16 16:23:01 2011 +0200 msvcrt: Fix return values in wcstombs and wcsrtombs functions. --- dlls/msvcrt/wcs.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 623ffbc..d297e43 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -376,7 +376,7 @@ MSVCRT_size_t CDECL MSVCRT_wcsrtombs(char *mbstr, const MSVCRT_wchar_t **wcstr, /********************************************************************* * MSVCRT_wcsrtombs_s_l (INTERNAL) */ -static MSVCRT_size_t MSVCRT_wcsrtombs_s_l(MSVCRT_size_t *ret, char *mbstr, +static int MSVCRT_wcsrtombs_s_l(MSVCRT_size_t *ret, char *mbstr, MSVCRT_size_t size, const MSVCRT_wchar_t **wcstr, MSVCRT_size_t count, MSVCRT__locale_t locale) { @@ -423,7 +423,7 @@ static MSVCRT_size_t MSVCRT_wcsrtombs_s_l(MSVCRT_size_t *ret, char *mbstr, /********************************************************************* * _wcstombs_s_l (MSVCRT.@) */ -MSVCRT_size_t CDECL MSVCRT__wcstombs_s_l(MSVCRT_size_t *ret, char *mbstr, +int CDECL MSVCRT__wcstombs_s_l(MSVCRT_size_t *ret, char *mbstr, MSVCRT_size_t size, const MSVCRT_wchar_t *wcstr, MSVCRT_size_t count, MSVCRT__locale_t locale) { @@ -433,7 +433,7 @@ MSVCRT_size_t CDECL MSVCRT__wcstombs_s_l(MSVCRT_size_t *ret, char *mbstr, /********************************************************************* * wcstombs_s (MSVCRT.@) */ -MSVCRT_size_t CDECL MSVCRT_wcstombs_s(MSVCRT_size_t *ret, char *mbstr, +int CDECL MSVCRT_wcstombs_s(MSVCRT_size_t *ret, char *mbstr, MSVCRT_size_t size, const MSVCRT_wchar_t *wcstr, MSVCRT_size_t count) { return MSVCRT_wcsrtombs_s_l(ret, mbstr, size, &wcstr, count, NULL); @@ -442,7 +442,7 @@ MSVCRT_size_t CDECL MSVCRT_wcstombs_s(MSVCRT_size_t *ret, char *mbstr, /********************************************************************* * wcsrtombs_s (MSVCRT.@) */ -MSVCRT_size_t CDECL MSVCRT_wcsrtombs_s(MSVCRT_size_t *ret, char *mbstr, MSVCRT_size_t size, +int CDECL MSVCRT_wcsrtombs_s(MSVCRT_size_t *ret, char *mbstr, MSVCRT_size_t size, const MSVCRT_wchar_t **wcstr, MSVCRT_size_t count, MSVCRT_mbstate_t *mbstate) { if(mbstate)

1 0

Piotr Caban : msvcrt: Fix return values in strlwr and strupr functions.
by Alexandre Julliard May 16, 2011

May 16, 2011

Module: wine Branch: master Commit: c43176b0943c67728245d5e28efe45cc73cdc266 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c43176b0943c67728245d5e28… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 16 16:22:46 2011 +0200 msvcrt: Fix return values in strlwr and strupr functions. --- dlls/msvcrt/string.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 0e7da1e..0246b2f 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -100,17 +100,19 @@ int CDECL _strlwr_s(char *str, MSVCRT_size_t len) /********************************************************************* * _strlwr_l (MSVCRT.@) */ -int CDECL _strlwr_l(char *str, MSVCRT__locale_t locale) +char* CDECL _strlwr_l(char *str, MSVCRT__locale_t locale) { - return _strlwr_s_l(str, -1, locale); + _strlwr_s_l(str, -1, locale); + return str; } /********************************************************************* * _strlwr (MSVCRT.@) */ -int CDECL _strlwr(char *str) +char* CDECL _strlwr(char *str) { - return _strlwr_s_l(str, -1, NULL); + _strlwr_s_l(str, -1, NULL); + return str; } /********************************************************************* @@ -162,17 +164,19 @@ int CDECL _strupr_s(char *str, MSVCRT_size_t len) /********************************************************************* * _strupr_l (MSVCRT.@) */ -int CDECL _strupr_l(char *str, MSVCRT__locale_t locale) +char* CDECL _strupr_l(char *str, MSVCRT__locale_t locale) { - return _strupr_s_l(str, -1, locale); + _strupr_s_l(str, -1, locale); + return str; } /********************************************************************* * _strupr (MSVCRT.@) */ -int CDECL _strupr(char *str) +char* CDECL _strupr(char *str) { - return _strupr_s_l(str, -1, NULL); + _strupr_s_l(str, -1, NULL); + return str; } /*********************************************************************

1 0

Jacek Caban : kernel32: Moved GetPerformanceInfo implementation to kernel32 .
by Alexandre Julliard May 16, 2011

May 16, 2011

Module: wine Branch: master Commit: e4ffd1f834cb2a237670f0c3f550fbdd093c1d3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4ffd1f834cb2a237670f0c3f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 16 15:19:48 2011 +0200 kernel32: Moved GetPerformanceInfo implementation to kernel32. --- dlls/kernel32/cpu.c | 20 +++++++++++++++ dlls/kernel32/kernel32.spec | 1 + dlls/psapi/Makefile.in | 3 -- dlls/psapi/psapi.spec | 2 +- dlls/psapi/psapi_main.c | 55 ------------------------------------------- 5 files changed, 22 insertions(+), 59 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 6594450..5d45941 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -38,6 +38,7 @@ #include "winbase.h" #include "winnt.h" #include "winternl.h" +#include "psapi.h" #include "wine/unicode.h" #include "wine/debug.h" #include "ddk/wdm.h" @@ -207,3 +208,22 @@ BOOL WINAPI IsProcessorFeaturePresent ( else return FALSE; } + +/*********************************************************************** + * K32GetPerformanceInfo (KERNEL32.@) + */ +BOOL WINAPI K32GetPerformanceInfo(PPERFORMANCE_INFORMATION info, DWORD size) +{ + NTSTATUS status; + + TRACE( "(%p, %d)\n", info, size ); + + status = NtQuerySystemInformation( SystemPerformanceInformation, info, size, NULL ); + + if (status) + { + SetLastError( RtlNtStatusToDosError( status ) ); + return FALSE; + } + return TRUE; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index e144fd6..ee4b966 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -786,6 +786,7 @@ @ stdcall K32GetModuleFileNameExA(long long ptr long) @ stdcall K32GetModuleFileNameExW(long long ptr long) @ stdcall K32GetModuleInformation(long long ptr long) +@ stdcall K32GetPerformanceInfo(ptr long) @ stdcall K32GetProcessMemoryInfo(long ptr long) @ stdcall K32GetWsChanges(long ptr long) @ stdcall K32InitializeProcessForWsWatch(long) diff --git a/dlls/psapi/Makefile.in b/dlls/psapi/Makefile.in index afdc90a..7d5cd60 100644 --- a/dlls/psapi/Makefile.in +++ b/dlls/psapi/Makefile.in @@ -1,9 +1,6 @@ MODULE = psapi.dll IMPORTLIB = psapi -C_SRCS = \ - psapi_main.c - RC_SRCS = version.rc @MAKE_DLL_RULES@ diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec index 844c761..45a1325 100644 --- a/dlls/psapi/psapi.spec +++ b/dlls/psapi/psapi.spec @@ -15,7 +15,7 @@ @ stdcall GetModuleFileNameExA(long long ptr long) kernel32.K32GetModuleFileNameExA @ stdcall GetModuleFileNameExW(long long ptr long) kernel32.K32GetModuleFileNameExW @ stdcall GetModuleInformation(long long ptr long) kernel32.K32GetModuleInformation -@ stdcall GetPerformanceInfo(ptr long) +@ stdcall GetPerformanceInfo(ptr long) kernel32.K32GetPerformanceInfo @ stdcall GetProcessImageFileNameA(long ptr long) kernel32.K32GetProcessImageFileNameA @ stdcall GetProcessImageFileNameW(long ptr long) kernel32.K32GetProcessImageFileNameW @ stdcall GetProcessMemoryInfo(long ptr long) kernel32.K32GetProcessMemoryInfo diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c deleted file mode 100644 index 17f408d..0000000 --- a/dlls/psapi/psapi_main.c +++ /dev/null @@ -1,55 +0,0 @@ -/* - * PSAPI library - * - * Copyright 1998 Patrik Stridvall - * Copyright 2003 Eric Pouech - * - * 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 "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wine/unicode.h" -#include "wine/debug.h" -#include "winnls.h" -#include "winternl.h" -#include "psapi.h" - -WINE_DEFAULT_DEBUG_CHANNEL(psapi); - - -/*********************************************************************** - * GetPerformanceInfo (PSAPI.@) - */ -BOOL WINAPI GetPerformanceInfo( PPERFORMANCE_INFORMATION info, DWORD size ) -{ - NTSTATUS status; - - TRACE( "(%p, %d)\n", info, size ); - - status = NtQuerySystemInformation( SystemPerformanceInformation, info, size, NULL ); - - if (status) - { - SetLastError( RtlNtStatusToDosError( status ) ); - return FALSE; - } - return TRUE; -}

1 0

Jacek Caban : kernel32: Moved device-related stubs from psapi to kernel32.
by Alexandre Julliard May 16, 2011

May 16, 2011

Module: wine Branch: master Commit: 0909f2e0540d8d1a3ca9340aecb3b34815cc481f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0909f2e0540d8d1a3ca9340ae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 16 15:19:07 2011 +0200 kernel32: Moved device-related stubs from psapi to kernel32. --- dlls/kernel32/file.c | 65 +++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/kernel32.spec | 5 +++ dlls/psapi/psapi.spec | 10 +++--- dlls/psapi/psapi_main.c | 68 ------------------------------------------- 4 files changed, 75 insertions(+), 73 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 537ea0a..94d795e 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -2536,3 +2536,68 @@ error: /* We get here if there was an error opening the file */ WARN("(%s): return = HFILE_ERROR error= %d\n", name,ofs->nErrCode ); return HFILE_ERROR; } + +/*********************************************************************** + * K32EnumDeviceDrivers (KERNEL32.@) + */ +BOOL WINAPI K32EnumDeviceDrivers(void **image_base, DWORD cb, DWORD *needed) +{ + FIXME("(%p, %d, %p): stub\n", image_base, cb, needed); + + if (needed) + *needed = 0; + + return TRUE; +} + +/*********************************************************************** + * K32GetDeviceDriverBaseNameA (KERNEL32.@) + */ +DWORD WINAPI K32GetDeviceDriverBaseNameA(void *image_base, LPSTR base_name, DWORD size) +{ + FIXME("(%p, %p, %d): stub\n", image_base, base_name, size); + + if (base_name && size) + base_name[0] = '\0'; + + return 0; +} + +/*********************************************************************** + * K32GetDeviceDriverBaseNameW (KERNEL32.@) + */ +DWORD WINAPI K32GetDeviceDriverBaseNameW(void *image_base, LPWSTR base_name, DWORD size) +{ + FIXME("(%p, %p, %d): stub\n", image_base, base_name, size); + + if (base_name && size) + base_name[0] = '\0'; + + return 0; +} + +/*********************************************************************** + * K32GetDeviceDriverFileNameA (KERNEL32.@) + */ +DWORD WINAPI K32GetDeviceDriverFileNameA(void *image_base, LPSTR file_name, DWORD size) +{ + FIXME("(%p, %p, %d): stub\n", image_base, file_name, size); + + if (file_name && size) + file_name[0] = '\0'; + + return 0; +} + +/*********************************************************************** + * K32GetDeviceDriverFileNameW (KERNEL32.@) + */ +DWORD WINAPI K32GetDeviceDriverFileNameW(void *image_base, LPWSTR file_name, DWORD size) +{ + FIXME("(%p, %p, %d): stub\n", image_base, file_name, size); + + if (file_name && size) + file_name[0] = '\0'; + + return 0; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 9edd92e..52ddb12 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -770,8 +770,13 @@ @ stdcall K32EmptyWorkingSet(long) @ stdcall K32GetProcessImageFileNameA(long ptr long) @ stdcall K32GetProcessImageFileNameW(long ptr long) +@ stdcall K32EnumDeviceDrivers(ptr long ptr) @ stdcall K32EnumProcessModules(long ptr long ptr) @ stdcall K32EnumProcesses(ptr long ptr) +@ stdcall K32GetDeviceDriverBaseNameA(ptr ptr long) +@ stdcall K32GetDeviceDriverBaseNameW(ptr ptr long) +@ stdcall K32GetDeviceDriverFileNameA(ptr ptr long) +@ stdcall K32GetDeviceDriverFileNameW(ptr ptr long) @ stdcall K32GetMappedFileNameA(long ptr ptr long) @ stdcall K32GetMappedFileNameW(long ptr ptr long) @ stdcall K32GetModuleBaseNameA(long long ptr long) diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec index a53ec04..835de4e 100644 --- a/dlls/psapi/psapi.spec +++ b/dlls/psapi/psapi.spec @@ -1,13 +1,13 @@ @ stdcall EmptyWorkingSet(long) kernel32.K32EmptyWorkingSet -@ stdcall EnumDeviceDrivers(ptr long ptr) +@ stdcall EnumDeviceDrivers(ptr long ptr) kernel32.K32EnumDeviceDrivers @ stdcall EnumPageFilesA(ptr ptr) @ stdcall EnumPageFilesW(ptr ptr) @ stdcall EnumProcessModules(long ptr long ptr) kernel32.K32EnumProcessModules @ stdcall EnumProcesses(ptr long ptr) kernel32.K32EnumProcesses -@ stdcall GetDeviceDriverBaseNameA(ptr ptr long) -@ stdcall GetDeviceDriverBaseNameW(ptr ptr long) -@ stdcall GetDeviceDriverFileNameA(ptr ptr long) -@ stdcall GetDeviceDriverFileNameW(ptr ptr long) +@ stdcall GetDeviceDriverBaseNameA(ptr ptr long) kernel32.K32GetDeviceDriverBaseNameA +@ stdcall GetDeviceDriverBaseNameW(ptr ptr long) kernel32.K32GetDeviceDriverBaseNameW +@ stdcall GetDeviceDriverFileNameA(ptr ptr long) kernel32.K32GetDeviceDriverFileNameA +@ stdcall GetDeviceDriverFileNameW(ptr ptr long) kernel32.K32GetDeviceDriverFileNameW @ stdcall GetMappedFileNameA(long ptr ptr long) kernel32.K32GetMappedFileNameA @ stdcall GetMappedFileNameW(long ptr ptr long) kernel32.K32GetMappedFileNameW @ stdcall GetModuleBaseNameA(long long ptr long) kernel32.K32GetModuleBaseNameA diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c index 8d79892..ef2f23d 100644 --- a/dlls/psapi/psapi_main.c +++ b/dlls/psapi/psapi_main.c @@ -35,19 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(psapi); /*********************************************************************** - * EnumDeviceDrivers (PSAPI.@) - */ -BOOL WINAPI EnumDeviceDrivers(LPVOID *lpImageBase, DWORD cb, LPDWORD lpcbNeeded) -{ - FIXME("(%p, %d, %p): stub\n", lpImageBase, cb, lpcbNeeded); - - if (lpcbNeeded) - *lpcbNeeded = 0; - - return TRUE; -} - -/*********************************************************************** * EnumPageFilesA (PSAPI.@) */ BOOL WINAPI EnumPageFilesA( PENUM_PAGE_FILE_CALLBACKA callback, LPVOID context ) @@ -65,61 +52,6 @@ BOOL WINAPI EnumPageFilesW( PENUM_PAGE_FILE_CALLBACKW callback, LPVOID context ) return FALSE; } -/*********************************************************************** - * GetDeviceDriverBaseNameA (PSAPI.@) - */ -DWORD WINAPI GetDeviceDriverBaseNameA(LPVOID ImageBase, LPSTR lpBaseName, - DWORD nSize) -{ - FIXME("(%p, %p, %d): stub\n", ImageBase, lpBaseName, nSize); - - if (lpBaseName && nSize) - lpBaseName[0] = '\0'; - - return 0; -} - -/*********************************************************************** - * GetDeviceDriverBaseNameW (PSAPI.@) - */ -DWORD WINAPI GetDeviceDriverBaseNameW(LPVOID ImageBase, LPWSTR lpBaseName, - DWORD nSize) -{ - FIXME("(%p, %p, %d): stub\n", ImageBase, lpBaseName, nSize); - - if (lpBaseName && nSize) - lpBaseName[0] = '\0'; - - return 0; -} - -/*********************************************************************** - * GetDeviceDriverFileNameA (PSAPI.@) - */ -DWORD WINAPI GetDeviceDriverFileNameA(LPVOID ImageBase, LPSTR lpFilename, - DWORD nSize) -{ - FIXME("(%p, %p, %d): stub\n", ImageBase, lpFilename, nSize); - - if (lpFilename && nSize) - lpFilename[0] = '\0'; - - return 0; -} - -/*********************************************************************** - * GetDeviceDriverFileNameW (PSAPI.@) - */ -DWORD WINAPI GetDeviceDriverFileNameW(LPVOID ImageBase, LPWSTR lpFilename, - DWORD nSize) -{ - FIXME("(%p, %p, %d): stub\n", ImageBase, lpFilename, nSize); - - if (lpFilename && nSize) - lpFilename[0] = '\0'; - - return 0; -} /*********************************************************************** * GetPerformanceInfo (PSAPI.@)

1 0

Huw Davies : gdi32: Implement PaintRgn().
by Alexandre Julliard May 16, 2011

May 16, 2011

Module: wine Branch: master Commit: 8c0bc67275db07d85227cbe36a099d8eb44b8591 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c0bc67275db07d85227cbe36… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon May 16 11:29:04 2011 +0100 gdi32: Implement PaintRgn(). --- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/graphics.c | 37 +++++++++++++++++++++++++++++++++---- 3 files changed, 35 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 50a7682..6cc1d33 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -391,7 +391,7 @@ const DC_FUNCTIONS dib_driver = NULL, /* pOffsetClipRgn */ NULL, /* pOffsetViewportOrg */ NULL, /* pOffsetWindowOrg */ - NULL, /* pPaintRgn */ + dibdrv_PaintRgn, /* pPaintRgn */ dibdrv_PatBlt, /* pPatBlt */ NULL, /* pPie */ NULL, /* pPolyBezier */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 2ec604c..ccf9f9a 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -20,6 +20,7 @@ extern BOOL CDECL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL CDECL dibdrv_PatBlt( PHYSDEV dev, INT x, INT y, INT width, INT height, DWORD rop ) DECLSPEC_HIDDEN; +extern BOOL CDECL dibdrv_PaintRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL CDECL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern HBRUSH CDECL dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) DECLSPEC_HIDDEN; extern HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index bc7c488..7f7746f 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dib); -static RECT get_device_rect( HDC hdc, int left, int top, int right, int bottom ) +static RECT get_device_rect( HDC hdc, int left, int top, int right, int bottom, BOOL rtl_correction ) { RECT rect; @@ -33,7 +33,7 @@ static RECT get_device_rect( HDC hdc, int left, int top, int right, int bottom ) rect.top = top; rect.right = right; rect.bottom = bottom; - if (GetLayout( hdc ) & LAYOUT_RTL) + if (rtl_correction && GetLayout( hdc ) & LAYOUT_RTL) { /* shift the rectangle so that the right border is included after mirroring */ /* it would be more correct to do this after LPtoDP but that's not what Windows does */ @@ -98,7 +98,7 @@ BOOL CDECL dibdrv_PatBlt( PHYSDEV dev, INT x, INT y, INT width, INT height, DWOR PHYSDEV next = GET_NEXT_PHYSDEV( dev, pPatBlt ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); INT rop2 = get_rop2_from_rop(rop); - RECT rect = get_device_rect( dev->hdc, x, y, x + width, y + height ); + RECT rect = get_device_rect( dev->hdc, x, y, x + width, y + height, TRUE ); BOOL done; TRACE("(%p, %d, %d, %d, %d, %06x)\n", dev, x, y, width, height, rop); @@ -119,13 +119,42 @@ BOOL CDECL dibdrv_PatBlt( PHYSDEV dev, INT x, INT y, INT width, INT height, DWOR } /*********************************************************************** + * dibdrv_PaintRgn + */ +BOOL CDECL dibdrv_PaintRgn( PHYSDEV dev, HRGN rgn ) +{ + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pPaintRgn ); + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + const WINEREGION *region; + int i; + RECT rect; + + TRACE("%p, %p\n", dev, rgn); + + if(defer_brush(pdev)) return next->funcs->pPaintRgn( next, rgn ); + + region = get_wine_region( rgn ); + if(!region) return FALSE; + + for(i = 0; i < region->numRects; i++) + { + rect = get_device_rect( dev->hdc, region->rects[i].left, region->rects[i].top, + region->rects[i].right, region->rects[i].bottom, FALSE ); + pdev->brush_rects( pdev, 1, &rect ); + } + + release_wine_region( rgn ); + return TRUE; +} + +/*********************************************************************** * dibdrv_Rectangle */ BOOL CDECL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pRectangle ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); - RECT rect = get_device_rect( dev->hdc, left, top, right, bottom ); + RECT rect = get_device_rect( dev->hdc, left, top, right, bottom, TRUE ); POINT pts[4]; TRACE("(%p, %d, %d, %d, %d)\n", dev, left, top, right, bottom);

1 0

Huw Davies : gdi32/tests: Add tests for PaintRgn and simple RTL behaviour.
by Alexandre Julliard May 16, 2011

May 16, 2011

Module: wine Branch: master Commit: b050eba3cdea698cc4b2e8b2f055549fb7c08355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b050eba3cdea698cc4b2e8b2f… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon May 16 11:29:26 2011 +0100 gdi32/tests: Add tests for PaintRgn and simple RTL behaviour. --- dlls/gdi32/tests/dib.c | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index e69de1f..915aec6 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -31,6 +31,7 @@ #include "wine/test.h" static HCRYPTPROV crypt_prov; +static DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); static const DWORD rop3[256] = { @@ -93,6 +94,8 @@ static const char *sha1_graphics_a8r8g8b8[] = "a8b59f25984b066fc6b91cae6bf983a78028ba7f", "3d95adb85b9673a932ac847a4b5451fa59885f74", "e2a8eef4aeda3a0f6c950075acba38f1f9e0814d", + "8b66f14d51ecdeea12bc993302bb9b7d3ec085a1", + "7da9dd3d40d44d92deb9883fb7110443c2d5769a", NULL }; @@ -348,7 +351,6 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh CombineRgn(hrgn, hrgn, hrgn2, RGN_OR); ExtSelectClipRgn(hdc, hrgn, RGN_COPY); DeleteObject(hrgn2); - DeleteObject(hrgn); for(i = 0; i < sizeof(hline_clips)/sizeof(hline_clips[0]); i++) { @@ -517,9 +519,36 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh compare_hash(bmi, bits, sha1, "rectangles"); memset(bits, 0xcc, dib_size); + SelectObject(hdc, solid_pen); + + /* PaintRgn */ + + PaintRgn(hdc, hrgn); + compare_hash(bmi, bits, sha1, "PaintRgn"); + memset(bits, 0xcc, dib_size); + + /* RTL rectangles */ + + if( !pSetLayout ) + { + win_skip("Don't have SetLayout\n"); + (*sha1)++; + } + else + { + pSetLayout(hdc, LAYOUT_RTL); + PaintRgn(hdc, hrgn); + PatBlt(hdc, 10, 250, 10, 10, PATCOPY); + Rectangle(hdc, 100, 250, 110, 260); + compare_hash(bmi, bits, sha1, "rtl"); + memset(bits, 0xcc, dib_size); + + pSetLayout(hdc, LAYOUT_LTR); + } SelectObject(hdc, orig_brush); SelectObject(hdc, orig_pen); + DeleteObject(hrgn); DeleteObject(dib_brush); DeleteObject(dashed_pen); DeleteObject(solid_brush); @@ -612,6 +641,9 @@ todo_wine START_TEST(dib) { + HMODULE mod = GetModuleHandleA("gdi32.dll"); + pSetLayout = (void *)GetProcAddress( mod, "SetLayout" ); + CryptAcquireContextW(&crypt_prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); test_simple_graphics();

1 0

Marcus Meissner : atl: Mark hInst variable as hidden.
by Alexandre Julliard May 16, 2011

May 16, 2011

Module: wine Branch: master Commit: 58aad7c2edb823160b7378c5589bf3ef42361565 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58aad7c2edb823160b7378c55… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 16:27:44 2011 +0200 atl: Mark hInst variable as hidden. --- dlls/atl/atl_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 78ef7ce..2898835 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -40,7 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(atl); -HINSTANCE hInst; +DECLSPEC_HIDDEN HINSTANCE hInst; BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {

1 0