February 2009 - Wine-Commits

Francois Gouget : wined3d: Make debug{fixup_channel_source, yuv_fixup}() static.
by Alexandre Julliard Feb. 18, 2009

Feb. 18, 2009

Module: wine Branch: master Commit: 5b60258f0d0c5154dd42ef98c5aad435e58df342 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b60258f0d0c5154dd42ef98c… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 17 18:54:43 2009 +0100 wined3d: Make debug{fixup_channel_source,yuv_fixup}() static. --- dlls/wined3d/utils.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 7937b86..4ba499d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1171,7 +1171,7 @@ const char *debug_d3ddegree(WINED3DDEGREETYPE degree) { } } -const char *debug_fixup_channel_source(enum fixup_channel_source source) +static const char *debug_fixup_channel_source(enum fixup_channel_source source) { switch(source) { @@ -1191,7 +1191,7 @@ const char *debug_fixup_channel_source(enum fixup_channel_source source) } } -const char *debug_yuv_fixup(enum yuv_fixup yuv_fixup) +static const char *debug_yuv_fixup(enum yuv_fixup yuv_fixup) { switch(yuv_fixup) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6ccd22a..91f2f50 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2048,8 +2048,6 @@ const char *debug_glerror(GLenum error); const char *debug_d3dbasis(WINED3DBASISTYPE basis); const char *debug_d3ddegree(WINED3DDEGREETYPE order); const char* debug_d3dtop(WINED3DTEXTUREOP d3dtop); -const char *debug_fixup_channel_source(enum fixup_channel_source source); -const char *debug_yuv_fixup(enum yuv_fixup yuv_fixup); void dump_color_fixup_desc(struct color_fixup_desc fixup); const char *debug_surflocation(DWORD flag);

1 0

Francois Gouget : winetest: Annotate xmalloc() and xrealloc() with allocation size attribute.
by Alexandre Julliard Feb. 18, 2009

Feb. 18, 2009

Module: wine Branch: master Commit: e3aa47c3889d3787a25e3e6bf686e825d08ae90b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3aa47c3889d3787a25e3e6bf… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 17 18:51:43 2009 +0100 winetest: Annotate xmalloc() and xrealloc() with allocation size attribute. --- programs/winetest/winetest.h | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/programs/winetest/winetest.h b/programs/winetest/winetest.h index 795bf03..e4844a9 100644 --- a/programs/winetest/winetest.h +++ b/programs/winetest/winetest.h @@ -28,9 +28,6 @@ void fatal (const char* msg); void warning (const char* msg); -void *xmalloc (size_t len); -void *xrealloc (void *op, size_t len); -char *xstrdup( const char *str ); void xprintf (const char *fmt, ...); char *vstrmake (size_t *lenp, va_list ap); char *strmake (size_t *lenp, ...); @@ -45,6 +42,13 @@ extern HANDLE logfile; #include <windows.h> +#ifndef __WINE_ALLOC_SIZE +#define __WINE_ALLOC_SIZE(x) +#endif +void *xmalloc (size_t len) __WINE_ALLOC_SIZE(1); +void *xrealloc (void *op, size_t len) __WINE_ALLOC_SIZE(2); +char *xstrdup( const char *str ); + enum report_type { R_STATUS = 0, R_PROGRESS,

1 0

Francois Gouget : wintrust: Make WINTRUST_ReAlloc() static.
by Alexandre Julliard Feb. 18, 2009

Feb. 18, 2009

Module: wine Branch: master Commit: d5936f4200090a4f17d2bd55013980594b0ede48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5936f4200090a4f17d2bd550… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 17 18:49:52 2009 +0100 wintrust: Make WINTRUST_ReAlloc() static. --- dlls/wintrust/wintrust_main.c | 31 +++++++++++++++++-------------- dlls/wintrust/wintrust_priv.h | 1 - 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index d6800b8..fa4da16 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -41,6 +41,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(wintrust); +/* Utility functions */ +void * WINAPI WINTRUST_Alloc(DWORD cb) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cb); +} + +static void* WINTRUST_ReAlloc(void *ptr, DWORD cb) __WINE_ALLOC_SIZE(2); +static void* WINTRUST_ReAlloc(void *ptr, DWORD cb) +{ + return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ptr, cb); +} + +void WINAPI WINTRUST_Free(void *p) +{ + HeapFree(GetProcessHeap(), 0, p); +} + /*********************************************************************** * DllMain (WINTRUST.@) */ @@ -888,20 +905,6 @@ BOOL WINAPI WintrustSetRegPolicyFlags( DWORD dwPolicyFlags) } /* Utility functions */ -void * WINAPI WINTRUST_Alloc(DWORD cb) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cb); -} - -void * WINAPI WINTRUST_ReAlloc(void *ptr, DWORD cb) -{ - return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ptr, cb); -} - -void WINAPI WINTRUST_Free(void *p) -{ - HeapFree(GetProcessHeap(), 0, p); -} BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store) { diff --git a/dlls/wintrust/wintrust_priv.h b/dlls/wintrust/wintrust_priv.h index f55a1b2..148e161 100644 --- a/dlls/wintrust/wintrust_priv.h +++ b/dlls/wintrust/wintrust_priv.h @@ -19,7 +19,6 @@ #define __WINTRUST_PRIV_H__ void * WINAPI WINTRUST_Alloc(DWORD cb) __WINE_ALLOC_SIZE(1); -void * WINAPI WINTRUST_ReAlloc(void *ptr, DWORD cb) __WINE_ALLOC_SIZE(2); void WINAPI WINTRUST_Free(void *p); BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store); BOOL WINAPI WINTRUST_AddSgnr(CRYPT_PROVIDER_DATA *data,

1 0

Francois Gouget : crypt32: Merge two traces.
by Alexandre Julliard Feb. 18, 2009

Feb. 18, 2009

Module: wine Branch: master Commit: 443fdf2731d1ff528e7cf1f6812cb65c7b211216 URL: http://source.winehq.org/git/wine.git/?a=commit;h=443fdf2731d1ff528e7cf1f68… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 17 18:49:07 2009 +0100 crypt32: Merge two traces. --- dlls/crypt32/chain.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index dce06b7..5943117 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -800,9 +800,8 @@ static void dump_element(PCCERT_CONTEXT cert) TRACE_(chain)("issued to %s\n", debugstr_w(name)); CryptMemFree(name); } - TRACE_(chain)("valid from %s", - debugstr_w(filetime_to_str(&cert->pCertInfo->NotBefore))); - TRACE_(chain)("to %s\n", + TRACE_(chain)("valid from %s to %s\n", + debugstr_w(filetime_to_str(&cert->pCertInfo->NotBefore)), debugstr_w(filetime_to_str(&cert->pCertInfo->NotAfter))); TRACE_(chain)("%d extensions\n", cert->pCertInfo->cExtension); for (i = 0; i < cert->pCertInfo->cExtension; i++)

1 0

Juan Lang : oleaut32: Remove an errant semicolon.
by Alexandre Julliard Feb. 18, 2009

Feb. 18, 2009

Module: wine Branch: master Commit: 63303048c4df19bd80dea719aa832622fb1af552 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63303048c4df19bd80dea719a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Feb 17 09:43:23 2009 -0800 oleaut32: Remove an errant semicolon. --- dlls/oleaut32/vartype.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 2ef1510..77c2d14 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -82,7 +82,7 @@ static inline void VARIANT_CopyData(const VARIANT *srcVar, VARTYPE vt, void *pOu else if (fract == -0.5) { typ is_odd = (typ)whole & 1; res = whole - is_odd; } \ else if (fract > -0.5) res = (typ)whole; \ else res = (typ)whole - (typ)1; \ -} while(0); +} while(0) /* Coerce VT_BSTR to a numeric type */ @@ -3980,9 +3980,9 @@ HRESULT WINAPI VarCyRound(const CY cyIn, int cDecimals, CY* pCyOut) _VarR8FromCy(cyIn, &d); d = d * div; - VARIANT_DutchRound(LONGLONG, d, pCyOut->int64) + VARIANT_DutchRound(LONGLONG, d, pCyOut->int64); d = (double)pCyOut->int64 / div * CY_MULTIPLIER_F; - VARIANT_DutchRound(LONGLONG, d, pCyOut->int64) + VARIANT_DutchRound(LONGLONG, d, pCyOut->int64); return S_OK; } }

1 0

Aric Stewart : msctf: Implement ITfInputProcessorProfiles:: IsEnabledLanguageProfile.
by Alexandre Julliard Feb. 18, 2009

Feb. 18, 2009

Module: wine Branch: master Commit: ba99ea2e0cd38fea564910ed798da23c5d2c499e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba99ea2e0cd38fea564910ed7… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Feb 17 10:25:44 2009 -0600 msctf: Implement ITfInputProcessorProfiles::IsEnabledLanguageProfile. --- dlls/msctf/inputprocessor.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index efdf831..ca2bbda 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -348,9 +348,47 @@ static HRESULT WINAPI InputProcessorProfiles_IsEnabledLanguageProfile( ITfInputProcessorProfiles *iface, REFCLSID rclsid, LANGID langid, REFGUID guidProfile, BOOL *pfEnable) { + HKEY key; + WCHAR buf[39]; + WCHAR buf2[39]; + WCHAR fullkey[168]; + ULONG res; + InputProcessorProfiles *This = (InputProcessorProfiles*)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + TRACE("(%p) %s, %i, %s, %p\n",This,debugstr_guid(rclsid),langid,debugstr_guid(guidProfile),pfEnable); + + if (!pfEnable) + return E_INVALIDARG; + + StringFromGUID2(rclsid, buf, 39); + StringFromGUID2(guidProfile, buf2, 39); + sprintfW(fullkey,szwFullLangfmt,szwSystemTIPKey,buf,szwLngp,langid,buf2); + + res = RegOpenKeyExW(HKEY_CURRENT_USER, fullkey, 0, KEY_READ | KEY_WRITE, &key); + + if (!res) + { + DWORD count = sizeof(DWORD); + res = RegQueryValueExW(key, szwEnabled, 0, NULL, (LPBYTE)pfEnable, &count); + RegCloseKey(key); + } + + if (res) /* Try Default */ + { + res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, fullkey, 0, KEY_READ | KEY_WRITE, &key); + + if (!res) + { + DWORD count = sizeof(DWORD); + res = RegQueryValueExW(key, szwEnabled, 0, NULL, (LPBYTE)pfEnable, &count); + RegCloseKey(key); + } + } + + if (!res) + return S_OK; + else + return E_FAIL; } static HRESULT WINAPI InputProcessorProfiles_EnableLanguageProfileByDefault(

1 0

Huw Davies : inetcomm/tests: AddRef on the stream doesn' t return the ref count on win95.
by Alexandre Julliard Feb. 18, 2009

Feb. 18, 2009

Module: wine Branch: master Commit: 6660d1dc38e12cd6a01db508288212406027f32b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6660d1dc38e12cd6a01db5082… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 17 15:43:09 2009 +0000 inetcomm/tests: AddRef on the stream doesn't return the ref count on win95. --- dlls/inetcomm/tests/mimeole.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 1f29abb..7edef67 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -324,7 +324,9 @@ static void test_CreateMessage(void) IMimeMessage_Release(msg); ref = IStream_AddRef(stream); - ok(ref == 2, "ref %d\n", ref); + ok(ref == 2 || + broken(ref == 1), /* win95 */ + "ref %d\n", ref); IStream_Release(stream); IStream_Release(stream);

1 0

Huw Davies : inetcomm/tests: Object is a static singleton on win95.
by Alexandre Julliard Feb. 18, 2009

Feb. 18, 2009

Module: wine Branch: master Commit: a6d584cec9f3e22942c964e5c99e234a213bb7a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6d584cec9f3e22942c964e5c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 17 15:42:09 2009 +0000 inetcomm/tests: Object is a static singleton on win95. --- dlls/inetcomm/tests/mimeintl.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/inetcomm/tests/mimeintl.c b/dlls/inetcomm/tests/mimeintl.c index e49567d..563943f 100644 --- a/dlls/inetcomm/tests/mimeintl.c +++ b/dlls/inetcomm/tests/mimeintl.c @@ -52,7 +52,9 @@ static void test_create(void) /* test to show that the object is a singleton with a reference held by the dll. */ ref = IMimeInternational_Release(internat2); - ok(ref == 2, "got %d\n", ref); + ok(ref == 2 || + ref == 1, /* win95 - object is a static singleton */ + "got %d\n", ref); ref = IMimeInternational_Release(internat); ok(ref == 1, "got %d\n", ref);

1 0

Stefano Guidoni : msacm32: Typo in Italian resource file.
by Alexandre Julliard Feb. 18, 2009

Feb. 18, 2009

Module: wine Branch: master Commit: 5bb3edb8d3fe8a86085955f447a60c3a07cf3a12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bb3edb8d3fe8a86085955f44… Author: Stefano Guidoni <s.guidoni(a)tin.it> Date: Mon Feb 16 20:22:23 2009 +0100 msacm32: Typo in Italian resource file. --- dlls/msacm32/msacm_It.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msacm32/msacm_It.rc b/dlls/msacm32/msacm_It.rc index 72a0361..1ce6b42 100644 --- a/dlls/msacm32/msacm_It.rc +++ b/dlls/msacm32/msacm_It.rc @@ -51,7 +51,7 @@ BEGIN CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP #endif DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Anulla", IDCANCEL, 92, 80, 40, 14 + PUSHBUTTON "Annulla", IDCANCEL, 92, 80, 40, 14 PUSHBUTTON "&Aiuto", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 END

1 0

Aric Stewart : msctf: Implement ITfInputProcessorProfiles:: EnableLanguageProfileByDefault.
by Alexandre Julliard Feb. 18, 2009

Feb. 18, 2009

Module: wine Branch: master Commit: 6f019fe9fe10c6a3f2bf9b4303de4f8d4d4d087b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f019fe9fe10c6a3f2bf9b430… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Feb 17 10:25:36 2009 -0600 msctf: Implement ITfInputProcessorProfiles::EnableLanguageProfileByDefault. --- dlls/msctf/inputprocessor.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index 83ec51e..efdf831 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -357,9 +357,30 @@ static HRESULT WINAPI InputProcessorProfiles_EnableLanguageProfileByDefault( ITfInputProcessorProfiles *iface, REFCLSID rclsid, LANGID langid, REFGUID guidProfile, BOOL fEnable) { + HKEY key; + WCHAR buf[39]; + WCHAR buf2[39]; + WCHAR fullkey[168]; + ULONG res; + InputProcessorProfiles *This = (InputProcessorProfiles*)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + TRACE("(%p) %s %x %s %i\n",This,debugstr_guid(rclsid),langid,debugstr_guid(guidProfile),fEnable); + + StringFromGUID2(rclsid, buf, 39); + StringFromGUID2(guidProfile, buf2, 39); + sprintfW(fullkey,szwFullLangfmt,szwSystemTIPKey,buf,szwLngp,langid,buf2); + + res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, fullkey, 0, KEY_READ | KEY_WRITE, &key); + + if (!res) + { + RegSetValueExW(key, szwEnabled, 0, REG_DWORD, (LPBYTE)&fEnable, sizeof(DWORD)); + RegCloseKey(key); + } + else + return E_FAIL; + + return S_OK; } static HRESULT WINAPI InputProcessorProfiles_SubstituteKeyboardLayout(

1 0