February 2008 - Wine-Commits

Paul Vriens : kernel32/tests: ReplaceFile[AW] doesn't exist on win9x.
by Alexandre Julliard Feb. 13, 2008

Feb. 13, 2008

Module: wine Branch: master Commit: fc82d8c2218a168245ed9aeb500181c5e7e8dda1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc82d8c2218a168245ed9aeb5… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Feb 13 13:54:07 2008 +0100 kernel32/tests: ReplaceFile[AW] doesn't exist on win9x. --- dlls/kernel32/tests/file.c | 50 ++++++++++++++++++++++++++++++------------- 1 files changed, 35 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 3889585..f73f104 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -31,8 +31,9 @@ #include "winbase.h" #include "winerror.h" -static HINSTANCE hkernel32; static HANDLE (WINAPI *pFindFirstFileExA)(LPCSTR,FINDEX_INFO_LEVELS,LPVOID,FINDEX_SEARCH_OPS,LPVOID,DWORD); +static BOOL (WINAPI *pReplaceFileA)(LPCSTR, LPCSTR, LPCSTR, DWORD, LPVOID, LPVOID); +static BOOL (WINAPI *pReplaceFileW)(LPCWSTR, LPCWSTR, LPCWSTR, DWORD, LPVOID, LPVOID); /* keep filename and filenameW the same */ static const char filename[] = "testfile.xxx"; @@ -49,6 +50,14 @@ static const char sillytext[] = "1234 43 4kljf lf &%%%&&&&&& 34 4 34 3############# 33 3 3 3 # 3## 3" "sdlkfjasdlkfj a dslkj adsklf \n \nasdklf askldfa sdlkf \nsadklf asdklf asdf "; +static void InitFunctionPointers(void) +{ + HMODULE hkernel32 = GetModuleHandleA("kernel32"); + + pFindFirstFileExA=(void*)GetProcAddress(hkernel32, "FindFirstFileExA"); + pReplaceFileA=(void*)GetProcAddress(hkernel32, "ReplaceFileA"); + pReplaceFileW=(void*)GetProcAddress(hkernel32, "ReplaceFileW"); +} static void test__hread( void ) { @@ -1918,6 +1927,12 @@ static void test_ReplaceFileA(void) DWORD ret; BOOL retok; + if (!pReplaceFileA) + { + skip("ReplaceFileA() is missing\n"); + return; + } + ret = GetTempPathA(MAX_PATH, temp_path); ok(ret != 0, "GetTempPathA error %d\n", GetLastError()); ok(ret < MAX_PATH, "temp path should fit into MAX_PATH\n"); @@ -1983,7 +1998,7 @@ static void test_ReplaceFileA(void) * TODO: flags are not implemented */ SetLastError(0xdeadbeef); - ret = ReplaceFile(replaced, replacement, backup, 0, 0, 0); + ret = pReplaceFileA(replaced, replacement, backup, 0, 0, 0); ok(ret, "ReplaceFileA: unexpected error %d\n", GetLastError()); /* make sure that the backup has the size of the old "replaced" file */ hBackupFile = CreateFileA(backup, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); @@ -2023,7 +2038,7 @@ static void test_ReplaceFileA(void) * TODO: flags are not implemented */ SetLastError(0xdeadbeef); - ret = ReplaceFileA(replaced, replacement, NULL, 0, 0, 0); + ret = pReplaceFileA(replaced, replacement, NULL, 0, 0, 0); ok(ret, "ReplaceFileA: unexpected error %d\n", GetLastError()); /* re-create replacement file for pass w/ backup (backup-file not existing) */ @@ -2035,7 +2050,7 @@ static void test_ReplaceFileA(void) * TODO: flags are not implemented */ SetLastError(0xdeadbeef); - ret = ReplaceFileA(replaced, replacement, backup, 0, 0, 0); + ret = pReplaceFileA(replaced, replacement, backup, 0, 0, 0); ok(ret, "ReplaceFileA: unexpected error %d\n", GetLastError()); /* re-create replacement file for pass w/ no permissions to "replaced" */ @@ -2047,7 +2062,7 @@ static void test_ReplaceFileA(void) * TODO: flags are not implemented */ SetLastError(0xdeadbeef); - ret = ReplaceFileA(replaced, replacement, backup, 0, 0, 0); + ret = pReplaceFileA(replaced, replacement, backup, 0, 0, 0); ok(ret != ERROR_UNABLE_TO_REMOVE_REPLACED, "ReplaceFileA: unexpected error %d\n", GetLastError()); /* make sure that the replacement file still exists */ hReplacementFile = CreateFileA(replacement, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); @@ -2064,7 +2079,7 @@ static void test_ReplaceFileA(void) * TODO: flags are not implemented */ SetLastError(0xdeadbeef); - ret = ReplaceFileA(replaced, replacement, backup, 0, 0, 0); + ret = pReplaceFileA(replaced, replacement, backup, 0, 0, 0); ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "ReplaceFileA: unexpected error %d\n", GetLastError()); @@ -2072,7 +2087,7 @@ static void test_ReplaceFileA(void) * TODO: flags are not implemented */ SetLastError(0xdeadbeef); - ret = ReplaceFileA(replaced, replacement, NULL, 0, 0, 0); + ret = pReplaceFileA(replaced, replacement, NULL, 0, 0, 0); ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "ReplaceFileA: unexpected error %d\n", GetLastError()); @@ -2098,6 +2113,12 @@ static void test_ReplaceFileW(void) WCHAR temp_path[MAX_PATH]; DWORD ret; + if (!pReplaceFileW) + { + skip("ReplaceFileW() is missing\n"); + return; + } + ret = GetTempPathW(MAX_PATH, temp_path); if (ret==0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) return; @@ -2113,19 +2134,19 @@ static void test_ReplaceFileW(void) ret = GetTempFileNameW(temp_path, prefix, 0, backup); ok(ret != 0, "GetTempFileNameW error (backup) %d\n", GetLastError()); - ret = ReplaceFileW(replaced, replacement, backup, 0, 0, 0); + ret = pReplaceFileW(replaced, replacement, backup, 0, 0, 0); ok(ret, "ReplaceFileW: error %d\n", GetLastError()); ret = GetTempFileNameW(temp_path, prefix, 0, replacement); ok(ret != 0, "GetTempFileNameW error (replacement) %d\n", GetLastError()); - ret = ReplaceFileW(replaced, replacement, NULL, 0, 0, 0); + ret = pReplaceFileW(replaced, replacement, NULL, 0, 0, 0); ok(ret, "ReplaceFileW: error %d\n", GetLastError()); ret = GetTempFileNameW(temp_path, prefix, 0, replacement); ok(ret != 0, "GetTempFileNameW error (replacement) %d\n", GetLastError()); ret = DeleteFileW(backup); ok(ret, "DeleteFileW: error (backup) %d\n", GetLastError()); - ret = ReplaceFileW(replaced, replacement, backup, 0, 0, 0); + ret = pReplaceFileW(replaced, replacement, backup, 0, 0, 0); ok(ret, "ReplaceFileW: error %d\n", GetLastError()); ret = GetTempFileNameW(temp_path, prefix, 0, replacement); @@ -2133,7 +2154,7 @@ static void test_ReplaceFileW(void) ret = SetFileAttributesW(replaced, FILE_ATTRIBUTE_READONLY); ok(ret, "SetFileAttributesW: error setting to read only %d\n", GetLastError()); - ret = ReplaceFileW(replaced, replacement, backup, 0, 0, 0); + ret = pReplaceFileW(replaced, replacement, backup, 0, 0, 0); ok(ret != ERROR_UNABLE_TO_REMOVE_REPLACED, "ReplaceFileW: unexpected error %d\n", GetLastError()); ret = SetFileAttributesW(replaced, FILE_ATTRIBUTE_NORMAL); @@ -2141,10 +2162,10 @@ static void test_ReplaceFileW(void) ret = DeleteFileW(replaced); ok(ret, "DeleteFileW: error (replaced) %d\n", GetLastError()); - ret = ReplaceFileW(replaced, replacement, backup, 0, 0, 0); + ret = pReplaceFileW(replaced, replacement, backup, 0, 0, 0); ok(!ret, "ReplaceFileW: error %d\n", GetLastError()); - ret = ReplaceFileW(replaced, replacement, NULL, 0, 0, 0); + ret = pReplaceFileW(replaced, replacement, NULL, 0, 0, 0); ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "ReplaceFileW: unexpected error %d\n", GetLastError()); @@ -2154,8 +2175,7 @@ static void test_ReplaceFileW(void) START_TEST(file) { - hkernel32 = GetModuleHandleA("kernel32.dll"); - pFindFirstFileExA=(void*)GetProcAddress(hkernel32, "FindFirstFileExA"); + InitFunctionPointers(); test__hread( ); test__hwrite( );

1 0

Rob Shearman : libport: Use configure guards for include files that may not be present.
by Alexandre Julliard Feb. 13, 2008

Feb. 13, 2008

Module: wine Branch: master Commit: 1279cf3597b364d8df43a4b16f9ab315c9642d71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1279cf3597b364d8df43a4b16… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 13 13:18:37 2008 +0000 libport: Use configure guards for include files that may not be present. --- libs/port/futimes.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libs/port/futimes.c b/libs/port/futimes.c index 7892199..f842d67 100644 --- a/libs/port/futimes.c +++ b/libs/port/futimes.c @@ -24,8 +24,12 @@ #ifndef HAVE_FUTIMES #include <sys/types.h> -#include <sys/time.h> -#include <utime.h> +#ifdef HAVE_SYS_TIME_H +# include <sys/time.h> +#endif +#ifdef HAVE_UTIME_H +# include <utime.h> +#endif #include <stdio.h> #include <errno.h>

1 0

Rob Shearman : include: Fix some typos in dpaddr.h.
by Alexandre Julliard Feb. 13, 2008

Feb. 13, 2008

Module: wine Branch: master Commit: 9f3c91e41f82ba302afad386aa1be58d6dec2b23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f3c91e41f82ba302afad386a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 13 13:19:23 2008 +0000 include: Fix some typos in dpaddr.h. --- include/dpaddr.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/dpaddr.h b/include/dpaddr.h index 8300729..3f67b9c 100644 --- a/include/dpaddr.h +++ b/include/dpaddr.h @@ -129,16 +129,16 @@ typedef struct sockaddr SOCKADDR; # define DPNA_KEY_DEVICE L"device" # define DPNA_KEY_FLOWCONTROL L"flowcontrol" # define DPNA_KEY_HOSTNAME L"hostname" -# define DPNA_KEY_NAMEINFO_A L"nameinfo" +# define DPNA_KEY_NAMEINFO L"nameinfo" # define DPNA_KEY_PARITY L"parity" # define DPNA_KEY_PHONENUMBER L"phonenumber" # define DPNA_KEY_PORT L"port" -# define DPNA_KEY_PROCESSOR_A L"processor" +# define DPNA_KEY_PROCESSOR L"processor" # define DPNA_KEY_PROGRAM L"program" # define DPNA_KEY_PROVIDER L"provider" -# define DPNA_KEY_SCOPE_A L"scope" +# define DPNA_KEY_SCOPE L"scope" # define DPNA_KEY_STOPBITS L"stopbits" -# define DPNA_KEY_TRAVERSALMODE_A L"traversalmode" +# define DPNA_KEY_TRAVERSALMODE L"traversalmode" # define DPNA_STOP_BITS_ONE L"1" # define DPNA_STOP_BITS_ONE_FIVE L"1.5" # define DPNA_STOP_BITS_TWO L"2"

1 0

Rob Shearman : ole32: Fix reference count leak in BindMoniker.
by Alexandre Julliard Feb. 13, 2008

Feb. 13, 2008

Module: wine Branch: master Commit: 14f7a59270579d57244e7ce3527f157233f0bc3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=14f7a59270579d57244e7ce35… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 13 12:34:44 2008 +0000 ole32: Fix reference count leak in BindMoniker. --- dlls/ole32/bindctx.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c index e0f297e..5c348cb 100644 --- a/dlls/ole32/bindctx.c +++ b/dlls/ole32/bindctx.c @@ -611,6 +611,9 @@ HRESULT WINAPI BindMoniker(LPMONIKER pmk, DWORD grfOpt, REFIID riid, LPVOID * pp res = CreateBindCtx(grfOpt, &pbc); if (SUCCEEDED(res)) + { res = IMoniker_BindToObject(pmk, pbc, NULL, riid, ppvResult); + IBindCtx_Release(pbc); + } return res; }

1 0

Huw Davies : inetcomm: Implement IMimeBody_GetProp for the primary context type.
by Alexandre Julliard Feb. 13, 2008

Feb. 13, 2008

Module: wine Branch: master Commit: 3f92c5b73494729193ce677668b09b9b5650a61b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f92c5b73494729193ce67766… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 12 14:11:34 2008 +0000 inetcomm: Implement IMimeBody_GetProp for the primary context type. --- dlls/inetcomm/mimeole.c | 15 +++++++++++++-- dlls/inetcomm/tests/mimeole.c | 11 +++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index cf0e85b..6f24f69 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -627,8 +627,19 @@ static HRESULT WINAPI MimeBody_GetProp( DWORD dwFlags, LPPROPVARIANT pValue) { - FIXME("stub\n"); - return E_NOTIMPL; + MimeBody *This = impl_from_IMimeBody(iface); + TRACE("(%p)->(%s, %d, %p)\n", This, pszName, dwFlags, pValue); + + if(!strcasecmp(pszName, "att:pri-content-type")) + { + PropVariantClear(pValue); + pValue->vt = VT_LPSTR; + pValue->u.pszVal = strdupA(This->content_pri_type); + return S_OK; + } + + FIXME("stub!\n"); + return E_FAIL; } static HRESULT WINAPI MimeBody_SetProp( diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index f5f8a90..d268e9d 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -19,6 +19,7 @@ */ #define COBJMACROS +#define NONAMELESSUNION #include "windows.h" #include "ole2.h" @@ -216,6 +217,8 @@ static void test_CreateMessage(void) FINDBODY find_struct; char text[] = "text"; HBODY *body_list; + PROPVARIANT prop; + static char att_pritype[] = "att:pri-content-type"; hr = MimeOleCreateMessage(NULL, &msg); ok(hr == S_OK, "ret %08x\n", hr); @@ -247,6 +250,14 @@ static void test_CreateMessage(void) IMimeBody_Release(body); hr = IMimeMessage_GetBody(msg, IBL_ROOT, NULL, &hbody); + + PropVariantInit(&prop); + hr = IMimeMessage_GetBodyProp(msg, hbody, att_pritype, 0, &prop); + ok(hr == S_OK, "ret %08x\n", hr); + ok(prop.vt == VT_LPSTR, "vt %08x\n", prop.vt); + ok(!strcasecmp(prop.u.pszVal, "multipart"), "got %s\n", prop.u.pszVal); + PropVariantClear(&prop); + hr = IMimeMessage_GetBody(msg, IBL_FIRST, hbody, &hbody); ok(hr == S_OK, "ret %08x\n", hr); hr = IMimeMessage_BindToObject(msg, hbody, &IID_IMimeBody, (void**)&body);

1 0

Huw Davies : inetcomm: Implement IMimeMessage_GetMessageSource.
by Alexandre Julliard Feb. 13, 2008

Feb. 13, 2008

Module: wine Branch: master Commit: e03f478aee2262ee265cc00ed1d92b1947bf9fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=e03f478aee2262ee265cc00ed… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 12 14:30:59 2008 +0000 inetcomm: Implement IMimeMessage_GetMessageSource. --- dlls/inetcomm/mimeole.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index b67a898..dd47a68 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1674,8 +1674,12 @@ static HRESULT WINAPI MimeMessage_GetMessageSource( IStream **ppStream, DWORD dwFlags) { + MimeMessage *This = (MimeMessage *)iface; FIXME("(%p)->(%p, 0x%x)\n", iface, ppStream, dwFlags); - return E_NOTIMPL; + + IStream_AddRef(This->stream); + *ppStream = This->stream; + return S_OK; } static HRESULT WINAPI MimeMessage_GetMessageSize(

1 0

Huw Davies : inetcomm: Stub for MimeOleGetCharsetInfo.
by Alexandre Julliard Feb. 13, 2008

Feb. 13, 2008

Module: wine Branch: master Commit: b21b9c73723f14ae82e6ffc5e2f38f207ecf215c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b21b9c73723f14ae82e6ffc5e… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 12 14:28:11 2008 +0000 inetcomm: Stub for MimeOleGetCharsetInfo. --- dlls/inetcomm/inetcomm.spec | 2 +- dlls/inetcomm/mimeole.c | 7 +++++++ dlls/inetcomm/tests/mimeole.c | 4 ++++ 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/inetcomm/inetcomm.spec b/dlls/inetcomm/inetcomm.spec index 0266bb1..36a5d8b 100644 --- a/dlls/inetcomm/inetcomm.spec +++ b/dlls/inetcomm/inetcomm.spec @@ -67,7 +67,7 @@ @ stub MimeOleGetBodyPropA @ stub MimeOleGetBodyPropW @ stub MimeOleGetCertsFromThumbprints -@ stub MimeOleGetCharsetInfo +@ stdcall MimeOleGetCharsetInfo(ptr ptr) @ stub MimeOleGetCodePageCharset @ stub MimeOleGetCodePageInfo @ stub MimeOleGetContentTypeExt diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 98f04c8..b67a898 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -2888,3 +2888,10 @@ HRESULT WINAPI MimeOleGetAllocator(IMimeAllocator **alloc) { return MimeAllocator_create(NULL, (void**)alloc); } + +HRESULT WINAPI MimeOleGetCharsetInfo(HCHARSET hCharset, LPINETCSETINFO pCsetInfo) +{ + FIXME("(%p, %p)\n", hCharset, pCsetInfo); + if(!hCharset) return E_INVALIDARG; + return E_FAIL; +} diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 1c82a2a..d286b74 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -216,6 +216,8 @@ static void test_CreateMessage(void) ULONG count; FINDBODY find_struct; HCHARSET hcs; + INETCSETINFO csi; + char text[] = "text"; HBODY *body_list; PROPVARIANT prop; @@ -308,6 +310,8 @@ static void test_CreateMessage(void) hr = IMimeMessage_GetCharset(body, &hcs); ok(hr == S_OK, "ret %08x\n", hr); ok(hcs == NULL, "ret %p\n", hcs); + hr = MimeOleGetCharsetInfo(hcs, &csi); + ok(hr == E_INVALIDARG, "ret %08x\n", hr); IMimeMessage_Release(msg);

1 0

Huw Davies : inetcomm: Implement IMimeMessage_GetAttachments.
by Alexandre Julliard Feb. 13, 2008

Feb. 13, 2008

Module: wine Branch: master Commit: 02ceeef2886a701998a1b46c6147302da14f7920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02ceeef2886a701998a1b46c6… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 12 13:49:28 2008 +0000 inetcomm: Implement IMimeMessage_GetAttachments. --- dlls/inetcomm/mimeole.c | 34 ++++++++++++++++++++++++++++++++-- dlls/inetcomm/tests/mimeole.c | 6 ++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index b794f5d..cf0e85b 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -2279,8 +2279,38 @@ static HRESULT WINAPI MimeMessage_GetAttachments( ULONG *pcAttach, LPHBODY *pprghAttach) { - FIXME("(%p)->(%p, %p)\n", iface, pcAttach, pprghAttach); - return E_NOTIMPL; + HRESULT hr; + FINDBODY find_struct; + HBODY hbody; + LPHBODY array; + ULONG size = 10; + + TRACE("(%p)->(%p, %p)\n", iface, pcAttach, pprghAttach); + + *pcAttach = 0; + array = CoTaskMemAlloc(size * sizeof(HBODY)); + + find_struct.pszPriType = find_struct.pszSubType = NULL; + hr = IMimeMessage_FindFirst(iface, &find_struct, &hbody); + while(hr == S_OK) + { + hr = IMimeMessage_IsContentType(iface, hbody, "multipart", NULL); + TRACE("IsCT rets %08x %d\n", hr, *pcAttach); + if(hr != S_OK) + { + if(*pcAttach + 1 > size) + { + size *= 2; + array = CoTaskMemRealloc(array, size * sizeof(HBODY)); + } + array[*pcAttach] = hbody; + (*pcAttach)++; + } + hr = IMimeMessage_FindNext(iface, &find_struct, &hbody); + } + + *pprghAttach = array; + return S_OK; } static HRESULT WINAPI MimeMessage_GetAddressTable( diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index ee53d15..f5f8a90 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -215,6 +215,7 @@ static void test_CreateMessage(void) ULONG count; FINDBODY find_struct; char text[] = "text"; + HBODY *body_list; hr = MimeOleCreateMessage(NULL, &msg); ok(hr == S_OK, "ret %08x\n", hr); @@ -282,6 +283,11 @@ static void test_CreateMessage(void) hr = IMimeMessage_FindNext(msg, &find_struct, &hbody); ok(hr == MIME_E_NOT_FOUND, "ret %08x\n", hr); + hr = IMimeMessage_GetAttachments(msg, &count, &body_list); + ok(hr == S_OK, "ret %08x\n", hr); + ok(count == 2, "got %d\n", count); + CoTaskMemFree(body_list); + IMimeMessage_Release(msg); ref = IStream_AddRef(stream);

1 0

Huw Davies : inetcomm: Implement IMimeMessage_GetTextBody.
by Alexandre Julliard Feb. 13, 2008

Feb. 13, 2008

Module: wine Branch: master Commit: 869b10b430e6bf27e6f0fd47579be8e4825c0806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=869b10b430e6bf27e6f0fd475… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 12 13:36:16 2008 +0000 inetcomm: Implement IMimeMessage_GetTextBody. --- dlls/inetcomm/mimeole.c | 40 ++++++++++++++++++++++++++++++++++++++-- include/mimeole.idl | 5 +++++ 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 5628728..b794f5d 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -2189,8 +2189,44 @@ static HRESULT WINAPI MimeMessage_GetTextBody( IStream **pStream, LPHBODY phBody) { - FIXME("(%p)->(%d, %d, %p, %p)\n", iface, dwTxtType, ietEncoding, pStream, phBody); - return E_NOTIMPL; + HRESULT hr; + HBODY hbody; + FINDBODY find_struct; + IMimeBody *mime_body; + static char text[] = "text"; + static char plain[] = "plain"; + static char html[] = "html"; + + TRACE("(%p)->(%d, %d, %p, %p)\n", iface, dwTxtType, ietEncoding, pStream, phBody); + + find_struct.pszPriType = text; + + switch(dwTxtType) + { + case TXT_PLAIN: + find_struct.pszSubType = plain; + break; + case TXT_HTML: + find_struct.pszSubType = html; + break; + default: + return MIME_E_INVALID_TEXT_TYPE; + } + + hr = IMimeMessage_FindFirst(iface, &find_struct, &hbody); + if(hr != S_OK) + { + TRACE("not found hr %08x\n", hr); + *phBody = NULL; + return hr; + } + + IMimeMessage_BindToObject(iface, hbody, &IID_IMimeBody, (void**)&mime_body); + + IMimeBody_GetData(mime_body, ietEncoding, pStream); + *phBody = hbody; + IMimeBody_Release(mime_body); + return hr; } static HRESULT WINAPI MimeMessage_SetTextBody( diff --git a/include/mimeole.idl b/include/mimeole.idl index 171f0e9..9d4f45b 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -41,6 +41,8 @@ cpp_quote("#define MIME_E_NOT_FOUND 0x800cce05") cpp_quote("#define MIME_E_NO_DATA 0x800cce05") cpp_quote("#define MIME_E_BUFFER_TOO_SMALL 0x800cce06") +cpp_quote("#define MIME_E_INVALID_TEXT_TYPE 0x800cce38") + cpp_quote("typedef enum tagMIMEPROPID {") cpp_quote(" PID_HDR_NEWSGROUP = 2,") cpp_quote(" PID_HDR_NEWSGROUPS = 3,") @@ -894,6 +896,9 @@ cpp_quote("#endif") WCHAR wchQuote; } WEBPAGEOPTIONS, *LPWEBPAGEOPTIONS; + cpp_quote("#define TXT_PLAIN 1") + cpp_quote("#define TXT_HTML 2") + HRESULT CreateWebPage( [in] IStream *pRootStm, [in] LPWEBPAGEOPTIONS pOptions,

1 0

James Hawkins : msi: Add tests for source folder resolution.
by Alexandre Julliard Feb. 13, 2008

Feb. 13, 2008

Module: wine Branch: master Commit: 050fa6a40ca0931e2eb4c9bf6224298dc5c4d377 URL: http://source.winehq.org/git/wine.git/?a=commit;h=050fa6a40ca0931e2eb4c9bf6… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Feb 13 00:07:43 2008 -0600 msi: Add tests for source folder resolution. --- dlls/msi/tests/install.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 47ef2f0..0eb6548 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -887,6 +887,18 @@ static const msi_table wrv_tables[] = ADD_TABLE(wrv_registry), }; +static const msi_table sf_tables[] = +{ + ADD_TABLE(wrv_component), + ADD_TABLE(directory), + ADD_TABLE(rof_feature), + ADD_TABLE(ci2_feature_comp), + ADD_TABLE(ci2_file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(rof_media), + ADD_TABLE(property), +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -3694,6 +3706,41 @@ static void test_writeregistryvalues(void) RemoveDirectory("msitest"); } +static void test_sourcefolder(void) +{ + UINT r; + + CreateDirectoryA("msitest", NULL); + create_file("augustus", 500); + + create_database(msifile, sf_tables, sizeof(sf_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n"); + todo_wine + { + ok(r == ERROR_INSTALL_FAILURE, + "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + ok(!delete_pf("msitest", FALSE), "File installed\n"); + } + + RemoveDirectoryA("msitest"); + + r = MsiInstallProductA(msifile, NULL); + todo_wine + { + ok(r == ERROR_INSTALL_FAILURE, + "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n"); + ok(!delete_pf("msitest", FALSE), "File installed\n"); + } + + DeleteFile(msifile); + DeleteFile("augustus"); +} + START_TEST(install) { DWORD len; @@ -3737,6 +3784,7 @@ START_TEST(install) test_missingcab(); test_duplicatefiles(); test_writeregistryvalues(); + test_sourcefolder(); SetCurrentDirectoryA(prev_path); }

1 0