November 2008 - Wine-Commits

Hans Leidekker : inetcomm: Advertise support for a couple more interfaces.
by Alexandre Julliard Nov. 4, 2008

Nov. 4, 2008

Module: wine Branch: master Commit: 157d18bbf8b25c9b5e3082f162576c0d4e8e09c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=157d18bbf8b25c9b5e3082f16… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 4 11:35:07 2008 +0100 inetcomm: Advertise support for a couple more interfaces. --- dlls/inetcomm/inetcomm_main.c | 21 +++++++++++++++++++- dlls/inetcomm/inetcomm_private.h | 4 +++ dlls/inetcomm/mimeole.c | 40 +++++++++++++++++++++++-------------- dlls/inetcomm/regsvr.c | 12 +++++++++++ include/imnxport.idl | 1 + include/mimeole.idl | 2 + 6 files changed, 64 insertions(+), 16 deletions(-) diff --git a/dlls/inetcomm/inetcomm_main.c b/dlls/inetcomm/inetcomm_main.c index cd412d2..1d71877 100644 --- a/dlls/inetcomm/inetcomm_main.c +++ b/dlls/inetcomm/inetcomm_main.c @@ -137,6 +137,8 @@ static const struct IClassFactoryVtbl cf_vtbl = static cf mime_body_cf = { &cf_vtbl, MimeBody_create }; static cf mime_allocator_cf = { &cf_vtbl, MimeAllocator_create }; +static cf mime_message_cf = { &cf_vtbl, MimeMessage_create }; +static cf mime_security_cf = { &cf_vtbl, MimeSecurity_create }; /*********************************************************************** * DllGetClassObject (INETCOMM.@) @@ -147,10 +149,27 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) TRACE("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv ); + if (IsEqualCLSID(rclsid, &CLSID_ISMTPTransport)) + return SMTPTransportCF_Create(iid, ppv); + + if (IsEqualCLSID(rclsid, &CLSID_ISMTPTransport2)) + return SMTPTransportCF_Create(iid, ppv); + if (IsEqualCLSID(rclsid, &CLSID_IIMAPTransport)) return IMAPTransportCF_Create(iid, ppv); - if( IsEqualCLSID( rclsid, &CLSID_IMimeBody )) + if (IsEqualCLSID(rclsid, &CLSID_IPOP3Transport)) + return POP3TransportCF_Create(iid, ppv); + + if ( IsEqualCLSID( rclsid, &CLSID_IMimeSecurity )) + { + cf = (IClassFactory*) &mime_security_cf.lpVtbl; + } + else if( IsEqualCLSID( rclsid, &CLSID_IMimeMessage )) + { + cf = (IClassFactory*) &mime_message_cf.lpVtbl; + } + else if( IsEqualCLSID( rclsid, &CLSID_IMimeBody )) { cf = (IClassFactory*) &mime_body_cf.lpVtbl; } diff --git a/dlls/inetcomm/inetcomm_private.h b/dlls/inetcomm/inetcomm_private.h index 7752d69..589f92c 100644 --- a/dlls/inetcomm/inetcomm_private.h +++ b/dlls/inetcomm/inetcomm_private.h @@ -75,7 +75,11 @@ void InternetTransport_UnregisterClass(HINSTANCE hInstance); HRESULT MimeBody_create(IUnknown *outer, void **obj); HRESULT MimeAllocator_create(IUnknown *outer, void **obj); +HRESULT MimeMessage_create(IUnknown *outer, void **obj); +HRESULT MimeSecurity_create(IUnknown *outer, void **obj); HRESULT MimeInternational_Construct(IMimeInternational **internat); +HRESULT SMTPTransportCF_Create(REFIID riid, LPVOID *ppv); HRESULT IMAPTransportCF_Create(REFIID riid, LPVOID *ppv); +HRESULT POP3TransportCF_Create(REFIID riid, LPVOID *ppv); diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 10c6685..07aa6bd 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -2540,22 +2540,19 @@ static const IMimeMessageVtbl MimeMessageVtbl = MimeMessage_GetRootMoniker, }; -/*********************************************************************** - * MimeOleCreateMessage (INETCOMM.@) - */ -HRESULT WINAPI MimeOleCreateMessage(IUnknown *pUnkOuter, IMimeMessage **ppMessage) +HRESULT MimeMessage_create(IUnknown *outer, void **obj) { MimeMessage *This; - TRACE("(%p, %p)\n", pUnkOuter, ppMessage); + TRACE("(%p, %p)\n", outer, obj); - if (pUnkOuter) + if (outer) { FIXME("outer unknown not supported yet\n"); return E_NOTIMPL; } - *ppMessage = NULL; + *obj = NULL; This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (!This) return E_OUTOFMEMORY; @@ -2566,11 +2563,20 @@ HRESULT WINAPI MimeOleCreateMessage(IUnknown *pUnkOuter, IMimeMessage **ppMessag list_init(&This->body_tree); This->next_hbody = (HBODY)1; - *ppMessage = (IMimeMessage *)&This->lpVtbl; + *obj = (IMimeMessage *)&This->lpVtbl; return S_OK; } /*********************************************************************** + * MimeOleCreateMessage (INETCOMM.@) + */ +HRESULT WINAPI MimeOleCreateMessage(IUnknown *pUnkOuter, IMimeMessage **ppMessage) +{ + TRACE("(%p, %p)\n", pUnkOuter, ppMessage); + return MimeMessage_create(NULL, (void **)ppMessage); +} + +/*********************************************************************** * MimeOleSetCompatMode (INETCOMM.@) */ HRESULT WINAPI MimeOleSetCompatMode(DWORD dwMode) @@ -2754,16 +2760,13 @@ static const IMimeSecurityVtbl MimeSecurityVtbl = MimeSecurity_GetCertData }; -/*********************************************************************** - * MimeOleCreateSecurity (INETCOMM.@) - */ -HRESULT WINAPI MimeOleCreateSecurity(IMimeSecurity **ppSecurity) +HRESULT MimeSecurity_create(IUnknown *outer, void **obj) { MimeSecurity *This; - TRACE("(%p)\n", ppSecurity); + *obj = NULL; - *ppSecurity = NULL; + if (outer) return CLASS_E_NOAGGREGATION; This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (!This) return E_OUTOFMEMORY; @@ -2771,10 +2774,17 @@ HRESULT WINAPI MimeOleCreateSecurity(IMimeSecurity **ppSecurity) This->lpVtbl = &MimeSecurityVtbl; This->refs = 1; - *ppSecurity = (IMimeSecurity *)&This->lpVtbl; + *obj = (IMimeSecurity *)&This->lpVtbl; return S_OK; } +/*********************************************************************** + * MimeOleCreateSecurity (INETCOMM.@) + */ +HRESULT WINAPI MimeOleCreateSecurity(IMimeSecurity **ppSecurity) +{ + return MimeSecurity_create(NULL, (void **)ppSecurity); +} typedef struct { diff --git a/dlls/inetcomm/regsvr.c b/dlls/inetcomm/regsvr.c index a21b85b..4c7310c 100644 --- a/dlls/inetcomm/regsvr.c +++ b/dlls/inetcomm/regsvr.c @@ -404,6 +404,12 @@ static struct regsvr_coclass const coclass_list[] = { "inetcomm.dll", "Both" }, + { &CLSID_ISMTPTransport2, + "CLSID_ISMTPTransport2", + NULL, + "inetcomm.dll", + "Both" + }, { &CLSID_IPOP3Transport, "CLSID_IPOP3Transport", NULL, @@ -452,6 +458,12 @@ static struct regsvr_coclass const coclass_list[] = { "inetcomm.dll", "Both" }, + { &CLSID_IMimeSecurity, + "CLSID_IMimeSecurity", + NULL, + "inetcomm.dll", + "Both" + }, { NULL } /* list terminator */ }; diff --git a/include/imnxport.idl b/include/imnxport.idl index 3b0e1c8..ef4f8ac 100644 --- a/include/imnxport.idl +++ b/include/imnxport.idl @@ -27,6 +27,7 @@ interface IIMAPTransport; cpp_quote("DEFINE_GUID(CLSID_IInternetMessageUrl, 0xca30cc91, 0xb1b3, 0x11d0, 0x85, 0xd0, 0x00, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") cpp_quote("DEFINE_GUID(CLSID_ISMTPTransport, 0xfd853ce6, 0x7f86, 0x11d0, 0x82, 0x52, 0x00, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") +cpp_quote("DEFINE_GUID(CLSID_ISMTPTransport2, 0xdf2c7eC, 0x3435, 0x11d0, 0x81, 0xd0, 0x0, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") cpp_quote("DEFINE_GUID(CLSID_IPOP3Transport, 0xfd853ce7, 0x7f86, 0x11d0, 0x82, 0x52, 0x00, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") cpp_quote("DEFINE_GUID(CLSID_INNTPTransport, 0xfd853ce8, 0x7f86, 0x11d0, 0x82, 0x52, 0x00, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") cpp_quote("DEFINE_GUID(CLSID_IRASTransport, 0xfd853ce9, 0x7f86, 0x11d0, 0x82, 0x52, 0x00, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") diff --git a/include/mimeole.idl b/include/mimeole.idl index 487b9fc..d74cdb5 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -32,6 +32,8 @@ interface IMimeEnumProperties; cpp_quote("DEFINE_GUID(CLSID_IMimeBody, 0xfd853cdb, 0x7f86, 0x11d0, 0x82, 0x52, 0x0, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") cpp_quote("DEFINE_GUID(CLSID_IMimeAllocator, 0xfd853cdd, 0x7f86, 0x11d0, 0x82, 0x52, 0x0, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") cpp_quote("DEFINE_GUID(CLSID_IMimeMessage, 0xfd853ce3, 0x7f86, 0x11d0, 0x82, 0x52, 0x0, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") +cpp_quote("DEFINE_GUID(CLSID_IMimeSecurity, 0xfd853cde, 0x7f86, 0x11d0, 0x82, 0x52, 0x0, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") +cpp_quote("DEFINE_GUID(CLSID_IVirtualStream, 0xfd853cdf, 0x7f86, 0x11d0, 0x82, 0x52, 0x0, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") cpp_quote("#define MIME_E_REG_CREATE_KEY 0x800cce01") cpp_quote("#define MIME_E_REG_QUERY_INFO 0x800cce02")

1 0

Hans Leidekker : inetcomm: Add an implementation of ISMTPTransport2:: CommandDATA.
by Alexandre Julliard Nov. 4, 2008

Nov. 4, 2008

Module: wine Branch: master Commit: de8dd504d7c1c92c0102029c2c842c2d58025269 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de8dd504d7c1c92c0102029c2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 4 11:34:54 2008 +0100 inetcomm: Add an implementation of ISMTPTransport2::CommandDATA. --- dlls/inetcomm/smtptransport.c | 42 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/smtptransport.c b/dlls/inetcomm/smtptransport.c index 9e0a278..d704525 100644 --- a/dlls/inetcomm/smtptransport.c +++ b/dlls/inetcomm/smtptransport.c @@ -123,6 +123,40 @@ static void SMTPTransport_CallbackReadResponseDoNothing(IInternetTransport *ifac InternetTransport_ReadLine(&This->InetTransport, SMTPTransport_CallbackDoNothing); } +static void SMTPTransport_CallbackProcessDATAResponse(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + SMTPTransport *This = (SMTPTransport *)iface; + SMTPRESPONSE response = { 0 }; + HRESULT hr; + + TRACE("\n"); + + hr = SMTPTransport_ParseResponse(This, pBuffer, &response); + if (FAILED(hr)) + { + /* FIXME: handle error */ + return; + } + + response.command = SMTP_DATA; + ISMTPCallback_OnResponse((ISMTPCallback *)This->InetTransport.pCallback, &response); + + if (FAILED(response.rIxpResult.hrServerError)) + { + ERR("server error: %s\n", debugstr_a(pBuffer)); + /* FIXME: handle error */ + return; + } +} + +static void SMTPTransport_CallbackReadDATAResponse(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + SMTPTransport *This = (SMTPTransport *)iface; + + TRACE("\n"); + InternetTransport_ReadLine(&This->InetTransport, SMTPTransport_CallbackProcessDATAResponse); +} + static void SMTPTransport_CallbackProcessMAILResponse(IInternetTransport *iface, char *pBuffer, int cbBuffer) { SMTPTransport *This = (SMTPTransport *)iface; @@ -843,8 +877,12 @@ static HRESULT WINAPI SMTPTransport_CommandRSET(ISMTPTransport2 *iface) static HRESULT WINAPI SMTPTransport_CommandDATA(ISMTPTransport2 *iface) { - FIXME("()\n"); - return E_NOTIMPL; + SMTPTransport *This = (SMTPTransport *)iface; + + TRACE("()\n"); + + return InternetTransport_DoCommand(&This->InetTransport, "DATA\n", + SMTPTransport_CallbackReadDATAResponse); } static HRESULT WINAPI SMTPTransport_CommandDOT(ISMTPTransport2 *iface)

1 0

Hans Leidekker : inetcomm: Add an implementation of IPOP3Transport:: CommandPASS.
by Alexandre Julliard Nov. 4, 2008

Nov. 4, 2008

Module: wine Branch: master Commit: d80d9b82f2f8cc1632faad863fa0bac97ae42fbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d80d9b82f2f8cc1632faad863… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 4 11:34:44 2008 +0100 inetcomm: Add an implementation of IPOP3Transport::CommandPASS. --- dlls/inetcomm/pop3transport.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/pop3transport.c b/dlls/inetcomm/pop3transport.c index 6c9d8fa..afb4094 100644 --- a/dlls/inetcomm/pop3transport.c +++ b/dlls/inetcomm/pop3transport.c @@ -439,8 +439,25 @@ static HRESULT WINAPI POP3Transport_CommandUSER(IPOP3Transport *iface, LPSTR use static HRESULT WINAPI POP3Transport_CommandPASS(IPOP3Transport *iface, LPSTR password) { - FIXME("(%s)\n", password); - return E_NOTIMPL; + static char pass[] = "PASS "; + POP3Transport *This = (POP3Transport *)iface; + char *command; + int len; + + TRACE("(%p)\n", password); + + len = sizeof(pass) + strlen(password) + 2; /* "\r\n" */ + command = HeapAlloc(GetProcessHeap(), 0, len); + + strcpy(command, pass); + strcat(command, password); + strcat(command, "\r\n"); + + This->command = POP3_PASS; + InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvPASSResp); + + HeapFree(GetProcessHeap(), 0, command); + return S_OK; } static HRESULT WINAPI POP3Transport_CommandLIST(

1 0

Hans Leidekker : inetcomm: Add an implementation of IPOP3Transport:: CommandUSER.
by Alexandre Julliard Nov. 4, 2008

Nov. 4, 2008

Module: wine Branch: master Commit: 954945cd2ed7c3568eae45d1aa43ea55b4ae644e URL: http://source.winehq.org/git/wine.git/?a=commit;h=954945cd2ed7c3568eae45d1a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 4 11:34:34 2008 +0100 inetcomm: Add an implementation of IPOP3Transport::CommandUSER. --- dlls/inetcomm/pop3transport.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/pop3transport.c b/dlls/inetcomm/pop3transport.c index 1cc8aa9..6c9d8fa 100644 --- a/dlls/inetcomm/pop3transport.c +++ b/dlls/inetcomm/pop3transport.c @@ -416,8 +416,25 @@ static HRESULT WINAPI POP3Transport_CommandAUTH(IPOP3Transport *iface, LPSTR psz static HRESULT WINAPI POP3Transport_CommandUSER(IPOP3Transport *iface, LPSTR username) { - FIXME("(%s)\n", username); - return E_NOTIMPL; + static char user[] = "USER "; + POP3Transport *This = (POP3Transport *)iface; + char *command; + int len; + + TRACE("(%s)\n", username); + + len = sizeof(user) + strlen(username) + 2; /* "\r\n" */ + command = HeapAlloc(GetProcessHeap(), 0, len); + + strcpy(command, user); + strcat(command, username); + strcat(command, "\r\n"); + + This->command = POP3_USER; + InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvUSERResp); + + HeapFree(GetProcessHeap(), 0, command); + return S_OK; } static HRESULT WINAPI POP3Transport_CommandPASS(IPOP3Transport *iface, LPSTR password)

1 0

Alexandre Julliard : ntdll: Add a noexec flag for memory views where we don 't want to force exec permission.
by Alexandre Julliard Nov. 4, 2008

Nov. 4, 2008

Module: wine Branch: master Commit: 7e9478794857e2714d59acac782d47802f77b363 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e9478794857e2714d59acac7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 4 13:16:01 2008 +0100 ntdll: Add a noexec flag for memory views where we don't want to force exec permission. --- dlls/ntdll/virtual.c | 8 +++++--- include/wine/server_protocol.h | 1 + server/protocol.def | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 4d421b6..596d8ee 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -473,7 +473,7 @@ static NTSTATUS create_view( struct file_view **view_ret, void *base, size_t siz *view_ret = view; VIRTUAL_DEBUG_DUMP_VIEW( view ); - if (force_exec_prot && (unix_prot & PROT_READ) && !(unix_prot & PROT_EXEC)) + if (force_exec_prot && !(vprot & VPROT_NOEXEC) && (unix_prot & PROT_READ) && !(unix_prot & PROT_EXEC)) { TRACE( "forcing exec permission on %p-%p\n", base, (char *)base + size - 1 ); mprotect( base, size, unix_prot | PROT_EXEC ); @@ -585,7 +585,8 @@ static BOOL VIRTUAL_SetProt( FILE_VIEW *view, /* [in] Pointer to view */ return TRUE; } - if (force_exec_prot && (unix_prot & PROT_READ) && !(unix_prot & PROT_EXEC)) + if (force_exec_prot && !(view->protect & VPROT_NOEXEC) && + (unix_prot & PROT_READ) && !(unix_prot & PROT_EXEC)) { TRACE( "forcing exec permission on %p-%p\n", base, (char *)base + size - 1 ); if (!mprotect( base, size, unix_prot | PROT_EXEC )) goto done; @@ -1386,6 +1387,7 @@ void VIRTUAL_SetForceExec( BOOL enable ) char *addr = view->base; BYTE prot = view->prot[0]; + if (view->protect & VPROT_NOEXEC) continue; for (count = i = 1; i < view->size >> page_shift; i++, count++) { if (view->prot[i] == prot) continue; @@ -1525,7 +1527,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_ if (type & MEM_SYSTEM) { - if (type & MEM_IMAGE) vprot |= VPROT_IMAGE; + if (type & MEM_IMAGE) vprot |= VPROT_IMAGE | VPROT_NOEXEC; status = create_view( &view, base, size, vprot | VPROT_COMMITTED | VPROT_SYSTEM ); if (status == STATUS_SUCCESS) base = view->base; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index f78174b..431fef6 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1692,6 +1692,7 @@ struct create_mapping_reply #define VPROT_IMAGE 0x0100 #define VPROT_SYSTEM 0x0200 #define VPROT_VALLOC 0x0400 +#define VPROT_NOEXEC 0x0800 diff --git a/server/protocol.def b/server/protocol.def index 269f1d9..92f931d 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1334,6 +1334,7 @@ enum char_info_mode #define VPROT_IMAGE 0x0100 /* mapping for an exe image */ #define VPROT_SYSTEM 0x0200 /* system view (underlying mmap not under our control) */ #define VPROT_VALLOC 0x0400 /* allocated by VirtualAlloc */ +#define VPROT_NOEXEC 0x0800 /* don't force exec permission */ /* Open a mapping */

1 0

Alexandre Julliard : ntdll: Store the per-view flags in the high word of the page protection bits.
by Alexandre Julliard Nov. 4, 2008

Nov. 4, 2008

Module: wine Branch: master Commit: 0b0b6c351a547565b1311cc492005f1f640bebf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b0b6c351a547565b1311cc49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 4 13:05:32 2008 +0100 ntdll: Store the per-view flags in the high word of the page protection bits. --- dlls/ntdll/virtual.c | 59 +++++++++++++++------------------------- include/wine/server_protocol.h | 9 ++++-- server/protocol.def | 9 ++++-- server/trace.c | 2 +- 4 files changed, 35 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b0b6c351a547565b1311…

1 0

Aric Stewart : shell32: Do not automatically fail in SHGetFileInfo if the flag SHGFI_USEFILEATTRIBUTES is combined with SHGFI_ATTRIBUTES , SHGFI_EXETYPE, or SHGFI_PIDL.
by Alexandre Julliard Nov. 4, 2008

Nov. 4, 2008

Module: wine Branch: master Commit: cf164785afac461a84e23d1e370205c28de73e0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf164785afac461a84e23d1e3… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Nov 3 10:14:53 2008 -0600 shell32: Do not automatically fail in SHGetFileInfo if the flag SHGFI_USEFILEATTRIBUTES is combined with SHGFI_ATTRIBUTES, SHGFI_EXETYPE, or SHGFI_PIDL. --- dlls/shell32/shell32_main.c | 7 +-- dlls/shell32/tests/shlfileop.c | 116 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 117 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index a0d3fe7..78a2d57 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -350,10 +350,6 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, (flags & SHGFI_PIDL)? "pidl" : debugstr_w(path), dwFileAttributes, psfi, psfi->dwAttributes, sizeofpsfi, flags); - if ( (flags & SHGFI_USEFILEATTRIBUTES) && - (flags & (SHGFI_ATTRIBUTES|SHGFI_EXETYPE|SHGFI_PIDL))) - return FALSE; - /* windows initializes these values regardless of the flags */ if (psfi != NULL) { @@ -430,7 +426,8 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, { psfi->dwAttributes = 0xffffffff; } - IShellFolder_GetAttributesOf( psfParent, 1, (LPCITEMIDLIST*)&pidlLast, + if (psfParent) + IShellFolder_GetAttributesOf( psfParent, 1, (LPCITEMIDLIST*)&pidlLast, &(psfi->dwAttributes) ); } diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 6293b93..2607c63 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -193,7 +193,7 @@ static void test_get_file_info(void) rc=SHGetFileInfoA("c:\\nonexistent", FILE_ATTRIBUTE_DIRECTORY, &shfi, sizeof(shfi), SHGFI_ATTRIBUTES | SHGFI_USEFILEATTRIBUTES); - todo_wine ok(rc, "SHGetFileInfoA(c:\\nonexistent | SHGFI_ATTRIBUTES) failed\n"); + ok(rc, "SHGetFileInfoA(c:\\nonexistent | SHGFI_ATTRIBUTES) failed\n"); if (rc) ok(shfi.dwAttributes != 0xcfcfcfcf, "dwFileAttributes is not set\n"); todo_wine ok(shfi.hIcon == 0, "SHGetFileInfoA(c:\\nonexistent | SHGFI_ATTRIBUTES) did not clear hIcon\n"); @@ -295,6 +295,7 @@ static void test_get_file_info_iconlist(void) { win_skip("SHGetFileInfoW is not available\n"); ILFree(pidList); + return; } memset(&shInfow, 0xcf, sizeof(shInfow)); @@ -308,6 +309,119 @@ static void test_get_file_info_iconlist(void) ok(shInfow.dwAttributes == 0xcfcfcfcf, "SHGetFileInfoW(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) should not change dwAttributes\n"); CloseHandle(hSysImageList); + /* Various suposidly invalid flag testing */ + memset(&shInfow, 0xcf, sizeof(shInfow)); + hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON); + ok(hr != 0, "SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON Failed\n"); + ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing \n"); + ok(shInfow.dwAttributes==0xcfcfcfcf,"dwAttributes modified\n"); + + memset(&shInfow, 0xcf, sizeof(shInfow)); + hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + SHGFI_ICON|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON); + ok(hr != 0, " SHGFI_ICON|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON Failed\n"); + ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing \n"); + ok(shInfow.hIcon!=(HICON)0xcfcfcfcf && shInfow.hIcon!=0,"hIcon invalid\n"); + if (shInfow.hIcon!=(HICON)0xcfcfcfcf) DestroyIcon(shInfow.hIcon); + todo_wine ok(shInfow.dwAttributes==0,"dwAttributes not set\n"); + + memset(&shInfow, 0xcf, sizeof(shInfow)); + hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + SHGFI_ICON|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_LARGEICON); + ok(hr != 0, "SHGFI_ICON|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_LARGEICON Failed\n"); + ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing \n"); + ok(shInfow.hIcon!=(HICON)0xcfcfcfcf && shInfow.hIcon!=0,"hIcon invalid\n"); + if (shInfow.hIcon != (HICON)0xcfcfcfcf) DestroyIcon(shInfow.hIcon); + todo_wine ok(shInfow.dwAttributes==0,"dwAttributes not set\n"); + + memset(&shInfow, 0xcf, sizeof(shInfow)); + hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_LARGEICON); + ok(hr != 0, "SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_LARGEICON Failed\n"); + ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing \n"); + ok(shInfow.dwAttributes==0xcfcfcfcf,"dwAttributes modified\n"); + + memset(&shInfow, 0xcf, sizeof(shInfow)); + hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + SHGFI_OPENICON|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON); + ok(hr != 0, "SHGFI_OPENICON|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON Failed\n"); + todo_wine ok(shInfow.iIcon==0xcfcfcfcf, "Icon Index Modified\n"); + ok(shInfow.dwAttributes==0xcfcfcfcf,"dwAttributes modified\n"); + + memset(&shInfow, 0xcf, sizeof(shInfow)); + hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + SHGFI_SHELLICONSIZE|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON); + ok(hr != 0, "SHGFI_SHELLICONSIZE|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON Failed\n"); + todo_wine ok(shInfow.iIcon==0xcfcfcfcf, "Icon Index Modified\n"); + ok(shInfow.dwAttributes==0xcfcfcfcf,"dwAttributes modified\n"); + + memset(&shInfow, 0xcf, sizeof(shInfow)); + hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + SHGFI_SHELLICONSIZE|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON); + ok(hr != 0, "SHGFI_SHELLICONSIZE|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON Failed\n"); + todo_wine ok(shInfow.iIcon==0xcfcfcfcf, "Icon Index Modified\n"); + ok(shInfow.dwAttributes==0xcfcfcfcf,"dwAttributes modified\n"); + + memset(&shInfow, 0xcf, sizeof(shInfow)); + hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON| + SHGFI_ATTRIBUTES); + ok(hr != 0, "SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON|SHGFI_ATTRIBUTES Failed\n"); + ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing \n"); + ok(shInfow.dwAttributes!=0xcfcfcfcf,"dwAttributes not set\n"); + + memset(&shInfow, 0xcf, sizeof(shInfow)); + hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON| + SHGFI_EXETYPE); + todo_wine ok(hr != 0, "SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON|SHGFI_EXETYPE Failed\n"); + ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing \n"); + ok(shInfow.dwAttributes==0xcfcfcfcf,"dwAttributes modified\n"); + + memset(&shInfow, 0xcf, sizeof(shInfow)); + hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON|SHGFI_EXETYPE); + todo_wine ok(hr != 0, "SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON|SHGFI_EXETYPE Failed\n"); + todo_wine ok(shInfow.iIcon==0xcfcfcfcf, "Icon Index Modified\n"); + ok(shInfow.dwAttributes==0xcfcfcfcf,"dwAttributes modified\n"); + + memset(&shInfow, 0xcf, sizeof(shInfow)); + hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON|SHGFI_ATTRIBUTES); + ok(hr != 0, "SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON|SHGFI_ATTRIBUTES Failed\n"); + todo_wine ok(shInfow.iIcon==0xcfcfcfcf, "Icon Index Modified\n"); + ok(shInfow.dwAttributes!=0xcfcfcfcf,"dwAttributes not set\n"); + + memset(&shInfow, 0xcf, sizeof(shInfow)); + hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL| + SHGFI_ATTRIBUTES); + ok(hr != 0, "SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_ATTRIBUTES Failed\n"); + ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing \n"); + ok(shInfow.dwAttributes!=0xcfcfcfcf,"dwAttributes not set\n"); + + memset(&shInfow, 0xcf, sizeof(shInfow)); + hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_EXETYPE); + todo_wine ok(hr != 0, "SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_EXETYPE Failed\n"); + ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing \n"); + ok(shInfow.dwAttributes==0xcfcfcfcf,"dwAttributes modified\n"); + + memset(&shInfow, 0xcf, sizeof(shInfow)); + hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_EXETYPE); + todo_wine ok(hr != 0, "SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_EXETYPE Failed\n"); + todo_wine ok(shInfow.iIcon==0xcfcfcfcf, "Icon Index Modified\n"); + ok(shInfow.dwAttributes==0xcfcfcfcf,"dwAttributes modified\n"); + + memset(&shInfow, 0xcf, sizeof(shInfow)); + hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_ATTRIBUTES); + ok(hr != 0, "SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_ATTRIBUTES Failed\n"); + todo_wine ok(shInfow.iIcon==0xcfcfcfcf, "Icon Index Modified\n"); + ok(shInfow.dwAttributes!=0xcfcfcfcf,"dwAttributes not set\n"); + ILFree(pidList); }

1 0

Aric Stewart : msimtf: Add a mostly wrapper stub for IActiveIMMApp.
by Alexandre Julliard Nov. 4, 2008

Nov. 4, 2008

Module: wine Branch: master Commit: a971489dd075e5c39c26aa958b1f3683a1f70b95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a971489dd075e5c39c26aa958… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Nov 3 10:14:43 2008 -0600 msimtf: Add a mostly wrapper stub for IActiveIMMApp. --- dlls/msimtf/Makefile.in | 7 +- dlls/msimtf/activeimmapp.c | 827 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msimtf/main.c | 26 +- 3 files changed, 847 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a971489dd075e5c39c26a…

1 0

Stefan Dösinger : d3d9: Add a test for GetTexture with no texture set.
by Alexandre Julliard Nov. 4, 2008

Nov. 4, 2008

Module: wine Branch: master Commit: 40c06ea2969fbc719a7c3207480ea255714123c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40c06ea2969fbc719a7c32074… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 19 13:12:30 2008 -0500 d3d9: Add a test for GetTexture with no texture set. --- dlls/d3d9/device.c | 8 +++++--- dlls/d3d9/tests/texture.c | 12 ++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index db58689..697c202 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -990,11 +990,13 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetTexture(LPDIRECT3DDEVICE9EX ifac EnterCriticalSection(&d3d9_cs); rc = IWineD3DDevice_GetTexture(This->WineD3DDevice, Stage, &retTexture); - if (rc == D3D_OK && NULL != retTexture) { + if (SUCCEEDED(rc) && NULL != retTexture) { IWineD3DBaseTexture_GetParent(retTexture, (IUnknown **)ppTexture); IWineD3DBaseTexture_Release(retTexture); - }else{ - FIXME("Call to get texture (%d) failed (%p)\n", Stage, retTexture); + } else { + if(FAILED(rc)) { + WARN("Call to get texture (%d) failed (%p)\n", Stage, retTexture); + } *ppTexture = NULL; } LeaveCriticalSection(&d3d9_cs); diff --git a/dlls/d3d9/tests/texture.c b/dlls/d3d9/tests/texture.c index 7212d3c..515820b 100644 --- a/dlls/d3d9/tests/texture.c +++ b/dlls/d3d9/tests/texture.c @@ -323,6 +323,17 @@ static void test_filter(IDirect3DDevice9 *device) { IDirect3D9_Release(d3d9); } +static void test_gettexture(IDirect3DDevice9 *device) { + HRESULT hr; + IDirect3DBaseTexture9 *texture = (IDirect3DBaseTexture9 *) 0xdeadbeef; + + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed, hr = 0x%08x\n", hr); + hr = IDirect3DDevice9_GetTexture(device, 0, &texture); + ok(hr == D3D_OK, "IDirect3DDevice9_GetTexture failed, hr = 0x%08x\n", hr); + ok(texture == NULL, "Texture returned is %p, expected NULL\n", texture); +} + START_TEST(texture) { D3DCAPS9 caps; @@ -345,4 +356,5 @@ START_TEST(texture) test_cube_textures(device_ptr, caps.TextureCaps); test_mipmap_gen(device_ptr); test_filter(device_ptr); + test_gettexture(device_ptr); }

1 0

Stefan Dösinger : wined3d: Kill the GL_ATI_envmap_bumpmap code.
by Alexandre Julliard Nov. 4, 2008

Nov. 4, 2008

Module: wine Branch: master Commit: 620a423b22663d3955f90555b0e62f11bcde0ee3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=620a423b22663d3955f90555b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 3 18:36:19 2008 +0100 wined3d: Kill the GL_ATI_envmap_bumpmap code. GL_ATI_envmap_bumpmap provides two things: Signed V8U8 pixel formats, and bump mapping. The extension is only supported on fglrx, and this driver also supports GL_ARB_fragment_program. Thus the bump mapping code is never used on any driver out there. Furthermore, if it is used, it tends to crash the driver The signed pixel format is used, as it can be used by pixel shaders or the ARBfp replacement. However, the format is broken in fglrx, and negative values are clamped to 0.0. This results in test failures. WineD3D has an alternative codepath using scale+bias to enable V8U8 using a standard signed RGB which works correctly on fglrx. --- dlls/wined3d/arb_program_shader.c | 3 +- dlls/wined3d/directx.c | 7 +--- dlls/wined3d/glsl_shader.c | 3 +- dlls/wined3d/state.c | 88 +------------------------------------ dlls/wined3d/surface.c | 12 ----- dlls/wined3d/utils.c | 6 +-- include/wine/wined3d_gl.h | 23 ---------- 7 files changed, 5 insertions(+), 137 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=620a423b22663d3955f90…

1 0