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

Frédéric Delanoy : oleacc: Add message context for object state string resources.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: d1dbc024b5c8ba0b9d6b539cd1a47562a34e6e6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1dbc024b5c8ba0b9d6b539cd… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu May 15 09:14:59 2014 +0200 oleacc: Add message context for object state string resources. --- dlls/oleacc/oleacc.rc | 64 ++++++++++++++++++++++++------------------------- po/ar.po | 44 +++++++++++++++++++++++++++++++--- po/bg.po | 45 ++++++++++++++++++++++++++++++---- po/ca.po | 44 +++++++++++++++++++++++++++++++--- po/cs.po | 44 +++++++++++++++++++++++++++++++--- po/da.po | 44 +++++++++++++++++++++++++++++++--- po/de.po | 44 +++++++++++++++++++++++++++++++--- po/el.po | 42 +++++++++++++++++++++++++++++--- po/en.po | 32 +++++++++++++++++++++++++ po/en_US.po | 32 +++++++++++++++++++++++++ po/eo.po | 48 +++++++++++++++++++++++++++++++++---- po/es.po | 44 +++++++++++++++++++++++++++++++--- po/fa.po | 41 ++++++++++++++++++++++++++++--- po/fi.po | 44 +++++++++++++++++++++++++++++++--- po/fr.po | 44 +++++++++++++++++++++++++++++++--- po/he.po | 48 +++++++++++++++++++++++++++++++++---- po/hi.po | 32 +++++++++++++++++++++++++ po/hr.po | 44 +++++++++++++++++++++++++++++++--- po/hu.po | 44 +++++++++++++++++++++++++++++++--- po/it.po | 44 +++++++++++++++++++++++++++++++--- po/ja.po | 44 +++++++++++++++++++++++++++++++--- po/ko.po | 44 +++++++++++++++++++++++++++++++--- po/lt.po | 44 +++++++++++++++++++++++++++++++--- po/ml.po | 32 +++++++++++++++++++++++++ po/nb_NO.po | 44 +++++++++++++++++++++++++++++++--- po/nl.po | 44 +++++++++++++++++++++++++++++++--- po/or.po | 32 +++++++++++++++++++++++++ po/pa.po | 32 +++++++++++++++++++++++++ po/pl.po | 44 +++++++++++++++++++++++++++++++--- po/pt_BR.po | 44 +++++++++++++++++++++++++++++++--- po/pt_PT.po | 44 +++++++++++++++++++++++++++++++--- po/rm.po | 35 ++++++++++++++++++++++++++- po/ro.po | 44 +++++++++++++++++++++++++++++++--- po/ru.po | 44 +++++++++++++++++++++++++++++++--- po/sk.po | 43 ++++++++++++++++++++++++++++++--- po/sl.po | 44 +++++++++++++++++++++++++++++++--- po/sr_RS(a)cyrillic.po | 47 ++++++++++++++++++++++++++++++++---- po/sr_RS(a)latin.po | 47 ++++++++++++++++++++++++++++++++---- po/sv.po | 44 +++++++++++++++++++++++++++++++--- po/te.po | 32 +++++++++++++++++++++++++ po/th.po | 48 +++++++++++++++++++++++++++++++++---- po/tr.po | 44 +++++++++++++++++++++++++++++++--- po/uk.po | 44 +++++++++++++++++++++++++++++++--- po/wa.po | 44 ++++++++++++++++++++++++++++++---- po/wine.pot | 32 +++++++++++++++++++++++++ po/zh_CN.po | 48 +++++++++++++++++++++++++++++++++---- po/zh_TW.po | 44 +++++++++++++++++++++++++++++++--- 47 files changed, 1847 insertions(+), 153 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1dbc024b5c8ba0b9d6b5…

1 0

Hans Leidekker : jsproxy: Implement InternetGetProxyInfo.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: f7c8f5b3e45d688e3facebd80396d10de4a44b16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7c8f5b3e45d688e3facebd80… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 15 14:05:31 2014 +0200 jsproxy: Implement InternetGetProxyInfo. --- dlls/jsproxy/Makefile.in | 3 + dlls/jsproxy/jsproxy.spec | 2 +- dlls/jsproxy/main.c | 480 +++++++++++++++++++++++++++++++++++++++++++++ dlls/jsproxy/pac.js | 244 +++++++++++++++++++++++ dlls/jsproxy/rsrc.rc | 20 ++ 5 files changed, 748 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f7c8f5b3e45d688e3face…

1 0

Hans Leidekker : jsproxy: New dll.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: ae542221a074f7459f28a623498421a59516192c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae542221a074f7459f28a6234… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 15 14:05:07 2014 +0200 jsproxy: New dll. --- configure | 2 ++ configure.ac | 1 + dlls/jsproxy/Makefile.in | 5 +++++ dlls/jsproxy/jsproxy.spec | 5 +++++ dlls/jsproxy/main.c | 48 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 61 insertions(+) diff --git a/configure b/configure index e5a26d1..4bcbfd8 100755 --- a/configure +++ b/configure @@ -1063,6 +1063,7 @@ enable_itircl enable_itss enable_joy_cpl enable_jscript +enable_jsproxy enable_kernel32 enable_ktmw32 enable_loadperf @@ -16937,6 +16938,7 @@ wine_fn_config_test dlls/itss/tests itss_test wine_fn_config_dll joy.cpl enable_joy_cpl po wine_fn_config_dll jscript enable_jscript clean,po wine_fn_config_test dlls/jscript/tests jscript_test +wine_fn_config_dll jsproxy enable_jsproxy implib wine_fn_config_dll kernel32 enable_kernel32 clean,implib,mc wine_fn_config_test dlls/kernel32/tests kernel32_test wine_fn_config_dll keyboard.drv16 enable_win16 diff --git a/configure.ac b/configure.ac index 673323a..de5aa41 100644 --- a/configure.ac +++ b/configure.ac @@ -2914,6 +2914,7 @@ WINE_CONFIG_TEST(dlls/itss/tests) WINE_CONFIG_DLL(joy.cpl,,[po]) WINE_CONFIG_DLL(jscript,,[clean,po]) WINE_CONFIG_TEST(dlls/jscript/tests) +WINE_CONFIG_DLL(jsproxy,,[implib]) WINE_CONFIG_DLL(kernel32,,[clean,implib,mc]) WINE_CONFIG_TEST(dlls/kernel32/tests) WINE_CONFIG_DLL(keyboard.drv16,enable_win16) diff --git a/dlls/jsproxy/Makefile.in b/dlls/jsproxy/Makefile.in new file mode 100644 index 0000000..41b59ea --- /dev/null +++ b/dlls/jsproxy/Makefile.in @@ -0,0 +1,5 @@ +MODULE = jsproxy.dll +IMPORTLIB = jsproxy + +C_SRCS = \ + main.c diff --git a/dlls/jsproxy/jsproxy.spec b/dlls/jsproxy/jsproxy.spec new file mode 100644 index 0000000..21943df --- /dev/null +++ b/dlls/jsproxy/jsproxy.spec @@ -0,0 +1,5 @@ +@ stub InternetInitializeAutoProxyDll +@ stub InternetInitializeExAutoProxyDll +@ stub InternetDeInitializeAutoProxyDll +@ stub InternetDeInitializeExAutoProxyDll +@ stub InternetGetProxyInfo diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c new file mode 100644 index 0000000..fa9703d --- /dev/null +++ b/dlls/jsproxy/main.c @@ -0,0 +1,48 @@ +/* + * Copyright 2014 Hans Leidekker for CodeWeavers + * + * 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 "config.h" +#include "wine/port.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +static HINSTANCE instance; + +WINE_DEFAULT_DEBUG_CHANNEL(jsproxy); + +/****************************************************************** + * DllMain (jsproxy.@) + */ +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + instance = hinst; + DisableThreadLibraryCalls( hinst ); + break; + + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +}

1 0

Hans Leidekker : include: Add missing proxy definitions.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: a8ec0edfa88dde40cdfe50dee34b1752b07b0a4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8ec0edfa88dde40cdfe50dee… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 15 14:04:54 2014 +0200 include: Add missing proxy definitions. --- include/wininet.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/include/wininet.h b/include/wininet.h index 5cc3fd5..331055c 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1720,6 +1720,36 @@ BOOL WINAPI InternetGetConnectedStateExA(LPDWORD, LPSTR, DWORD, DWORD); BOOL WINAPI InternetGetConnectedStateExW(LPDWORD, LPWSTR, DWORD, DWORD); #define InternetGetConnectedStateEx WINELIB_NAME_AW(InternetGetConnectedStateEx) +typedef struct AutoProxyHelperVtbl +{ + BOOL (WINAPI *IsResolvable)(LPSTR); + DWORD (WINAPI *GetIPAddress)(LPSTR, LPDWORD); + DWORD (WINAPI *ResolveHostName)(LPSTR, LPSTR, LPDWORD); + BOOL (WINAPI *IsInNet)(LPSTR, LPSTR, LPSTR); + BOOL (WINAPI *IsResolvableEx)(LPSTR); + DWORD (WINAPI *GetIPAddressEx)(LPSTR, LPDWORD); + DWORD (WINAPI *ResolveHostNameEx)(LPSTR, LPSTR, LPDWORD); + BOOL (WINAPI *IsInNetEx)(LPSTR, LPSTR); + DWORD (WINAPI *SortIpList)(LPSTR, LPSTR, LPDWORD); +} AutoProxyHelperVtbl; + +typedef struct AutoProxyHelperFunctions +{ + const struct AutoProxyHelperVtbl *lpVtbl; +} AutoProxyHelperFunctions; + +typedef struct +{ + DWORD dwStructSize; + LPSTR lpszScriptBuffer; + DWORD dwScriptBufferSize; +} AUTO_PROXY_SCRIPT_BUFFER, *LPAUTO_PROXY_SCRIPT_BUFFER; + +typedef BOOL (CALLBACK *pfnInternetDeInitializeAutoProxyDll)(LPSTR, DWORD); +typedef BOOL (CALLBACK *pfnInternetGetProxyInfo)(LPCSTR, DWORD, LPSTR, DWORD, LPSTR *, LPDWORD); +typedef BOOL (CALLBACK *pfnInternetInitializeAutoProxyDll)(DWORD, LPSTR, LPSTR, AutoProxyHelperFunctions *, + LPAUTO_PROXY_SCRIPT_BUFFER); + BOOL WINAPI InternetInitializeAutoProxyDll(DWORD); BOOL WINAPI DetectAutoProxyUrl(LPSTR, DWORD, DWORD);

1 0

Huw Davies : shell32/tests: Fix tests on win 8.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 6f7650aec11f2bc8f10d46a36207ba23f92eeb22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f7650aec11f2bc8f10d46a36… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 15 10:27:12 2014 +0100 shell32/tests: Fix tests on win 8. --- dlls/shell32/tests/shlfolder.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 3e51c8a..474f605 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -779,7 +779,8 @@ static void test_GetDisplayName(void) if (pidlLast->mkid.cb >= 76) { ok(!lstrcmpW((WCHAR*)&pidlLast->mkid.abID[46], wszFileName) || (pidlLast->mkid.cb >= 94 && !lstrcmpW((WCHAR*)&pidlLast->mkid.abID[64], wszFileName)) || /* Vista */ - (pidlLast->mkid.cb >= 98 && !lstrcmpW((WCHAR*)&pidlLast->mkid.abID[68], wszFileName)), /* Win7 */ + (pidlLast->mkid.cb >= 98 && !lstrcmpW((WCHAR*)&pidlLast->mkid.abID[68], wszFileName)) || /* Win7 */ + (pidlLast->mkid.cb >= 102 && !lstrcmpW((WCHAR*)&pidlLast->mkid.abID[72], wszFileName)), /* Win8 */ "Filename should be stored as wchar-string at this position!\n"); } @@ -1853,8 +1854,9 @@ static void test_ITEMIDLIST_format(void) { } ok (!lstrcmpW(wszFile[i], name) || - !lstrcmpW(wszFile[i], name + 9) || /* Vista */ - !lstrcmpW(wszFile[i], name + 11), /* Win7 */ + !lstrcmpW(wszFile[i], name + 9) || /* Vista */ + !lstrcmpW(wszFile[i], name + 11) || /* Win7 */ + !lstrcmpW(wszFile[i], name + 13), /* Win8 */ "The filename should be stored in unicode at this position!\n"); } } @@ -3969,7 +3971,8 @@ static void test_GetUIObject(void) } max_id_check -= baseItem; ok((max_id_check == max_id) || - (max_id_check == max_id-1 /* Win 7 */), + (max_id_check == max_id-1) || /* Win 7 */ + (max_id_check == max_id-2), /* Win 8 */ "Not equal (or near equal), got %d and %d\n", max_id_check, max_id); #define is_win2k() (pSHGetFolderPathA && !pSHGetFolderPathAndSubDirA)

1 0

Hans Leidekker : jsproxy: Implement InternetInitializeAutoProxyDll and InternetDeinitializeAutoProxyDll.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 8545a971c94358c904a657859aff2fe9c943a49a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8545a971c94358c904a657859… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 15 14:05:17 2014 +0200 jsproxy: Implement InternetInitializeAutoProxyDll and InternetDeinitializeAutoProxyDll. --- dlls/jsproxy/jsproxy.spec | 4 +- dlls/jsproxy/main.c | 109 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+), 2 deletions(-) diff --git a/dlls/jsproxy/jsproxy.spec b/dlls/jsproxy/jsproxy.spec index 21943df..f557fe6 100644 --- a/dlls/jsproxy/jsproxy.spec +++ b/dlls/jsproxy/jsproxy.spec @@ -1,5 +1,5 @@ -@ stub InternetInitializeAutoProxyDll +@ stdcall InternetInitializeAutoProxyDll(long str str ptr ptr) JSPROXY_InternetInitializeAutoProxyDll @ stub InternetInitializeExAutoProxyDll -@ stub InternetDeInitializeAutoProxyDll +@ stdcall InternetDeInitializeAutoProxyDll(str long) @ stub InternetDeInitializeExAutoProxyDll @ stub InternetGetProxyInfo diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c index fa9703d..9305ff8 100644 --- a/dlls/jsproxy/main.c +++ b/dlls/jsproxy/main.c @@ -23,12 +23,23 @@ #include "windef.h" #include "winbase.h" +#include "winnls.h" +#include "wininet.h" #include "wine/debug.h" static HINSTANCE instance; WINE_DEFAULT_DEBUG_CHANNEL(jsproxy); +static CRITICAL_SECTION cs_jsproxy; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &cs_jsproxy, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": cs_jsproxy") } +}; +static CRITICAL_SECTION cs_jsproxy = { &critsect_debug, -1, 0, 0, 0, 0 }; + /****************************************************************** * DllMain (jsproxy.@) */ @@ -46,3 +57,101 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) } return TRUE; } + +static inline void *heap_alloc( SIZE_T size ) +{ + return HeapAlloc( GetProcessHeap(), 0, size ); +} + +static inline BOOL heap_free( LPVOID mem ) +{ + return HeapFree( GetProcessHeap(), 0, mem ); +} + +static inline WCHAR *strdupAW( const char *src, DWORD len ) +{ + WCHAR *dst = NULL; + if (src) + { + int dst_len = MultiByteToWideChar( CP_ACP, 0, src, len, NULL, 0 ); + if ((dst = heap_alloc( (dst_len + 1) * sizeof(WCHAR) ))) len = MultiByteToWideChar( CP_ACP, 0, src, len, dst, dst_len ); + dst[dst_len] = 0; + } + return dst; +} + +static struct pac_script +{ + WCHAR *text; +} pac_script; +static struct pac_script *global_script = &pac_script; + +/****************************************************************** + * InternetDeInitializeAutoProxyDll (jsproxy.@) + */ +BOOL WINAPI InternetDeInitializeAutoProxyDll( LPSTR mime, DWORD reserved ) +{ + TRACE( "%s, %u\n", debugstr_a(mime), reserved ); + + EnterCriticalSection( &cs_jsproxy ); + + heap_free( global_script->text ); + global_script->text = NULL; + + LeaveCriticalSection( &cs_jsproxy ); + return TRUE; +} + +static WCHAR *load_script( const char *filename ) +{ + HANDLE handle; + DWORD size, bytes_read; + char *buffer; + int len; + WCHAR *script = NULL; + + handle = CreateFileA( filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); + if (handle == INVALID_HANDLE_VALUE) return NULL; + + size = GetFileSize( handle, NULL ); + if (!(buffer = heap_alloc( size ))) goto done; + if (!ReadFile( handle, buffer, size, &bytes_read, NULL ) || bytes_read != size) goto done; + + len = MultiByteToWideChar( CP_ACP, 0, buffer, size, NULL, 0 ); + if (!(script = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, buffer, size, script, len ); + script[len] = 0; + +done: + CloseHandle( handle ); + heap_free( buffer ); + return script; +} + +/****************************************************************** + * InternetInitializeAutoProxyDll (jsproxy.@) + */ +BOOL WINAPI JSPROXY_InternetInitializeAutoProxyDll( DWORD version, LPSTR tmpfile, LPSTR mime, + AutoProxyHelperFunctions *callbacks, + LPAUTO_PROXY_SCRIPT_BUFFER buffer ) +{ + BOOL ret = FALSE; + + TRACE( "%u, %s, %s, %p, %p\n", version, debugstr_a(tmpfile), debugstr_a(mime), callbacks, buffer ); + + if (callbacks) FIXME( "callbacks not supported\n" ); + + EnterCriticalSection( &cs_jsproxy ); + + if (global_script->text) + { + LeaveCriticalSection( &cs_jsproxy ); + return FALSE; + } + if (buffer && buffer->dwStructSize == sizeof(*buffer) && buffer->lpszScriptBuffer && + (global_script->text = strdupAW( buffer->lpszScriptBuffer, buffer->dwScriptBufferSize ))) ret = TRUE; + else if ((global_script->text = load_script( tmpfile ))) ret = TRUE; + + LeaveCriticalSection( &cs_jsproxy ); + return ret; +}

1 0

Huw Davies : shell32/tests: Fix the tests when run from the top directory.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: d87aa43ce56630a5031ce492a8ac475b1ad97b75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d87aa43ce56630a5031ce492a… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 15 10:27:11 2014 +0100 shell32/tests: Fix the tests when run from the top directory. --- dlls/shell32/tests/shlfolder.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index f096476..3e51c8a 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -533,12 +533,13 @@ if (0) IShellFolder_Release(psfSystemDir); - GetCurrentDirectoryA(MAX_PATH, buf); - if(!lstrlenA(buf)) + cChars = GetCurrentDirectoryA(MAX_PATH, buf); + if(!cChars) { skip("Failed to get current directory, skipping tests.\n"); return; } + if(buf[cChars-1] != '\\') lstrcatA(buf, "\\"); SHGetDesktopFolder(&psfDesktop); @@ -546,7 +547,6 @@ if (0) /* .html */ lstrcpyA(pathA, buf); - lstrcatA(pathA, "\\"); lstrcatA(pathA, filename_html); hfile = CreateFileA(pathA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); if(hfile != INVALID_HANDLE_VALUE) @@ -590,7 +590,6 @@ if (0) /* .txt */ lstrcpyA(pathA, buf); - lstrcatA(pathA, "\\"); lstrcatA(pathA, filename_txt); hfile = CreateFileA(pathA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); if(hfile != INVALID_HANDLE_VALUE) @@ -604,6 +603,7 @@ if (0) hr = IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (void**)&psfChild); ok(hr == E_FAIL || /* Vista+ */ hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || /* XP, W2K3 */ + hr == E_INVALIDARG || /* W2K item in top dir */ broken(hr == S_OK), /* Win9x, NT4, W2K */ "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) IShellFolder_Release(psfChild); @@ -616,7 +616,6 @@ if (0) /* .foo */ lstrcpyA(pathA, buf); - lstrcatA(pathA, "\\"); lstrcatA(pathA, filename_foo); hfile = CreateFileA(pathA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); if(hfile != INVALID_HANDLE_VALUE) @@ -630,6 +629,7 @@ if (0) hr = IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (void**)&psfChild); ok(hr == E_FAIL || /* Vista+ */ hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || /* XP, W2K3 */ + hr == E_INVALIDARG || /* W2K item in top dir */ broken(hr == S_OK), /* Win9x, NT4, W2K */ "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) IShellFolder_Release(psfChild);

1 0

Henri Verbeet : d2d1: Add the ID2D1LinearGradientBrush interface.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 04af7227da3ba5f0380bb746151861bb9f61864b URL: http://source.winehq.org/git/wine.git/?a=commit;h=04af7227da3ba5f0380bb7461… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 15 10:15:35 2014 +0200 d2d1: Add the ID2D1LinearGradientBrush interface. --- include/d2d1.idl | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 21af6a7..3a7901f 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -659,5 +659,25 @@ interface ID2D1GradientStopCollection : ID2D1Resource D2D1_EXTEND_MODE GetExtendMode(); } +[ + local, + object, + uuid(2cd906ab-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1LinearGradientBrush : ID2D1Brush +{ + void SetStartPoint( + [in] D2D1_POINT_2F start_point + ); + void SetEndPoint( + [in] D2D1_POINT_2F end_point + ); + D2D1_POINT_2F GetStartPoint(); + D2D1_POINT_2F GetEndPoint(); + void GetGradientStopCollection( + [out] ID2D1GradientStopCollection **gradient + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Henri Verbeet : d2d1: Add the ID2D1GradientStopCollection interface.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 36c438145d7c4c50dd553b27c7f3867d4618bcd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36c438145d7c4c50dd553b27c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 15 10:15:34 2014 +0200 d2d1: Add the ID2D1GradientStopCollection interface. --- include/d2d1.idl | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 7f7de1d..21af6a7 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -191,6 +191,13 @@ typedef enum D2D1_BITMAP_INTERPOLATION_MODE D2D1_BITMAP_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff, } D2D1_BITMAP_INTERPOLATION_MODE; +typedef enum D2D1_GAMMA +{ + D2D1_GAMMA_2_2 = 0, + D2D1_GAMMA_1_0 = 1, + D2D1_GAMMA_FORCE_DWORD = 0xffffffff, +} D2D1_GAMMA; + typedef struct D2D1_BEZIER_SEGMENT { D2D1_POINT_2F point1; @@ -248,6 +255,12 @@ typedef struct D2D1_DRAWING_STATE_DESCRIPTION D2D1_MATRIX_3X2_F transform; } D2D1_DRAWING_STATE_DESCRIPTION; +typedef struct D2D1_GRADIENT_STOP +{ + float position; + D2D1_COLOR_F color; +} D2D1_GRADIENT_STOP; + [ local, object, @@ -630,5 +643,21 @@ interface ID2D1SolidColorBrush : ID2D1Brush D2D1_COLOR_F GetColor(); } +[ + local, + object, + uuid(2cd906a7-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1GradientStopCollection : ID2D1Resource +{ + UINT32 GetGradientStopCount(); + void GetGradientStops( + [out] D2D1_GRADIENT_STOP *stops, + [in] UINT32 stop_count + ); + D2D1_GAMMA GetColorInterpolationGamma(); + D2D1_EXTEND_MODE GetExtendMode(); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Henri Verbeet : d2d1: Add the ID2D1BitmapBrush interface.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: d156bf03a6bed139e3aaf32f829e07047f6f6f1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d156bf03a6bed139e3aaf32f8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 15 10:15:32 2014 +0200 d2d1: Add the ID2D1BitmapBrush interface. --- include/d2d1.idl | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 2ea05f1..88a733f 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -33,6 +33,18 @@ typedef D2D_SIZE_U D2D1_SIZE_U; typedef D2D_POINT_2U D2D1_POINT_2U; typedef D2D_RECT_U D2D1_RECT_U; +enum +{ + D2D1_INTERPOLATION_MODE_DEFINITION_NEAREST_NEIGHBOR = 0, + D2D1_INTERPOLATION_MODE_DEFINITION_LINEAR = 1, + D2D1_INTERPOLATION_MODE_DEFINITION_CUBIC = 2, + D2D1_INTERPOLATION_MODE_DEFINITION_MULTI_SAMPLE_LINEAR = 3, + D2D1_INTERPOLATION_MODE_DEFINITION_ANISOTROPIC = 4, + D2D1_INTERPOLATION_MODE_DEFINITION_HIGH_QUALITY_CUBIC = 5, + D2D1_INTERPOLATION_MODE_DEFINITION_FANT = 6, + D2D1_INTERPOLATION_MODE_DEFINITION_MIPMAP_LINEAR = 7, +}; + typedef enum D2D1_DEBUG_LEVEL { D2D1_DEBUG_LEVEL_NONE = 0, @@ -163,6 +175,21 @@ typedef enum D2D1_TEXT_ANTIALIAS_MODE D2D1_TEXT_ANTIALIAS_MODE_FORCE_DWORD = 0xffffffff, } D2D1_TEXT_ANTIALIAS_MODE; +typedef enum D2D1_EXTEND_MODE +{ + D2D1_EXTEND_MODE_CLAMP = 0, + D2D1_EXTEND_MODE_WRAP = 1, + D2D1_EXTEND_MODE_MIRROR = 2, + D2D1_EXTEND_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_EXTEND_MODE; + +typedef enum D2D1_BITMAP_INTERPOLATION_MODE +{ + D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR = D2D1_INTERPOLATION_MODE_DEFINITION_NEAREST_NEIGHBOR, + D2D1_BITMAP_INTERPOLATION_MODE_LINEAR = D2D1_INTERPOLATION_MODE_DEFINITION_LINEAR, + D2D1_BITMAP_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_BITMAP_INTERPOLATION_MODE; + typedef struct D2D1_BEZIER_SEGMENT { D2D1_POINT_2F point1; @@ -562,5 +589,32 @@ interface ID2D1Brush : ID2D1Resource ); } +[ + local, + object, + uuid(2cd906aa-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1BitmapBrush : ID2D1Brush +{ + void SetExtendModeX( + [in] D2D1_EXTEND_MODE mode + ); + void SetExtendModeY( + [in] D2D1_EXTEND_MODE mode + ); + void SetInterpolationMode( + [in] D2D1_BITMAP_INTERPOLATION_MODE mode + ); + void SetBitmap( + [in] ID2D1Bitmap *bitmap + ); + D2D1_EXTEND_MODE GetExtendModeX(); + D2D1_EXTEND_MODE GetExtendModeY(); + D2D1_BITMAP_INTERPOLATION_MODE GetInterpolationMode(); + void GetBitmap( + [out] ID2D1Bitmap **bitmap + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0