April 2011 - Wine-commits - list.winehq.org

Huw Davies : gdi32: Add a skeleton dib driver.
by Alexandre Julliard 04 Apr '11

04 Apr '11

Module: wine Branch: master Commit: 4cffb2d0a9f8cb001584e5f561f76385919a0172 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cffb2d0a9f8cb001584e5f56… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 1 15:27:48 2011 +0100 gdi32: Add a skeleton dib driver. --- configure | 5 + configure.ac | 1 + dlls/gdi32/Makefile.in | 2 + dlls/gdi32/bitmap.c | 21 ++++- dlls/gdi32/dc.c | 2 + dlls/gdi32/dibdrv/dc.c | 221 ++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/dibdrv/dibdrv.h | 24 +++++ dlls/gdi32/gdi_private.h | 17 ++++ 8 files changed, 290 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4cffb2d0a9f8cb001584e…

1 0

Stefan Leichter : scarddlg: New dll stub.
by Alexandre Julliard 04 Apr '11

04 Apr '11

Module: wine Branch: master Commit: 81f3d68abd3eef263e6c50d62208b466accb9365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81f3d68abd3eef263e6c50d62… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sun Apr 3 23:50:40 2011 +0200 scarddlg: New dll stub. --- configure | 1 + configure.ac | 1 + dlls/scarddlg/Makefile.in | 6 +++++ dlls/scarddlg/main.c | 49 +++++++++++++++++++++++++++++++++++++++++++ dlls/scarddlg/scarddlg.spec | 5 ++++ 5 files changed, 62 insertions(+), 0 deletions(-) diff --git a/configure b/configure index a61c726..0b972b3 100755 --- a/configure +++ b/configure @@ -15279,6 +15279,7 @@ wine_fn_config_dll rstrtmgr enable_rstrtmgr wine_fn_config_dll rtutils enable_rtutils implib wine_fn_config_dll samlib enable_samlib wine_fn_config_dll sane.ds enable_sane_ds po +wine_fn_config_dll scarddlg enable_scarddlg wine_fn_config_dll sccbase enable_sccbase wine_fn_config_dll schannel enable_schannel wine_fn_config_test dlls/schannel/tests schannel_test diff --git a/configure.ac b/configure.ac index 3f29303..8d68d9b 100644 --- a/configure.ac +++ b/configure.ac @@ -2746,6 +2746,7 @@ WINE_CONFIG_DLL(rstrtmgr) WINE_CONFIG_DLL(rtutils,,[implib]) WINE_CONFIG_DLL(samlib) WINE_CONFIG_DLL(sane.ds,,[po]) +WINE_CONFIG_DLL(scarddlg) WINE_CONFIG_DLL(sccbase) WINE_CONFIG_DLL(schannel) WINE_CONFIG_TEST(dlls/schannel/tests) diff --git a/dlls/scarddlg/Makefile.in b/dlls/scarddlg/Makefile.in new file mode 100644 index 0000000..7b3ddc8 --- /dev/null +++ b/dlls/scarddlg/Makefile.in @@ -0,0 +1,6 @@ +MODULE = scarddlg.dll + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/scarddlg/main.c b/dlls/scarddlg/main.c new file mode 100644 index 0000000..59cc5a8 --- /dev/null +++ b/dlls/scarddlg/main.c @@ -0,0 +1,49 @@ +/* + * Implementation of the SCardDlg Interface + * + * Copyright 2011 Stefan Leichter + * + * 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 "winuser.h" +#include "wfext.h" + +#include "wine/unicode.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(scarddlg); + +/***************************************************** + * DllMain + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinstDLL ); + break; + } + return TRUE; +} diff --git a/dlls/scarddlg/scarddlg.spec b/dlls/scarddlg/scarddlg.spec new file mode 100644 index 0000000..3208c1b --- /dev/null +++ b/dlls/scarddlg/scarddlg.spec @@ -0,0 +1,5 @@ +1 stub GetOpenCardNameA +2 stub GetOpenCardNameW +3 stub SCardDlgExtendedError +4 stub SCardUIDlgSelectCardA +5 stub SCardUIDlgSelectCardW

1 0

Rico Schüller : d3dcompiler: Move D3DCreateBlob() to blob.c.
by Alexandre Julliard 04 Apr '11

04 Apr '11

Module: wine Branch: master Commit: 4d543607650a34c341a199bf6684980a8073aeac URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d543607650a34c341a199bf6… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Apr 1 15:00:04 2011 +0200 d3dcompiler: Move D3DCreateBlob() to blob.c. --- dlls/d3dcompiler_43/blob.c | 46 ++++++++++++++++++++++++++++- dlls/d3dcompiler_43/d3dcompiler_43_main.c | 35 ---------------------- dlls/d3dcompiler_43/d3dcompiler_private.h | 12 ------- 3 files changed, 45 insertions(+), 48 deletions(-) diff --git a/dlls/d3dcompiler_43/blob.c b/dlls/d3dcompiler_43/blob.c index 995ac41..4a5ff79 100644 --- a/dlls/d3dcompiler_43/blob.c +++ b/dlls/d3dcompiler_43/blob.c @@ -26,6 +26,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler); +struct d3dcompiler_blob +{ + ID3DBlob ID3DBlob_iface; + LONG refcount; + + SIZE_T size; + void *data; +}; + static inline struct d3dcompiler_blob *impl_from_ID3DBlob(ID3DBlob *iface) { return CONTAINING_RECORD(iface, struct d3dcompiler_blob, ID3DBlob_iface); @@ -108,7 +117,7 @@ static const struct ID3D10BlobVtbl d3dcompiler_blob_vtbl = d3dcompiler_blob_GetBufferSize, }; -HRESULT d3dcompiler_blob_init(struct d3dcompiler_blob *blob, SIZE_T data_size) +static HRESULT d3dcompiler_blob_init(struct d3dcompiler_blob *blob, SIZE_T data_size) { blob->ID3DBlob_iface.lpVtbl = &d3dcompiler_blob_vtbl; blob->refcount = 1; @@ -124,6 +133,41 @@ HRESULT d3dcompiler_blob_init(struct d3dcompiler_blob *blob, SIZE_T data_size) return S_OK; } +HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob) +{ + struct d3dcompiler_blob *object; + HRESULT hr; + + TRACE("data_size %lu, blob %p\n", data_size, blob); + + if (!blob) + { + WARN("Invalid blob specified.\n"); + return D3DERR_INVALIDCALL; + } + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate D3D blob object memory\n"); + return E_OUTOFMEMORY; + } + + hr = d3dcompiler_blob_init(object, data_size); + if (FAILED(hr)) + { + WARN("Failed to initialize blob, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + *blob = (ID3DBlob *)object; + + TRACE("Created ID3DBlob %p\n", object); + + return S_OK; +} + static BOOL check_blob_part(DWORD tag, D3D_BLOB_PART part) { BOOL add = FALSE; diff --git a/dlls/d3dcompiler_43/d3dcompiler_43_main.c b/dlls/d3dcompiler_43/d3dcompiler_43_main.c index 37937a6..51314e8 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_43_main.c +++ b/dlls/d3dcompiler_43/d3dcompiler_43_main.c @@ -46,41 +46,6 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) return TRUE; } -HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob) -{ - struct d3dcompiler_blob *object; - HRESULT hr; - - TRACE("data_size %lu, blob %p\n", data_size, blob); - - if (!blob) - { - WARN("Invalid blob specified.\n"); - return D3DERR_INVALIDCALL; - } - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) - { - ERR("Failed to allocate D3D blob object memory\n"); - return E_OUTOFMEMORY; - } - - hr = d3dcompiler_blob_init(object, data_size); - if (FAILED(hr)) - { - WARN("Failed to initialize blob, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); - return hr; - } - - *blob = (ID3DBlob *)object; - - TRACE("Created ID3DBlob %p\n", object); - - return S_OK; -} - HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob) { TRACE("data %p, data_size %lu, part %s, flags %#x, blob %p\n", data, diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 4ac8966..3ee88db 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -44,18 +44,6 @@ const char *debug_d3dcompiler_d3d_blob_part(D3D_BLOB_PART part) DECLSPEC_HIDDEN; const char *debug_d3dcompiler_shader_variable_class(D3D_SHADER_VARIABLE_CLASS c) DECLSPEC_HIDDEN; const char *debug_d3dcompiler_shader_variable_type(D3D_SHADER_VARIABLE_TYPE t) DECLSPEC_HIDDEN; -/* ID3DBlob */ -struct d3dcompiler_blob -{ - ID3DBlob ID3DBlob_iface; - LONG refcount; - - SIZE_T size; - void *data; -}; - -HRESULT d3dcompiler_blob_init(struct d3dcompiler_blob *blob, SIZE_T data_size) DECLSPEC_HIDDEN; - /* blob handling */ HRESULT d3dcompiler_get_blob_part(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob) DECLSPEC_HIDDEN; HRESULT d3dcompiler_strip_shader(const void *data, SIZE_T data_size, UINT flags, ID3DBlob **blob) DECLSPEC_HIDDEN;

1 0

Andrew Nguyen : dxdiagn: Add language properties to the DxDiag_SystemInfo container.
by Alexandre Julliard 04 Apr '11

04 Apr '11

Module: wine Branch: master Commit: f9c8e4651762da298d94d522ca02ff4b3b5915b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c8e4651762da298d94d522c… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Apr 3 20:55:32 2011 -0500 dxdiagn: Add language properties to the DxDiag_SystemInfo container. --- configure | 2 +- configure.ac | 2 +- dlls/dxdiagn/Makefile.in | 3 +- dlls/dxdiagn/dxdiag_private.h | 1 + dlls/dxdiagn/{version.rc => dxdiagn.rc} | 9 +++++++ dlls/dxdiagn/provider.c | 38 +++++++++++++++++++++++++++++++ dlls/dxdiagn/{version.rc => resource.h} | 13 ++++------ po/ar.po | 4 +++ po/bg.po | 5 ++++ po/ca.po | 4 +++ po/cs.po | 5 ++++ po/da.po | 5 ++++ po/de.po | 5 ++++ po/el.po | 4 +++ po/en.po | 4 +++ po/en_US.po | 4 +++ po/eo.po | 5 ++++ po/es.po | 5 ++++ po/fa.po | 4 +++ po/fi.po | 5 ++++ po/fr.po | 5 ++++ po/he.po | 5 ++++ po/hi.po | 4 +++ po/hu.po | 5 ++++ po/it.po | 5 ++++ po/ja.po | 5 ++++ po/ko.po | 5 ++++ po/lt.po | 5 ++++ po/ml.po | 4 +++ po/nb_NO.po | 5 ++++ po/nl.po | 5 ++++ po/or.po | 4 +++ po/pa.po | 4 +++ po/pl.po | 5 ++++ po/pt_BR.po | 5 ++++ po/pt_PT.po | 5 ++++ po/rm.po | 5 ++++ po/ro.po | 5 ++++ po/ru.po | 5 ++++ po/sk.po | 5 ++++ po/sl.po | 5 ++++ po/sr_RS(a)cyrillic.po | 5 ++++ po/sr_RS(a)latin.po | 5 ++++ po/sv.po | 5 ++++ po/te.po | 4 +++ po/th.po | 4 +++ po/tr.po | 5 ++++ po/uk.po | 5 ++++ po/wa.po | 5 ++++ po/wine.pot | 4 +++ po/zh_CN.po | 5 ++++ po/zh_TW.po | 5 ++++ 52 files changed, 269 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9c8e4651762da298d94d…

1 0

Andrew Nguyen : dxdiagn: Add a NetMeeting detection property to the DxDiag_SystemInfo container.
by Alexandre Julliard 04 Apr '11

04 Apr '11

Module: wine Branch: master Commit: 9e3fd163068ec43638fc2f82aa8cae1db98c03da URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e3fd163068ec43638fc2f82a… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Apr 3 20:55:39 2011 -0500 dxdiagn: Add a NetMeeting detection property to the DxDiag_SystemInfo container. --- dlls/dxdiagn/Makefile.in | 2 +- dlls/dxdiagn/provider.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 1 deletions(-) diff --git a/dlls/dxdiagn/Makefile.in b/dlls/dxdiagn/Makefile.in index 12dd8be..b522547 100644 --- a/dlls/dxdiagn/Makefile.in +++ b/dlls/dxdiagn/Makefile.in @@ -1,5 +1,5 @@ MODULE = dxdiagn.dll -IMPORTS = strmiids dxguid uuid ddraw version ole32 oleaut32 user32 advapi32 +IMPORTS = strmiids dxguid uuid ddraw version ole32 oleaut32 psapi user32 advapi32 C_SRCS = \ container.c \ diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 5281981..058f5a6 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -2,6 +2,7 @@ * IDxDiagProvider Implementation * * Copyright 2004-2005 Raphael Junqueira + * Copyright 2010 Andrew Nguyen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -36,6 +37,7 @@ #include "strmif.h" #include "initguid.h" #include "fil_data.h" +#include "psapi.h" #include "wine/debug.h" @@ -346,6 +348,98 @@ static inline HRESULT add_ull_as_bstr_property(IDxDiagContainerImpl_Container *n return S_OK; } +/* Copied from programs/taskkill/taskkill.c. */ +static DWORD *enumerate_processes(DWORD *list_count) +{ + DWORD *pid_list, alloc_bytes = 1024 * sizeof(*pid_list), needed_bytes; + + pid_list = HeapAlloc(GetProcessHeap(), 0, alloc_bytes); + if (!pid_list) + return NULL; + + for (;;) + { + DWORD *realloc_list; + + if (!EnumProcesses(pid_list, alloc_bytes, &needed_bytes)) + { + HeapFree(GetProcessHeap(), 0, pid_list); + return NULL; + } + + /* EnumProcesses can't signal an insufficient buffer condition, so the + * only way to possibly determine whether a larger buffer is required + * is to see whether the written number of bytes is the same as the + * buffer size. If so, the buffer will be reallocated to twice the + * size. */ + if (alloc_bytes != needed_bytes) + break; + + alloc_bytes *= 2; + realloc_list = HeapReAlloc(GetProcessHeap(), 0, pid_list, alloc_bytes); + if (!realloc_list) + { + HeapFree(GetProcessHeap(), 0, pid_list); + return NULL; + } + pid_list = realloc_list; + } + + *list_count = needed_bytes / sizeof(*pid_list); + return pid_list; +} + +/* Copied from programs/taskkill/taskkill.c. */ +static BOOL get_process_name_from_pid(DWORD pid, WCHAR *buf, DWORD chars) +{ + HANDLE process; + HMODULE module; + DWORD required_size; + + process = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, pid); + if (!process) + return FALSE; + + if (!EnumProcessModules(process, &module, sizeof(module), &required_size)) + { + CloseHandle(process); + return FALSE; + } + + if (!GetModuleBaseNameW(process, module, buf, chars)) + { + CloseHandle(process); + return FALSE; + } + + CloseHandle(process); + return TRUE; +} + +/* dxdiagn's detection scheme is simply to look for a process called conf.exe. */ +static BOOL is_netmeeting_running(void) +{ + static const WCHAR conf_exe[] = {'c','o','n','f','.','e','x','e',0}; + + DWORD list_count; + DWORD *pid_list = enumerate_processes(&list_count); + + if (pid_list) + { + DWORD i; + WCHAR process_name[MAX_PATH]; + + for (i = 0; i < list_count; i++) + { + if (get_process_name_from_pid(pid_list[i], process_name, sizeof(process_name)/sizeof(WCHAR)) && + !lstrcmpW(conf_exe, process_name)) + return TRUE; + } + } + + return FALSE; +} + static HRESULT fill_language_information(IDxDiagContainerImpl_Container *node) { static const WCHAR regional_setting_engW[] = {'R','e','g','i','o','n','a','l',' ','S','e','t','t','i','n','g',0}; @@ -394,6 +488,7 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) static const WCHAR ullPhysicalMemory[] = {'u','l','l','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; static const WCHAR ullUsedPageFile[] = {'u','l','l','U','s','e','d','P','a','g','e','F','i','l','e',0}; static const WCHAR ullAvailPageFile[] = {'u','l','l','A','v','a','i','l','P','a','g','e','F','i','l','e',0}; + static const WCHAR bNetMeetingRunning[] = {'b','N','e','t','M','e','e','t','i','n','g','R','u','n','n','i','n','g',0}; static const WCHAR szWindowsDir[] = {'s','z','W','i','n','d','o','w','s','D','i','r',0}; static const WCHAR dwOSMajorVersion[] = {'d','w','O','S','M','a','j','o','r','V','e','r','s','i','o','n',0}; static const WCHAR dwOSMinorVersion[] = {'d','w','O','S','M','i','n','o','r','V','e','r','s','i','o','n',0}; @@ -448,6 +543,10 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) if (FAILED(hr)) return hr; + hr = add_bool_property(node, bNetMeetingRunning, is_netmeeting_running()); + if (FAILED(hr)) + return hr; + info.dwOSVersionInfoSize = sizeof(info); GetVersionExW(&info);

1 0

Andrew Nguyen : dxdiagn: Add a NECPC98 property to the DxDiag_SystemInfo container for completeness .
by Alexandre Julliard 04 Apr '11

04 Apr '11

Module: wine Branch: master Commit: 96c3db6829f118448bce328bb63734fad919e5fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=96c3db6829f118448bce328bb… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Apr 3 20:55:43 2011 -0500 dxdiagn: Add a NECPC98 property to the DxDiag_SystemInfo container for completeness. --- dlls/dxdiagn/provider.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 058f5a6..537db4e 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -481,6 +481,7 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) static const WCHAR szDirectXVersionLetter[] = {'s','z','D','i','r','e','c','t','X','V','e','r','s','i','o','n','L','e','t','t','e','r',0}; static const WCHAR szDirectXVersionLetter_v[] = {'c',0}; static const WCHAR bDebug[] = {'b','D','e','b','u','g',0}; + static const WCHAR bNECPC98[] = {'b','N','E','C','P','C','9','8',0}; static const WCHAR szDirectXVersionEnglish[] = {'s','z','D','i','r','e','c','t','X','V','e','r','s','i','o','n','E','n','g','l','i','s','h',0}; static const WCHAR szDirectXVersionEnglish_v[] = {'4','.','0','9','.','0','0','0','0','.','0','9','0','4',0}; static const WCHAR szDirectXVersionLongEnglish[] = {'s','z','D','i','r','e','c','t','X','V','e','r','s','i','o','n','L','o','n','g','E','n','g','l','i','s','h',0}; @@ -528,6 +529,10 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) if (FAILED(hr)) return hr; + hr = add_bool_property(node, bNECPC98, FALSE); + if (FAILED(hr)) + return hr; + msex.dwLength = sizeof(msex); GlobalMemoryStatusEx(&msex);

1 0

Andrew Nguyen : dxdiagn/tests: Add tests for some DxDiag_SystemInfo properties.
by Alexandre Julliard 04 Apr '11

04 Apr '11

Module: wine Branch: master Commit: 35d313c4d453eab28f277c4382949029cb517ce2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35d313c4d453eab28f277c438… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Apr 3 20:55:48 2011 -0500 dxdiagn/tests: Add tests for some DxDiag_SystemInfo properties. --- dlls/dxdiagn/tests/container.c | 124 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 123 insertions(+), 1 deletions(-) diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c index ac3229d..8df4cb3 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -28,6 +28,37 @@ static IDxDiagProvider *pddp; static IDxDiagContainer *pddc; +static const WCHAR DxDiag_SystemInfo[] = {'D','x','D','i','a','g','_','S','y','s','t','e','m','I','n','f','o',0}; + +/* Based on debugstr_variant in dlls/jscript/jsutils.c. */ +static const char *debugstr_variant(const VARIANT *var) +{ + static char buf[400]; + + if (!var) + return "(null)"; + + switch (V_VT(var)) + { + case VT_EMPTY: + return "{VT_EMPTY}"; + case VT_BSTR: + sprintf(buf, "{VT_BSTR: %s}", wine_dbgstr_w(V_BSTR(var))); + break; + case VT_BOOL: + sprintf(buf, "{VT_BOOL: %x}", V_BOOL(var)); + break; + case VT_UI4: + sprintf(buf, "{VT_UI4: %u}", V_UI4(var)); + break; + default: + sprintf(buf, "{vt %d}", V_VT(var)); + break; + } + + return buf; +} + static BOOL create_root_IDxDiagContainer(void) { HRESULT hr; @@ -658,7 +689,6 @@ cleanup: static void test_root_children(void) { - static const WCHAR DxDiag_SystemInfo[] = {'D','x','D','i','a','g','_','S','y','s','t','e','m','I','n','f','o',0}; static const WCHAR DxDiag_DisplayDevices[] = {'D','x','D','i','a','g','_','D','i','s','p','l','a','y','D','e','v','i','c','e','s',0}; static const WCHAR DxDiag_DirectSound[] = {'D','x','D','i','a','g','_','D','i','r','e','c','t','S','o','u','n','d',0}; static const WCHAR DxDiag_DirectMusic[] = {'D','x','D','i','a','g','_','D','i','r','e','c','t','M','u','s','i','c',0}; @@ -733,6 +763,97 @@ cleanup: IDxDiagProvider_Release(pddp); } +static void test_DxDiag_SystemInfo(void) +{ + static const WCHAR dwOSMajorVersion[] = {'d','w','O','S','M','a','j','o','r','V','e','r','s','i','o','n',0}; + static const WCHAR dwOSMinorVersion[] = {'d','w','O','S','M','i','n','o','r','V','e','r','s','i','o','n',0}; + static const WCHAR dwOSBuildNumber[] = {'d','w','O','S','B','u','i','l','d','N','u','m','b','e','r',0}; + static const WCHAR dwOSPlatformID[] = {'d','w','O','S','P','l','a','t','f','o','r','m','I','D',0}; + static const WCHAR dwDirectXVersionMajor[] = {'d','w','D','i','r','e','c','t','X','V','e','r','s','i','o','n','M','a','j','o','r',0}; + static const WCHAR dwDirectXVersionMinor[] = {'d','w','D','i','r','e','c','t','X','V','e','r','s','i','o','n','M','i','n','o','r',0}; + static const WCHAR szDirectXVersionLetter[] = {'s','z','D','i','r','e','c','t','X','V','e','r','s','i','o','n','L','e','t','t','e','r',0}; + static const WCHAR bDebug[] = {'b','D','e','b','u','g',0}; + static const WCHAR bNECPC98[] = {'b','N','E','C','P','C','9','8',0}; + static const WCHAR ullPhysicalMemory[] = {'u','l','l','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; + static const WCHAR ullUsedPageFile[] = {'u','l','l','U','s','e','d','P','a','g','e','F','i','l','e',0}; + static const WCHAR ullAvailPageFile[] = {'u','l','l','A','v','a','i','l','P','a','g','e','F','i','l','e',0}; + static const WCHAR szWindowsDir[] = {'s','z','W','i','n','d','o','w','s','D','i','r',0}; + static const WCHAR szCSDVersion[] = {'s','z','C','S','D','V','e','r','s','i','o','n',0}; + static const WCHAR szDirectXVersionEnglish[] = {'s','z','D','i','r','e','c','t','X','V','e','r','s','i','o','n','E','n','g','l','i','s','h',0}; + static const WCHAR szDirectXVersionLongEnglish[] = {'s','z','D','i','r','e','c','t','X','V','e','r','s','i','o','n','L','o','n','g','E','n','g','l','i','s','h',0}; + static const WCHAR bNetMeetingRunning[] = {'b','N','e','t','M','e','e','t','i','n','g','R','u','n','n','i','n','g',0}; + static const WCHAR szMachineNameLocalized[] = {'s','z','M','a','c','h','i','n','e','N','a','m','e','L','o','c','a','l','i','z','e','d',0}; + static const WCHAR szMachineNameEnglish[] = {'s','z','M','a','c','h','i','n','e','N','a','m','e','E','n','g','l','i','s','h',0}; + static const WCHAR szLanguagesLocalized[] = {'s','z','L','a','n','g','u','a','g','e','s','L','o','c','a','l','i','z','e','d',0}; + static const WCHAR szLanguagesEnglish[] = {'s','z','L','a','n','g','u','a','g','e','s','E','n','g','l','i','s','h',0}; + + static const struct + { + const WCHAR *prop; + VARTYPE vt; + } property_tests[] = + { + {dwOSMajorVersion, VT_UI4}, + {dwOSMinorVersion, VT_UI4}, + {dwOSBuildNumber, VT_UI4}, + {dwOSPlatformID, VT_UI4}, + {dwDirectXVersionMajor, VT_UI4}, + {dwDirectXVersionMinor, VT_UI4}, + {szDirectXVersionLetter, VT_BSTR}, + {bDebug, VT_BOOL}, + {bNECPC98, VT_BOOL}, + {ullPhysicalMemory, VT_BSTR}, + {ullUsedPageFile, VT_BSTR}, + {ullAvailPageFile, VT_BSTR}, + {szWindowsDir, VT_BSTR}, + {szCSDVersion, VT_BSTR}, + {szDirectXVersionEnglish, VT_BSTR}, + {szDirectXVersionLongEnglish, VT_BSTR}, + {bNetMeetingRunning, VT_BOOL}, + {szMachineNameLocalized, VT_BSTR}, + {szMachineNameEnglish, VT_BSTR}, + {szLanguagesLocalized, VT_BSTR}, + {szLanguagesEnglish, VT_BSTR}, + }; + + HRESULT hr; + IDxDiagContainer *child = NULL; + VARIANT var; + + if (!create_root_IDxDiagContainer()) + { + skip("Unable to create the root IDxDiagContainer\n"); + return; + } + + hr = IDxDiagContainer_GetChildContainer(pddc, DxDiag_SystemInfo, &child); + ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); + + if (hr == S_OK) + { + int i; + + /* Examine the variant types of obtained property values. */ + for (i = 0; i < sizeof(property_tests)/sizeof(property_tests[0]); i++) + { + hr = IDxDiagContainer_GetProp(child, property_tests[i].prop, &var); + ok(hr == S_OK, "[%d] Expected IDxDiagContainer::GetProp to return S_OK, got 0x%08x\n", i, hr); + + if (hr == S_OK) + { + ok(V_VT(&var) == property_tests[i].vt, + "[%d] Expected variant type %d, got %d\n", i, property_tests[i].vt, V_VT(&var)); + trace("%s = %s\n", wine_dbgstr_w(property_tests[i].prop), debugstr_variant(&var)); + VariantClear(&var); + } + } + } + + IDxDiagContainer_Release(child); + IDxDiagContainer_Release(pddc); + IDxDiagProvider_Release(pddp); +} + START_TEST(container) { CoInitialize(NULL); @@ -745,5 +866,6 @@ START_TEST(container) test_GetProp(); test_root_children(); + test_DxDiag_SystemInfo(); CoUninitialize(); }

1 0

Andrew Nguyen : dxdiagn: Add date and time properties to the DxDiag_SystemInfo container.
by Alexandre Julliard 04 Apr '11

04 Apr '11

Module: wine Branch: master Commit: bd7ad13bb38a31136c671bbc739fb8fa3c3d6515 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd7ad13bb38a31136c671bbc7… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Apr 3 20:55:53 2011 -0500 dxdiagn: Add date and time properties to the DxDiag_SystemInfo container. --- dlls/dxdiagn/provider.c | 41 ++++++++++++++++++++++++++++++++++++++++ dlls/dxdiagn/tests/container.c | 4 +++ 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 537db4e..0004d0f 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -474,6 +474,43 @@ static HRESULT fill_language_information(IDxDiagContainerImpl_Container *node) return S_OK; } +static HRESULT fill_datetime_information(IDxDiagContainerImpl_Container *node) +{ + static const WCHAR date_fmtW[] = {'M','\'','/','\'','d','\'','/','\'','y','y','y','y',0}; + static const WCHAR time_fmtW[] = {'H','H','\'',':','\'','m','m','\'',':','\'','s','s',0}; + static const WCHAR datetime_fmtW[] = {'%','s',',',' ','%','s',0}; + static const WCHAR szTimeLocalized[] = {'s','z','T','i','m','e','L','o','c','a','l','i','z','e','d',0}; + static const WCHAR szTimeEnglish[] = {'s','z','T','i','m','e','E','n','g','l','i','s','h',0}; + + SYSTEMTIME curtime; + WCHAR date_str[80], time_str[80], datetime_str[200]; + HRESULT hr; + + GetLocalTime(&curtime); + + GetTimeFormatW(LOCALE_NEUTRAL, 0, &curtime, time_fmtW, time_str, sizeof(time_str)/sizeof(WCHAR)); + + /* szTimeLocalized */ + GetDateFormatW(LOCALE_USER_DEFAULT, DATE_LONGDATE, &curtime, NULL, date_str, sizeof(date_str)/sizeof(WCHAR)); + + snprintfW(datetime_str, sizeof(datetime_str)/sizeof(WCHAR), datetime_fmtW, date_str, time_str); + + hr = add_bstr_property(node, szTimeLocalized, datetime_str); + if (FAILED(hr)) + return hr; + + /* szTimeEnglish */ + GetDateFormatW(LOCALE_NEUTRAL, 0, &curtime, date_fmtW, date_str, sizeof(date_str)/sizeof(WCHAR)); + + snprintfW(datetime_str, sizeof(datetime_str)/sizeof(WCHAR), datetime_fmtW, date_str, time_str); + + hr = add_bstr_property(node, szTimeEnglish, datetime_str); + if (FAILED(hr)) + return hr; + + return S_OK; +} + static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) { static const WCHAR dwDirectXVersionMajor[] = {'d','w','D','i','r','e','c','t','X','V','e','r','s','i','o','n','M','a','j','o','r',0}; @@ -597,6 +634,10 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) if (FAILED(hr)) return hr; + hr = fill_datetime_information(node); + if (FAILED(hr)) + return hr; + return S_OK; } diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c index 8df4cb3..6c6928c 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -786,6 +786,8 @@ static void test_DxDiag_SystemInfo(void) static const WCHAR szMachineNameEnglish[] = {'s','z','M','a','c','h','i','n','e','N','a','m','e','E','n','g','l','i','s','h',0}; static const WCHAR szLanguagesLocalized[] = {'s','z','L','a','n','g','u','a','g','e','s','L','o','c','a','l','i','z','e','d',0}; static const WCHAR szLanguagesEnglish[] = {'s','z','L','a','n','g','u','a','g','e','s','E','n','g','l','i','s','h',0}; + static const WCHAR szTimeLocalized[] = {'s','z','T','i','m','e','L','o','c','a','l','i','z','e','d',0}; + static const WCHAR szTimeEnglish[] = {'s','z','T','i','m','e','E','n','g','l','i','s','h',0}; static const struct { @@ -814,6 +816,8 @@ static void test_DxDiag_SystemInfo(void) {szMachineNameEnglish, VT_BSTR}, {szLanguagesLocalized, VT_BSTR}, {szLanguagesEnglish, VT_BSTR}, + {szTimeLocalized, VT_BSTR}, + {szTimeEnglish, VT_BSTR}, }; HRESULT hr;

1 0

Andrew Nguyen : dxdiagn: Add a physical memory display string property to the DxDiag_SystemInfo container .
by Alexandre Julliard 04 Apr '11

04 Apr '11

Module: wine Branch: master Commit: 791aa5383917d4c8c592892a4f74856e9d756cee URL: http://source.winehq.org/git/wine.git/?a=commit;h=791aa5383917d4c8c592892a4… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Apr 3 20:55:58 2011 -0500 dxdiagn: Add a physical memory display string property to the DxDiag_SystemInfo container. --- dlls/dxdiagn/provider.c | 11 ++++++++++- dlls/dxdiagn/tests/container.c | 2 ++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 0004d0f..88e6260 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -533,14 +533,17 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) static const WCHAR dwOSBuildNumber[] = {'d','w','O','S','B','u','i','l','d','N','u','m','b','e','r',0}; static const WCHAR dwOSPlatformID[] = {'d','w','O','S','P','l','a','t','f','o','r','m','I','D',0}; static const WCHAR szCSDVersion[] = {'s','z','C','S','D','V','e','r','s','i','o','n',0}; + static const WCHAR szPhysicalMemoryEnglish[] = {'s','z','P','h','y','s','i','c','a','l','M','e','m','o','r','y','E','n','g','l','i','s','h',0}; static const WCHAR szMachineNameLocalized[] = {'s','z','M','a','c','h','i','n','e','N','a','m','e','L','o','c','a','l','i','z','e','d',0}; static const WCHAR szMachineNameEnglish[] = {'s','z','M','a','c','h','i','n','e','N','a','m','e','E','n','g','l','i','s','h',0}; + static const WCHAR physmem_fmtW[] = {'%','u','M','B',' ','R','A','M',0}; + HRESULT hr; MEMORYSTATUSEX msex; OSVERSIONINFOW info; DWORD count; - WCHAR buffer[MAX_PATH], computer_name[MAX_COMPUTERNAME_LENGTH + 1]; + WCHAR buffer[MAX_PATH], computer_name[MAX_COMPUTERNAME_LENGTH + 1], print_buf[200]; hr = add_ui4_property(node, dwDirectXVersionMajor, 9); if (FAILED(hr)) @@ -612,6 +615,12 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) if (FAILED(hr)) return hr; + /* FIXME: Roundoff should not be done with truncated division. */ + snprintfW(print_buf, sizeof(print_buf)/sizeof(WCHAR), physmem_fmtW, (DWORD)(msex.ullTotalPhys / (1024 * 1024))); + hr = add_bstr_property(node, szPhysicalMemoryEnglish, print_buf); + if (FAILED(hr)) + return hr; + GetWindowsDirectoryW(buffer, MAX_PATH); hr = add_bstr_property(node, szWindowsDir, buffer); diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c index 6c6928c..5430a44 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -788,6 +788,7 @@ static void test_DxDiag_SystemInfo(void) static const WCHAR szLanguagesEnglish[] = {'s','z','L','a','n','g','u','a','g','e','s','E','n','g','l','i','s','h',0}; static const WCHAR szTimeLocalized[] = {'s','z','T','i','m','e','L','o','c','a','l','i','z','e','d',0}; static const WCHAR szTimeEnglish[] = {'s','z','T','i','m','e','E','n','g','l','i','s','h',0}; + static const WCHAR szPhysicalMemoryEnglish[] = {'s','z','P','h','y','s','i','c','a','l','M','e','m','o','r','y','E','n','g','l','i','s','h',0}; static const struct { @@ -818,6 +819,7 @@ static void test_DxDiag_SystemInfo(void) {szLanguagesEnglish, VT_BSTR}, {szTimeLocalized, VT_BSTR}, {szTimeEnglish, VT_BSTR}, + {szPhysicalMemoryEnglish, VT_BSTR}, }; HRESULT hr;

1 0

Owen Rudge : advapi32: Add basic SaferSetLevelInformation stub.
by Alexandre Julliard 04 Apr '11

04 Apr '11

Module: wine Branch: master Commit: 65ba77bd5c16c5d8a02e7c70ccf5ed1d7918a41a URL: http://source.winehq.org/git/wine.git/?a=commit;h=65ba77bd5c16c5d8a02e7c70c… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Fri Apr 1 17:29:24 2011 +0100 advapi32: Add basic SaferSetLevelInformation stub. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 10 ++++++++++ include/winsafer.h | 20 ++++++++++++++++++++ 3 files changed, 31 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 683e7ab..9bb202d 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -550,7 +550,7 @@ @ stdcall SaferGetPolicyInformation(long long long ptr ptr ptr) # @ stub SaferIdentifyLevel # @ stub SaferRecordEventLogEntry -# @ stub SaferSetLevelInformation +@ stdcall SaferSetLevelInformation(ptr long ptr long) # @ stub SaferSetPolicyInformation # @ stub SaferiChangeRegistryScope # @ stub SaferiCompareTokenLevels diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index cd76fb5..2dcb8fa 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -5619,3 +5619,13 @@ BOOL WINAPI SaferGetPolicyInformation(DWORD scope, SAFER_POLICY_INFO_CLASS class FIXME("(%u %u %u %p %p %p) stub\n", scope, class, size, buffer, required, lpReserved); return FALSE; } + +/****************************************************************************** + * SaferSetLevelInformation [ADVAPI32.@] + */ +BOOL WINAPI SaferSetLevelInformation(SAFER_LEVEL_HANDLE handle, SAFER_OBJECT_INFO_CLASS infotype, + LPVOID buffer, DWORD size) +{ + FIXME("(%p %u %p %u) stub\n", handle, infotype, buffer, size); + return FALSE; +} diff --git a/include/winsafer.h b/include/winsafer.h index 837a551..4855f53 100644 --- a/include/winsafer.h +++ b/include/winsafer.h @@ -51,7 +51,27 @@ typedef enum _SAFER_POLICY_INFO_CLASS { SaferPolicyScopeFlags } SAFER_POLICY_INFO_CLASS; +typedef enum _SAFER_OBJECT_INFO_CLASS { + SaferObjectLevelId = 1, + SaferObjectScopeId, + SaferObjectFriendlyName, + SaferObjectDescription, + SaferObjectBuiltin, + SaferObjectDisallowed, + SaferObjectDisableMaxPrivilege, + SaferObjectInvertDeletedPrivileges, + SaferObjectDeletedPrivileges, + SaferObjectDefaultOwner, + SaferObjectSidsToDisable, + SaferObjectRestrictedSidsInverted, + SaferObjectRestrictedSidsAdded, + SaferObjectAllIdentificationGuids, + SaferObjectSingleIdentification, + SaferObjectExtendedError +} SAFER_OBJECT_INFO_CLASS; + WINADVAPI BOOL WINAPI SaferGetPolicyInformation(DWORD,SAFER_POLICY_INFO_CLASS,DWORD,PVOID,PDWORD,LPVOID); +WINADVAPI BOOL WINAPI SaferSetLevelInformation(SAFER_LEVEL_HANDLE,SAFER_OBJECT_INFO_CLASS,LPVOID,DWORD); #ifdef __cplusplus }

1 0