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

Hans Leidekker : wininet: Implement GetDiskInfoA.
by Alexandre Julliard May 13, 2009

May 13, 2009

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

Aric Stewart : msctf: Support advising ITfLanguageProfileNotifySink in ITfInputProcessorProfiles .
by Alexandre Julliard May 13, 2009

May 13, 2009

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

Stefan Dösinger : wined3d: Separate Tx tempregs from Tx varyings in ARB.
by Alexandre Julliard May 13, 2009

May 13, 2009

Module: wine Branch: master Commit: 90526ce7617bf5da14a0b824046ceda42c77666c URL: http://source.winehq.org/git/wine.git/?a=commit;h=90526ce7617bf5da14a0b8240… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 8 17:14:56 2009 +0200 wined3d: Separate Tx tempregs from Tx varyings in ARB. ps_1_3 uses Tx to pass in texture coordinates, but also as temporary registers. ps_1_4 and ps_2_0 only use them for texture coordinates. This patch gets rid of the Tx = fragment.texcoord[x] assign in all shader versions, and doesn't even declare Tx in ps_1_4 and ps_2_0. The <=ps_1_3 instructions know which kind of input they expect from the Tx register, so the instruction handlers now know if they have to read the tempreg Tx or the varying fragment.texcoord[x]. --- dlls/wined3d/arb_program_shader.c | 100 ++++++++++++++++++++++-------------- 1 files changed, 61 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=90526ce7617bf5da14a0b…

1 0

Stefan Dösinger : wined3d: Tidy up pshader_hw_cmp.
by Alexandre Julliard May 13, 2009

May 13, 2009

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

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

May 13, 2009

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

Aric Stewart : msctf: Implement ITfSource interface for ITfInputProcessorProfiles.
by Alexandre Julliard May 13, 2009

May 13, 2009

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

Stefan Dösinger : wined3d: Tidy up pshader_hw_cnd.
by Alexandre Julliard May 13, 2009

May 13, 2009

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: Fix 1. 4 pshader projection in ARB.
by Alexandre Julliard May 13, 2009

May 13, 2009

Module: wine Branch: master Commit: fc5e511dda1683c9bfd3b29011d08118e14bb842 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc5e511dda1683c9bfd3b2901… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 5 22:13:12 2009 +0200 wined3d: Fix 1.4 pshader projection in ARB. shader_arb_add_src_param handled DW and TXP undid it again. Remove DZ DW from the modifiers and handle it in the instruction. DZ cannot be handled by TXP as is, so move the .z component to .w and make it DW-like. Using SZW+TXP is likely more efficient than the RCP, MUL, TEX we'd get if we let shader_arb_add_src_param do the job. --- dlls/wined3d/arb_program_shader.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0eccaa0..1e97f1b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1037,6 +1037,7 @@ static void pshader_hw_tex(const struct wined3d_shader_instruction *ins) DWORD shader_version = WINED3D_SHADER_VERSION(ins->ctx->reg_maps->shader_version.major, ins->ctx->reg_maps->shader_version.minor); BOOL projected = FALSE, bias = FALSE; + struct wined3d_shader_src_param src; char reg_dest[40]; char reg_coord[40]; @@ -1049,8 +1050,13 @@ static void pshader_hw_tex(const struct wined3d_shader_instruction *ins) 1.4+: Use provided coordinate source register. */ if (shader_version < WINED3D_SHADER_VERSION(1,4)) strcpy(reg_coord, reg_dest); - else - shader_arb_get_src_param(ins, &ins->src[0], 0, reg_coord); + else { + /* TEX is the only instruction that can handle DW and DZ natively */ + src = ins->src[0]; + if(src.modifiers == WINED3DSPSM_DW) src.modifiers = WINED3DSPSM_NONE; + if(src.modifiers == WINED3DSPSM_DZ) src.modifiers = WINED3DSPSM_NONE; + shader_arb_get_src_param(ins, &src, 0, reg_coord); + } /* 1.0-1.4: Use destination register number as texture code. 2.0+: Use provided sampler number as texure code. */ @@ -1078,6 +1084,11 @@ static void pshader_hw_tex(const struct wined3d_shader_instruction *ins) { DWORD src_mod = ins->src[0].modifiers; if (src_mod == WINED3DSPSM_DZ) { + /* TXP cannot handle DZ natively, so move the z coordinate to .w. reg_coord is a read-only + * varying register, so we need a temp reg + */ + shader_addline(ins->ctx->buffer, "SWZ TA, %s, x, y, z, z;\n", reg_coord); + strcpy(reg_coord, "TA"); projected = TRUE; } else if(src_mod == WINED3DSPSM_DW) { projected = TRUE;

1 0

Francois Gouget : winecfg: Use Win32 APIs instead of strdup().
by Alexandre Julliard May 13, 2009

May 13, 2009

Module: wine Branch: master Commit: 7eac467258694ae78b7542f24042fb5eb36ee229 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eac467258694ae78b7542f24… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed May 13 10:33:12 2009 +0200 winecfg: Use Win32 APIs instead of strdup(). --- programs/winecfg/audio.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 8e966a5..79e62f0 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -543,7 +543,10 @@ static void findAudioDrivers(void) static void checkRegistrySetting(HWND hDlg) { const AUDIO_DRIVER *pAudioDrv; - char * token, * tokens = strdup(curAudioDriver); + char * token, * tokens; + + tokens = HeapAlloc(GetProcessHeap(), 0, strlen(curAudioDriver)+1); + strcpy(tokens, curAudioDriver); start_over: token = strtok(tokens, ","); @@ -581,7 +584,7 @@ start_over: } token = strtok(NULL, ","); } - free(tokens); + HeapFree(GetProcessHeap(), 0, tokens); } static void selectDriver(HWND hDlg, const char * driver)

1 0

Francois Gouget : ddraw/tests: Replace malloc() with HeapAlloc().
by Alexandre Julliard May 13, 2009

May 13, 2009

Module: wine Branch: master Commit: 82b7fc685512b95120bf7590e7bf75accc233c44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82b7fc685512b95120bf7590e… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed May 13 10:33:42 2009 +0200 ddraw/tests: Replace malloc() with HeapAlloc(). --- dlls/ddraw/tests/ddrawmodes.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index e0bf526..03ac673 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -92,16 +92,16 @@ static void releasedirectdraw(void) static void adddisplaymode(LPDDSURFACEDESC lpddsd) { if (!modes) - modes = malloc((modes_size = 2) * sizeof(DDSURFACEDESC)); + modes = HeapAlloc(GetProcessHeap(), 0, (modes_size = 2) * sizeof(DDSURFACEDESC)); if (modes_cnt == modes_size) - modes = realloc(modes, (modes_size *= 2) * sizeof(DDSURFACEDESC)); + modes = HeapReAlloc(GetProcessHeap(), 0, modes, (modes_size *= 2) * sizeof(DDSURFACEDESC)); assert(modes); modes[modes_cnt++] = *lpddsd; } static void flushdisplaymodes(void) { - free(modes); + HeapFree(GetProcessHeap(), 0, modes); modes = 0; modes_cnt = modes_size = 0; }

1 0