June 2012 - Wine-Commits - list.winehq.org

Stefan Leichter : psapi/tests: Added tests for EnumProcessModules with last parameter NULL.
by Alexandre Julliard June 22, 2012

June 22, 2012

Module: wine Branch: master Commit: 0773ed8d271261db28d31afd780a7ff944ef320f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0773ed8d271261db28d31afd7… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu Jun 21 23:11:22 2012 +0200 psapi/tests: Added tests for EnumProcessModules with last parameter NULL. --- dlls/psapi/tests/psapi_main.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 8db695e..312d544 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -117,6 +117,16 @@ static void test_EnumProcessModules(void) ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError(0xdeadbeef); + ret = pEnumProcessModules(hpQI, &hMod, sizeof(HMODULE), NULL); + ok(!ret, "succeeded\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pEnumProcessModules(hpQV, &hMod, sizeof(HMODULE), NULL); + ok(!ret, "succeeded\n"); + ok(GetLastError() == ERROR_NOACCESS, "expected error=ERROR_NOACCESS but got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); ret = pEnumProcessModules(hpQV, NULL, 0, &cbNeeded); ok(ret == 1, "failed with %d\n", GetLastError());

1 0

Thomas Faber : wintrust/tests: Fix build with MSVC.
by Alexandre Julliard June 22, 2012

June 22, 2012

Module: wine Branch: master Commit: e68d5b93ffa6b6948f71d5f0a8ece67c7c0ab42e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e68d5b93ffa6b6948f71d5f0a… Author: Thomas Faber <thfabba(a)gmx.de> Date: Fri Jun 22 10:28:16 2012 +0200 wintrust/tests: Fix build with MSVC. --- dlls/wintrust/tests/softpub.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 0987f9c..3c23464 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -568,7 +568,7 @@ struct Imports { } ibn; char dllname[0x10]; }; -#define EXIT_PROCESS (VA_START+RVA_IDATA+FIELD_OFFSET(struct Imports, thunks[0])) +#define EXIT_PROCESS (VA_START+RVA_IDATA+FIELD_OFFSET(struct Imports, thunks)) static struct _PeImage { IMAGE_DOS_HEADER dos_header; @@ -582,9 +582,9 @@ static struct _PeImage { char __alignment3[FILE_TOTAL-FILE_IDATA-sizeof(struct Imports)]; } bin = { /* dos header */ - {IMAGE_DOS_SIGNATURE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, 0, 0, {}, FILE_PE_START}, + {IMAGE_DOS_SIGNATURE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0}, 0, 0, {0}, FILE_PE_START}, /* alignment before PE header */ - {}, + {0}, /* nt headers */ {IMAGE_NT_SIGNATURE, /* basic headers - 3 sections, no symbols, EXE file */ @@ -611,7 +611,7 @@ static struct _PeImage { 0, 0, 0, IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE} }, /* alignment before first section */ - {}, + {0}, /* .text section */ { 0x31, 0xC0, /* xor eax, eax */ @@ -634,7 +634,7 @@ static struct _PeImage { "KERNEL32.DLL" }, /* final alignment */ - {} + {0} }; #include <poppack.h>

1 0

Piotr Caban : msvcp90: Added basic_ostream::operator<<(base type) implementation.
by Alexandre Julliard June 22, 2012

June 22, 2012

Module: wine Branch: master Commit: 8e2efc19390423299a22ad730410f51f7c5539db URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e2efc19390423299a22ad730… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 22 10:28:05 2012 +0200 msvcp90: Added basic_ostream::operator<<(base type) implementation. --- dlls/msvcp90/ios.c | 223 +++++++++++++++++++++++++++++++++++++------- dlls/msvcp90/locale.c | 26 +++++ dlls/msvcp90/msvcp90.h | 18 ++++ dlls/msvcp90/msvcp90.spec | 12 +- 4 files changed, 237 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8e2efc19390423299a22a…

1 0

Hans Leidekker : wbemprox: Handle more property types in get_propval.
by Alexandre Julliard June 22, 2012

June 22, 2012

Module: wine Branch: master Commit: a827a51cc0de2bb1ea0cba54d090ae3e7fd61041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a827a51cc0de2bb1ea0cba54d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 22 09:23:20 2012 +0200 wbemprox: Handle more property types in get_propval. --- dlls/wbemprox/query.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 7a2b545..181549f 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -653,6 +653,22 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR V_VT( ret ) = VT_BSTR; V_BSTR( ret ) = SysAllocString( (const WCHAR *)val ); break; + case CIM_SINT16: + V_VT( ret ) = VT_I2; + V_I2( ret ) = val; + break; + case CIM_UINT16: + V_VT( ret ) = VT_UI2; + V_UI2( ret ) = val; + break; + case CIM_SINT32: + V_VT( ret ) = VT_I4; + V_I4( ret ) = val; + break; + case CIM_UINT32: + V_VT( ret ) = VT_UI4; + V_UI4( ret ) = val; + break; default: ERR("unhandled column type %u\n", view->table->columns[column].type); return WBEM_E_FAILED;

1 0

Piotr Caban : msvcp90: Fixed fraction digits ignoring in num_get_char__Getffld.
by Alexandre Julliard June 22, 2012

June 22, 2012

Module: wine Branch: master Commit: ca90f4723a03e5812942addf3ec4cd168afa3dc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca90f4723a03e5812942addf3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 22 10:26:06 2012 +0200 msvcp90: Fixed fraction digits ignoring in num_get_char__Getffld. --- dlls/msvcp90/locale.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 728ce3b..8a2fb93 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -4686,8 +4686,6 @@ int __cdecl num_get_char__Getffld(const num_get *this, char *dest, istreambuf_it break; else if(dest<num_end) *dest++ = first->val; - else - exp--; } if(first->strbuf && (first->val=='e' || first->val=='E')) {

1 0

Detlef Riekenberg : shell32/tests: Ignore case when comparing filenames.
by Alexandre Julliard June 22, 2012

June 22, 2012

Module: wine Branch: master Commit: a8643ccc85345267f9e3731bdc48ac18bdd69f41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8643ccc85345267f9e3731bd… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jun 22 05:07:32 2012 +0200 shell32/tests: Ignore case when comparing filenames. --- dlls/shell32/tests/shelldispatch.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 307e0fc..9d8d70b 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -140,7 +140,7 @@ static void test_namespace(void) p = path + lstrlenW(path); while (path < p && *(p - 1) != '\\') p--; - ok(!lstrcmpW(title, p), "expected %s, got %s\n", + ok(!lstrcmpiW(title, p), "expected %s, got %s\n", wine_dbgstr_w(p), wine_dbgstr_w(title)); } else skip("skipping Folder::get_Title test\n"); @@ -157,7 +157,7 @@ static void test_namespace(void) r = FolderItem_get_Path(item, &item_path); ok(r == S_OK, "FolderItem::get_Path failed: %08x\n", r); if (pSHGetFolderPathW) - ok(!lstrcmpW(item_path, path), "expected %s, got %s\n", + ok(!lstrcmpiW(item_path, path), "expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(item_path)); SysFreeString(item_path); FolderItem_Release(item);

1 0

Piotr Caban : msvcp90: Added num_put<char>::put(bool) implementation.
by Alexandre Julliard June 22, 2012

June 22, 2012

Module: wine Branch: master Commit: 8003b0ab3da1422ba3367428404eb8b16e52a90d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8003b0ab3da1422ba33674284… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 22 10:27:16 2012 +0200 msvcp90: Added num_put<char>::put(bool) implementation. --- dlls/msvcp90/locale.c | 28 ++++++++++++++++++++++++++-- 1 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index eabdef8..2e48c79 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -5744,8 +5744,32 @@ DEFINE_THISCALL_WRAPPER(num_put_char_do_put_bool, 28) ostreambuf_iterator_char* __thiscall num_put_char_do_put_bool(const num_put *this, ostreambuf_iterator_char *ret, ostreambuf_iterator_char dest, ios_base *base, char fill, MSVCP_bool v) { - FIXME("(%p %p %p %d %d) stub\n", this, ret, base, fill, v); - return NULL; + TRACE("(%p %p %p %d %d)\n", this, ret, base, fill, v); + + if(base->fmtfl & FMTFLAG_boolalpha) { + numpunct_char *numpunct = numpunct_char_use_facet(base->loc); + basic_string_char str; + MSVCP_size_t pad, len; + + if(v) + numpunct_char_truename(numpunct, &str); + else + numpunct_char_falsename(numpunct, &str); + + len = MSVCP_basic_string_char_length(&str); + pad = (len>base->wide ? 0 : base->wide-len); + base->wide = 0; + + if((base->fmtfl & FMTFLAG_adjustfield) != FMTFLAG_left) { + num_put_char__Rep(this, &dest, dest, fill, pad); + pad = 0; + } + num_put_char__Putc(this, &dest, dest, MSVCP_basic_string_char_c_str(&str), len); + MSVCP_basic_string_char_dtor(&str); + return num_put_char__Rep(this, ret, dest, fill, pad); + } + + return num_put_char_put_long(this, ret, dest, base, fill, v); } /* ?put@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBE?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@D_N(a)Z */

1 0

Piotr Caban : msvcp90: Added partial num_put<char> implementation.
by Alexandre Julliard June 22, 2012

June 22, 2012

Module: wine Branch: master Commit: a359df5fa286047fc79335c2c6ebdbdaf093511b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a359df5fa286047fc79335c2c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 22 10:26:48 2012 +0200 msvcp90: Added partial num_put<char> implementation. --- dlls/msvcp90/locale.c | 137 ++++++++++++++++++++++++++++++++++++----------- dlls/msvcp90/msvcp90.h | 1 + 2 files changed, 106 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a359df5fa286047fc7933…

1 0

Piotr Caban : msvcp90: Added num_put<char> class stub.
by Alexandre Julliard June 22, 2012

June 22, 2012

Module: wine Branch: master Commit: 83ef253b8ddf4fc82dc6880f3dbfd9ab9e566528 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83ef253b8ddf4fc82dc6880f3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 22 10:26:32 2012 +0200 msvcp90: Added num_put<char> class stub. --- dlls/msvcp90/locale.c | 311 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 11 ++ dlls/msvcp90/msvcp90.spec | 126 +++++++++--------- 3 files changed, 385 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=83ef253b8ddf4fc82dc68…

1 0

Hans Leidekker : wbemprox: Add a partial Win32_VideoController class implementation.
by Alexandre Julliard June 22, 2012

June 22, 2012

Module: wine Branch: master Commit: 47261d63cae77fc87b040dd2802f30377f9633e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47261d63cae77fc87b040dd28… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 22 09:23:36 2012 +0200 wbemprox: Add a partial Win32_VideoController class implementation. --- dlls/wbemprox/Makefile.in | 2 +- dlls/wbemprox/builtin.c | 56 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index f973c2f..56e3d8f 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -1,5 +1,5 @@ MODULE = wbemprox.dll -IMPORTS = oleaut32 ole32 advapi32 +IMPORTS = dxgi oleaut32 ole32 advapi32 C_SRCS = \ builtin.c \ diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 0c88ad5..af913d4 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -27,6 +27,8 @@ #include "winbase.h" #include "wbemcli.h" #include "tlhelp32.h" +#include "initguid.h" +#include "d3d10.h" #include "wine/debug.h" #include "wbemprox_private.h" @@ -43,13 +45,19 @@ static const WCHAR class_processW[] = {'W','i','n','3','2','_','P','r','o','c','e','s','s',0}; static const WCHAR class_processorW[] = {'W','i','n','3','2','_','P','r','o','c','e','s','s','o','r',0}; +static const WCHAR class_videocontrollerW[] = + {'W','i','n','3','2','_','V','i','d','e','o','C','o','n','t','r','o','l','l','e','r',0}; +static const WCHAR prop_adapterramW[] = + {'A','d','a','p','t','e','r','R','A','M',0}; static const WCHAR prop_captionW[] = {'C','a','p','t','i','o','n',0}; static const WCHAR prop_commandlineW[] = {'C','o','m','m','a','n','d','L','i','n','e',0}; static const WCHAR prop_descriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; +static const WCHAR prop_deviceidW[] = + {'D','e','v','i','c','e','I','d',0}; static const WCHAR prop_handleW[] = {'H','a','n','d','l','e',0}; static const WCHAR prop_manufacturerW[] = @@ -101,6 +109,11 @@ static const struct column col_processor[] = { { prop_manufacturerW, CIM_STRING } }; +static const struct column col_videocontroller[] = +{ + { prop_adapterramW, CIM_UINT32 }, + { prop_deviceidW, CIM_STRING|COL_FLAG_KEY } +}; static const WCHAR bios_descriptionW[] = {'D','e','f','a','u','l','t',' ','S','y','s','t','e','m',' ','B','I','O','S',0}; @@ -124,6 +137,8 @@ static const WCHAR os_64bitW[] = {'6','4','-','b','i','t',0}; static const WCHAR processor_manufacturerW[] = {'G','e','n','u','i','n','e','I','n','t','e','l',0}; +static const WCHAR videocontroller_deviceidW[] = + {'V','i','d','e','o','C','o','n','t','r','o','l','l','e','r','1',0}; #include "pshpack1.h" struct record_bios @@ -158,6 +173,11 @@ struct record_processor { const WCHAR *manufacturer; }; +struct record_videocontroller +{ + UINT32 adapter_ram; + const WCHAR *device_id; +}; #include "poppack.h" static const struct record_bios data_bios[] = @@ -244,13 +264,47 @@ static void fill_os( struct table *table ) table->num_rows = 1; } +static void fill_videocontroller( struct table *table ) +{ + + struct record_videocontroller *rec; + HRESULT hr; + IDXGIFactory *factory = NULL; + IDXGIAdapter *adapter = NULL; + DXGI_ADAPTER_DESC desc; + UINT vidmem = 512 * 1024 * 1024; + + if (!(table->data = heap_alloc( sizeof(*rec) ))) return; + + hr = CreateDXGIFactory( &IID_IDXGIFactory, (void **)&factory ); + if (FAILED(hr)) goto done; + + hr = IDXGIFactory_EnumAdapters( factory, 0, &adapter ); + if (FAILED(hr)) goto done; + + hr = IDXGIAdapter_GetDesc( adapter, &desc ); + if (SUCCEEDED(hr)) vidmem = desc.DedicatedVideoMemory; + +done: + rec = (struct record_videocontroller *)table->data; + rec->device_id = videocontroller_deviceidW; + rec->adapter_ram = vidmem; + + TRACE("created 1 row\n"); + table->num_rows = 1; + + if (adapter) IDXGIAdapter_Release( adapter ); + if (factory) IDXGIFactory_Release( factory ); +} + static struct table classtable[] = { { class_biosW, SIZEOF(col_bios), col_bios, SIZEOF(data_bios), (BYTE *)data_bios, NULL }, { class_compsysW, SIZEOF(col_compsys), col_compsys, SIZEOF(data_compsys), (BYTE *)data_compsys, NULL }, { class_osW, SIZEOF(col_os), col_os, 0, NULL, fill_os }, { class_processW, SIZEOF(col_process), col_process, 0, NULL, fill_process }, - { class_processorW, SIZEOF(col_processor), col_processor, SIZEOF(data_processor), (BYTE *)data_processor, NULL } + { class_processorW, SIZEOF(col_processor), col_processor, SIZEOF(data_processor), (BYTE *)data_processor, NULL }, + { class_videocontrollerW, SIZEOF(col_videocontroller), col_videocontroller, 0, NULL, fill_videocontroller } }; struct table *get_table( const WCHAR *name )

1 0