October 2010 - Wine-commits

Sven Baars : ipconfig: Update the Dutch translation.
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: 5fb9e9081ab06cd8792f962902a3d7fd3f6b8a1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb9e9081ab06cd8792f96290… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Oct 8 22:09:23 2010 +0200 ipconfig: Update the Dutch translation. --- programs/ipconfig/Nl.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/ipconfig/Nl.rc b/programs/ipconfig/Nl.rc index 66c126f..0891188 100644 --- a/programs/ipconfig/Nl.rc +++ b/programs/ipconfig/Nl.rc @@ -44,4 +44,5 @@ STRINGTABLE STRING_DHCP_ENABLED, "DHCP geactiveerd" STRING_YES, "Ja" STRING_NO, "Nee" + STRING_DEFAULT_GATEWAY, "Standaard gateway" }

1 0

Sven Baars : inetcpl.cpl: Update the Dutch translation.
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: f896b5eb6d8c9951ac61ec2683ee4ef566e55bd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f896b5eb6d8c9951ac61ec268… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Oct 8 22:09:36 2010 +0200 inetcpl.cpl: Update the Dutch translation. --- dlls/inetcpl.cpl/cpl_Nl.rc | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_Nl.rc b/dlls/inetcpl.cpl/cpl_Nl.rc index 7c9acc7..b34bd9d 100644 --- a/dlls/inetcpl.cpl/cpl_Nl.rc +++ b/dlls/inetcpl.cpl/cpl_Nl.rc @@ -26,5 +26,37 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE BEGIN IDS_CPL_NAME "Internet-instellingen" - IDS_CPL_INFO "Configureer Wine Internet Browser en gerelateerde instellingen" + IDS_CPL_INFO "Configureer Wine Internet Browser en gerelateerde instellingen" +END + +/* "General" propsheet */ +IDD_GENERAL DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Algemeen" +BEGIN + + GROUPBOX " Startpagina ", IDC_STATIC, 4, 4, 312, 52 + LTEXT "Hier kunt u het adres kiezen dat gebruikt wordt als uw startpagina.", + IDC_STATIC, 58, 10, 252, 10 + EDITTEXT IDC_HOME_EDIT, 58, 22, 252, 12, WS_VISIBLE | ES_AUTOHSCROLL + PUSHBUTTON "&Huidige pagina", IDC_HOME_CURRENT, 58, 36, 80, 14 + PUSHBUTTON "&Standaardpagina", IDC_HOME_DEFAULT, 144, 36, 80, 14 + PUSHBUTTON "&Lege pagina", IDC_HOME_BLANK, 230, 36, 80, 14 + +END + +/* "Content" propsheet */ +IDD_CONTENT DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Inhoud" +BEGIN + + GROUPBOX " Certificaten ", IDC_STATIC, 4, 4, 312, 50 + LTEXT "Certificaten worden gebruikt voor uw persoonlijke identificatie en om certificaat-autoriteiten en uitgevers te identificeren.", + IDC_STATIC, 58, 14, 252, 18 + PUSHBUTTON "Certificaten...", IDC_CERT, 146, 34, 80, 14 + PUSHBUTTON "Uitgevers...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 + END

1 0

Jacek Caban : shlwapi: Skip more tests on too old shlwapi.dll.
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: a839e2ec4572dad3b790f20a925adcab0e4875b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a839e2ec4572dad3b790f20a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 10 15:11:22 2010 +0200 shlwapi: Skip more tests on too old shlwapi.dll. --- dlls/shlwapi/tests/clist.c | 13 +++++++++++-- dlls/shlwapi/tests/clsid.c | 7 +++++++ dlls/shlwapi/tests/ordinal.c | 6 ++++++ dlls/shlwapi/tests/path.c | 6 ++++++ dlls/shlwapi/tests/shreg.c | 7 +++++++ 5 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/clist.c b/dlls/shlwapi/tests/clist.c index 3b979fd..0c1704d 100644 --- a/dlls/shlwapi/tests/clist.c +++ b/dlls/shlwapi/tests/clist.c @@ -212,10 +212,16 @@ static HRESULT (WINAPI *pSHLWAPI_213)(_IDummyStream*); static HRESULT (WINAPI *pSHLWAPI_214)(_IDummyStream*,ULARGE_INTEGER*); -static void InitFunctionPtrs(void) +static BOOL InitFunctionPtrs(void) { SHLWAPI_hshlwapi = GetModuleHandleA("shlwapi.dll"); + /* SHCreateStreamOnFileEx was introduced in shlwapi v6.0 */ + if(!GetProcAddress(SHLWAPI_hshlwapi, "SHCreateStreamOnFileEx")){ + win_skip("Too old shlwapi version\n"); + return FALSE; + } + pSHLWAPI_17 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)17); ok(pSHLWAPI_17 != 0, "No Ordinal 17\n"); pSHLWAPI_18 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)18); @@ -238,6 +244,8 @@ static void InitFunctionPtrs(void) ok(pSHLWAPI_213 != 0, "No Ordinal 213\n"); pSHLWAPI_214 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)214); ok(pSHLWAPI_214 != 0, "No Ordinal 214\n"); + + return TRUE; } static void InitDummyStream(_IDummyStream* iface) @@ -623,7 +631,8 @@ static void test_SHLWAPI_214(void) START_TEST(clist) { - InitFunctionPtrs(); + if(!InitFunctionPtrs()) + return; test_CList(); diff --git a/dlls/shlwapi/tests/clsid.c b/dlls/shlwapi/tests/clsid.c index 85550fc..ed37c79 100644 --- a/dlls/shlwapi/tests/clsid.c +++ b/dlls/shlwapi/tests/clsid.c @@ -185,6 +185,13 @@ static void test_CLSIDFromProgIDWrap(void) START_TEST(clsid) { hShlwapi = GetModuleHandleA("shlwapi.dll"); + + /* SHCreateStreamOnFileEx was introduced in shlwapi v6.0 */ + if(!GetProcAddress(hShlwapi, "SHCreateStreamOnFileEx")){ + win_skip("Too old shlwapi version\n"); + return; + } + pSHLWAPI_269 = (void*)GetProcAddress(hShlwapi, (LPSTR)269); pSHLWAPI_23 = (void*)GetProcAddress(hShlwapi, (LPSTR)23); diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 7b02031..dfee9bf 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -2770,6 +2770,12 @@ START_TEST(ordinal) is_win2k_and_lower = GetProcAddress(hShlwapi, "StrChrNW") == 0; is_win9x = GetProcAddress(hShlwapi, (LPSTR)99) == 0; /* StrCpyNXA */ + /* SHCreateStreamOnFileEx was introduced in shlwapi v6.0 */ + if(!GetProcAddress(hShlwapi, "SHCreateStreamOnFileEx")){ + win_skip("Too old shlwapi version\n"); + return; + } + init_pointers(); hmlang = LoadLibraryA("mlang.dll"); diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 9b4b15e..e5f5c7c 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -1362,6 +1362,12 @@ START_TEST(path) { HMODULE hShlwapi = GetModuleHandleA("shlwapi.dll"); + /* SHCreateStreamOnFileEx was introduced in shlwapi v6.0 */ + if(!GetProcAddress(hShlwapi, "SHCreateStreamOnFileEx")){ + win_skip("Too old shlwapi version\n"); + return; + } + pPathCreateFromUrlA = (void*)GetProcAddress(hShlwapi, "PathCreateFromUrlA"); pPathCreateFromUrlW = (void*)GetProcAddress(hShlwapi, "PathCreateFromUrlW"); pPathCombineW = (void*)GetProcAddress(hShlwapi, "PathCombineW"); diff --git a/dlls/shlwapi/tests/shreg.c b/dlls/shlwapi/tests/shreg.c index 5fb3dac..11ebae9 100644 --- a/dlls/shlwapi/tests/shreg.c +++ b/dlls/shlwapi/tests/shreg.c @@ -452,6 +452,13 @@ START_TEST(shreg) if (!hkey) return; hshlwapi = GetModuleHandleA("shlwapi.dll"); + + /* SHCreateStreamOnFileEx was introduced in shlwapi v6.0 */ + if(!GetProcAddress(hshlwapi, "SHCreateStreamOnFileEx")){ + win_skip("Too old shlwapi version\n"); + return; + } + pSHCopyKeyA=(SHCopyKeyA_func)GetProcAddress(hshlwapi,"SHCopyKeyA"); pSHRegGetPathA=(SHRegGetPathA_func)GetProcAddress(hshlwapi,"SHRegGetPathA"); pSHRegGetValueA=(SHRegGetValueA_func)GetProcAddress(hshlwapi,"SHRegGetValueA");

1 0

Piotr Caban : urlmon: Added ProtocolStream_Stat implementation.
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: 8e48cd1ad7ae94d0db30373ff9a0812fa743815d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e48cd1ad7ae94d0db30373ff… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Oct 10 22:22:13 2010 +0200 urlmon: Added ProtocolStream_Stat implementation. --- dlls/urlmon/binding.c | 26 ++++++++++++++++++++++++-- dlls/urlmon/tests/url.c | 26 ++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index b7f742d..ca2b91d 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -632,8 +632,30 @@ static HRESULT WINAPI ProtocolStream_Stat(IStream *iface, STATSTG *pstatstg, DWORD dwStatFlag) { ProtocolStream *This = STREAM_THIS(iface); - FIXME("(%p)->(%p %08x)\n", This, pstatstg, dwStatFlag); - return E_NOTIMPL; + TRACE("(%p)->(%p %08x)\n", This, pstatstg, dwStatFlag); + + if(!pstatstg) + return E_FAIL; + + memset(pstatstg, 0, sizeof(STATSTG)); + + if(!(dwStatFlag&STATFLAG_NONAME) && This->buf->cache_file) { + pstatstg->pwcsName = CoTaskMemAlloc((lstrlenW(This->buf->cache_file)+1)*sizeof(WCHAR)); + if(!pstatstg->pwcsName) + return STG_E_INSUFFICIENTMEMORY; + + lstrcpyW(pstatstg->pwcsName, This->buf->cache_file); + } + + pstatstg->type = STGTY_STREAM; + if(This->buf->file != INVALID_HANDLE_VALUE) { + GetFileSizeEx(This->buf->file, (PLARGE_INTEGER)&pstatstg->cbSize); + GetFileTime(This->buf->file, &pstatstg->ctime, &pstatstg->atime, &pstatstg->mtime); + if(pstatstg->cbSize.QuadPart) + pstatstg->grfMode = GENERIC_READ; + } + + return S_OK; } static HRESULT WINAPI ProtocolStream_Clone(IStream *iface, IStream **ppstm) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 9bd25a7..03a95fd 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1625,6 +1625,8 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallbackEx *iface, DW switch(pstgmed->tymed) { case TYMED_ISTREAM: if(grfBSCF & BSCF_FIRSTDATANOTIFICATION) { + STATSTG stat; + hres = IStream_Write(U(*pstgmed).pstm, buf, 10, NULL); ok(hres == STG_E_ACCESSDENIED, "Write failed: %08x, expected STG_E_ACCESSDENIED\n", hres); @@ -1634,6 +1636,30 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallbackEx *iface, DW hres = IStream_Revert(U(*pstgmed).pstm); ok(hres == E_NOTIMPL, "Revert failed: %08x, expected E_NOTIMPL\n", hres); + + hres = IStream_Stat(U(*pstgmed).pstm, NULL, STATFLAG_NONAME); + ok(hres == E_FAIL, "hres = %x\n", hres); + if(use_cache_file && emulate_protocol) { + hres = IStream_Stat(U(*pstgmed).pstm, &stat, STATFLAG_DEFAULT); + ok(hres == S_OK, "hres = %x\n", hres); + ok(!lstrcmpW(stat.pwcsName, cache_file_name), + "stat.pwcsName = %s, cache_file_name = %s\n", + wine_dbgstr_w(stat.pwcsName), wine_dbgstr_w(cache_file_name)); + CoTaskMemFree(stat.pwcsName); + ok(U(stat.cbSize).LowPart == (bindf&BINDF_ASYNCHRONOUS?0:6500), + "stat.cbSize.LowPart = %u\n", U(stat.cbSize).LowPart); + } else { + hres = IStream_Stat(U(*pstgmed).pstm, &stat, STATFLAG_NONAME); + ok(hres == S_OK, "hres = %x\n", hres); + ok(!stat.pwcsName || broken(stat.pwcsName!=NULL), + "stat.pwcsName = %s\n", wine_dbgstr_w(stat.pwcsName)); + } + ok(stat.type == STGTY_STREAM, "stat.type = %x\n", stat.type); + ok(U(stat.cbSize).HighPart == 0, "stat.cbSize.HighPart != 0\n"); + ok(stat.grfMode == (U(stat.cbSize).LowPart?GENERIC_READ:0), "stat.grfMode = %x\n", stat.grfMode); + ok(stat.grfLocksSupported == 0, "stat.grfLocksSupported = %x\n", stat.grfLocksSupported); + ok(stat.grfStateBits == 0, "stat.grfStateBits = %x\n", stat.grfStateBits); + ok(stat.reserved == 0, "stat.reserved = %x\n", stat.reserved); } ok(U(*pstgmed).pstm != NULL, "U(*pstgmed).pstm == NULL\n");

1 0

Frédéric Delanoy : French translation for release 1.2.1
by Jeremy Newman 08 Oct '10

08 Oct '10

Module: website Branch: master Commit: 36051798673361fa71eeeee3b5bc18f948bb7554 URL: http://source.winehq.org/git/website.git/?a=commit;h=36051798673361fa71eeee… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 8 20:05:51 2010 +0200 French translation for release 1.2.1 --- news/fr/2010100801.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/fr/2010100801.xml b/news/fr/2010100801.xml new file mode 100644 index 0000000..ce9c6cb --- /dev/null +++ b/news/fr/2010100801.xml @@ -0,0 +1,16 @@ +<news> +<date>8 octobre 2010</date> +<title>Sortie de Wine 1.2.1</title> +<body> + La version de maintenance 1.2.1 de Wine est à présent disponible. + <a href="{$root}/announce/1.2.1">Nouveautés</a> de cette version : +<ul> + <li>Mises à jour de traductions.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.2.1.tar.bz2">code +source</a> est disponible dès à présent. +Les paquets binaires sont en cours de construction, et apparaîtront sous peu +sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Henri Verbeet : wined3d: SM4 immediate constants are typeless.
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: 1fe1676ae9dfd1664683d507986e3882423b496c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fe1676ae9dfd1664683d5079… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 8 13:12:18 2010 +0200 wined3d: SM4 immediate constants are typeless. --- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/shader.c | 4 ++-- dlls/wined3d/shader_sm4.c | 12 ++++++------ dlls/wined3d/wined3d_private.h | 12 +++--------- 4 files changed, 13 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8e9795e..0b5bb36 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1477,11 +1477,11 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3DSPR_IMMCONST: switch (reg->immconst_type) { - case WINED3D_IMMCONST_FLOAT: + case WINED3D_IMMCONST_SCALAR: sprintf(register_name, "%.8e", *(const float *)reg->immconst_data); break; - case WINED3D_IMMCONST_FLOAT4: + case WINED3D_IMMCONST_VEC4: sprintf(register_name, "vec4(%.8e, %.8e, %.8e, %.8e)", *(const float *)&reg->immconst_data[0], *(const float *)&reg->immconst_data[1], *(const float *)&reg->immconst_data[2], *(const float *)&reg->immconst_data[3]); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 075c204..bc39b3b 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1033,11 +1033,11 @@ static void shader_dump_register(const struct wined3d_shader_register *reg, TRACE("("); switch (reg->immconst_type) { - case WINED3D_IMMCONST_FLOAT: + case WINED3D_IMMCONST_SCALAR: TRACE("%.8e", *(const float *)reg->immconst_data); break; - case WINED3D_IMMCONST_FLOAT4: + case WINED3D_IMMCONST_VEC4: TRACE("%.8e, %.8e, %.8e, %.8e", *(const float *)&reg->immconst_data[0], *(const float *)&reg->immconst_data[1], *(const float *)&reg->immconst_data[2], *(const float *)&reg->immconst_data[3]); diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index ecd1ec3..a438614 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -90,8 +90,8 @@ enum wined3d_sm4_register_type enum wined3d_sm4_immconst_type { - WINED3D_SM4_IMMCONST_FLOAT = 0x1, - WINED3D_SM4_IMMCONST_FLOAT4 = 0x2, + WINED3D_SM4_IMMCONST_SCALAR = 0x1, + WINED3D_SM4_IMMCONST_VEC4 = 0x2, }; struct wined3d_sm4_data @@ -354,14 +354,14 @@ static void shader_sm4_read_src_param(void *data, const DWORD **ptr, struct wine switch(immconst_type) { - case WINED3D_SM4_IMMCONST_FLOAT: - src_param->reg.immconst_type = WINED3D_IMMCONST_FLOAT; + case WINED3D_SM4_IMMCONST_SCALAR: + src_param->reg.immconst_type = WINED3D_IMMCONST_SCALAR; memcpy(src_param->reg.immconst_data, *ptr, 1 * sizeof(DWORD)); *ptr += 1; break; - case WINED3D_SM4_IMMCONST_FLOAT4: - src_param->reg.immconst_type = WINED3D_IMMCONST_FLOAT4; + case WINED3D_SM4_IMMCONST_VEC4: + src_param->reg.immconst_type = WINED3D_IMMCONST_VEC4; memcpy(src_param->reg.immconst_data, *ptr, 4 * sizeof(DWORD)); *ptr += 4; break; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 467eb28..3651c32 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -313,8 +313,8 @@ typedef enum _WINED3DSHADER_PARAM_REGISTER_TYPE enum wined3d_immconst_type { - WINED3D_IMMCONST_FLOAT, - WINED3D_IMMCONST_FLOAT4, + WINED3D_IMMCONST_SCALAR, + WINED3D_IMMCONST_VEC4, }; #define WINED3DSP_NOSWIZZLE (0 | (1 << 2) | (2 << 4) | (3 << 6)) @@ -2821,13 +2821,7 @@ static inline BOOL shader_is_scalar(const struct wined3d_shader_register *reg) } case WINED3DSPR_IMMCONST: - switch(reg->immconst_type) - { - case WINED3D_IMMCONST_FLOAT: - return TRUE; - default: - return FALSE; - } + return reg->immconst_type == WINED3D_IMMCONST_SCALAR; default: return FALSE;

1 0

Jacek Caban : urlmon: Skip more tests on too old IEs.
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: 61cd0648f2f508c0bbe4d6c3bcef69da0f6e5e7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=61cd0648f2f508c0bbe4d6c3b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 8 17:49:04 2010 +0200 urlmon: Skip more tests on too old IEs. --- dlls/urlmon/tests/stream.c | 5 +++++ dlls/urlmon/tests/url.c | 5 +++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/stream.c b/dlls/urlmon/tests/stream.c index 329addb..fc3f639 100644 --- a/dlls/urlmon/tests/stream.c +++ b/dlls/urlmon/tests/stream.c @@ -370,6 +370,11 @@ static void test_URLOpenStreamW(void) START_TEST(stream) { + if(!GetProcAddress(GetModuleHandleA("urlmon.dll"), "CompareSecurityIds")) { + win_skip("Too old IE\n"); + return; + } + create_file(); test_URLOpenBlockingStreamW(); test_URLOpenStreamW(); diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 0db6dff..9bd25a7 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -3141,6 +3141,11 @@ START_TEST(url) hurlmon = GetModuleHandle("urlmon.dll"); pCreateAsyncBindCtxEx = (void*) GetProcAddress(hurlmon, "CreateAsyncBindCtxEx"); + if(!GetProcAddress(hurlmon, "CompareSecurityIds")) { + win_skip("Too old IE\n"); + return; + } + complete_event = CreateEvent(NULL, FALSE, FALSE, NULL); complete_event2 = CreateEvent(NULL, FALSE, FALSE, NULL); thread_id = GetCurrentThreadId();

1 0

Alexandre Julliard : wininet: Load X509_STORE_CTX_get_ex_data from libcrypto not libssl.
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: 0cc9c52f8c5ad5e1f821177f165fbb72be90d2d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cc9c52f8c5ad5e1f821177f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 8 19:15:45 2010 +0200 wininet: Load X509_STORE_CTX_get_ex_data from libcrypto not libssl. --- dlls/wininet/netconnection.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index a1c3090..16b534b 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -152,7 +152,6 @@ MAKE_FUNCPTR(SSL_CTX_set_default_verify_paths); MAKE_FUNCPTR(SSL_CTX_set_verify); MAKE_FUNCPTR(SSL_get_current_cipher); MAKE_FUNCPTR(SSL_CIPHER_get_bits); -MAKE_FUNCPTR(X509_STORE_CTX_get_ex_data); /* OpenSSL's libcrypto functions that we use */ MAKE_FUNCPTR(BIO_new_fp); @@ -162,6 +161,7 @@ MAKE_FUNCPTR(CRYPTO_set_locking_callback); MAKE_FUNCPTR(ERR_free_strings); MAKE_FUNCPTR(ERR_get_error); MAKE_FUNCPTR(ERR_error_string); +MAKE_FUNCPTR(X509_STORE_CTX_get_ex_data); MAKE_FUNCPTR(i2d_X509); MAKE_FUNCPTR(sk_num); MAKE_FUNCPTR(sk_value); @@ -431,7 +431,6 @@ DWORD NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) DYNSSL(SSL_CTX_set_verify); DYNSSL(SSL_get_current_cipher); DYNSSL(SSL_CIPHER_get_bits); - DYNSSL(X509_STORE_CTX_get_ex_data); #undef DYNSSL #define DYNCRYPTO(x) \ @@ -449,6 +448,7 @@ DWORD NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) DYNCRYPTO(ERR_free_strings); DYNCRYPTO(ERR_get_error); DYNCRYPTO(ERR_error_string); + DYNCRYPTO(X509_STORE_CTX_get_ex_data); DYNCRYPTO(i2d_X509); DYNCRYPTO(sk_num); DYNCRYPTO(sk_value);

1 0

Alexandre Julliard : user32: Implemented GetIconInfoExA/W.
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: d3de0c265b00c7b7d7fc63b69b3a04a5e855d1ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3de0c265b00c7b7d7fc63b69… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 8 13:23:48 2010 +0200 user32: Implemented GetIconInfoExA/W. --- dlls/user32/cursoricon.c | 71 ++++++++++++++++++++++++++++++++++++++++------ dlls/user32/user32.spec | 2 + include/winuser.h | 31 ++++++++++++++++++++ 3 files changed, 95 insertions(+), 9 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index ce25a9d..cea5552 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1866,19 +1866,72 @@ HICON WINAPI LoadIconA(HINSTANCE hInstance, LPCSTR name) */ BOOL WINAPI GetIconInfo(HICON hIcon, PICONINFO iconinfo) { - struct cursoricon_object *ptr; + ICONINFOEXW infoW; + + infoW.cbSize = sizeof(infoW); + if (!GetIconInfoExW( hIcon, &infoW )) return FALSE; + iconinfo->fIcon = infoW.fIcon; + iconinfo->xHotspot = infoW.xHotspot; + iconinfo->yHotspot = infoW.yHotspot; + iconinfo->hbmColor = infoW.hbmColor; + iconinfo->hbmMask = infoW.hbmMask; + return TRUE; +} - if (!(ptr = get_icon_ptr( hIcon ))) return FALSE; +/********************************************************************** + * GetIconInfoExA (USER32.@) + */ +BOOL WINAPI GetIconInfoExA( HICON icon, ICONINFOEXA *info ) +{ + ICONINFOEXW infoW; - TRACE("%p => %dx%d\n", hIcon, ptr->width, ptr->height); + if (info->cbSize != sizeof(*info)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + infoW.cbSize = sizeof(infoW); + if (!GetIconInfoExW( icon, &infoW )) return FALSE; + info->fIcon = infoW.fIcon; + info->xHotspot = infoW.xHotspot; + info->yHotspot = infoW.yHotspot; + info->hbmColor = infoW.hbmColor; + info->hbmMask = infoW.hbmMask; + info->wResID = infoW.wResID; + WideCharToMultiByte( CP_ACP, 0, infoW.szModName, -1, info->szModName, MAX_PATH, NULL, NULL ); + WideCharToMultiByte( CP_ACP, 0, infoW.szResName, -1, info->szResName, MAX_PATH, NULL, NULL ); + return TRUE; +} - iconinfo->fIcon = ptr->is_icon; - iconinfo->xHotspot = ptr->hotspot.x; - iconinfo->yHotspot = ptr->hotspot.y; - iconinfo->hbmColor = copy_bitmap( ptr->frames[0].color ); - iconinfo->hbmMask = copy_bitmap( ptr->frames[0].mask ); - release_icon_ptr( hIcon, ptr ); +/********************************************************************** + * GetIconInfoExW (USER32.@) + */ +BOOL WINAPI GetIconInfoExW( HICON icon, ICONINFOEXW *info ) +{ + struct cursoricon_object *ptr; + + if (info->cbSize != sizeof(*info)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (!(ptr = get_icon_ptr( icon ))) + { + SetLastError( ERROR_INVALID_CURSOR_HANDLE ); + return FALSE; + } + + TRACE("%p => %dx%d\n", icon, ptr->width, ptr->height); + info->fIcon = ptr->is_icon; + info->xHotspot = ptr->hotspot.x; + info->yHotspot = ptr->hotspot.y; + info->hbmColor = copy_bitmap( ptr->frames[0].color ); + info->hbmMask = copy_bitmap( ptr->frames[0].mask ); + info->wResID = 0; /* FIXME */ + info->szModName[0] = 0; /* FIXME */ + info->szResName[0] = 0; /* FIXME */ + release_icon_ptr( icon, ptr ); return TRUE; } diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index b5f6d87..072fed4 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -290,6 +290,8 @@ @ stdcall GetGUIThreadInfo(long ptr) @ stdcall GetGuiResources(long long) @ stdcall GetIconInfo(long ptr) +@ stdcall GetIconInfoExA(long ptr) +@ stdcall GetIconInfoExW(long ptr) @ stub GetInputDesktop @ stdcall GetInputState() @ stdcall GetInternalWindowPos(long ptr ptr) diff --git a/include/winuser.h b/include/winuser.h index 82d0e2e..9d07ef6 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2107,6 +2107,34 @@ typedef struct _ICONINFO { HBITMAP hbmColor; } ICONINFO, *PICONINFO; +typedef struct _ICONINFOEXA +{ + DWORD cbSize; + BOOL fIcon; + DWORD xHotspot; + DWORD yHotspot; + HBITMAP hbmMask; + HBITMAP hbmColor; + WORD wResID; + CHAR szModName[MAX_PATH]; + CHAR szResName[MAX_PATH]; +} ICONINFOEXA, *PICONINFOEXA; + +typedef struct _ICONINFOEXW +{ + DWORD cbSize; + BOOL fIcon; + DWORD xHotspot; + DWORD yHotspot; + HBITMAP hbmMask; + HBITMAP hbmColor; + WORD wResID; + WCHAR szModName[MAX_PATH]; + WCHAR szResName[MAX_PATH]; +} ICONINFOEXW, *PICONINFOEXW; + +DECL_WINELIB_TYPE_AW(ICONINFOEX); +DECL_WINELIB_TYPE_AW(PICONINFOEX); typedef struct tagCURSORINFO { @@ -4633,6 +4661,9 @@ WINUSERAPI HWND WINAPI GetFocus(void); WINUSERAPI HWND WINAPI GetForegroundWindow(void); WINUSERAPI BOOL WINAPI GetGUIThreadInfo(DWORD,GUITHREADINFO*); WINUSERAPI BOOL WINAPI GetIconInfo(HICON,PICONINFO); +WINUSERAPI BOOL WINAPI GetIconInfoExA(HICON,ICONINFOEXA*); +WINUSERAPI BOOL WINAPI GetIconInfoExW(HICON,ICONINFOEXW*); +#define GetIconInfoEx WINELIB_NAME_AW(GetIconInfoEx) WINUSERAPI BOOL WINAPI GetInputState(void); WINUSERAPI UINT WINAPI GetInternalWindowPos(HWND,LPRECT,LPPOINT); WINUSERAPI UINT WINAPI GetKBCodePage(void);

1 0

Alexandre Julliard : user32/tests: Tests for GetIconInfoExA/W.
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: 990842a32226388d736c5022d1581ed2df9ef81f URL: http://source.winehq.org/git/wine.git/?a=commit;h=990842a32226388d736c5022d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 8 13:23:56 2010 +0200 user32/tests: Tests for GetIconInfoExA/W. --- dlls/user32/tests/cursoricon.c | 73 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 73 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index e81e76d..cc00ac0 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -65,6 +65,7 @@ static HANDLE child_process; #define PROC_INIT (WM_USER+1) static BOOL (WINAPI *pGetCursorInfo)(CURSORINFO *); +static BOOL (WINAPI *pGetIconInfoExA)(HICON,ICONINFOEXA *); static LRESULT CALLBACK callback_child(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { @@ -504,6 +505,37 @@ static void test_icon_info_dbg(HICON hIcon, UINT exp_cx, UINT exp_cy, UINT exp_b ok_(__FILE__, line)(bmMask.bmWidth == exp_cx, "bmMask.bmWidth = %d\n", bmMask.bmWidth); ok_(__FILE__, line)(bmMask.bmHeight == exp_cy * 2, "bmMask.bmHeight = %d\n", bmMask.bmHeight); } + if (pGetIconInfoExA) + { + ICONINFOEXA infoex; + + memset( &infoex, 0xcc, sizeof(infoex) ); + SetLastError( 0xdeadbeef ); + infoex.cbSize = sizeof(infoex) - 1; + ret = pGetIconInfoExA( hIcon, &infoex ); + ok_(__FILE__, line)(!ret, "GetIconInfoEx succeeded\n"); + ok_(__FILE__, line)(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %d\n", GetLastError()); + + SetLastError( 0xdeadbeef ); + infoex.cbSize = sizeof(infoex) + 1; + ret = pGetIconInfoExA( hIcon, &infoex ); + ok_(__FILE__, line)(!ret, "GetIconInfoEx succeeded\n"); + ok_(__FILE__, line)(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %d\n", GetLastError()); + + SetLastError( 0xdeadbeef ); + infoex.cbSize = sizeof(infoex); + ret = pGetIconInfoExA( (HICON)0xdeadbabe, &infoex ); + ok_(__FILE__, line)(!ret, "GetIconInfoEx succeeded\n"); + ok_(__FILE__, line)(GetLastError() == ERROR_INVALID_CURSOR_HANDLE, + "wrong error %d\n", GetLastError()); + + infoex.cbSize = sizeof(infoex); + ret = pGetIconInfoExA( hIcon, &infoex ); + ok_(__FILE__, line)(ret, "GetIconInfoEx failed err %d\n", GetLastError()); + ok_(__FILE__, line)(infoex.wResID == 0, "GetIconInfoEx wrong resid %x\n", infoex.wResID); + ok_(__FILE__, line)(infoex.szModName[0] == 0, "GetIconInfoEx wrong module %s\n", infoex.szModName); + ok_(__FILE__, line)(infoex.szResName[0] == 0, "GetIconInfoEx wrong name %s\n", infoex.szResName); + } } #define test_icon_info(a,b,c,d) test_icon_info_dbg((a),(b),(c),(d),__LINE__) @@ -889,6 +921,18 @@ static void test_LoadImage(void) ok(icon_info.hbmMask != NULL, "No hbmMask!\n"); } + if (pGetIconInfoExA) + { + ICONINFOEXA infoex; + infoex.cbSize = sizeof(infoex); + ret = pGetIconInfoExA( handle, &infoex ); + ok( ret, "GetIconInfoEx failed err %d\n", GetLastError() ); + ok( infoex.wResID == 0, "GetIconInfoEx wrong resid %x\n", infoex.wResID ); + ok( infoex.szModName[0] == 0, "GetIconInfoEx wrong module %s\n", infoex.szModName ); + ok( infoex.szResName[0] == 0, "GetIconInfoEx wrong name %s\n", infoex.szResName ); + } + else win_skip( "GetIconInfoEx not available\n" ); + /* Clean up. */ SetLastError(0xdeadbeef); ret = DestroyCursor(handle); @@ -899,6 +943,23 @@ static void test_LoadImage(void) HeapFree(GetProcessHeap(), 0, icon_data); DeleteFileA("icon.ico"); + /* Test a system icon */ + handle = LoadIcon( 0, IDI_HAND ); + ok(handle != NULL, "LoadImage() failed.\n"); + if (pGetIconInfoExA) + { + ICONINFOEXA infoex; + infoex.cbSize = sizeof(infoex); + ret = pGetIconInfoExA( handle, &infoex ); + ok( ret, "GetIconInfoEx failed err %d\n", GetLastError() ); + todo_wine ok( infoex.wResID == (UINT_PTR)IDI_HAND, "GetIconInfoEx wrong resid %x\n", infoex.wResID ); + todo_wine ok( GetModuleHandleA(infoex.szModName) == GetModuleHandleA("user32.dll"), + "GetIconInfoEx wrong module %s\n", infoex.szModName ); + ok( infoex.szResName[0] == 0, "GetIconInfoEx wrong name %s\n", infoex.szResName ); + } + SetLastError(0xdeadbeef); + DestroyIcon(handle); + test_LoadImageFile("BMP", bmpimage, sizeof(bmpimage), "bmp", 1); test_LoadImageFile("BMP (coreinfo)", bmpcoreimage, sizeof(bmpcoreimage), "bmp", 1); test_LoadImageFile("GIF", gifimage, sizeof(gifimage), "gif", 0); @@ -968,6 +1029,17 @@ static void test_CreateIconFromResource(void) ok(icon_info.hbmMask != NULL, "No hbmMask!\n"); } + if (pGetIconInfoExA) + { + ICONINFOEXA infoex; + infoex.cbSize = sizeof(infoex); + ret = pGetIconInfoExA( handle, &infoex ); + ok( ret, "GetIconInfoEx failed err %d\n", GetLastError() ); + ok( infoex.wResID == 0, "GetIconInfoEx wrong resid %x\n", infoex.wResID ); + ok( infoex.szModName[0] == 0, "GetIconInfoEx wrong module %s\n", infoex.szModName ); + ok( infoex.szResName[0] == 0, "GetIconInfoEx wrong name %s\n", infoex.szResName ); + } + /* Clean up. */ SetLastError(0xdeadbeef); ret = DestroyCursor(handle); @@ -1721,6 +1793,7 @@ static void test_DestroyCursor(void) START_TEST(cursoricon) { pGetCursorInfo = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetCursorInfo" ); + pGetIconInfoExA = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetIconInfoExA" ); test_argc = winetest_get_mainargs(&test_argv); if (test_argc >= 3)

1 0