wine-commits February 2008

wine-commits@winehq.org

3 participants
999 discussions

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

13 Feb '08

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 : libport: Use configure guards for include files that may not be present.
by Alexandre Julliard 13 Feb '08

13 Feb '08

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

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

13 Feb '08

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

Andrew Talbot : comdlg32: Assign to structs instead of using memcpy.
by Alexandre Julliard 13 Feb '08

13 Feb '08

Module: wine Branch: master Commit: 8fb1f0d089b975c13cfa134541a3524206684790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fb1f0d089b975c13cfa13454… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Feb 13 11:09:02 2008 +0000 comdlg32: Assign to structs instead of using memcpy. --- dlls/comdlg32/printdlg.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 95f4dac..8e78f3c 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -3232,7 +3232,7 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) if (uMsg == WM_INITDIALOG) { /*Init dialog*/ pda = (PageSetupDataA*)lParam; pda->hDlg = hDlg; /* saving handle to main window to PageSetupDataA structure */ - memcpy(&pda->curdlg, pda->dlga, sizeof(pda->curdlg)); + pda->curdlg = *pda->dlga; hDrawWnd = GetDlgItem(hDlg, rct1); TRACE("set property to %p\n", pda); @@ -3358,7 +3358,7 @@ PageDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) if (uMsg==WM_INITDIALOG) { res = TRUE; pda = (PageSetupDataW*)lParam; - memcpy(&pda->curdlg, pda, sizeof(pda->curdlg)); + pda->curdlg = *pda->dlga; SetPropW(hDlg, __WINE_PAGESETUPDLGDATA, pda); if (pda->dlga->Flags & PSD_ENABLEPAGESETUPHOOK) { res = pda->dlga->lpfnPageSetupHook(hDlg,uMsg,wParam,(LPARAM)pda->dlga); @@ -3537,10 +3537,10 @@ BOOL WINAPI PageSetupDlgA(LPPAGESETUPDLGA setupdlg) { COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE); return FALSE; } - + pda = HeapAlloc(GetProcessHeap(),0,sizeof(*pda)); pda->dlga = setupdlg; - memcpy(&pda->pdlg,&pdlg,sizeof(pdlg)); + pda->pdlg = pdlg; bRet = (0<DialogBoxIndirectParamA( setupdlg->hInstance, @@ -3631,7 +3631,7 @@ BOOL WINAPI PageSetupDlgW(LPPAGESETUPDLGW setupdlg) { } pdw = HeapAlloc(GetProcessHeap(),0,sizeof(*pdw)); pdw->dlga = setupdlg; - memcpy(&pdw->pdlg,&pdlg,sizeof(pdlg)); + pdw->pdlg = pdlg; bRet = (0<DialogBoxIndirectParamW( setupdlg->hInstance,

1 0

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

13 Feb '08

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

Michael Stefaniuc : gdi32: Move two 16bit function stubs to gdi16.c.
by Alexandre Julliard 13 Feb '08

13 Feb '08

Module: wine Branch: master Commit: 3db6eeeda9a3f2228df49398f5a6a9d81c04f5f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3db6eeeda9a3f2228df49398f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 13 01:47:59 2008 +0100 gdi32: Move two 16bit function stubs to gdi16.c. --- dlls/gdi32/font.c | 29 ----------------------------- dlls/gdi32/gdi16.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 29 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 3a0beed..3624e97 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1455,26 +1455,6 @@ BOOL WINAPI GetTextMetricsW( HDC hdc, TEXTMETRICW *metrics ) /*********************************************************************** - * GetOutlineTextMetrics [GDI.308] Gets metrics for TrueType fonts. - * - * NOTES - * lpOTM should be LPOUTLINETEXTMETRIC - * - * RETURNS - * Success: Non-zero or size of required buffer - * Failure: 0 - */ -UINT16 WINAPI GetOutlineTextMetrics16( - HDC16 hdc, /* [in] Handle of device context */ - UINT16 cbData, /* [in] Size of metric data array */ - LPOUTLINETEXTMETRIC16 lpOTM) /* [out] Address of metric data array */ -{ - FIXME("(%04x,%04x,%p): stub\n", hdc,cbData,lpOTM); - return 0; -} - - -/*********************************************************************** * GetOutlineTextMetricsA (GDI32.@) * Gets metrics for TrueType fonts. * @@ -2408,15 +2388,6 @@ DWORD WINAPI SetMapperFlags( HDC hDC, DWORD dwFlag ) } /*********************************************************************** - * GetAspectRatioFilterEx (GDI.486) - */ -BOOL16 WINAPI GetAspectRatioFilterEx16( HDC16 hdc, LPSIZE16 pAspectRatio ) -{ - FIXME("(%04x, %p): -- Empty Stub !\n", hdc, pAspectRatio); - return FALSE; -} - -/*********************************************************************** * GetAspectRatioFilterEx (GDI32.@) */ BOOL WINAPI GetAspectRatioFilterEx( HDC hdc, LPSIZE pAspectRatio ) diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi32/gdi16.c index b7d1293..02bb16f 100644 --- a/dlls/gdi32/gdi16.c +++ b/dlls/gdi32/gdi16.c @@ -1728,6 +1728,31 @@ BOOL16 WINAPI GetCharABCWidths16( HDC16 hdc, UINT16 firstChar, UINT16 lastChar, /*********************************************************************** + * GetOutlineTextMetrics (GDI.308) + * + * Gets metrics for TrueType fonts. + * + * PARAMS + * hdc [In] Handle of device context + * cbData [In] Size of metric data array + * lpOTM [Out] Address of metric data array + * + * RETURNS + * Success: Non-zero or size of required buffer + * Failure: 0 + * + * NOTES + * lpOTM should be LPOUTLINETEXTMETRIC + */ +UINT16 WINAPI GetOutlineTextMetrics16( HDC16 hdc, UINT16 cbData, + LPOUTLINETEXTMETRIC16 lpOTM ) +{ + FIXME("(%04x,%04x,%p): stub\n", hdc,cbData,lpOTM); + return 0; +} + + +/*********************************************************************** * GetGlyphOutline (GDI.309) */ DWORD WINAPI GetGlyphOutline16( HDC16 hdc, UINT16 uChar, UINT16 fuFormat, @@ -2611,6 +2636,16 @@ BOOL16 WINAPI ScaleWindowExtEx16( HDC16 hdc, INT16 xNum, INT16 xDenom, } +/*********************************************************************** + * GetAspectRatioFilterEx (GDI.486) + */ +BOOL16 WINAPI GetAspectRatioFilterEx16( HDC16 hdc, LPSIZE16 pAspectRatio ) +{ + FIXME("(%04x, %p): -- Empty Stub !\n", hdc, pAspectRatio); + return FALSE; +} + + /****************************************************************************** * PolyBezier (GDI.502) */

1 0

Huw Davies : inetcomm: Implement IMimeMessage_GetMessageSource.
by Alexandre Julliard 13 Feb '08

13 Feb '08

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 13 Feb '08

13 Feb '08

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: Stub IMime{Message, Body}_GetCharset to return a NULL charset.
by Alexandre Julliard 13 Feb '08

13 Feb '08

Module: wine Branch: master Commit: 43958866a300183d8b93aee1871ad214c85eaee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43958866a300183d8b93aee18… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 12 14:20:37 2008 +0000 inetcomm: Stub IMime{Message, Body}_GetCharset to return a NULL charset. --- dlls/inetcomm/mimeole.c | 6 ++++-- dlls/inetcomm/tests/mimeole.c | 10 ++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 6f24f69..98f04c8 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -715,7 +715,8 @@ static HRESULT WINAPI MimeBody_GetCharset( LPHCHARSET phCharset) { FIXME("stub\n"); - return E_NOTIMPL; + *phCharset = NULL; + return S_OK; } static HRESULT WINAPI MimeBody_SetCharset( @@ -2023,7 +2024,8 @@ static HRESULT WINAPI MimeMessage_GetCharset( LPHCHARSET phCharset) { FIXME("(%p)->(%p)\n", iface, phCharset); - return E_NOTIMPL; + *phCharset = NULL; + return S_OK; } static HRESULT WINAPI MimeMessage_SetCharset( diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index d268e9d..1c82a2a 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -215,6 +215,7 @@ static void test_CreateMessage(void) BODYOFFSETS offsets; ULONG count; FINDBODY find_struct; + HCHARSET hcs; char text[] = "text"; HBODY *body_list; PROPVARIANT prop; @@ -268,6 +269,11 @@ static void test_CreateMessage(void) ok(offsets.cbHeaderStart == 428, "got %d\n", offsets.cbHeaderStart); ok(offsets.cbBodyStart == 518, "got %d\n", offsets.cbBodyStart); ok(offsets.cbBodyEnd == 523, "got %d\n", offsets.cbBodyEnd); + + hr = IMimeBody_GetCharset(body, &hcs); + ok(hr == S_OK, "ret %08x\n", hr); + ok(hcs == NULL, "ret %p\n", hcs); + IMimeBody_Release(body); hr = IMimeMessage_GetBody(msg, IBL_NEXT, hbody, &hbody); @@ -299,6 +305,10 @@ static void test_CreateMessage(void) ok(count == 2, "got %d\n", count); CoTaskMemFree(body_list); + hr = IMimeMessage_GetCharset(body, &hcs); + ok(hr == S_OK, "ret %08x\n", hr); + ok(hcs == NULL, "ret %p\n", hcs); + IMimeMessage_Release(msg); ref = IStream_AddRef(stream);

1 0

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

13 Feb '08

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2008