wine-commits July 2012

wine-commits@winehq.org

2 participants
712 discussions

Alexandre Goujon : include/ddk: Add DVD_DESCRIPTOR_HEADER descriptor structure.
by Alexandre Julliard 12 Jul '12

12 Jul '12

Module: wine Branch: master Commit: 9536e66d61ac3ac9185b6da518fe9cd26ea6539f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9536e66d61ac3ac9185b6da51… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Wed Jul 11 22:26:49 2012 +0200 include/ddk: Add DVD_DESCRIPTOR_HEADER descriptor structure. --- include/ddk/ntddcdvd.h | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/include/ddk/ntddcdvd.h b/include/ddk/ntddcdvd.h index 5313496..f6ce77b 100644 --- a/include/ddk/ntddcdvd.h +++ b/include/ddk/ntddcdvd.h @@ -113,7 +113,13 @@ typedef struct DVD_READ_STRUCTURE { /* From 0 to 4 */ UCHAR LayerNumber; -}DVD_READ_STRUCTURE, * PDVD_READ_STRUCTURE; +} DVD_READ_STRUCTURE, *PDVD_READ_STRUCTURE; + +typedef struct _DVD_DESCRIPTOR_HEADER { + USHORT Length; + UCHAR Reserved[2]; +} DVD_DESCRIPTOR_HEADER, *PDVD_DESCRIPTOR_HEADER; +C_ASSERT(sizeof(DVD_DESCRIPTOR_HEADER) == 4); typedef struct _DVD_LAYER_DESCRIPTOR { @@ -154,6 +160,7 @@ typedef struct _DVD_LAYER_DESCRIPTOR /* 0 indicates no BCA data */ UCHAR BCAFlag : 1; }DVD_LAYER_DESCRIPTOR, * PDVD_LAYER_DESCRIPTOR; +C_ASSERT(sizeof(DVD_LAYER_DESCRIPTOR) == 17); typedef struct _DVD_COPYRIGHT_DESCRIPTOR {

1 0

Erich Hoover : shell32: Fix FindExecutable search path when a default directory is supplied.
by Alexandre Julliard 12 Jul '12

12 Jul '12

Module: wine Branch: master Commit: 6a1d2f80b87de75cd4ed2d1280ab8e885b691857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a1d2f80b87de75cd4ed2d128… Author: Erich Hoover <ehoover(a)mines.edu> Date: Tue Jul 10 11:59:24 2012 -0600 shell32: Fix FindExecutable search path when a default directory is supplied. --- dlls/shell32/shlexec.c | 8 +++++++- dlls/shell32/tests/shlexec.c | 16 ++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 77212f0..e351d86 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -603,7 +603,13 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpOpera { TRACE("SearchPathW returned non-zero\n"); lpFile = xlpFile; - /* Hey, isn't this value ignored? Why make this call? Shouldn't we return here? --dank*/ + /* The file was found in the application-supplied default directory (or the system search path) */ + } + else if (lpPath && SearchPathW(NULL, lpFile, wszExe, sizeof(xlpFile)/sizeof(WCHAR), xlpFile, NULL)) + { + TRACE("SearchPathW returned non-zero\n"); + lpFile = xlpFile; + /* The file was found in one of the directories in the system-wide search path */ } attribs = GetFileAttributesW(lpFile); diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 1c5fe7f..8e200aa 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1307,6 +1307,7 @@ static void test_filename(void) static void test_find_executable(void) { + char notepad_path[MAX_PATH]; char filename[MAX_PATH]; char command[MAX_PATH]; const filename_tests_t* test; @@ -1329,6 +1330,21 @@ static void test_find_executable(void) ok(strcmp(command, "your word") != 0, "FindExecutable(NULL) returned command=[%s]\n", command); } + GetSystemDirectoryA( notepad_path, MAX_PATH ); + strcat( notepad_path, "\\notepad.exe" ); + + /* Search for something that should be in the system-wide search path (no default directory) */ + strcpy(command, "your word"); + rc=(INT_PTR)FindExecutableA("notepad.exe", NULL, command); + ok(rc > 32, "FindExecutable(%s) returned %ld\n", "notepad.exe", rc); + ok(strcasecmp(command, notepad_path) == 0, "FindExecutable(%s) returned command=[%s]\n", "notepad.exe", command); + + /* Search for something that should be in the system-wide search path (with default directory) */ + strcpy(command, "your word"); + rc=(INT_PTR)FindExecutableA("notepad.exe", tmpdir, command); + ok(rc > 32, "FindExecutable(%s) returned %ld\n", "notepad.exe", rc); + ok(strcasecmp(command, notepad_path) == 0, "FindExecutable(%s) returned command=[%s]\n", "notepad.exe", command); + strcpy(command, "your word"); rc=(INT_PTR)FindExecutableA(tmpdir, NULL, command); ok(rc == SE_ERR_NOASSOC /* >= win2000 */ || rc > 32 /* win98, nt4 */, "FindExecutable(NULL) returned %ld\n", rc);

1 0

Detlef Riekenberg : advapi32/tests: Add tests for CredIsMarshaledCredential .
by Alexandre Julliard 12 Jul '12

12 Jul '12

Module: wine Branch: master Commit: d685894a45d98d2f507b02e8a42124aa48d86eb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d685894a45d98d2f507b02e8a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Jul 7 00:36:28 2012 +0200 advapi32/tests: Add tests for CredIsMarshaledCredential. --- dlls/advapi32/tests/cred.c | 64 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 64 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index 3aaae4c..5762f1b 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -37,6 +37,7 @@ static BOOL (WINAPI *pCredWriteA)(PCREDENTIALA,DWORD); static BOOL (WINAPI *pCredReadDomainCredentialsA)(PCREDENTIAL_TARGET_INFORMATIONA,DWORD,DWORD*,PCREDENTIALA**); static BOOL (WINAPI *pCredMarshalCredentialA)(CRED_MARSHAL_TYPE,PVOID,LPSTR *); static BOOL (WINAPI *pCredUnmarshalCredentialA)(LPCSTR,PCRED_MARSHAL_TYPE,PVOID); +static BOOL (WINAPI *pCredIsMarshaledCredentialA)(LPCSTR); #define TEST_TARGET_NAME "credtest.winehq.org" #define TEST_TARGET_NAME2 "credtest2.winehq.org" @@ -630,6 +631,67 @@ static void test_CredUnmarshalCredentialA(void) pCredFree( username ); } +static void test_CredIsMarshaledCredentialA(void) +{ + int i; + BOOL res; + BOOL expected = TRUE; + + const char * ptr[] = { + /* CertCredential */ + "@@BXlmblBAAAAAAAAAAAAAAAAAAAAA", /* hash for 'W','i','n','e' */ + "@@BAAAAAAAAAAAAAAAAAAAAAAAAAAA", /* hash for all 0 */ + + /* UsernameTargetCredential */ + "@@CCAAAAA0BA", /* "t" */ + "@@CIAAAAA0BQZAMHA0BA", /* "test" */ + + /* todo: BinaryBlobCredential */ + + /* not marshaled names return always FALSE */ + "winetest", + "", + "@@", + "@@A", + "@@AA", + "@@AAA", + "@@B", + "@@BB", + "@@BBB", + + /* CertCredential */ + "@@BAAAAAAAAAAAAAAAAAAAAAAAAAAAA", /* to long */ + "@@BAAAAAAAAAAAAAAAAAAAAAAAAAA", /* to short */ + "@@BAAAAAAAAAAAAAAAAAAAAAAAAAA+", /* bad char */ + "@@BAAAAAAAAAAAAAAAAAAAAAAAAAA:", + "@@BAAAAAAAAAAAAAAAAAAAAAAAAAA>", + "@@BAAAAAAAAAAAAAAAAAAAAAAAAAA<", + + "@@C", + "@@CC", + "@@CCC", + "@@D", + "@@DD", + "@@DDD", + NULL}; + + for (i = 0; ptr[i]; i++) + { + if (*ptr[i] != '@') + expected = FALSE; + + SetLastError(0xdeadbeef); + res = pCredIsMarshaledCredentialA(ptr[i]); + if (expected) + ok(res != FALSE, "%d: got %d and %u for %s (expected TRUE)\n", i, res, GetLastError(), ptr[i]); + else + { + /* Windows returns ERROR_INVALID_PARAMETER here, but that's not documented */ + ok(!res, "%d: got %d and %u for %s (expected FALSE)\n", i, res, GetLastError(), ptr[i]); + } + } +} + START_TEST(cred) { DWORD persists[CRED_TYPE_MAXIMUM]; @@ -644,6 +706,7 @@ START_TEST(cred) pCredReadDomainCredentialsA = (void *)GetProcAddress(GetModuleHandle("advapi32.dll"), "CredReadDomainCredentialsA"); pCredMarshalCredentialA = (void *)GetProcAddress(GetModuleHandle("advapi32.dll"), "CredMarshalCredentialA"); pCredUnmarshalCredentialA = (void *)GetProcAddress(GetModuleHandle("advapi32.dll"), "CredUnmarshalCredentialA"); + pCredIsMarshaledCredentialA = (void *)GetProcAddress(GetModuleHandle("advapi32.dll"), "CredIsMarshaledCredentialA"); if (!pCredEnumerateA || !pCredFree || !pCredWriteA || !pCredDeleteA || !pCredReadA) { @@ -690,4 +753,5 @@ START_TEST(cred) test_CredMarshalCredentialA(); test_CredUnmarshalCredentialA(); + test_CredIsMarshaledCredentialA(); }

1 0

Detlef Riekenberg : advapi32: Implement CredIsMarshaledCredentialA/W.
by Alexandre Julliard 12 Jul '12

12 Jul '12

Module: wine Branch: master Commit: d96de83089cc4af8077e6f185024134b06bab78e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d96de83089cc4af8077e6f185… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Jul 7 00:36:27 2012 +0200 advapi32: Implement CredIsMarshaledCredentialA/W. --- dlls/advapi32/advapi32.spec | 4 +- dlls/advapi32/cred.c | 66 +++++++++++++++++++++++++++++++++++++++++++ include/wincred.h | 3 ++ 3 files changed, 71 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 638cba1..732bf04 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -144,8 +144,8 @@ @ stdcall CredGetSessionTypes(long ptr) # @ stub CredGetTargetInfoA # @ stub CredGetTargetInfoW -# @ stub CredIsMarshaledCredentialA -# @ stub CredIsMarshaledCredentialW +@ stdcall CredIsMarshaledCredentialA(str) +@ stdcall CredIsMarshaledCredentialW(wstr) # @ stub CredIsProtectedA # @ stub CredIsProtectedW @ stdcall CredMarshalCredentialA(long ptr ptr) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 432eb5c..d15feb7 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -2161,3 +2161,69 @@ BOOL WINAPI CredUnmarshalCredentialW( LPCWSTR cred, PCRED_MARSHAL_TYPE type, PVO } return TRUE; } + +/****************************************************************************** + * CredIsMarshaledCredentialW [ADVAPI32.@] + * + * Check, if the name parameter is a marshaled credential, hash or binary blob + * + * PARAMS + * name the name to check + * + * RETURNS + * TRUE: the name parameter is a marshaled credential, hash or binary blob + * FALSE: the name is a plain username + */ +BOOL WINAPI CredIsMarshaledCredentialW(LPCWSTR name) +{ + TRACE("(%s)\n", debugstr_w(name)); + + if (name && name[0] == '@' && name[1] == '@' && name[2] > 'A' && name[3]) + { + char hash[CERT_HASH_LENGTH + 2]; + int len = strlenW(name + 3 ); + DWORD size; + + if ((name[2] - 'A') == CertCredential && (len == 27) && cred_decode(name + 3, len, hash)) + return TRUE; + + if (((name[2] - 'A') == UsernameTargetCredential) && + (len >= 9) && cred_decode(name + 3, 6, (char *)&size) && size) + return TRUE; + + if ((name[2] - 'A') == BinaryBlobCredential) + FIXME("BinaryBlobCredential not checked\n"); + + if ((name[2] - 'A') > BinaryBlobCredential) + TRACE("unknown type: %d\n", (name[2] - 'A')); + } + + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; +} + +/****************************************************************************** + * CredIsMarshaledCredentialA [ADVAPI32.@] + * + * See CredIsMarshaledCredentialW + * + */ +BOOL WINAPI CredIsMarshaledCredentialA(LPCSTR name) +{ + LPWSTR nameW = NULL; + BOOL res; + int len; + + TRACE("(%s)\n", debugstr_a(name)); + + if (name) + { + len = MultiByteToWideChar(CP_ACP, 0, name, -1, NULL, 0); + nameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, name, -1, nameW, len); + } + + res = CredIsMarshaledCredentialW(nameW); + HeapFree(GetProcessHeap(), 0, nameW); + return res; +} diff --git a/include/wincred.h b/include/wincred.h index fb18a01..d0a75a7 100644 --- a/include/wincred.h +++ b/include/wincred.h @@ -248,6 +248,9 @@ WINADVAPI BOOL WINAPI CredEnumerateW(LPCWSTR,DWORD,DWORD *,PCREDENTIALW **); #define CredEnumerate WINELIB_NAME_AW(CredEnumerate) WINADVAPI VOID WINAPI CredFree(PVOID); WINADVAPI BOOL WINAPI CredGetSessionTypes(DWORD,LPDWORD); +WINADVAPI BOOL WINAPI CredIsMarshaledCredentialA(LPCSTR); +WINADVAPI BOOL WINAPI CredIsMarshaledCredentialW(LPCWSTR); +#define CredIsMarshaledCredential WINELIB_NAME_AW(CredIsMarshaledCredential) WINADVAPI BOOL WINAPI CredMarshalCredentialA(CRED_MARSHAL_TYPE,PVOID,LPSTR *); WINADVAPI BOOL WINAPI CredMarshalCredentialW(CRED_MARSHAL_TYPE,PVOID,LPWSTR *); #define CredMarshalCredential WINELIB_NAME_AW(CredMarshalCredential)

1 0

Nikolay Sivov : scrrun: Added IFileSystem3_FileExists implementation.
by Alexandre Julliard 12 Jul '12

12 Jul '12

Module: wine Branch: master Commit: 1ca6cacdb348746fbc3a8b56e9285593dcc7c437 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ca6cacdb348746fbc3a8b56e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 12 02:00:42 2012 +0400 scrrun: Added IFileSystem3_FileExists implementation. --- dlls/scrrun/filesystem.c | 10 ++++++---- dlls/scrrun/tests/Makefile.in | 2 +- dlls/scrrun/tests/filesystem.c | 21 ++++++++++++++++++++- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index cd397a4..5c8fb7d 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -213,12 +213,14 @@ static HRESULT WINAPI filesys_DriveExists(IFileSystem3 *iface, BSTR DriveSpec, return E_NOTIMPL; } -static HRESULT WINAPI filesys_FileExists(IFileSystem3 *iface, BSTR FileSpec, - VARIANT_BOOL *pfExists) +static HRESULT WINAPI filesys_FileExists(IFileSystem3 *iface, BSTR path, VARIANT_BOOL *ret) { - FIXME("%p %s %p\n", iface, debugstr_w(FileSpec), pfExists); + TRACE("%p %s %p\n", iface, debugstr_w(path), ret); - return E_NOTIMPL; + if (!ret) return E_POINTER; + + *ret = GetFileAttributesW(path) != INVALID_FILE_ATTRIBUTES ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI filesys_FolderExists(IFileSystem3 *iface, BSTR FolderSpec, diff --git a/dlls/scrrun/tests/Makefile.in b/dlls/scrrun/tests/Makefile.in index 44cef8a..326eb1a 100644 --- a/dlls/scrrun/tests/Makefile.in +++ b/dlls/scrrun/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = scrrun.dll -IMPORTS = ole32 shlwapi uuid +IMPORTS = ole32 shlwapi uuid oleaut32 C_SRCS = \ filesystem.c diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index c48baa4..ff1856e 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -22,6 +22,7 @@ #include "windows.h" #include "ole2.h" +#include "oleauto.h" #include "dispex.h" #include "wine/test.h" @@ -31,11 +32,14 @@ static void test_interfaces(void) { + static const WCHAR pathW[] = {'p','a','t','h',0}; HRESULT hr; IDispatch *disp; IDispatchEx *dispex; IFileSystem3 *fs3; IObjectWithSite *site; + VARIANT_BOOL b; + BSTR path; hr = CoCreateInstance(&CLSID_FileSystemObject, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IDispatch, (void**)&disp); @@ -46,7 +50,6 @@ static void test_interfaces(void) hr = IDispatch_QueryInterface(disp, &IID_IFileSystem3, (void**)&fs3); ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); - IFileSystem3_Release(fs3); hr = IDispatch_QueryInterface(disp, &IID_IObjectWithSite, (void**)&site); ok(hr == E_NOINTERFACE, "got 0x%08x, expected 0x%08x\n", hr, E_NOINTERFACE); @@ -54,6 +57,22 @@ static void test_interfaces(void) hr = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); ok(hr == E_NOINTERFACE, "got 0x%08x, expected 0x%08x\n", hr, E_NOINTERFACE); + b = VARIANT_TRUE; + hr = IFileSystem3_FileExists(fs3, NULL, &b); + ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + ok(b == VARIANT_FALSE, "got %x\n", b); + + hr = IFileSystem3_FileExists(fs3, NULL, NULL); + ok(hr == E_POINTER, "got 0x%08x, expected 0x%08x\n", hr, E_POINTER); + + path = SysAllocString(pathW); + b = VARIANT_TRUE; + hr = IFileSystem3_FileExists(fs3, path, &b); + ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + ok(b == VARIANT_FALSE, "got %x\n", b); + SysFreeString(path); + + IFileSystem3_Release(fs3); IDispatch_Release(disp); }

1 0

Alistair Leslie-Hughes : scrrun: Add typelib support.
by Alexandre Julliard 12 Jul '12

12 Jul '12

Module: wine Branch: master Commit: 6c5588f95d2e27aa14a1cc15d4fdfda012a4bd2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c5588f95d2e27aa14a1cc15d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jun 15 15:17:42 2012 +1000 scrrun: Add typelib support. --- dlls/scrrun/Makefile.in | 2 +- dlls/scrrun/filesystem.c | 39 ++++++++++++++++++------ dlls/scrrun/scrrun.c | 68 ++++++++++++++++++++++++++++++++++++++++- dlls/scrrun/scrrun_private.h | 32 +++++++++++++++++++ 4 files changed, 128 insertions(+), 13 deletions(-) diff --git a/dlls/scrrun/Makefile.in b/dlls/scrrun/Makefile.in index d2ceb87..f6dcf62 100644 --- a/dlls/scrrun/Makefile.in +++ b/dlls/scrrun/Makefile.in @@ -1,5 +1,5 @@ MODULE = scrrun.dll -IMPORTS = uuid +IMPORTS = uuid oleaut32 C_SRCS = \ filesystem.c \ diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index a14d926..cd397a4 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -26,6 +26,7 @@ #include "ole2.h" #include "dispex.h" #include "scrrun.h" +#include "scrrun_private.h" #include "wine/debug.h" @@ -90,19 +91,26 @@ static HRESULT WINAPI filesys_GetTypeInfoCount(IFileSystem3 *iface, UINT *pctinf static HRESULT WINAPI filesys_GetTypeInfo(IFileSystem3 *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - FIXME("(%p)->(%u %u %p)\n", iface, iTInfo, lcid, ppTInfo); - - return E_NOTIMPL; -} + TRACE("(%p)->(%u %u %p)\n", iface, iTInfo, lcid, ppTInfo); + return get_typeinfo(IFileSystem3_tid, ppTInfo);} static HRESULT WINAPI filesys_GetIDsOfNames(IFileSystem3 *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - FIXME("(%p)->(%s %p %u %u %p)\n", iface, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); + ITypeInfo *typeinfo; + HRESULT hr; - return E_NOTIMPL; + TRACE("(%p)->(%s %p %u %u %p)\n", iface, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo(IFileSystem3_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI filesys_Invoke(IFileSystem3 *iface, DISPID dispIdMember, @@ -110,10 +118,21 @@ static HRESULT WINAPI filesys_Invoke(IFileSystem3 *iface, DISPID dispIdMember, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", iface, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo *typeinfo; + HRESULT hr; - return E_NOTIMPL; + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", iface, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IFileSystem3_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI filesys_get_Drives(IFileSystem3 *iface, IDriveCollection **ppdrives) diff --git a/dlls/scrrun/scrrun.c b/dlls/scrrun/scrrun.c index d1e2de2..d5ea369 100644 --- a/dlls/scrrun/scrrun.c +++ b/dlls/scrrun/scrrun.c @@ -27,6 +27,7 @@ #include <initguid.h> #include "scrrun.h" +#include "scrrun_private.h" #include "wine/debug.h" @@ -36,8 +37,6 @@ static HINSTANCE scrrun_instance; typedef HRESULT (*fnCreateInstance)(LPVOID *ppObj); -extern HRESULT WINAPI FileSystem_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; - static HRESULT WINAPI scrruncf_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *ppv ) { *ppv = NULL; @@ -88,6 +87,70 @@ static const struct IClassFactoryVtbl scrruncf_vtbl = static IClassFactory FileSystemFactory = { &scrruncf_vtbl }; +static ITypeLib *typelib; +static ITypeInfo *typeinfos[LAST_tid]; + +static REFIID tid_ids[] = { + &IID_NULL, + &IID_IFileSystem3, +}; + +static HRESULT load_typelib(void) +{ + HRESULT hres; + ITypeLib *tl; + + hres = LoadRegTypeLib(&LIBID_Scripting, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); + if(FAILED(hres)) { + ERR("LoadRegTypeLib failed: %08x\n", hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)&typelib, tl, NULL)) + ITypeLib_Release(tl); + return hres; +} + +HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) +{ + HRESULT hres; + + if (!typelib) + hres = load_typelib(); + if (!typelib) + return hres; + + if(!typeinfos[tid]) { + ITypeInfo *ti; + + hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); + if(FAILED(hres)) { + ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)(typeinfos+tid), ti, NULL)) + ITypeInfo_Release(ti); + } + + *typeinfo = typeinfos[tid]; + return S_OK; +} + +static void release_typelib(void) +{ + unsigned i; + + if(!typelib) + return; + + for(i=0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) + if(typeinfos[i]) + ITypeInfo_Release(typeinfos[i]); + + ITypeLib_Release(typelib); +} + BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { TRACE("%p, %u, %p\n", hinst, reason, reserved); @@ -101,6 +164,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) scrrun_instance = hinst; break; case DLL_PROCESS_DETACH: + release_typelib(); break; } return TRUE; diff --git a/dlls/scrrun/scrrun_private.h b/dlls/scrrun/scrrun_private.h new file mode 100644 index 0000000..fc700a6 --- /dev/null +++ b/dlls/scrrun/scrrun_private.h @@ -0,0 +1,32 @@ +/* + * Copyright 2012 Alistair Leslie-Hughes + * + * 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 + */ +#ifndef _SCRRUN_PRIVATE_H_ +#define _SCRRUN_PRIVATE_H + +extern HRESULT WINAPI FileSystem_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; + +typedef enum tid_t +{ + NULL_tid, + IFileSystem3_tid, + LAST_tid +} tid_t; + +HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) DECLSPEC_HIDDEN; + +#endif

1 0

Dmitry Timoshkov : windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone256 palette.
by Alexandre Julliard 12 Jul '12

12 Jul '12

Module: wine Branch: master Commit: 45f240c0cbefee748ea8380357649abddf8d03f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45f240c0cbefee748ea838035… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 12 16:14:11 2012 +0900 windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone256 palette. --- dlls/windowscodecs/palette.c | 26 ++++++++++++++++++++++++++ dlls/windowscodecs/tests/palette.c | 20 ++++++++++++++++++++ 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index a024cd1..4541c7c 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -188,6 +188,27 @@ static WICColor *generate_halftone64_palette(UINT *count) return entries; } +static WICColor *generate_halftone256_palette(UINT *count) +{ + WICColor *entries; + UINT i; + + *count = 256; + entries = HeapAlloc(GetProcessHeap(), 0, 256 * sizeof(WICColor)); + if (!entries) return NULL; + + for (i = 0; i < 256; i++) + { + static const BYTE halftone_values_b[4] = { 0x00,0x55,0xaa,0xff }; + static const BYTE halftone_values_gr[8] = { 0x00,0x24,0x49,0x6d,0x92,0xb6,0xdb,0xff }; + entries[i] = 0xff000000; + entries[i] |= halftone_values_b[i%4]; + entries[i] |= halftone_values_gr[(i/4)%8] << 8; + entries[i] |= halftone_values_gr[(i/32)%8] << 16; + } + return entries; +} + static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, WICBitmapPaletteType type, BOOL add_transparent) { @@ -237,6 +258,11 @@ static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, if (!colors) return E_OUTOFMEMORY; break; + case WICBitmapPaletteTypeFixedHalftone256: + colors = generate_halftone256_palette(&count); + if (!colors) return E_OUTOFMEMORY; + break; + default: FIXME("(%p,%u,%d): stub\n", iface, type, add_transparent); return E_NOTIMPL; diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index e97ffc6..8e320c5 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -223,6 +223,23 @@ static void generate_halftone64_palette(DWORD *entries, UINT count) } } +static void generate_halftone256_palette(DWORD *entries, UINT count) +{ + static const BYTE halftone_values_b[4] = { 0x00,0x55,0xaa,0xff }; + static const BYTE halftone_values_gr[8] = { 0x00,0x24,0x49,0x6d,0x92,0xb6,0xdb,0xff }; + UINT i; + + assert(count == 256); + + for (i = 0; i < 256; i++) + { + entries[i] = 0xff000000; + entries[i] |= halftone_values_b[i%4]; + entries[i] |= halftone_values_gr[(i/4)%8] << 8; + entries[i] |= halftone_values_gr[(i/32)%8] << 16; + } +} + static void test_predefined_palette(void) { static struct test_data @@ -240,6 +257,7 @@ static void test_predefined_palette(void) { WICBitmapPaletteTypeFixedGray256, 0, 1, 256, { 0 } }, { WICBitmapPaletteTypeFixedHalftone8, 0, 0, 16, { 0 } }, { WICBitmapPaletteTypeFixedHalftone64, 0, 0, 72, { 0 } }, + { WICBitmapPaletteTypeFixedHalftone256, 0, 0, 256, { 0 } }, }; IWICImagingFactory *factory; IWICPalette *palette; @@ -298,6 +316,8 @@ static void test_predefined_palette(void) generate_halftone8_palette(td[i].color, td[i].count); else if (td[i].type == WICBitmapPaletteTypeFixedHalftone64) generate_halftone64_palette(td[i].color, td[i].count); + else if (td[i].type == WICBitmapPaletteTypeFixedHalftone256) + generate_halftone256_palette(td[i].color, td[i].count); for (j = 0; j < count; j++) {

1 0

Dmitry Timoshkov : windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone64 palette.
by Alexandre Julliard 12 Jul '12

12 Jul '12

Module: wine Branch: master Commit: 011d23c535d67877e986d52810253554e616c103 URL: http://source.winehq.org/git/wine.git/?a=commit;h=011d23c535d67877e986d5281… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 12 16:11:51 2012 +0900 windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone64 palette. --- dlls/windowscodecs/palette.c | 33 +++++++++++++++++++++++++++++++++ dlls/windowscodecs/tests/palette.c | 27 +++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 9280aa1..a024cd1 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -160,6 +160,34 @@ static WICColor *generate_halftone8_palette(UINT *count) return entries; } +static WICColor *generate_halftone64_palette(UINT *count) +{ + WICColor *entries; + UINT i; + + *count = 72; + entries = HeapAlloc(GetProcessHeap(), 0, 72 * sizeof(WICColor)); + if (!entries) return NULL; + + for (i = 0; i < 64; i++) + { + static const BYTE halftone_values[4] = { 0x00,0x55,0xaa,0xff }; + entries[i] = 0xff000000; + entries[i] |= halftone_values[i%4]; + entries[i] |= halftone_values[(i/4)%4] << 8; + entries[i] |= halftone_values[(i/16)%4] << 16; + } + + for (i = 64; i < 72; i++) + { + static const DWORD halftone[8] = { 0xc0c0c0, 0x808080, 0x800000, 0x008000, + 0x000080, 0x808000, 0x800080, 0x008080 }; + entries[i] = 0xff000000; + entries[i] |= halftone[i-64]; + } + return entries; +} + static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, WICBitmapPaletteType type, BOOL add_transparent) { @@ -204,6 +232,11 @@ static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, if (!colors) return E_OUTOFMEMORY; break; + case WICBitmapPaletteTypeFixedHalftone64: + colors = generate_halftone64_palette(&count); + if (!colors) return E_OUTOFMEMORY; + break; + default: FIXME("(%p,%u,%d): stub\n", iface, type, add_transparent); return E_NOTIMPL; diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index e92c871..e97ffc6 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -199,6 +199,30 @@ static void generate_halftone8_palette(DWORD *entries, UINT count) } } +static void generate_halftone64_palette(DWORD *entries, UINT count) +{ + static const BYTE halftone_values[4] = { 0x00,0x55,0xaa,0xff }; + UINT i; + + assert(count == 72); + + for (i = 0; i < 64; i++) + { + entries[i] = 0xff000000; + entries[i] |= halftone_values[i%4]; + entries[i] |= halftone_values[(i/4)%4] << 8; + entries[i] |= halftone_values[(i/16)%4] << 16; + } + + for (i = 64; i < 72; i++) + { + static const DWORD halftone[8] = { 0xc0c0c0, 0x808080, 0x800000, 0x008000, + 0x000080, 0x808000, 0x800080, 0x008080 }; + entries[i] = 0xff000000; + entries[i] |= halftone[i-64]; + } +} + static void test_predefined_palette(void) { static struct test_data @@ -215,6 +239,7 @@ static void test_predefined_palette(void) { WICBitmapPaletteTypeFixedGray16, 0, 1, 16, { 0 } }, { WICBitmapPaletteTypeFixedGray256, 0, 1, 256, { 0 } }, { WICBitmapPaletteTypeFixedHalftone8, 0, 0, 16, { 0 } }, + { WICBitmapPaletteTypeFixedHalftone64, 0, 0, 72, { 0 } }, }; IWICImagingFactory *factory; IWICPalette *palette; @@ -271,6 +296,8 @@ static void test_predefined_palette(void) generate_gray256_palette(td[i].color, td[i].count); else if (td[i].type == WICBitmapPaletteTypeFixedHalftone8) generate_halftone8_palette(td[i].color, td[i].count); + else if (td[i].type == WICBitmapPaletteTypeFixedHalftone64) + generate_halftone64_palette(td[i].color, td[i].count); for (j = 0; j < count; j++) {

1 0

Dmitry Timoshkov : windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone8 palette.
by Alexandre Julliard 12 Jul '12

12 Jul '12

Module: wine Branch: master Commit: 63cb0cf6d2ff856bf36066c6d970a8072a444c45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63cb0cf6d2ff856bf36066c6d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 12 16:10:27 2012 +0900 windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone8 palette. --- dlls/windowscodecs/palette.c | 33 +++++++++++++++++++++++++++++++++ dlls/windowscodecs/tests/palette.c | 27 +++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 9d3b8ee..9280aa1 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -1,5 +1,6 @@ /* * Copyright 2009 Vincent Povirk for CodeWeavers + * Copyright 2012 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -132,6 +133,33 @@ static WICColor *generate_gray256_palette(UINT *count) return entries; } +static WICColor *generate_halftone8_palette(UINT *count) +{ + WICColor *entries; + UINT i; + + *count = 16; + entries = HeapAlloc(GetProcessHeap(), 0, 16 * sizeof(WICColor)); + if (!entries) return NULL; + + for (i = 0; i < 8; i++) + { + entries[i] = 0xff000000; + if (i & 1) entries[i] |= 0xff; + if (i & 2) entries[i] |= 0xff00; + if (i & 4) entries[i] |= 0xff0000; + } + + for (i = 8; i < 16; i++) + { + static const DWORD halftone[8] = { 0xc0c0c0, 0x808080, 0x800000, 0x008000, + 0x000080, 0x808000, 0x800080, 0x008080 }; + entries[i] = 0xff000000; + entries[i] |= halftone[i-8]; + } + return entries; +} + static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, WICBitmapPaletteType type, BOOL add_transparent) { @@ -171,6 +199,11 @@ static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, if (!colors) return E_OUTOFMEMORY; break; + case WICBitmapPaletteTypeFixedHalftone8: + colors = generate_halftone8_palette(&count); + if (!colors) return E_OUTOFMEMORY; + break; + default: FIXME("(%p,%u,%d): stub\n", iface, type, add_transparent); return E_NOTIMPL; diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index ef21307..e92c871 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -1,5 +1,6 @@ /* * Copyright 2009 Vincent Povirk for CodeWeavers + * Copyright 2012 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -175,6 +176,29 @@ static void generate_gray256_palette(DWORD *entries, UINT count) } } +static void generate_halftone8_palette(DWORD *entries, UINT count) +{ + UINT i; + + assert(count == 16); + + for (i = 0; i < 8; i++) + { + entries[i] = 0xff000000; + if (i & 1) entries[i] |= 0xff; + if (i & 2) entries[i] |= 0xff00; + if (i & 4) entries[i] |= 0xff0000; + } + + for (i = 8; i < 16; i++) + { + static const DWORD halftone[8] = { 0xc0c0c0, 0x808080, 0x800000, 0x008000, + 0x000080, 0x808000, 0x800080, 0x008080 }; + entries[i] = 0xff000000; + entries[i] |= halftone[i-8]; + } +} + static void test_predefined_palette(void) { static struct test_data @@ -190,6 +214,7 @@ static void test_predefined_palette(void) { 0xff000000, 0xff555555, 0xffaaaaaa, 0xffffffff } }, { WICBitmapPaletteTypeFixedGray16, 0, 1, 16, { 0 } }, { WICBitmapPaletteTypeFixedGray256, 0, 1, 256, { 0 } }, + { WICBitmapPaletteTypeFixedHalftone8, 0, 0, 16, { 0 } }, }; IWICImagingFactory *factory; IWICPalette *palette; @@ -244,6 +269,8 @@ static void test_predefined_palette(void) generate_gray16_palette(td[i].color, td[i].count); else if (td[i].type == WICBitmapPaletteTypeFixedGray256) generate_gray256_palette(td[i].color, td[i].count); + else if (td[i].type == WICBitmapPaletteTypeFixedHalftone8) + generate_halftone8_palette(td[i].color, td[i].count); for (j = 0; j < count; j++) {

1 0

Dmitry Timoshkov : windowscodecs: Add support for generating WICBitmapPaletteTypeFixedGray256 palette.
by Alexandre Julliard 12 Jul '12

12 Jul '12

Module: wine Branch: master Commit: ca126c069fcbf388acac0326d18ea3fb6343bb12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca126c069fcbf388acac0326d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 12 16:09:26 2012 +0900 windowscodecs: Add support for generating WICBitmapPaletteTypeFixedGray256 palette. --- dlls/windowscodecs/palette.c | 22 ++++++++++++++++++++++ dlls/windowscodecs/tests/palette.c | 16 ++++++++++++++++ 2 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 03f5774a..9d3b8ee 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -115,6 +115,23 @@ static WICColor *generate_gray16_palette(UINT *count) return entries; } +static WICColor *generate_gray256_palette(UINT *count) +{ + WICColor *entries; + UINT i; + + *count = 256; + entries = HeapAlloc(GetProcessHeap(), 0, 256 * sizeof(WICColor)); + if (!entries) return NULL; + + for (i = 0; i < 256; i++) + { + entries[i] = 0xff000000; + entries[i] |= (i<<16) | (i<<8) | i; + } + return entries; +} + static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, WICBitmapPaletteType type, BOOL add_transparent) { @@ -149,6 +166,11 @@ static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, if (!colors) return E_OUTOFMEMORY; break; + case WICBitmapPaletteTypeFixedGray256: + colors = generate_gray256_palette(&count); + if (!colors) return E_OUTOFMEMORY; + break; + default: FIXME("(%p,%u,%d): stub\n", iface, type, add_transparent); return E_NOTIMPL; diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index aba8168..ef21307 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -162,6 +162,19 @@ static void generate_gray16_palette(DWORD *entries, UINT count) } } +static void generate_gray256_palette(DWORD *entries, UINT count) +{ + UINT i; + + assert(count == 256); + + for (i = 0; i < 256; i++) + { + entries[i] = 0xff000000; + entries[i] |= (i << 16) | (i << 8) | i; + } +} + static void test_predefined_palette(void) { static struct test_data @@ -176,6 +189,7 @@ static void test_predefined_palette(void) { WICBitmapPaletteTypeFixedGray4, 0, 1, 4, { 0xff000000, 0xff555555, 0xffaaaaaa, 0xffffffff } }, { WICBitmapPaletteTypeFixedGray16, 0, 1, 16, { 0 } }, + { WICBitmapPaletteTypeFixedGray256, 0, 1, 256, { 0 } }, }; IWICImagingFactory *factory; IWICPalette *palette; @@ -228,6 +242,8 @@ static void test_predefined_palette(void) if (td[i].type == WICBitmapPaletteTypeFixedGray16) generate_gray16_palette(td[i].color, td[i].count); + else if (td[i].type == WICBitmapPaletteTypeFixedGray256) + generate_gray256_palette(td[i].color, td[i].count); for (j = 0; j < count; j++) {

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2012