February 2008 - Wine-commits

James Hawkins : msi: Handle carriage returns in MsiDatabaseImport.
by Alexandre Julliard 12 Feb '08

12 Feb '08

Module: wine Branch: master Commit: ec086f77e3261dacb501b0f03265cd68cbaaa44e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec086f77e3261dacb501b0f03… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Feb 12 01:37:56 2008 -0600 msi: Handle carriage returns in MsiDatabaseImport. --- dlls/msi/database.c | 22 +++++++-- dlls/msi/tests/automation.c | 1 + dlls/msi/tests/db.c | 98 ++++++++++++++++--------------------------- 3 files changed, 54 insertions(+), 67 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index a7dc285..425486e 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -317,12 +317,18 @@ static void msi_parse_line(LPWSTR *line, LPWSTR **entries, DWORD *num_entries) /* store pointers into the data */ for (i = 0, ptr = *line; i < count; i++) { + while (*ptr && *ptr == '\r') ptr++; save = ptr; - while (*ptr && *ptr != '\t' && *ptr != '\n') ptr++; + while (*ptr && *ptr != '\t' && *ptr != '\n' && *ptr != '\r') ptr++; /* NULL-separate the data */ - if (*ptr) + if (*ptr == '\n' || *ptr == '\r') + { + while (*ptr == '\n' || *ptr == '\r') + *(ptr++) = '\0'; + } + else if (*ptr) *ptr++ = '\0'; (*entries)[i] = save; @@ -598,11 +604,11 @@ UINT MSI_DatabaseImport(MSIDATABASE *db, LPCWSTR folder, LPCWSTR file) { UINT r; DWORD len, i; - DWORD num_labels; + DWORD num_labels, num_types; DWORD num_columns, num_records = 0; LPWSTR *columns, *types, *labels; LPWSTR path, ptr, data; - LPWSTR **records; + LPWSTR **records = NULL; LPWSTR **temp_records; static const WCHAR backslash[] = {'\\',0}; @@ -625,9 +631,15 @@ UINT MSI_DatabaseImport(MSIDATABASE *db, LPCWSTR folder, LPCWSTR file) ptr = data; msi_parse_line( &ptr, &columns, &num_columns ); - msi_parse_line( &ptr, &types, NULL ); + msi_parse_line( &ptr, &types, &num_types ); msi_parse_line( &ptr, &labels, &num_labels ); + if (num_columns != num_types) + { + r = ERROR_FUNCTION_FAILED; + goto done; + } + records = msi_alloc(sizeof(LPWSTR *)); if (!records) { diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 3ae4a7b..8cf764e 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -272,6 +272,7 @@ static void create_database(const CHAR *name, const msi_table *tables, int num_t write_file(table->filename, table->data, (table->size - 1) * sizeof(char)); + printf("table->filename: %s\n", table->filename); r = MsiDatabaseImportA(db, CURR_DIR, table->filename); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 684379e..fa3b55b 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1643,10 +1643,7 @@ static void test_msiimport(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = add_table_to_db(hdb, endlines1); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = add_table_to_db(hdb, endlines2); ok(r == ERROR_FUNCTION_FAILED, @@ -1749,7 +1746,8 @@ static void test_msiimport(void) MsiCloseHandle(rec); r = MsiViewFetch(view, &rec); - ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + ok(r == ERROR_NO_MORE_ITEMS, + "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); r = MsiViewClose(view); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); @@ -1758,37 +1756,28 @@ static void test_msiimport(void) query = "SELECT * FROM `Table`"; r = MsiDatabaseOpenView(hdb, query, &view); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = MsiViewGetColumnInfo(view, MSICOLINFO_NAMES, &rec); count = MsiRecordGetFieldCount(rec); - todo_wine - { - ok(count == 6, "Expected 6, got %d\n", count); - ok(check_record(rec, 1, "A"), "Expected A\n"); - ok(check_record(rec, 2, "B"), "Expected B\n"); - ok(check_record(rec, 3, "C"), "Expected C\n"); - ok(check_record(rec, 4, "D"), "Expected D\n"); - ok(check_record(rec, 5, "E"), "Expected E\n"); - ok(check_record(rec, 6, "F"), "Expected F\n"); - } + ok(count == 6, "Expected 6, got %d\n", count); + ok(check_record(rec, 1, "A"), "Expected A\n"); + ok(check_record(rec, 2, "B"), "Expected B\n"); + ok(check_record(rec, 3, "C"), "Expected C\n"); + ok(check_record(rec, 4, "D"), "Expected D\n"); + ok(check_record(rec, 5, "E"), "Expected E\n"); + ok(check_record(rec, 6, "F"), "Expected F\n"); MsiCloseHandle(rec); r = MsiViewGetColumnInfo(view, MSICOLINFO_TYPES, &rec); count = MsiRecordGetFieldCount(rec); - todo_wine - { - ok(count == 6, "Expected 6, got %d\n", count); - ok(check_record(rec, 1, "s72"), "Expected s72\n"); - ok(check_record(rec, 2, "s72"), "Expected s72\n"); - ok(check_record(rec, 3, "s72"), "Expected s72\n"); - ok(check_record(rec, 4, "s72"), "Expected s72\n"); - ok(check_record(rec, 5, "s72"), "Expected s72\n"); - ok(check_record(rec, 6, "s72"), "Expected s72\n"); - } + ok(count == 6, "Expected 6, got %d\n", count); + ok(check_record(rec, 1, "s72"), "Expected s72\n"); + ok(check_record(rec, 2, "s72"), "Expected s72\n"); + ok(check_record(rec, 3, "s72"), "Expected s72\n"); + ok(check_record(rec, 4, "s72"), "Expected s72\n"); + ok(check_record(rec, 5, "s72"), "Expected s72\n"); + ok(check_record(rec, 6, "s72"), "Expected s72\n"); MsiCloseHandle(rec); MsiViewClose(view); @@ -1796,51 +1785,36 @@ static void test_msiimport(void) query = "SELECT * FROM `Table`"; r = MsiDatabaseOpenView(hdb, query, &view); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = MsiViewExecute(view, 0); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = MsiViewFetch(view, &rec); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(check_record(rec, 1, "a"), "Expected 'a'\n"); - ok(check_record(rec, 2, "b"), "Expected 'b'\n"); - ok(check_record(rec, 3, "c"), "Expected 'c'\n"); - ok(check_record(rec, 4, "d"), "Expected 'd'\n"); - ok(check_record(rec, 5, "e"), "Expected 'e'\n"); - ok(check_record(rec, 6, "f"), "Expected 'f'\n"); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(check_record(rec, 1, "a"), "Expected 'a'\n"); + ok(check_record(rec, 2, "b"), "Expected 'b'\n"); + ok(check_record(rec, 3, "c"), "Expected 'c'\n"); + ok(check_record(rec, 4, "d"), "Expected 'd'\n"); + ok(check_record(rec, 5, "e"), "Expected 'e'\n"); + ok(check_record(rec, 6, "f"), "Expected 'f'\n"); MsiCloseHandle(rec); r = MsiViewFetch(view, &rec); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(check_record(rec, 1, "g"), "Expected 'g'\n"); - ok(check_record(rec, 2, "h"), "Expected 'h'\n"); - ok(check_record(rec, 3, "i"), "Expected 'i'\n"); - ok(check_record(rec, 4, "j"), "Expected 'j'\n"); - ok(check_record(rec, 5, "k"), "Expected 'k'\n"); - ok(check_record(rec, 6, "l"), "Expected 'l'\n"); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(check_record(rec, 1, "g"), "Expected 'g'\n"); + ok(check_record(rec, 2, "h"), "Expected 'h'\n"); + ok(check_record(rec, 3, "i"), "Expected 'i'\n"); + ok(check_record(rec, 4, "j"), "Expected 'j'\n"); + ok(check_record(rec, 5, "k"), "Expected 'k'\n"); + ok(check_record(rec, 6, "l"), "Expected 'l'\n"); MsiCloseHandle(rec); r = MsiViewFetch(view, &rec); - todo_wine - { - ok(r == ERROR_NO_MORE_ITEMS, - "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); - } + ok(r == ERROR_NO_MORE_ITEMS, + "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); MsiViewClose(view); MsiCloseHandle(view);

1 0

Alexandre Julliard : kernel32: Don't save the signal mask in sigsetjmp.
by Alexandre Julliard 12 Feb '08

12 Feb '08

Module: wine Branch: master Commit: b1789fc73f6a4816c234e2bfb22a8a7271d80fab URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1789fc73f6a4816c234e2bfb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 12 22:39:54 2008 +0100 kernel32: Don't save the signal mask in sigsetjmp. This shouldn't be needed anymore now that exceptions are not handled on the signal stack, and signal mask handling is broken on Mac OS. --- dlls/kernel32/fiber.c | 2 +- include/wine/exception.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/fiber.c b/dlls/kernel32/fiber.c index f8647ef..24ea351 100644 --- a/dlls/kernel32/fiber.c +++ b/dlls/kernel32/fiber.c @@ -188,7 +188,7 @@ void WINAPI SwitchToFiber( LPVOID fiber ) /* stack_allocation and stack_base never change */ /* FIXME: should save floating point context if requested in fiber->flags */ - if (!sigsetjmp( current_fiber->jmpbuf, 1 )) + if (!sigsetjmp( current_fiber->jmpbuf, 0 )) { NtCurrentTeb()->Tib.u.FiberData = new_fiber; NtCurrentTeb()->Tib.ExceptionList = new_fiber->except; diff --git a/include/wine/exception.h b/include/wine/exception.h index ceb4c12..adf8926 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -94,7 +94,7 @@ __f.frame.Handler = __wine_exception_handler; \ __f.u.filter = (func); \ __wine_push_frame( &__f.frame ); \ - if (sigsetjmp( __f.jmp, 1 )) { \ + if (sigsetjmp( __f.jmp, 0 )) { \ const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ do {

1 0

Paul Vriens : advapi32/tests: Only use functions if they are implemented.
by Alexandre Julliard 12 Feb '08

12 Feb '08

Module: wine Branch: master Commit: 56d085ccec9f001de40c2311c05805e1a36c1052 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56d085ccec9f001de40c2311c… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Feb 12 18:09:23 2008 +0100 advapi32/tests: Only use functions if they are implemented. --- dlls/advapi32/tests/crypt.c | 33 ++++++++++++++++++++++++--------- 1 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 9fa532c..4f5f431 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -34,7 +34,6 @@ static const char szKeySet[] = "wine_test_keyset"; static const char szBadKeySet[] = "wine_test_bad_keyset"; #define NON_DEF_PROV_TYPE 999 -static HMODULE hadvapi32; static BOOL (WINAPI *pCryptAcquireContextA)(HCRYPTPROV*,LPCSTR,LPCSTR,DWORD,DWORD); static BOOL (WINAPI *pCryptEnumProviderTypesA)(DWORD, DWORD*, DWORD, DWORD*, LPSTR, DWORD*); static BOOL (WINAPI *pCryptEnumProvidersA)(DWORD, DWORD*, DWORD, DWORD*, LPSTR, DWORD*); @@ -68,7 +67,7 @@ static BOOL (WINAPI *pCryptVerifySignatureW)(HCRYPTHASH, BYTE*, DWORD, HCRYPTKEY static void init_function_pointers(void) { - hadvapi32 = GetModuleHandleA("advapi32.dll"); + HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); pCryptAcquireContextA = (void*)GetProcAddress(hadvapi32, "CryptAcquireContextA"); pCryptEnumProviderTypesA = (void*)GetProcAddress(hadvapi32, "CryptEnumProviderTypesA"); @@ -324,10 +323,15 @@ static void test_incorrect_api_usage(void) result = pCryptImportKey(hProv, &temp, 1, (HCRYPTKEY)NULL, 0, &hKey2); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); - dwLen = 1; - result = pCryptSignHashW(hHash, 0, NULL, 0, &temp, &dwLen); - ok (!result && (GetLastError() == ERROR_INVALID_PARAMETER || - GetLastError() == ERROR_CALL_NOT_IMPLEMENTED), "%d\n", GetLastError()); + if (pCryptSignHashW) + { + dwLen = 1; + result = pCryptSignHashW(hHash, 0, NULL, 0, &temp, &dwLen); + ok (!result && (GetLastError() == ERROR_INVALID_PARAMETER || + GetLastError() == ERROR_CALL_NOT_IMPLEMENTED), "%d\n", GetLastError()); + } + else + skip("CryptSignHashW is not available\n"); result = pCryptSetKeyParam(hKey, 0, &temp, 1); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); @@ -338,9 +342,14 @@ static void test_incorrect_api_usage(void) result = pCryptSetProvParam(hProv, 0, &temp, 1); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); - result = pCryptVerifySignatureW(hHash, &temp, 1, hKey, NULL, 0); - ok (!result && (GetLastError() == ERROR_INVALID_PARAMETER || - GetLastError() == ERROR_CALL_NOT_IMPLEMENTED), "%d\n", GetLastError()); + if (pCryptVerifySignatureW) + { + result = pCryptVerifySignatureW(hHash, &temp, 1, hKey, NULL, 0); + ok (!result && (GetLastError() == ERROR_INVALID_PARAMETER || + GetLastError() == ERROR_CALL_NOT_IMPLEMENTED), "%d\n", GetLastError()); + } + else + skip("CryptVerifySignatureW is not available\n"); result = pCryptDestroyHash(hHash); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); @@ -383,6 +392,12 @@ static void test_verify_sig(void) HCRYPTHASH hash; BYTE bogus[] = { 0 }; + if (!pCryptVerifySignatureW) + { + skip("CryptVerifySignatureW is not available\n"); + return; + } + SetLastError(0xdeadbeef); ret = pCryptVerifySignatureW(0, NULL, 0, 0, NULL, 0); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER,

1 0

Alistair Leslie-Hughes : msxml3: Corrected tests for msxml service packs versions.
by Alexandre Julliard 12 Feb '08

12 Feb '08

Module: wine Branch: master Commit: 9e8c0e54c63b9bccdc72411dd8a114284cb560be URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e8c0e54c63b9bccdc72411dd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 13 06:56:09 2008 +1100 msxml3: Corrected tests for msxml service packs versions. --- dlls/msxml3/tests/xmldoc.c | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index 0d1c90a..b4e6823 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -270,16 +270,25 @@ static void test_createElement(void) V_I4(&vType) = -1; V_VT(&vName) = VT_NULL; hr = IXMLDocument_createElement(doc, vType, vName, &element); - ok(hr == E_NOTIMPL, "Expected E_NOTIMPL, got %d\n", hr); - ok(element == NULL, "Expected NULL element\n"); - - if (element != NULL) + /* Upto and including SP7, createElement returns an element. */ + if(hr == S_OK) { - hr = IXMLElement_get_type(element, &type); - ok(hr == S_OK, "Expected S_OK, got %d\n", hr); - ok(type == XMLELEMTYPE_OTHER, "Expected XMLELEMTYPE_OTHER, got %ld\n", type); - - IXMLElement_Release(element); + ok(element != NULL, "Expected element\n"); + if (element != NULL) + { + hr = IXMLElement_get_type(element, &type); + ok(hr == S_OK, "Expected S_OK, got %d\n", hr); + /* SP7 returns an XMLELEMTYPE_ELEMENT */ + ok(type == XMLELEMTYPE_OTHER || type == XMLELEMTYPE_ELEMENT, + "Expected XMLELEMTYPE_OTHER || XMLELEMTYPE_ELEMENT, got %ld\n", type); + + IXMLElement_Release(element); + } + } + else + { + ok(hr == E_NOTIMPL, "Expected E_NOTIMPL, got %d\n", hr); + ok(element == NULL, "Expected NULL element\n"); } /* invalid vName type */

1 0

Alexandre Julliard : ntdll: Store the unhandled exception filter at startup to avoid race conditions.
by Alexandre Julliard 12 Feb '08

12 Feb '08

Module: wine Branch: master Commit: 78fba54ab791f8ed6d68305869b18403d08011e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78fba54ab791f8ed6d6830586… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 12 22:39:19 2008 +0100 ntdll: Store the unhandled exception filter at startup to avoid race conditions. --- dlls/ntdll/loader.c | 3 +++ dlls/ntdll/ntdll_misc.h | 3 +++ dlls/ntdll/thread.c | 27 ++++----------------------- 3 files changed, 10 insertions(+), 23 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 05538a0..0fbf604 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2533,6 +2533,9 @@ void __wine_process_init(void) MESSAGE( "wine: could not load kernel32.dll, status %x\n", status ); exit(1); } + RtlInitAnsiString( &func_name, "UnhandledExceptionFilter" ); + LdrGetProcedureAddress( wm->ldr.BaseAddress, &func_name, 0, (void **)&unhandled_exception_filter ); + RtlInitAnsiString( &func_name, "__wine_kernel_init" ); if ((status = LdrGetProcedureAddress( wm->ldr.BaseAddress, &func_name, 0, (void **)&init_func )) != STATUS_SUCCESS) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index c283e1e..8c04557 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -94,6 +94,9 @@ extern void SNOOP_SetupDLL( HMODULE hmod ); extern UNICODE_STRING windows_dir; extern UNICODE_STRING system_dir; +typedef LONG (WINAPI *PUNHANDLED_EXCEPTION_FILTER)(PEXCEPTION_POINTERS); +extern PUNHANDLED_EXCEPTION_FILTER unhandled_exception_filter; + /* redefine these to make sure we don't reference kernel symbols */ #define GetProcessHeap() (NtCurrentTeb()->Peb->ProcessHeap) #define GetCurrentProcessId() (HandleToULong(NtCurrentTeb()->ClientId.UniqueProcess)) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 8944b6a..55cedc7 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -48,6 +48,8 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); struct _KUSER_SHARED_DATA *user_shared_data = NULL; +PUNHANDLED_EXCEPTION_FILTER unhandled_exception_filter = NULL; + /* info passed to a starting thread */ struct startup_info { @@ -339,27 +341,6 @@ HANDLE thread_init(void) return exe_file; } -typedef LONG (WINAPI *PUNHANDLED_EXCEPTION_FILTER)(PEXCEPTION_POINTERS); -static PUNHANDLED_EXCEPTION_FILTER get_unhandled_exception_filter(void) -{ - static PUNHANDLED_EXCEPTION_FILTER unhandled_exception_filter; - static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; - UNICODE_STRING module_name; - ANSI_STRING func_name; - HMODULE kernel32_handle; - - if (unhandled_exception_filter) return unhandled_exception_filter; - - RtlInitUnicodeString(&module_name, kernel32W); - RtlInitAnsiString( &func_name, "UnhandledExceptionFilter" ); - - if (LdrGetDllHandle( 0, 0, &module_name, &kernel32_handle ) == STATUS_SUCCESS) - LdrGetProcedureAddress( kernel32_handle, &func_name, 0, - (void **)&unhandled_exception_filter ); - - return unhandled_exception_filter; -} - #ifdef __i386__ /* wrapper for apps that don't declare the thread function correctly */ extern DWORD call_thread_entry_point( PRTL_THREAD_START_ROUTINE entry, void *arg ); @@ -465,13 +446,13 @@ static void start_thread( struct wine_pthread_thread_info *info ) /* NOTE: Windows does not have an exception handler around the call to * the thread attach. We do for ease of debugging */ - if (get_unhandled_exception_filter()) + if (unhandled_exception_filter) { __TRY { call_thread_func( func, arg ); } - __EXCEPT(get_unhandled_exception_filter()) + __EXCEPT(unhandled_exception_filter) { NtTerminateThread( GetCurrentThread(), GetExceptionCode() ); }

1 0

Frans Kool : shell32: Added Dutch translations.
by Alexandre Julliard 12 Feb '08

12 Feb '08

Module: wine Branch: master Commit: b5f51404d0b29e42734e179e9bb488e8d117c1df URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5f51404d0b29e42734e179e9… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Tue Feb 12 10:59:17 2008 +0100 shell32: Added Dutch translations. --- dlls/shell32/shell32_Nl.rc | 199 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 191 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/shell32_Nl.rc b/dlls/shell32/shell32_Nl.rc index 54fdd78..98f529c 100644 --- a/dlls/shell32/shell32_Nl.rc +++ b/dlls/shell32/shell32_Nl.rc @@ -18,6 +18,57 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +MENU_001 MENU DISCARDABLE +BEGIN + MENUITEM "&Grote Icons", FCIDM_SHVIEW_BIGICON + MENUITEM "&Kleine Icons", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Lijst", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW +END + +/* + shellview background menu +*/ +MENU_002 MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&Bekijken" + BEGIN + MENUITEM "&Grote Icons", FCIDM_SHVIEW_BIGICON + MENUITEM "&Kleine Icons", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Lijst", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW + END + MENUITEM SEPARATOR + POPUP "Sorteren &Icons" + BEGIN + MENUITEM "Op &Naam", 0x30 /* column 0 */ + MENUITEM "Op &Type", 0x32 /* column 2 */ + MENUITEM "Op &Grootte", 0x31 /* ... */ + MENUITEM "Op &Datum", 0x33 + MENUITEM SEPARATOR + MENUITEM "&Automatisch", FCIDM_SHVIEW_AUTOARRANGE + END + MENUITEM "Uitlijnen Icons", FCIDM_SHVIEW_SNAPTOGRID + MENUITEM SEPARATOR + MENUITEM "Vernieuwen", FCIDM_SHVIEW_REFRESH + MENUITEM SEPARATOR + MENUITEM "Plakken", FCIDM_SHVIEW_INSERT + MENUITEM "Plakken als Link", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + POPUP "Nieuw" + BEGIN + MENUITEM "Nieuwe &Map", FCIDM_SHVIEW_NEWFOLDER + MENUITEM "Nieuwe &Link", FCIDM_SHVIEW_NEWLINK + MENUITEM SEPARATOR + END + MENUITEM SEPARATOR + MENUITEM "Eigenschappen", FCIDM_SHVIEW_PROPERTIES + END +END + + /* shellview item menu */ @@ -25,21 +76,67 @@ MENU_SHV_FILE MENU DISCARDABLE BEGIN POPUP "" BEGIN - MENUITEM "&Select" FCIDM_SHVIEW_OPEN - MENUITEM "E&xplore", FCIDM_SHVIEW_EXPLORE + MENUITEM "&Selecteer" FCIDM_SHVIEW_OPEN + MENUITEM "&Verkennen", FCIDM_SHVIEW_EXPLORE MENUITEM "&Open", FCIDM_SHVIEW_OPEN MENUITEM SEPARATOR - MENUITEM "C&ut", FCIDM_SHVIEW_CUT - MENUITEM "&Copy", FCIDM_SHVIEW_COPY + MENUITEM "K&nippen", FCIDM_SHVIEW_CUT + MENUITEM "&Kopieren", FCIDM_SHVIEW_COPY MENUITEM SEPARATOR - MENUITEM "Create &Link", FCIDM_SHVIEW_CREATELINK - MENUITEM "&Delete", FCIDM_SHVIEW_DELETE - MENUITEM "&Rename", FCIDM_SHVIEW_RENAME + MENUITEM "Creeer &Link", FCIDM_SHVIEW_CREATELINK + MENUITEM "Ver&wijder", FCIDM_SHVIEW_DELETE + MENUITEM "&Hernoemen", FCIDM_SHVIEW_RENAME MENUITEM SEPARATOR - MENUITEM "&Properties", FCIDM_SHVIEW_PROPERTIES + MENUITEM "&Eigenschappen", FCIDM_SHVIEW_PROPERTIES END END +SHBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 188, 192 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK +CAPTION "Bladeren naar Map" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Annuleren", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP + LTEXT "", IDD_TITLE, 4, 4, 180, 12 + LTEXT "", IDD_STATUS, 4, 25, 180, 12 + CONTROL "", IDD_TREEVIEW, "SysTreeView32", + TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | + WS_BORDER | WS_TABSTOP, + 4, 40, 180, 120 +} + +SHNEWBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 218, 196 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK +CAPTION "Bladeren naar Map" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDD_TITLE, 10, 8, 198, 24 + LTEXT "", IDD_STATUS, 10, 25, 198, 12 + LTEXT "Folder:", IDD_FOLDER, 10, 156, 40, 12 + CONTROL "", IDD_TREEVIEW, "SysTreeView32", + TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | + WS_BORDER | WS_TABSTOP, + 12, 38, 194, 105 + EDITTEXT IDD_FOLDERTEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Nieuwe &map maken", IDD_MAKENEWFOLDER, 12, 174, 70, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Annuleren", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP +} + +SHELL_YESTOALL_MSGBOX DIALOG 200, 100, 280, 90 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Message" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "&Ja", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Ja op &alles", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Nee", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Ann&uleren", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP + ICON "", IDD_ICON, 10, 10, 16, 16 + LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 +} + SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Info %s" @@ -66,3 +163,89 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Annuleren", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP PUSHBUTTON "&Bladeren...", 12288, 170, 63, 50, 14, WS_TABSTOP } + +STRINGTABLE DISCARDABLE +{ + /* columns in the shellview */ + IDS_SHV_COLUMN1 "Bestand" + IDS_SHV_COLUMN2 "Grootte" + IDS_SHV_COLUMN3 "Type" + IDS_SHV_COLUMN4 "Gewijzigd" + IDS_SHV_COLUMN5 "Attributen" + IDS_SHV_COLUMN6 "Grootte" + IDS_SHV_COLUMN7 "Beschikbare ruimte" + IDS_SHV_COLUMN8 "Naam" + IDS_SHV_COLUMN9 "Commentaar" + IDS_SHV_COLUMN10 "Eigenaar" + IDS_SHV_COLUMN11 "Groep" + IDS_SHV_COLUMN_DELFROM "Originele locatie" + IDS_SHV_COLUMN_DELDATE "Datum verwijderd" + + /* special folders */ + IDS_DESKTOP "Bureaublad" + IDS_MYCOMPUTER "Mijn Computer" + IDS_RECYCLEBIN_FOLDER_NAME "Vuilnisbak" + + /* context menus */ + IDS_VIEW_LARGE "Grote Icons" + IDS_VIEW_SMALL "&Kleine Icons" + IDS_VIEW_LIST "&Lijst" + IDS_VIEW_DETAILS "&Details" + IDS_SELECT "Selecteer" + IDS_OPEN "Open" + + IDS_CREATEFOLDER_DENIED "Niet mogelijk om nieuwe map te maken: Permissie afgewezen." + IDS_CREATEFOLDER_CAPTION "Fout tijdens creatie van een nieuwe map" + IDS_DELETEITEM_CAPTION "Bevestig bestand verwijdering" + IDS_DELETEFOLDER_CAPTION "Bevestig map verwijdering" + IDS_DELETEITEM_TEXT "Weet u zeker dat u '%1' wilt verwijderen?" + IDS_DELETEMULTIPLE_TEXT "Weet u zeker dat u deze %1 bestanden wilt verwijderen?" + IDS_DELETESELECTED_TEXT "Weet u zeker dat u de geselecteerde bestand(en) wilt verwijderen?" + IDS_TRASHITEM_TEXT "Weet u zeker dat u '%1' naar de Vuilnisbak wilt sturen?" + IDS_TRASHFOLDER_TEXT "Weet u zeker dat u '%1' en zijn gehele inhoud naar de Vuilnisbak wilt sturen?" + IDS_TRASHMULTIPLE_TEXT "Weet u zeker dat u deze %1 bestanden naar de Vuilnisbak wilt sturen?" + IDS_CANTTRASH_TEXT "Bestand '%1' kan niet naar de Vuilnisbak worden gestuurd. Wilt u het dan maar verwijderen?" + IDS_OVERWRITEFILE_TEXT "Deze map bevat reeds een bestand genaamd '%1'.\n\nWilt u het vervangen?" + IDS_OVERWRITEFILE_CAPTION "Bevestig het overschrijven van het bestand" + IDS_OVERWRITEFOLDER_TEXT "Deze map bevat reeds een map genaamd '%1'.\n\n"\ + "Als de bestanden in de doel map dezelfde naam hebben als de bestanden in de\n"\ + "geselecteerde map worden ze overschreven. Wilt u nog steeds de map copieren\n"\ + "of verplaatsen?" + + /* message box strings */ + IDS_RESTART_TITLE "Herstarten" + IDS_RESTART_PROMPT "Wilt u een Windows herstart simuleren?" + IDS_SHUTDOWN_TITLE "Afsluiten" + IDS_SHUTDOWN_PROMPT "Wilt u uw Wine sessie afsluiten?" + + /* shell folder path default values */ + IDS_PROGRAMS "Start Menu\\Programmas" + IDS_PERSONAL "Mijn Documenten" + IDS_FAVORITES "Favorieten" + IDS_STARTUP "Start Menu\\Programmas\\StartUp" + IDS_RECENT "Recent" + IDS_SENDTO "Stuur Naar" + IDS_STARTMENU "Start Menu" + IDS_MYMUSIC "Mijn Muziek" + IDS_MYVIDEO "Mijn Videos" + IDS_DESKTOPDIRECTORY "Bureaublad" + IDS_NETHOOD "Netwerkomgeving" + IDS_TEMPLATES "Sjablonen" + IDS_APPDATA "Applicatie Data" + IDS_PRINTHOOD "Printeromgeving" + IDS_LOCAL_APPDATA "Lokale Instellingen\\Applicatie Data" + IDS_INTERNET_CACHE "Lokale Instellingen\\Tijdelijke Internet Bestanden" + IDS_COOKIES "Koekies" + IDS_HISTORY "Lokale Instellingen\\Geschiedenis" + IDS_PROGRAM_FILES "Programma Bestanden" + IDS_MYPICTURES "Mijn Afbeeldingen" + IDS_PROGRAM_FILES_COMMON "Programma Bestanden\\Gemeenschappelijke Bestanden" + IDS_COMMON_DOCUMENTS "Documenten" + IDS_ADMINTOOLS "Start Menu\\Programmas\\Administratieve Tools" + IDS_COMMON_MUSIC "Documenten\\Mijn Muziek" + IDS_COMMON_PICTURES "Documenten\\Mijn Afbeeldingen" + IDS_COMMON_VIDEO "Documenten\\Mijn Videos" + IDS_CDBURN_AREA "Lokale Instellingen\\Applicatie Data\\Microsoft\\CD Branden" + + IDS_NEWFOLDER "Nieuwe Map" +}

1 0

Frans Kool : oleview: Added Dutch translations.
by Alexandre Julliard 12 Feb '08

12 Feb '08

Module: wine Branch: master Commit: b3115fc60e73d69e6efc26ff6768cb0f86e72c19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3115fc60e73d69e6efc26ff6… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Tue Feb 12 12:04:56 2008 +0100 oleview: Added Dutch translations. --- programs/oleview/Nl.rc | 212 ++++++++++++++++++++++++++++++++++++++++++++++ programs/oleview/rsrc.rc | 1 + 2 files changed, 213 insertions(+), 0 deletions(-) diff --git a/programs/oleview/Nl.rc b/programs/oleview/Nl.rc new file mode 100644 index 0000000..8ac4598 --- /dev/null +++ b/programs/oleview/Nl.rc @@ -0,0 +1,212 @@ +/* + * OleView (Nl.rc) + * Dutch Language Support + * + * Copyright 2008 Frans Kool + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +IDM_MENU MENU +{ + POPUP "&Bestand" + { + MENUITEM "&Verbind aan bestand...", IDM_BIND + MENUITEM "&Bekijk TypeLib...", IDM_TYPELIB + MENUITEM SEPARATOR + MENUITEM "&Systeem Configuratie", IDM_SYSCONF + MENUITEM "&Run de Register Editer", IDM_REGEDIT + MENUITEM SEPARATOR + MENUITEM "&Afsluiten", IDM_EXIT + } + POPUP "&Object" + { + POPUP "&CoCreateInstance Vlag" + { + MENUITEM "CLSCTX_&INPROC_SERVER", IDM_FLAG_INSERV,CHECKED + MENUITEM "CLSCTX_INPROC_&HANDLER", IDM_FLAG_INHANDL + MENUITEM "CLSCTX_&LOCAL_SERVER", IDM_FLAG_LOCSERV,CHECKED + MENUITEM "CLSCTX_&REMOTE_SERVER", IDM_FLAG_REMSERV + } + MENUITEM SEPARATOR + MENUITEM "Bekijk &Type informatie", IDM_TYPEINFO, GRAYED + MENUITEM SEPARATOR + MENUITEM "Cre�er &Instantie", IDM_CREATEINST, GRAYED + MENUITEM "Cre�er Instantie &Op", IDM_CREATEINSTON, GRAYED + MENUITEM "&Verwijder Instantie", IDM_RELEASEINST, GRAYED + MENUITEM SEPARATOR + MENUITEM "Copieer C&LSID naar clipbord", IDM_COPYCLSID, GRAYED + MENUITEM "Copieer &HTML object Label naar clipbord", IDM_HTMLTAG, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Bekijk...", IDM_VIEW, GRAYED + } + POPUP "Be&kijken" + { + MENUITEM "&Expert modus", IDM_EXPERT,CHECKED + MENUITEM SEPARATOR + MENUITEM "Ver&borgen componenten categorie�n", IDM_HIDDEN, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Taakbalk", IDM_TOOLBAR,CHECKED + MENUITEM "&Status Balk", IDM_STATUSBAR,CHECKED + MENUITEM SEPARATOR + MENUITEM "&Verversen\tF5", IDM_REFRESH + } + POPUP "&Help" + { + MENUITEM "&Over OleView", IDM_ABOUT + } +} + +IDM_TYPELIB MENU +{ + POPUP "&Bestand" + { + MENUITEM "Op&slaan als", IDM_SAVEAS + MENUITEM "S&luiten", IDM_CLOSE + } + POPUP "Be&kijken" + { + MENUITEM "&Groepeer op type kind", IDM_GROUP + MENUITEM SEPARATOR + MENUITEM "&Taakbalk", IDM_TOOLBAR + MENUITEM "&Status Balk", IDM_STATUSBAR,CHECKED + } +} + +STRINGTABLE +{ + IDS_APPNAME "OleView" + IDS_APPTITLE "OleView" + IDS_READY "Gereed" + IDS_ABOUT "OleView - OLE/COM Object Toner" + IDS_ABOUTVER "versie 1.0" + IDS_TYPELIBTITLE "ITypeLib Toner" + IDS_OPEN "Open" + + IDM_BIND, "Verbind aan een bestand via een Bestandsbeschrijver (Moniker)" + IDM_TYPELIB, "Open een TypeLib bestand en bekijk de inhoud" + IDM_SYSCONF, "Wijzig de algemene machine Distributed COM instellingen" + IDM_REGEDIT, "Run de Wine register editer" + IDM_EXIT, "Verlaat de applicatie. Vraagt om wijzigingen op te slaan" + IDM_CREATEINST, "Cre�er een instantie van get geselecteerde object" + IDM_CREATEINSTON, "Cre�er een instantie van get geselecteerde object op een specifieke machine" + IDM_RELEASEINST, "Verwijder de momenteel geselecteerde object instantie" + IDM_COPYCLSID, "Copieer de GUID van het momenteel geselecteerde object naar het clipbord" + IDM_VIEW, "Toon details voor het geselecteerde object" + IDM_FLAG_INSERV, "Gebruik CLSCTX_INPROC_SERVER als CoGetClassObject wordt aangeroepen" + IDM_FLAG_INHANDL, "Gebruik CLSCTX_INPROC_HANDLER als CoGetClassObject wordt aangeroepen" + IDM_FLAG_LOCSERV, "Gebruik CLSCTX_LOCAL_SERVER als CoGetClassObject wordt aangeroepen" + IDM_FLAG_REMSERV, "Gebruik CLSCTX_REMOTE_SERVER als CoGetClassObject wordt aangeroepen" + IDM_EXPERT, "Schakel tussen expert en beginner modus" + IDM_HIDDEN, "Toon/verberg component categorie�n die niet zichtbaar zouden moeten zijn" + IDM_TOOLBAR, "Toon of verberg de taakbalk" + IDM_STATUSBAR, "Toon of verberg de status balk" + IDM_REFRESH, "Ververs alle lijsten" + IDM_ABOUT, "Toon programma informatie, versie nummer en copyright" + + IDM_SAVEAS, "Opslaan als een .IDL of .H bestand" + IDM_CLOSE, "Sluit venster" + IDM_GROUP, "Groepeer typeinfos op type" + + IDS_TREE_OC, "ObjectClasses" + IDS_TREE_GBCC, "Gegroepeerd op Component Categorie" + IDS_TREE_O1O, "OLE 1.0 Objecten" + IDS_TREE_CLO, "COM Library Objecten" + IDS_TREE_AO, "Alle Objecten" + IDS_TREE_AID, "Applicatie ID's" + IDS_TREE_TL, "Type Bibliotheken" + IDS_TL_VER, "ver." + IDS_TREE_I, "Interfaces" + + IDS_TAB_REG, "Register" + IDS_TAB_IMPL, "Implementatie" + IDS_TAB_ACTIV, "Activatie" + + IDS_CGCOFAIL, "CoGetClassObject faalde." + IDS_ERROR_UNKN, "Onbekende fout" + IDS_TRUE, "Waar" + IDS_FALSE, "Onwaar" + IDS_BYTES, "bytes" + + IDS_ERROR_LOADTYPELIB, "LoadTypeLib( %s ) gefaald ($%x)" + IDS_INHERITINTERFACES, "Inherited Interfaces" +} + +DLG_CREATEINSTON DIALOG DISCARDABLE 0, 0, 250, 41 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Verbinden met een andere machine" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Machine naam:", IDIGNORE, 5, 6, 190, 8 + EDITTEXT IDC_MACHINE, 5, 16, 190, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + DEFPUSHBUTTON "&OK", IDOK, 200, 5, 45, 14 + PUSHBUTTON "&Annuleren", IDCANCEL, 200, 22, 45, 14 +} + +DLG_SYSCONF DIALOG DISCARDABLE 0, 0, 170, 100 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Systeem Configuratie" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Systeem Instellingen", IDIGNORE, 5, 6, 160, 8 + CHECKBOX "&Distributed COM toestaan", IDC_ENABLEDCOM, 5, 20, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX + CHECKBOX "&Remote Connections toestaan (Alleen Win95)", IDC_ENABLEREMOTE, 5, 35, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX + LTEXT "Deze instellingen wijzigen alleen register waarden.\nZe hebben geen effect op de snelheid van Wine.", IDIGNORE, 5, 50, 160, 40 + DEFPUSHBUTTON "&OK", IDOK, 70, 80, 45, 14 + PUSHBUTTON "&Annuleren", IDCANCEL, 120, 80, 45, 14 +} + +DLG_DEFAULT_IV DIALOG DISCARDABLE 0, 0, 280, 50 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Default Interface" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Interface", IDIGNORE, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "IID:", IDIGNORE, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "&Sluiten", IDCANCEL, 230, 6, 45, 14 + PUSHBUTTON "&Bekijk Type Informatie", IDC_VIEWTYPEINFO, 6, 31, 70, 14, WS_DISABLED +} + +DLG_IPERSIST_IV DIALOG DISCARDABLE 0, 0, 280, 29 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "IPersist Interface" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Class Naam:", IDIGNORE, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "CLSID:", IDIGNORE, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "&Sluiten", IDCANCEL, 230, 6, 45, 14 +} + +DLG_IPERSISTSTREAM_IV DIALOG DISCARDABLE 0, 0, 280, 68 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "IPersistStream Interface" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Class Naam:", IDIGNORE, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "CLSID:", IDIGNORE, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "&Sluiten", IDCANCEL, 230, 6, 45, 14 + PUSHBUTTON "&IsDirty", IDC_ISDIRTY_BUTTON, 6, 31, 50, 14 + LTEXT "???", IDC_ISDIRTY, 60, 34, 145, 8 + PUSHBUTTON "&GetSizeMax", IDC_GETSIZEMAX_BUTTON, 6, 49, 50, 14 + LTEXT "???", IDC_GETSIZEMAX, 60, 52, 145, 8 +} diff --git a/programs/oleview/rsrc.rc b/programs/oleview/rsrc.rc index 6a35869..2053acd 100644 --- a/programs/oleview/rsrc.rc +++ b/programs/oleview/rsrc.rc @@ -27,6 +27,7 @@ #include "En.rc" #include "Fr.rc" #include "Ko.rc" +#include "Nl.rc" #include "No.rc" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

1 0

Huw Davies : inetcomm: Partial implementation of IMimeBody_GetData.
by Alexandre Julliard 12 Feb '08

12 Feb '08

Module: wine Branch: master Commit: c930fc70f5d5ad7ee2d54aa887c88d5d1d77f834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c930fc70f5d5ad7ee2d54aa88… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 8 12:24:38 2008 +0000 inetcomm: Partial implementation of IMimeBody_GetData. --- dlls/inetcomm/mimeole.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index a55aceb..157fd8a 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -914,8 +914,12 @@ static HRESULT WINAPI MimeBody_GetData( ENCODINGTYPE ietEncoding, IStream** ppStream) { - FIXME("stub\n"); - return E_NOTIMPL; + MimeBody *This = impl_from_IMimeBody(iface); + FIXME("(%p)->(%d, %p). Ignoring encoding type.\n", This, ietEncoding, ppStream); + + *ppStream = This->data; + IStream_AddRef(*ppStream); + return S_OK; } static HRESULT WINAPI MimeBody_SetData(

1 0

Huw Davies : inetcomm: Create the root body in IMimeMessage_Load.
by Alexandre Julliard 12 Feb '08

12 Feb '08

Module: wine Branch: master Commit: 88df8e83dd5a604585d3c22ce9a4d51f485ea25e URL: http://source.winehq.org/git/wine.git/?a=commit;h=88df8e83dd5a604585d3c22ce… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 11 11:54:14 2008 +0000 inetcomm: Create the root body in IMimeMessage_Load. --- dlls/inetcomm/mimeole.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 75 insertions(+), 0 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 157fd8a..6c34e1d 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1090,12 +1090,25 @@ HRESULT MimeBody_create(IUnknown *outer, void **obj) return S_OK; } +typedef struct body_t +{ + struct list entry; + HBODY hbody; + IMimeBody *mime_body; + + struct body_t *parent; + struct list children; +} body_t; + typedef struct MimeMessage { const IMimeMessageVtbl *lpVtbl; LONG refs; IStream *stream; + + struct list body_tree; + HBODY next_hbody; } MimeMessage; static HRESULT WINAPI MimeMessage_QueryInterface(IMimeMessage *iface, REFIID riid, void **ppv) @@ -1125,6 +1138,18 @@ static ULONG WINAPI MimeMessage_AddRef(IMimeMessage *iface) return InterlockedIncrement(&This->refs); } +static void empty_body_list(struct list *list) +{ + body_t *body, *cursor2; + LIST_FOR_EACH_ENTRY_SAFE(body, cursor2, list, body_t, entry) + { + empty_body_list(&body->children); + list_remove(&body->entry); + IMimeBody_Release(body->mime_body); + HeapFree(GetProcessHeap(), 0, body); + } +} + static ULONG WINAPI MimeMessage_Release(IMimeMessage *iface) { MimeMessage *This = (MimeMessage *)iface; @@ -1135,6 +1160,8 @@ static ULONG WINAPI MimeMessage_Release(IMimeMessage *iface) refs = InterlockedDecrement(&This->refs); if (!refs) { + empty_body_list(&This->body_tree); + if(This->stream) IStream_Release(This->stream); HeapFree(GetProcessHeap(), 0, This); } @@ -1159,11 +1186,48 @@ static HRESULT WINAPI MimeMessage_IsDirty( return E_NOTIMPL; } +static body_t *new_body_entry(IMimeBody *mime_body, HBODY hbody, body_t *parent) +{ + body_t *body = HeapAlloc(GetProcessHeap(), 0, sizeof(*body)); + if(body) + { + body->mime_body = mime_body; + body->hbody = hbody; + list_init(&body->children); + body->parent = parent; + } + return body; +} + +static body_t *create_sub_body(MimeMessage *msg, IStream *pStm, BODYOFFSETS *offset, body_t *parent) +{ + IMimeBody *mime_body; + HRESULT hr; + body_t *body; + ULARGE_INTEGER cur; + LARGE_INTEGER zero; + + MimeBody_create(NULL, (void**)&mime_body); + IMimeBody_Load(mime_body, pStm); + zero.QuadPart = 0; + hr = IStream_Seek(pStm, zero, STREAM_SEEK_CUR, &cur); + offset->cbBodyStart = cur.LowPart; + IMimeBody_SetData(mime_body, IET_BINARY, NULL, NULL, &IID_IStream, pStm); + body = new_body_entry(mime_body, msg->next_hbody, parent); + msg->next_hbody = (HBODY)((DWORD)msg->next_hbody + 1); + + return body; +} + static HRESULT WINAPI MimeMessage_Load( IMimeMessage *iface, LPSTREAM pStm) { MimeMessage *This = (MimeMessage *)iface; + body_t *root_body; + BODYOFFSETS offsets; + ULARGE_INTEGER cur; + LARGE_INTEGER zero; TRACE("(%p)->(%p)\n", iface, pStm); @@ -1175,6 +1239,17 @@ static HRESULT WINAPI MimeMessage_Load( IStream_AddRef(pStm); This->stream = pStm; + offsets.cbBoundaryStart = offsets.cbHeaderStart = 0; + offsets.cbBodyStart = offsets.cbBodyEnd = 0; + + root_body = create_sub_body(This, pStm, &offsets, NULL); + + zero.QuadPart = 0; + IStream_Seek(pStm, zero, STREAM_SEEK_END, &cur); + offsets.cbBodyEnd = cur.LowPart; + MimeBody_set_offsets(impl_from_IMimeBody(root_body->mime_body), &offsets); + + list_add_head(&This->body_tree, &root_body->entry); return S_OK; }

1 0

Huw Davies : inetcomm: Implement IMimeMessage_BindToObject.
by Alexandre Julliard 12 Feb '08

12 Feb '08

Module: wine Branch: master Commit: a14bb14dc506b6e7d6377d0f022c7af9fdcb7123 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a14bb14dc506b6e7d6377d0f0… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 11 12:04:49 2008 +0000 inetcomm: Implement IMimeMessage_BindToObject. --- dlls/inetcomm/mimeole.c | 44 +++++++++++++++++++++++++++++++++++++++- dlls/inetcomm/tests/mimeole.c | 12 +++++++++++ 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 6c34e1d..ab68090 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1339,14 +1339,54 @@ static HRESULT WINAPI MimeMessage_HandsOffStorage( return E_NOTIMPL; } +static HRESULT find_body(struct list *list, HBODY hbody, body_t **body) +{ + body_t *cur; + HRESULT hr; + + if(hbody == HBODY_ROOT) + { + *body = LIST_ENTRY(list_head(list), body_t, entry); + return S_OK; + } + + LIST_FOR_EACH_ENTRY(cur, list, body_t, entry) + { + if(cur->hbody == hbody) + { + *body = cur; + return S_OK; + } + hr = find_body(&cur->children, hbody, body); + if(hr == S_OK) return S_OK; + } + return S_FALSE; +} + static HRESULT WINAPI MimeMessage_BindToObject( IMimeMessage *iface, const HBODY hBody, REFIID riid, void **ppvObject) { - FIXME("(%p)->(%p, %s, %p)\n", iface, hBody, debugstr_guid(riid), ppvObject); - return E_NOTIMPL; + MimeMessage *This = (MimeMessage *)iface; + HRESULT hr; + body_t *body; + + TRACE("(%p)->(%p, %s, %p)\n", iface, hBody, debugstr_guid(riid), ppvObject); + + hr = find_body(&This->body_tree, hBody, &body); + + if(hr != S_OK) return hr; + + if(IsEqualIID(riid, &IID_IMimeBody)) + { + IMimeBody_AddRef(body->mime_body); + *ppvObject = body->mime_body; + return S_OK; + } + + return E_NOINTERFACE; } static HRESULT WINAPI MimeMessage_SaveBody( diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 1f542cf..5f5fa0c 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -209,6 +209,8 @@ static void test_CreateMessage(void) IStream *stream; LARGE_INTEGER pos; LONG ref; + IMimeBody *body; + BODYOFFSETS offsets; hr = MimeOleCreateMessage(NULL, &msg); ok(hr == S_OK, "ret %08x\n", hr); @@ -221,6 +223,16 @@ static void test_CreateMessage(void) hr = IMimeMessage_Load(msg, stream); ok(hr == S_OK, "ret %08x\n", hr); + hr = IMimeMessage_BindToObject(msg, HBODY_ROOT, &IID_IMimeBody, (void**)&body); + ok(hr == S_OK, "ret %08x\n", hr); + hr = IMimeBody_GetOffsets(body, &offsets); + ok(hr == S_OK, "ret %08x\n", hr); + ok(offsets.cbBoundaryStart == 0, "got %d\n", offsets.cbBoundaryStart); + ok(offsets.cbHeaderStart == 0, "got %d\n", offsets.cbHeaderStart); + ok(offsets.cbBodyStart == 359, "got %d\n", offsets.cbBodyStart); + ok(offsets.cbBodyEnd == 666, "got %d\n", offsets.cbBodyEnd); + IMimeBody_Release(body); + IMimeMessage_Release(msg); ref = IStream_AddRef(stream);

1 0