May 2009 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Tidy up pshader_hw_cnd.
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: c06aa361e021928fff4d61c0c5dea05d67578f0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c06aa361e021928fff4d61c0c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 18:34:07 2009 +0200 wined3d: Tidy up pshader_hw_cnd. --- dlls/wined3d/arb_program_shader.c | 20 ++++++-------------- 1 files changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a934bdb..1b6d8d8 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -831,33 +831,25 @@ static void pshader_hw_cnd(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_dst_param *dst = &ins->dst[0]; SHADER_BUFFER *buffer = ins->ctx->buffer; - char dst_wmask[20]; char dst_name[50]; char src_name[3][50]; BOOL sat = dst->modifiers & WINED3DSPDM_SATURATE; - BOOL is_color; DWORD shader_version = WINED3D_SHADER_VERSION(ins->ctx->reg_maps->shader_version.major, ins->ctx->reg_maps->shader_version.minor); - /* FIXME: support output modifiers */ - - /* Handle output register */ - shader_arb_get_register_name(ins->ctx->shader, &dst->reg, dst_name, &is_color); - shader_arb_get_write_mask(ins, dst, dst_wmask); - - /* Generate input register names (with modifiers) */ - shader_arb_get_src_param(ins, &ins->src[0], 0, src_name[0]); + shader_arb_get_dst_param(ins, dst, dst_name); shader_arb_get_src_param(ins, &ins->src[1], 1, src_name[1]); - shader_arb_get_src_param(ins, &ins->src[2], 2, src_name[2]); /* The coissue flag changes the semantic of the cnd instruction in <= 1.3 shaders */ if (shader_version <= WINED3D_SHADER_VERSION(1, 3) && ins->coissue) { - shader_addline(buffer, "MOV%s %s%s, %s;\n", sat ? "_SAT" : "", dst_name, dst_wmask, src_name[1]); + shader_addline(buffer, "MOV%s %s, %s;\n", sat ? "_SAT" : "", dst_name, src_name[1]); } else { + shader_arb_get_src_param(ins, &ins->src[0], 0, src_name[0]); + shader_arb_get_src_param(ins, &ins->src[2], 2, src_name[2]); shader_addline(buffer, "ADD TMP, -%s, coefdiv.x;\n", src_name[0]); - shader_addline(buffer, "CMP%s %s%s, TMP, %s, %s;\n", - sat ? "_SAT" : "", dst_name, dst_wmask, src_name[1], src_name[2]); + shader_addline(buffer, "CMP%s %s, TMP, %s, %s;\n", + sat ? "_SAT" : "", dst_name, src_name[1], src_name[2]); } }

1 0

Stefan Dösinger : wined3d: Tidy up pshader_hw_cmp.
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: ca1a979c699cc0e5f355c66333335e2675423cad URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca1a979c699cc0e5f355c6633… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 18:37:33 2009 +0200 wined3d: Tidy up pshader_hw_cmp. --- dlls/wined3d/arb_program_shader.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1b6d8d8..2d73c31 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -857,24 +857,18 @@ static void pshader_hw_cmp(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_dst_param *dst = &ins->dst[0]; SHADER_BUFFER *buffer = ins->ctx->buffer; - char dst_wmask[20]; char dst_name[50]; char src_name[3][50]; BOOL sat = dst->modifiers & WINED3DSPDM_SATURATE; - BOOL is_color; - /* FIXME: support output modifiers */ - - /* Handle output register */ - shader_arb_get_register_name(ins->ctx->shader, &dst->reg, dst_name, &is_color); - shader_arb_get_write_mask(ins, dst, dst_wmask); + shader_arb_get_dst_param(ins, dst, dst_name); /* Generate input register names (with modifiers) */ shader_arb_get_src_param(ins, &ins->src[0], 0, src_name[0]); shader_arb_get_src_param(ins, &ins->src[1], 1, src_name[1]); shader_arb_get_src_param(ins, &ins->src[2], 2, src_name[2]); - shader_addline(buffer, "CMP%s %s%s, %s, %s, %s;\n", sat ? "_SAT" : "", dst_name, dst_wmask, + shader_addline(buffer, "CMP%s %s, %s, %s, %s;\n", sat ? "_SAT" : "", dst_name, src_name[0], src_name[2], src_name[1]); }

1 0

Hans Leidekker : wininet: Implement GetDiskInfoA.
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: 7ddec087f04a6d5b285d36dbe2a81b8fc73eaa0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ddec087f04a6d5b285d36dbe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 13 14:01:18 2009 +0200 wininet: Implement GetDiskInfoA. --- dlls/wininet/tests/urlcache.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/wininet/urlcache.c | 22 +++++++++++++++++++--- dlls/wininet/wininet.spec | 2 +- include/winineti.h | 1 + 4 files changed, 62 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index d135976..62e4bd2 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -25,6 +25,7 @@ #include "windef.h" #include "winbase.h" #include "wininet.h" +#include "winineti.h" #include "wine/test.h" @@ -219,6 +220,45 @@ static void test_FindCloseUrlCache(void) ok(ERROR_INVALID_HANDLE == err, "expected %d, got %d\n", ERROR_INVALID_HANDLE, err); } +static void test_GetDiskInfoA(void) +{ + BOOL ret; + DWORD error, cluster_size; + DWORDLONG free, total; + char path[MAX_PATH], *p; + + GetSystemDirectoryA(path, MAX_PATH); + if ((p = strchr(path, '\\'))) *++p = 0; + + ret = GetDiskInfoA(path, &cluster_size, &free, &total); + ok(ret, "GetDiskInfoA failed %u\n", GetLastError()); + + ret = GetDiskInfoA(path, &cluster_size, &free, NULL); + ok(ret, "GetDiskInfoA failed %u\n", GetLastError()); + + ret = GetDiskInfoA(path, &cluster_size, NULL, NULL); + ok(ret, "GetDiskInfoA failed %u\n", GetLastError()); + + ret = GetDiskInfoA(path, NULL, NULL, NULL); + ok(ret, "GetDiskInfoA failed %u\n", GetLastError()); + + ret = GetDiskInfoA(path, NULL, NULL, NULL); + ok(ret, "GetDiskInfoA failed %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + strcpy(p, "\\non\\existing\\path"); + ret = GetDiskInfoA(path, NULL, NULL, NULL); + error = GetLastError(); + ok(!ret, "GetDiskInfoA succeeded\n"); + ok(error == ERROR_PATH_NOT_FOUND, "got %u expected ERROR_PATH_NOT_FOUND\n", error); + + SetLastError(0xdeadbeef); + ret = GetDiskInfoA(NULL, NULL, NULL, NULL); + error = GetLastError(); + ok(!ret, "GetDiskInfoA succeeded\n"); + ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", error); +} + START_TEST(urlcache) { HMODULE hdll; @@ -227,4 +267,5 @@ START_TEST(urlcache) pUnlockUrlCacheEntryFileA = (void*)GetProcAddress(hdll, "UnlockUrlCacheEntryFileA"); test_urlcacheA(); test_FindCloseUrlCache(); + test_GetDiskInfoA(); } diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 5e1541d..db5020c 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -3624,10 +3624,26 @@ BOOL WINAPI IsUrlCacheEntryExpiredW( LPCWSTR url, DWORD dwFlags, FILETIME* pftLa /*********************************************************************** * GetDiskInfoA (WININET.@) */ -DWORD WINAPI GetDiskInfoA(void *p0, void *p1, void *p2, void *p3) +BOOL WINAPI GetDiskInfoA(PCSTR path, PDWORD cluster_size, PDWORDLONG free, PDWORDLONG total) { - FIXME("(%p, %p, %p, %p)\n", p0, p1, p2, p3); - return 0; + BOOL ret; + ULARGE_INTEGER bytes_free, bytes_total; + + TRACE("(%s, %p, %p, %p)\n", debugstr_a(path), cluster_size, free, total); + + if (!path) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if ((ret = GetDiskFreeSpaceExA(path, NULL, &bytes_total, &bytes_free))) + { + if (cluster_size) *cluster_size = 1; + if (free) *free = bytes_free.QuadPart; + if (total) *total = bytes_total.QuadPart; + } + return ret; } /*********************************************************************** diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec index 61beaf4..9506b6c 100644 --- a/dlls/wininet/wininet.spec +++ b/dlls/wininet/wininet.spec @@ -1,5 +1,5 @@ 101 stub -noname DoConnectoidsExist -102 stdcall -noname GetDiskInfoA(ptr ptr ptr ptr) +102 stdcall -noname GetDiskInfoA(str ptr ptr ptr) 103 stub -noname PerformOperationOverUrlCacheA 104 stub -noname HttpCheckDavComplianceA 105 stub -noname HttpCheckDavComplianceW diff --git a/include/winineti.h b/include/winineti.h index 98cba3b..32951ff 100644 --- a/include/winineti.h +++ b/include/winineti.h @@ -90,6 +90,7 @@ extern "C" { #endif DWORD WINAPI DeleteIE3Cache(HWND,HINSTANCE,LPSTR,int); +BOOL WINAPI GetDiskInfoA(PCSTR,PDWORD,PDWORDLONG,PDWORDLONG); BOOL WINAPI GetUrlCacheConfigInfoA(LPINTERNET_CACHE_CONFIG_INFOA,LPDWORD,DWORD); BOOL WINAPI GetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW,LPDWORD,DWORD); #define GetUrlCacheConfigInfo WINELIB_NAME_AW(GetUrlCacheConfigInfo)

1 0

Hans Leidekker : wininet: Add a stub implementation of IncrementUrlCacheHeaderData.
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: 67b6c2a4e9f531278186c612dfc550b68413a258 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67b6c2a4e9f531278186c612d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 13 14:01:27 2009 +0200 wininet: Add a stub implementation of IncrementUrlCacheHeaderData. --- dlls/wininet/urlcache.c | 9 +++++++++ dlls/wininet/wininet.spec | 2 +- include/winineti.h | 1 + 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index db5020c..f385c7e 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -3654,3 +3654,12 @@ DWORD WINAPI RegisterUrlCacheNotification(LPVOID a, DWORD b, DWORD c, DWORD d, D FIXME("(%p %x %x %x %x %x)\n", a, b, c, d, e, f); return 0; } + +/*********************************************************************** + * IncrementUrlCacheHeaderData (WININET.@) + */ +BOOL WINAPI IncrementUrlCacheHeaderData(DWORD index, LPDWORD data) +{ + FIXME("(%u, %p)\n", index, data); + return FALSE; +} diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec index 9506b6c..d5995eb 100644 --- a/dlls/wininet/wininet.spec +++ b/dlls/wininet/wininet.spec @@ -109,7 +109,7 @@ @ stdcall HttpSendRequestExA(long ptr ptr long long) @ stdcall HttpSendRequestExW(long ptr ptr long long) @ stdcall HttpSendRequestW(ptr wstr long ptr long) -@ stub IncrementUrlCacheHeaderData +@ stdcall IncrementUrlCacheHeaderData(long ptr) @ stub InternetAlgIdToStringA @ stub InternetAlgIdToStringW @ stdcall InternetAttemptConnect(long) diff --git a/include/winineti.h b/include/winineti.h index 32951ff..27efa50 100644 --- a/include/winineti.h +++ b/include/winineti.h @@ -94,6 +94,7 @@ BOOL WINAPI GetDiskInfoA(PCSTR,PDWORD,PDWORDLONG,PDWORDLONG); BOOL WINAPI GetUrlCacheConfigInfoA(LPINTERNET_CACHE_CONFIG_INFOA,LPDWORD,DWORD); BOOL WINAPI GetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW,LPDWORD,DWORD); #define GetUrlCacheConfigInfo WINELIB_NAME_AW(GetUrlCacheConfigInfo) +BOOL WINAPI IncrementUrlCacheHeaderData(DWORD,LPDWORD); BOOL WINAPI InternetQueryFortezzaStatus(DWORD*,DWORD_PTR); BOOL WINAPI IsUrlCacheEntryExpiredA(LPCSTR,DWORD,FILETIME*); BOOL WINAPI IsUrlCacheEntryExpiredW(LPCWSTR,DWORD,FILETIME*);

1 0

Aric Stewart : msctf: Implement ITfSource interface for ITfInputProcessorProfiles.
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: fec456b3ff4adc8c7f5046f016eb6c2ac3d3b4a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fec456b3ff4adc8c7f5046f01… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue May 12 12:50:00 2009 -0500 msctf: Implement ITfSource interface for ITfInputProcessorProfiles. --- dlls/msctf/inputprocessor.c | 107 +++++++++++++++++++++++++++++++++++++++++++ dlls/msctf/msctf_internal.h | 1 + 2 files changed, 108 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index 38e9368..f5e5989 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -32,8 +32,10 @@ #include "shlwapi.h" #include "winerror.h" #include "objbase.h" +#include "olectl.h" #include "wine/unicode.h" +#include "wine/list.h" #include "msctf.h" #include "msctf_internal.h" @@ -45,11 +47,23 @@ static const WCHAR szwEnabled[] = {'E','n','a','b','l','e','d',0}; static const WCHAR szwTipfmt[] = {'%','s','\\','%','s',0}; static const WCHAR szwFullLangfmt[] = {'%','s','\\','%','s','\\','%','s','\\','0','x','%','0','8','x','\\','%','s',0}; +typedef struct tagInputProcessorProfilesSink { + struct list entry; + union { + /* InputProcessorProfile Sinks */ + IUnknown *pIUnknown; + /* ITfLanguageProfileNotifySink *pITfLanguageProfileNotifySink; */ + } interfaces; +} InputProcessorProfilesSink; + typedef struct tagInputProcessorProfiles { const ITfInputProcessorProfilesVtbl *InputProcessorProfilesVtbl; + const ITfSourceVtbl *SourceVtbl; LONG refCount; LANGID currentLanguage; + + struct list LanguageProfileNotifySink; } InputProcessorProfiles; typedef struct tagProfilesEnumGuid { @@ -78,9 +92,30 @@ typedef struct tagEnumTfLanguageProfiles { static HRESULT ProfilesEnumGuid_Constructor(IEnumGUID **ppOut); static HRESULT EnumTfLanguageProfiles_Constructor(LANGID langid, IEnumTfLanguageProfiles **ppOut); +static inline InputProcessorProfiles *impl_from_ITfSourceVtbl(ITfSource *iface) +{ + return (InputProcessorProfiles *)((char *)iface - FIELD_OFFSET(InputProcessorProfiles,SourceVtbl)); +} + +static void free_sink(InputProcessorProfilesSink *sink) +{ + IUnknown_Release(sink->interfaces.pIUnknown); + HeapFree(GetProcessHeap(),0,sink); +} + static void InputProcessorProfiles_Destructor(InputProcessorProfiles *This) { + struct list *cursor, *cursor2; TRACE("destroying %p\n", This); + + /* free sinks */ + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->LanguageProfileNotifySink) + { + InputProcessorProfilesSink* sink = LIST_ENTRY(cursor,InputProcessorProfilesSink,entry); + list_remove(cursor); + free_sink(sink); + } + HeapFree(GetProcessHeap(),0,This); } @@ -122,6 +157,10 @@ static HRESULT WINAPI InputProcessorProfiles_QueryInterface(ITfInputProcessorPro { *ppvOut = This; } + else if (IsEqualIID(iid, &IID_ITfSource)) + { + *ppvOut = &This->SourceVtbl; + } if (*ppvOut) { @@ -536,6 +575,71 @@ static const ITfInputProcessorProfilesVtbl InputProcessorProfiles_InputProcessor InputProcessorProfiles_SubstituteKeyboardLayout }; +/***************************************************** + * ITfSource functions + *****************************************************/ +static HRESULT WINAPI IPPSource_QueryInterface(ITfSource *iface, REFIID iid, LPVOID *ppvOut) +{ + InputProcessorProfiles *This = impl_from_ITfSourceVtbl(iface); + return InputProcessorProfiles_QueryInterface((ITfInputProcessorProfiles *)This, iid, *ppvOut); +} + +static ULONG WINAPI IPPSource_AddRef(ITfSource *iface) +{ + InputProcessorProfiles *This = impl_from_ITfSourceVtbl(iface); + return InputProcessorProfiles_AddRef((ITfInputProcessorProfiles*)This); +} + +static ULONG WINAPI IPPSource_Release(ITfSource *iface) +{ + InputProcessorProfiles *This = impl_from_ITfSourceVtbl(iface); + return InputProcessorProfiles_Release((ITfInputProcessorProfiles *)This); +} + +static WINAPI HRESULT IPPSource_AdviseSink(ITfSource *iface, + REFIID riid, IUnknown *punk, DWORD *pdwCookie) +{ + InputProcessorProfiles *This = impl_from_ITfSourceVtbl(iface); + + TRACE("(%p) %s %p %p\n",This,debugstr_guid(riid),punk,pdwCookie); + + if (!riid || !punk || !pdwCookie) + return E_INVALIDARG; + + FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid)); + return E_NOTIMPL; +} + +static WINAPI HRESULT IPPSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) +{ + InputProcessorProfilesSink *sink; + InputProcessorProfiles *This = impl_from_ITfSourceVtbl(iface); + + TRACE("(%p) %x\n",This,pdwCookie); + + if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_IPPSINK) + return E_INVALIDARG; + + sink = (InputProcessorProfilesSink*)remove_Cookie(pdwCookie); + if (!sink) + return CONNECT_E_NOCONNECTION; + + list_remove(&sink->entry); + free_sink(sink); + + return S_OK; +} + +static const ITfSourceVtbl InputProcessorProfiles_SourceVtbl = +{ + IPPSource_QueryInterface, + IPPSource_AddRef, + IPPSource_Release, + + IPPSource_AdviseSink, + IPPSource_UnadviseSink, +}; + HRESULT InputProcessorProfiles_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) { InputProcessorProfiles *This; @@ -547,9 +651,12 @@ HRESULT InputProcessorProfiles_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut return E_OUTOFMEMORY; This->InputProcessorProfilesVtbl= &InputProcessorProfiles_InputProcessorProfilesVtbl; + This->SourceVtbl = &InputProcessorProfiles_SourceVtbl; This->refCount = 1; This->currentLanguage = GetUserDefaultLCID(); + list_init(&This->LanguageProfileNotifySink); + TRACE("returning %p\n", This); *ppOut = (IUnknown *)This; return S_OK; diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 0df88de..15950ed 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -24,6 +24,7 @@ #define COOKIE_MAGIC_TMSINK 0x0010 #define COOKIE_MAGIC_CONTEXTSINK 0x0020 #define COOKIE_MAGIC_GUIDATOM 0x0030 +#define COOKIE_MAGIC_IPPSINK 0x0040 extern DWORD tlsIndex; extern TfClientId processId;

1 0

Aric Stewart : msctf: Support advising ITfLanguageProfileNotifySink in ITfInputProcessorProfiles .
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: 619b3896ec44ada1c0b0daaf0482cda40cb74fd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=619b3896ec44ada1c0b0daaf0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue May 12 12:50:08 2009 -0500 msctf: Support advising ITfLanguageProfileNotifySink in ITfInputProcessorProfiles. --- dlls/msctf/inputprocessor.c | 27 ++++++++++++++++++++++++--- include/msctf.idl | 14 ++++++++++++++ 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index f5e5989..8d36cd5 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -52,7 +52,7 @@ typedef struct tagInputProcessorProfilesSink { union { /* InputProcessorProfile Sinks */ IUnknown *pIUnknown; - /* ITfLanguageProfileNotifySink *pITfLanguageProfileNotifySink; */ + ITfLanguageProfileNotifySink *pITfLanguageProfileNotifySink; } interfaces; } InputProcessorProfilesSink; @@ -599,6 +599,7 @@ static ULONG WINAPI IPPSource_Release(ITfSource *iface) static WINAPI HRESULT IPPSource_AdviseSink(ITfSource *iface, REFIID riid, IUnknown *punk, DWORD *pdwCookie) { + InputProcessorProfilesSink *ipps; InputProcessorProfiles *This = impl_from_ITfSourceVtbl(iface); TRACE("(%p) %s %p %p\n",This,debugstr_guid(riid),punk,pdwCookie); @@ -606,8 +607,28 @@ static WINAPI HRESULT IPPSource_AdviseSink(ITfSource *iface, if (!riid || !punk || !pdwCookie) return E_INVALIDARG; - FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid)); - return E_NOTIMPL; + if (IsEqualIID(riid, &IID_ITfLanguageProfileNotifySink)) + { + ipps = HeapAlloc(GetProcessHeap(),0,sizeof(InputProcessorProfilesSink)); + if (!ipps) + return E_OUTOFMEMORY; + if (!SUCCEEDED(IUnknown_QueryInterface(punk, riid, (LPVOID*)&ipps->interfaces.pITfLanguageProfileNotifySink))) + { + HeapFree(GetProcessHeap(),0,ipps); + return CONNECT_E_CANNOTCONNECT; + } + list_add_head(&This->LanguageProfileNotifySink,&ipps->entry); + *pdwCookie = generate_Cookie(COOKIE_MAGIC_IPPSINK, ipps); + } + else + { + FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid)); + return E_NOTIMPL; + } + + TRACE("cookie %x\n",*pdwCookie); + + return S_OK; } static WINAPI HRESULT IPPSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) diff --git a/include/msctf.idl b/include/msctf.idl index 7e643f4..40853ee 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -699,3 +699,17 @@ interface ITfClientId : IUnknown [in] REFCLSID rclsid, [out] TfClientId *ptid); }; + +[ + object, + uuid(43c9fe15-f494-4c17-9de2-b8a4ac350aa8), + pointer_default(unique) +] +interface ITfLanguageProfileNotifySink : IUnknown +{ + HRESULT OnLanguageChange( + [in] LANGID langid, + [out] BOOL *pfAccept); + + HRESULT OnLanguageChanged(); +}

1 0

Paul Vriens : user32/tests: Fix test failures on Win9x/WinME.
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: 334efcde130e77b372c7e21539d3e3fd1ff44674 URL: http://source.winehq.org/git/wine.git/?a=commit;h=334efcde130e77b372c7e2153… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed May 13 15:13:02 2009 +0200 user32/tests: Fix test failures on Win9x/WinME. --- dlls/user32/tests/scroll.c | 30 +++++++++++++++++++----------- 1 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 55fb6f6..03725b9 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -222,25 +222,27 @@ static void scrollbar_test_default( DWORD style) ret = GetScrollRange( hwnd, SB_VERT, &min, &max); ok( ret || - broken( !ret) /* Win 98/ME */ , "GetScrollRange failed.\n"); + broken( !ret) /* Win 9x/ME */ , "GetScrollRange failed.\n"); /* range is 0,0 if there are no H or V scroll bars. 0,100 otherwise */ if( !( style & ( WS_VSCROLL | WS_HSCROLL))) ok( min == 0 && max == 0, "Scroll bar range is %d,%d. Expected 0,0. Style %08x\n", min, max, style); else todo_wine - ok( min == 0 && max == 100, + ok(( min == 0 && max == 100) || + broken( min == 0 && max == 0), /* Win 9x/ME */ "Scroll bar range is %d,%d. Expected 0,100. Style %08x\n", min, max, style); ret = GetScrollRange( hwnd, SB_HORZ, &min, &max); ok( ret || - broken( !ret) /* Win 98/ME */ , "GetScrollRange failed.\n"); + broken( !ret) /* Win 9x/ME */ , "GetScrollRange failed.\n"); /* range is 0,0 if there are no H or V scroll bars. 0,100 otherwise */ if( !( style & ( WS_VSCROLL | WS_HSCROLL))) ok( min == 0 && max == 0, "Scroll bar range is %d,%d. Expected 0,0. Style %08x\n", min, max, style); else todo_wine - ok( min == 0 && max == 100, + ok(( min == 0 && max == 100) || + broken( min == 0 && max == 0), /* Win 9x/ME */ "Scroll bar range is %d,%d. Expected 0,100. Style %08x\n", min, max, style); /* test GetScrollInfo, vist for vertical SB */ ret = GetScrollInfo( hwnd, SB_VERT, &si); @@ -249,7 +251,9 @@ todo_wine ok( !ret, "GetScrollInfo succeeded unexpectedly. Style is %08x\n", style); else todo_wine - ok( ret, "GetScrollInfo failed unexpectedly. Style is %08x\n", style); + ok( ret || + broken( !ret), /* Win 9x/ME */ + "GetScrollInfo failed unexpectedly. Style is %08x\n", style); /* Same for Horizontal SB */ ret = GetScrollInfo( hwnd, SB_HORZ, &si); /* should fail if no H orV scroll bar styles are present. Succeed otherwise */ @@ -257,7 +261,9 @@ todo_wine ok( !ret, "GetScrollInfo succeeded unexpectedly. Style is %08x\n", style); else todo_wine - ok( ret, "GetScrollInfo failed unexpectedly. Style is %08x\n", style); + ok( ret || + broken( !ret), /* Win 9x/ME */ + "GetScrollInfo failed unexpectedly. Style is %08x\n", style); /* now set the Vertical Scroll range to something that could be the default value it * already has */; ret = SetScrollRange( hwnd, SB_VERT, 0, 100, FALSE); @@ -276,7 +282,7 @@ todo_wine /* should succeed in ALL cases */ ok( ret, "GetScrollInfo failed unexpectedly. Style is %08x\n", style); /* report the windows style */ - winstyle = GetWindowLongW( hwnd, GWL_STYLE ); + winstyle = GetWindowLongA( hwnd, GWL_STYLE ); /* WS_VSCROLL added to the window style */ if( !(style & WS_VSCROLL)) { @@ -286,7 +292,8 @@ todo_wine "unexpected style change %8lx expected %8lx\n", (winstyle & (WS_HSCROLL|WS_VSCROLL)), style | WS_VSCROLL); else - ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == style, + ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == style || + broken((winstyle & (WS_HSCROLL|WS_VSCROLL)) == (WS_HSCROLL|WS_VSCROLL)), /* Win 9x/ME */ "unexpected style change %8lx expected %8x\n", (winstyle & (WS_HSCROLL|WS_VSCROLL)), style); } @@ -314,7 +321,7 @@ todo_wine /* should succeed in ALL cases */ ok( ret, "GetScrollInfo failed unexpectedly. Style is %08x\n", style); /* report the windows style */ - winstyle = GetWindowLongW( hwnd, GWL_STYLE ); + winstyle = GetWindowLongA( hwnd, GWL_STYLE ); /* WS_HSCROLL added to the window style */ if( !(style & WS_HSCROLL)) { @@ -324,7 +331,8 @@ todo_wine "unexpected style change %8lx expected %8lx\n", (winstyle & (WS_HSCROLL|WS_VSCROLL)), style | WS_HSCROLL); else - ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == style, + ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == style || + broken((winstyle & (WS_HSCROLL|WS_VSCROLL)) == (WS_HSCROLL|WS_VSCROLL)), /* Win 9x/ME */ "unexpected style change %8lx expected %8x\n", (winstyle & (WS_HSCROLL|WS_VSCROLL)), style); } @@ -372,7 +380,7 @@ todo_wine /* should fail */ ok( !ret, "GetScrollInfo succeeded unexpectedly. Style is %08x\n", style); /* add scroll styles */ - winstyle = GetWindowLongW( hwnd, GWL_STYLE ); + winstyle = GetWindowLongA( hwnd, GWL_STYLE ); SetWindowLongW( hwnd, GWL_STYLE, winstyle | WS_VSCROLL | WS_HSCROLL); ret = GetScrollInfo( hwnd, SB_VERT, &si); /* should still fail */

1 0

Francois Gouget : msctf/tests: Make some functions static.
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: ec80352ea0d2d1e6a9a99ca1248a7d12605cacc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec80352ea0d2d1e6a9a99ca12… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed May 13 10:30:30 2009 +0200 msctf/tests: Make some functions static. --- dlls/msctf/tests/inputprocessor.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 2b53bcc..a3070fc 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -310,7 +310,7 @@ static const ITextStoreACPVtbl TextStoreACP_TextStoreACPVtbl = TextStoreACP_GetWnd }; -HRESULT TextStoreACP_Constructor(IUnknown **ppOut) +static HRESULT TextStoreACP_Constructor(IUnknown **ppOut) { TextStoreACP *This; @@ -431,7 +431,7 @@ static const ITfThreadMgrEventSinkVtbl ThreadMgrEventSink_ThreadMgrEventSinkVtbl ThreadMgrEventSink_OnPopContext }; -HRESULT ThreadMgrEventSink_Constructor(IUnknown **ppOut) +static HRESULT ThreadMgrEventSink_Constructor(IUnknown **ppOut) { ThreadMgrEventSink *This; @@ -618,7 +618,7 @@ static const ITfTextInputProcessorVtbl TextService_TextInputProcessorVtbl= TextService_Deactivate }; -HRESULT TextService_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) +static HRESULT TextService_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) { TextService *This; if (pUnkOuter) @@ -635,13 +635,13 @@ HRESULT TextService_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) return S_OK; } -HRESULT RegisterTextService(REFCLSID rclsid) +static HRESULT RegisterTextService(REFCLSID rclsid) { ClassFactory_Constructor( TextService_Constructor ,(LPVOID*)&cf); return CoRegisterClassObject(rclsid, (IUnknown*) cf, CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &regid); } -HRESULT UnregisterTextService() +static HRESULT UnregisterTextService() { return CoRevokeClassObject(regid); } @@ -961,7 +961,7 @@ static const ITfKeyEventSinkVtbl KeyEventSink_KeyEventSinkVtbl = KeyEventSink_OnPreservedKey }; -HRESULT KeyEventSink_Constructor(ITfKeyEventSink **ppOut) +static HRESULT KeyEventSink_Constructor(ITfKeyEventSink **ppOut) { KeyEventSink *This; @@ -983,7 +983,7 @@ static void test_KeystrokeMgr(void) HRESULT hr; TF_PRESERVEDKEY tfpk; BOOL preserved; - ITfKeyEventSink *sink; + ITfKeyEventSink *sink = NULL; KeyEventSink_Constructor(&sink);

1 0

Francois Gouget : setupapi: VcpEnumFiles() is implemented so export it.
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: 9cfc021b1a40d702cd687d2d76685e5d98be4dbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cfc021b1a40d702cd687d2d7… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed May 13 10:32:09 2009 +0200 setupapi: VcpEnumFiles() is implemented so export it. --- dlls/setupapi/setupx.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/setupx.spec b/dlls/setupapi/setupx.spec index 590355f..e5bdf23 100644 --- a/dlls/setupapi/setupx.spec +++ b/dlls/setupapi/setupx.spec @@ -122,7 +122,7 @@ 200 pascal VcpOpen(segptr ptr) VcpOpen16 201 pascal VcpClose(word str) VcpClose16 202 pascal -ret16 vcpDefCallbackProc(ptr word word long long) vcpDefCallbackProc16 -203 stub vcpEnumFiles #(ptr long) +203 pascal VcpEnumFiles(ptr long) 204 pascal -ret16 VcpQueueRename(str str str str word word long) VcpQueueRename16 205 pascal -ret16 vsmGetStringName(word ptr word) vsmGetStringName16 206 pascal -ret16 vsmStringDelete(word) vsmStringDelete16

1 0

Francois Gouget : dsound/tests: Replace malloc() with HeapAlloc().
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: d7c5f1a90be0d38247766bfd642533d40c1c0a1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7c5f1a90be0d38247766bfd6… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed May 13 10:32:21 2009 +0200 dsound/tests: Replace malloc() with HeapAlloc(). --- dlls/dsound/tests/ds3d.c | 4 ++-- dlls/dsound/tests/ds3d8.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 8f5b88a..71ff2ab 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -48,7 +48,7 @@ char* wave_generate_la(WAVEFORMATEX* wfx, double duration, DWORD* size) nb_samples=(int)(duration*wfx->nSamplesPerSec); *size=nb_samples*wfx->nBlockAlign; - b=buf=malloc(*size); + b=buf=HeapAlloc(GetProcessHeap(), 0, *size); for (i=0;i<nb_samples;i++) { double y=sin(440.0*2*PI*i/wfx->nSamplesPerSec); if (wfx->wBitsPerSample==8) { @@ -674,7 +674,7 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, "The sound played for %d ms instead of %g ms\n", now-start_time,1000*duration); - free(state.wave); + HeapFree(GetProcessHeap(), 0, state.wave); if (is_primary) { /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index 1f5f28a..9dfdd31 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -518,7 +518,7 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, "The sound played for %d ms instead of %g ms\n", now-start_time,1000*duration); - free(state.wave); + HeapFree(GetProcessHeap(), 0, state.wave); if (is_primary) { /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */

1 0