March 2012 - Wine-commits - list.winehq.org

Hans Leidekker : sxs: Implement IAssemblyCache::QueryAssemblyInfo.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: f2ce0cdabfbdb1136fbc6b7a81e0791d78add4d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2ce0cdabfbdb1136fbc6b7a8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 30 10:21:11 2012 +0200 sxs: Implement IAssemblyCache::QueryAssemblyInfo. --- dlls/sxs/cache.c | 211 ++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 141 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f2ce0cdabfbdb1136fbc6…

1 0

Hans Leidekker : sxs: Add tests for IAssemblyCache::QueryAssemblyInfo.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: 0a648d76f1a089b6c985e0c7b830ca3daa76f348 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a648d76f1a089b6c985e0c7b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 30 10:21:26 2012 +0200 sxs: Add tests for IAssemblyCache::QueryAssemblyInfo. --- dlls/sxs/tests/Makefile.in | 1 + dlls/sxs/tests/cache.c | 211 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 212 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0a648d76f1a089b6c985e…

1 0

Hans Leidekker : fusion/tests: Add another test for IAssemblyCache:: QueryAssemblyInfo.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: aa53a8f005645234a5bfa9d7a287a3480ddb62e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa53a8f005645234a5bfa9d7a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 30 10:21:42 2012 +0200 fusion/tests: Add another test for IAssemblyCache::QueryAssemblyInfo. --- dlls/fusion/tests/asmcache.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index 46c1db9..3910488 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -1485,6 +1485,21 @@ static void test_QueryAssemblyInfo(void) ok(info.cchBuf == lstrlenW(asmpath) + 1, "Expected %d, got %d\n", lstrlenW(asmpath) + 1, info.cchBuf); + /* no flags, display name is "wine, Version=1.0.0.0" */ + INIT_ASM_INFO(); + info.pszCurrentAssemblyPathBuf = NULL; + info.cchBuf = 0; + lstrcpyW(name, wine); + lstrcatW(name, commasep); + lstrcatW(name, ver); + hr = IAssemblyCache_QueryAssemblyInfo(cache, 0, name, &info); + ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), + "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); + ok(info.cbAssemblyInfo == sizeof(ASSEMBLY_INFO), + "Expected sizeof(ASSEMBLY_INFO), got %d\n", info.cbAssemblyInfo); + ok(info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED, + "Expected ASSEMBLYINFO_FLAG_INSTALLED, got %08x\n", info.dwAssemblyFlags); + /* uninstall the assembly from the GAC */ disp = 0xf00dbad; hr = IAssemblyCache_UninstallAssembly(cache, 0, wine, NULL, &disp);

1 0

Hans Leidekker : msi: Detect installed side-by-side assemblies.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: 8ea52669155a396d52bc0f2cfd33d850b988d428 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ea52669155a396d52bc0f2cf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 30 10:22:05 2012 +0200 msi: Detect installed side-by-side assemblies. --- dlls/msi/assembly.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index 6ce020e..af23c4a 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -262,13 +262,13 @@ static BOOL is_assembly_installed( IAssemblyCache *cache, const WCHAR *display_n memset( &info, 0, sizeof(info) ); info.cbAssemblyInfo = sizeof(info); - hr = IAssemblyCache_QueryAssemblyInfo( cache, QUERYASMINFO_FLAG_GETSIZE, display_name, &info ); - if (hr != HRESULT_FROM_WIN32( ERROR_INSUFFICIENT_BUFFER )) + hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, display_name, &info ); + if (hr == S_OK /* sxs version */ || hr == HRESULT_FROM_WIN32( ERROR_INSUFFICIENT_BUFFER )) { - TRACE("QueryAssemblyInfo returned 0x%08x\n", hr); - return FALSE; + return (info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED); } - return (info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED); + TRACE("QueryAssemblyInfo returned 0x%08x\n", hr); + return FALSE; } static const WCHAR clr_version_v10[] = {'v','1','.','0','.','3','7','0','5',0};

1 0

Morten Rønne : wineconsole: Fixed a wrong word in message.
by Alexandre Julliard 29 Mar '12

29 Mar '12

1 0

Francois Gouget : cryptui: Use a single space after a full stop to follow the Windows GUI guidelines.
by Alexandre Julliard 29 Mar '12

29 Mar '12

1 0

Dmitry Timoshkov : advapi32: Add tests for kernel objects accessed with 0 and ACCESS_SYSTEM_SECURITY.
by Alexandre Julliard 29 Mar '12

29 Mar '12

Module: wine Branch: master Commit: 9c29e4210322afbeb4cc948083bb0078344e7191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c29e4210322afbeb4cc94808… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 16 18:31:11 2012 +0800 advapi32: Add tests for kernel objects accessed with 0 and ACCESS_SYSTEM_SECURITY. --- dlls/advapi32/tests/security.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 7c5303d..0b653ff 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4060,6 +4060,26 @@ todo_wine { ok(status == 1, "expected 1, got %d\n", status); ok(granted == mapping->GenericAll, "expected %#x, got %#x\n", mapping->GenericAll, granted); } + priv_set_len = sizeof(priv_set); + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = AccessCheck(sd, token, 0, mapping, &priv_set, &priv_set_len, &granted, &status); +todo_wine { + ok(ret, "AccessCheck error %d\n", GetLastError()); + ok(status == 0 || broken(status == 1) /* NT4 */, "expected 0, got %d\n", status); + ok(granted == 0 || broken(granted == mapping->GenericRead) /* NT4 */, "expected 0, got %#x\n", granted); +} + priv_set_len = sizeof(priv_set); + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = AccessCheck(sd, token, ACCESS_SYSTEM_SECURITY, mapping, &priv_set, &priv_set_len, &granted, &status); +todo_wine { + ok(ret, "AccessCheck error %d\n", GetLastError()); + ok(status == 0, "expected 0, got %d\n", status); + ok(granted == 0, "expected 0, got %#x\n", granted); +} HeapFree(GetProcessHeap(), 0, sd); }

1 0

Dmitry Timoshkov : advapi32: Add event security access tests.
by Alexandre Julliard 29 Mar '12

29 Mar '12

Module: wine Branch: master Commit: d574e7948e87d11de591b8d25012365622da02a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d574e7948e87d11de591b8d25… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 16 18:31:43 2012 +0800 advapi32: Add event security access tests. --- dlls/advapi32/tests/security.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 0b653ff..9db84a4 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4104,6 +4104,27 @@ static void test_mutex_security(HANDLE token) CloseHandle (mutex); } +static void test_event_security(HANDLE token) +{ + HANDLE event; + GENERIC_MAPPING mapping = { STANDARD_RIGHTS_READ, STANDARD_RIGHTS_WRITE, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, + STANDARD_RIGHTS_ALL | EVENT_ALL_ACCESS }; + + SetLastError(0xdeadbeef); + event = OpenEvent(0, FALSE, "WineTestEvent"); + ok(!event, "event should not exist\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + event = CreateEvent(NULL, FALSE, FALSE, "WineTestEvent"); + ok(event != 0, "CreateEvent error %d\n", GetLastError()); + + test_default_handle_security(token, event, &mapping); + + CloseHandle(event); +} + static BOOL validate_impersonation_token(HANDLE token, DWORD *token_type) { DWORD ret, needed; @@ -4175,6 +4196,7 @@ static void test_kernel_objects_security(void) ok(token_type == TokenImpersonation, "expected TokenImpersonation, got %d\n", token_type); test_mutex_security(token); + test_event_security(token); /* FIXME: test other kernel object types */ CloseHandle(process_token);

1 0

Józef Kucia : wpp: Fix a few memory leaks in the wpp_parse() function.
by Alexandre Julliard 29 Mar '12

29 Mar '12

Module: wine Branch: master Commit: 2c8a3c31b732b048a05fcb3e9756b76f9a57e973 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c8a3c31b732b048a05fcb3e9… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sun Mar 25 15:53:31 2012 +0200 wpp: Fix a few memory leaks in the wpp_parse() function. --- libs/wpp/wpp.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/libs/wpp/wpp.c b/libs/wpp/wpp.c index 0c9c808..66eb026 100644 --- a/libs/wpp/wpp.c +++ b/libs/wpp/wpp.c @@ -49,6 +49,16 @@ static void add_cmdline_defines(void) } } +static void del_cmdline_defines(void) +{ + struct define *def; + + for (def = cmdline_defines; def; def = def->next) + { + if (def->value) pp_del_define( def->name ); + } +} + static void add_special_defines(void) { time_t now = time(NULL); @@ -70,6 +80,14 @@ static void add_special_defines(void) ppp->type = def_special; } +static void del_special_defines(void) +{ + pp_del_define( "__DATE__" ); + pp_del_define( "__TIME__" ); + pp_del_define( "__FILE__" ); + pp_del_define( "__LINE__" ); +} + /* add a define to the preprocessor list */ int wpp_add_define( const char *name, const char *value ) @@ -182,6 +200,8 @@ int wpp_parse( const char *input, FILE *output ) else if (!(pp_status.file = wpp_callbacks->open(input, 1))) { ppy_error("Could not open %s\n", input); + del_special_defines(); + del_cmdline_defines(); pp_pop_define_state(); return 2; } @@ -198,6 +218,8 @@ int wpp_parse( const char *input, FILE *output ) if (input) wpp_callbacks->close(pp_status.file); /* Clean if_stack, it could remain dirty on errors */ while (pp_get_if_depth()) pp_pop_if(); + del_special_defines(); + del_cmdline_defines(); pp_pop_define_state(); return ret; }

1 0

Christian Costa : qcap: Enable registration of all non yet implemented filters.
by Alexandre Julliard 29 Mar '12

29 Mar '12

Module: wine Branch: master Commit: e3c781376e501f6cb99af6dc6171b1da65e70010 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3c781376e501f6cb99af6dc6… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 26 22:04:15 2012 +0200 qcap: Enable registration of all non yet implemented filters. --- dlls/qcap/qcap_main.c | 55 ++++++++++++++++++++++++------------------------- 1 files changed, 27 insertions(+), 28 deletions(-) diff --git a/dlls/qcap/qcap_main.c b/dlls/qcap/qcap_main.c index d89aafe..6f175cf 100644 --- a/dlls/qcap/qcap_main.c +++ b/dlls/qcap/qcap_main.c @@ -45,7 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap); static LONG objects_ref = 0; -static const WCHAR wAudioCaptFilter[] = +static const WCHAR wAudioCaptureFilter[] = {'A','u','d','i','o',' ','C','a','p','t','u','r','e',' ','F','i','l','t','e','r',0}; static const WCHAR wAVICompressor[] = {'A','V','I',' ','C','o','m','p','r','e','s','s','o','r',0}; @@ -76,48 +76,47 @@ static const WCHAR wAudioInMixerProp[] = 'p','e','r','t','y',' ','P','a','g','e',0}; FactoryTemplate const g_Templates[] = { -/* { - wAudioCaptureFilter, - &CLSID_AudioCaptureFilter, - QCAP_createAudioCaptureFilter, + wAudioCaptureFilter, + &CLSID_AudioRecord, + NULL, /* FIXME: Implement QCAP_createAudioCaptureFilter */ NULL },{ - wAVICompressor, - &CLSID_AVICompressor, - QCAP_createAVICompressor, + wAVICompressor, + &CLSID_AVICo, + NULL, /* FIXME: Implement QCAP_createAVICompressor */ NULL - },*/{ + },{ wVFWCaptFilter, &CLSID_VfwCapture, QCAP_createVFWCaptureFilter, NULL - },/*{ + },{ wVFWCaptFilterProp, - &CLSID_VFWCaptureFilterPropertyPage, - QCAP_createVFWCaptureFilterPropertyPage, + &CLSID_CaptureProperties, + NULL, /* FIXME: Implement QCAP_createVFWCaptureFilterPropertyPage */ NULL },{ wAVIMux, - &CLSID_AVImux, - QCAP_createAVImux, + &CLSID_AviDest, + NULL, /* FIXME: Implement QCAP_createAVImux */ NULL },{ wAVIMuxPropPage, - &CLSID_AVImuxPropertyPage, - QCAP_createAVImuxPropertyPage, + &CLSID_AviMuxProptyPage, + NULL, /* FIXME: Implement QCAP_createAVImuxPropertyPage */ NULL },{ wAVIMuxPropPage1, - &CLSID_AVImuxPropertyPage1, - QCAP_createAVImuxPropertyPage1, + &CLSID_AviMuxProptyPage1, + NULL, /* FIXME: Implement QCAP_createAVImuxPropertyPage1 */ NULL },{ wFileWriter, &CLSID_FileWriter, - QCAP_createFileWriter, + NULL, /* FIXME: Implement QCAP_createFileWriter */ NULL - },*/{ + },{ wCaptGraphBuilder, &CLSID_CaptureGraphBuilder, QCAP_createCaptureGraphBuilder2, @@ -127,22 +126,22 @@ FactoryTemplate const g_Templates[] = { &CLSID_CaptureGraphBuilder2, QCAP_createCaptureGraphBuilder2, NULL - }/*,{ + },{ wInfPinTeeFilter, - &CLSID_InfinitePinTeeFilter, - QCAP_createInfinitePinTeeFilter, + &CLSID_InfTee, + NULL, /* FIXME: Implement QCAP_createInfinitePinTeeFilter */ NULL },{ wSmartTeeFilter, - &CLSID_SmartTeeFilter, - QCAP_createSmartTeeFilter, + &CLSID_SmartTee, + NULL, /* FIXME: Implement QCAP_createSmartTeeFilter */ NULL },{ wAudioInMixerProp, - &CLSID_AudioInputMixerPropertyPage, - QCAP_createAudioInputMixerPropertyPage, + &CLSID_AudioInputMixerProperties, + NULL, /* FIXME: Implement QCAP_createAudioInputMixerPropertyPage */ NULL - }*/ + } }; int g_cTemplates = sizeof(g_Templates) / sizeof(g_Templates[0]);

1 0