Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gvg] 20867: HTML-escape high characters
by gvg＠svn.reactos.org 14 Jan '06

14 Jan '06

HTML-escape high characters Modified: trunk/web/reactos.org/htdocs/roscms/inc/generate_page.php Added: trunk/web/reactos.org/phpext/ Added: trunk/web/reactos.org/phpext/config.m4 Added: trunk/web/reactos.org/phpext/php_roscms.h Added: trunk/web/reactos.org/phpext/roscms.c _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/generate_page.php --- trunk/web/reactos.org/htdocs/roscms/inc/generate_page.php 2006-01-14 21:57:07 UTC (rev 20866) +++ trunk/web/reactos.org/htdocs/roscms/inc/generate_page.php 2006-01-14 22:18:07 UTC (rev 20867) @@ -392,7 +392,9 @@ // redirect all bad links to the frontpage: $data_page = str_replace("[#link_",$roscms_intern_path_server."?page=index&temp=" ,$data_page); // correct link - + // Replace high chars by their html-escaped version + $data_page = roscms_unicode_escape($data_page); + // Output & View: switch ($rpm_sec2) { case "genpage": // generate a single page _____ Added: trunk/web/reactos.org/phpext/config.m4 --- trunk/web/reactos.org/phpext/config.m4 2006-01-14 21:57:07 UTC (rev 20866) +++ trunk/web/reactos.org/phpext/config.m4 2006-01-14 22:18:07 UTC (rev 20867) @@ -0,0 +1,8 @@ +dnl config.m4 for extension roscms + +PHP_ARG_ENABLE(roscms, whether to enable roscms support, +[ --enable-roscms Enable roscms support]) + +if test "$PHP_ROSCMS" != "no"; then + PHP_NEW_EXTENSION(roscms, roscms.c, $ext_shared) +fi Property changes on: trunk/web/reactos.org/phpext/config.m4 ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/web/reactos.org/phpext/php_roscms.h --- trunk/web/reactos.org/phpext/php_roscms.h 2006-01-14 21:57:07 UTC (rev 20866) +++ trunk/web/reactos.org/phpext/php_roscms.h 2006-01-14 22:18:07 UTC (rev 20867) @@ -0,0 +1,21 @@ +#ifndef PHP_ROSCMS_H +#define PHP_ROSCMS_H + +extern zend_module_entry roscms_module_entry; +#define phpext_roscms_ptr &roscms_module_entry + +#ifdef PHP_WIN32 +#define PHP_ROSCMS_API __declspec(dllexport) +#else +#define PHP_ROSCMS_API +#endif + +#ifdef ZTS +#include "TSRM.h" +#endif + +PHP_MINFO_FUNCTION(roscms); + +PHP_FUNCTION(roscms_unicode_escape); + +#endif /* PHP_ROSCMS_H */ Property changes on: trunk/web/reactos.org/phpext/php_roscms.h ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/web/reactos.org/phpext/roscms.c --- trunk/web/reactos.org/phpext/roscms.c 2006-01-14 21:57:07 UTC (rev 20866) +++ trunk/web/reactos.org/phpext/roscms.c 2006-01-14 22:18:07 UTC (rev 20867) @@ -0,0 +1,206 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "php.h" +#include "php_ini.h" +#include "ext/standard/info.h" +#include "php_roscms.h" + +/* + * Every user visible function must have an entry in roscms_functions[]. + */ +function_entry roscms_functions[] = { + PHP_FE(roscms_unicode_escape,NULL) + {NULL, NULL, NULL} /* Must be the last line in roscms_functions[] */ +}; + +zend_module_entry roscms_module_entry = { +#if ZEND_MODULE_API_NO >= 20010901 + STANDARD_MODULE_HEADER, +#endif + "roscms", + roscms_functions, + NULL, + NULL, + NULL, + NULL, + PHP_MINFO(roscms), +#if ZEND_MODULE_API_NO >= 20010901 + "1.0", /* Replace with version number for your extension */ +#endif + STANDARD_MODULE_PROPERTIES +}; + +#ifdef COMPILE_DL_ROSCMS +ZEND_GET_MODULE(roscms) +#endif + +PHP_MINFO_FUNCTION(roscms) +{ + php_info_print_table_start(); + php_info_print_table_header(2, "roscms support", "enabled"); + php_info_print_table_end(); +} +/* {{{ proto string roscms_unicode_escape(string arg) + Return a string in which characters > 127 have been HTML-escaped */ +PHP_FUNCTION(roscms_unicode_escape) +{ + unsigned char *in, *out, *pi, *po; + unsigned in_len, out_len; + unsigned i; + unsigned val, len; + int has_high; + char msg[128]; + unsigned size; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", + &in, &in_len)) + { + RETURN_NULL(); + } + + /* We make a first pass over the input string. If there are high chars, + we use this pass to compute the total amount of mem required. If there + aren't any high chars (will probably happen a lot), we can skip the + conversion */ + size = 0; + i = 0; + pi = in; + has_high = 0; + while (i < in_len) + { + if (*pi <= 127) + { + size++; + i++; + pi++; + } + else + { + if (192 <= *pi && *pi < 224) + { + i += 2; + pi += 2; + } + else if (224 <= *pi && *pi < 240) + { + i += 3; + pi += 3; + } + else if (240 <= *pi && *pi < 248) + { + i += 4; + pi += 4; + } + else if (248 <= *pi && *pi < 252) + { + i += 5; + pi += 5; + } + else if (252 <= *pi && *pi < 254) + { + i += 6; + pi += 6; + } + else + { + RETURN_NULL(); + } + has_high = 1; + size += 8; /*  */ + } + } + + /* Now check if any high chars were found. If not, just return the input */ + if (! has_high) + { + RETURN_STRINGL((char *) in, in_len, 1); + } + + size++; + out = emalloc(size); + if (NULL == out) + { + RETURN_NULL(); + } + + i = 0; + pi = in; + out_len = 0; + po = out; + while (i < in_len) + { + if (*pi <= 127) + { + i++; + *po++ = *pi++; + out_len++; + } + else + { + if (192 <= *pi && *pi < 224) + { + val = (pi[0] - 192) * 64 + + (pi[1] - 128); + i += 2; + pi += 2; + } + else if (224 <= *pi && *pi < 240) + { + val = (pi[0] - 224) * 4096 + + (pi[1] - 128) * 64 + + (pi[2] - 128); + i += 3; + pi += 3; + } + else if (240 <= *pi && *pi < 248) + { + val = (pi[0] - 240) * 262144 + + (pi[1] - 128) * 4096 + + (pi[2] - 128) * 64 + + (pi[3] - 128); + i += 4; + pi += 4; + } + else if (248 <= *pi && *pi < 252) + { + val = (pi[0] - 248) * 16777216 + + (pi[1] - 128) * 262144 + + (pi[2] - 128) * 4096 + + (pi[3] - 128) * 64 + + (pi[4] - 128); + i += 5; + pi += 5; + } + else if (252 <= *pi && *pi < 254) + { + val = (pi[0] - 252) * 1073741824 + + (pi[1] - 128) * 16777216 + + (pi[2] - 128) * 262144 + + (pi[3] - 128) * 4096 + + (pi[4] - 128) * 64 + + (pi[5] - 128); + i += 6; + pi += 6; + } + else + { + RETURN_NULL(); + } + php_sprintf((char *) po, "&#%u;", val); + out_len += strlen((char *)po); + po = out + out_len; + } + } + *po = '\0'; + + if (size < out_len + 1) + { + sprintf(msg, "roscms_unicode_escape: buffer overflow size %u needed %d", + size, out_len); + zend_error(E_ERROR, msg); + } + + RETURN_STRINGL((char *) out, out_len, 0); +} Property changes on: trunk/web/reactos.org/phpext/roscms.c ___________________________________________________________________ Name: svn:eol-style + native

1 0

[npwoods] 20866: Freeloader: Check return code of RegOpenKey() in FrLdrLoadBootDrivers() for failure
by npwoods＠svn.reactos.org 14 Jan '06

14 Jan '06

Freeloader: Check return code of RegOpenKey() in FrLdrLoadBootDrivers() for failure Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c 2006-01-14 20:36:49 UTC (rev 20865) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c 2006-01-14 21:57:07 UTC (rev 20866) @@ -428,55 +428,57 @@ /* open driver Key */ rc = RegOpenKey(hServiceKey, ServiceName, &hDriverKey); + if (rc == ERROR_SUCCESS) + { + /* Read the Start Value */ + ValueSize = sizeof(ULONG); + rc = RegQueryValue(hDriverKey, L"Start", &ValueType, (PUCHAR)&StartValue, &ValueSize); + if (rc != ERROR_SUCCESS) StartValue = (ULONG)-1; + DbgPrint((DPRINT_REACTOS, " Start: %x \n", (int)StartValue)); - /* Read the Start Value */ - ValueSize = sizeof(ULONG); - rc = RegQueryValue(hDriverKey, L"Start", &ValueType, (PUCHAR)&StartValue, &ValueSize); - if (rc != ERROR_SUCCESS) StartValue = (ULONG)-1; - DbgPrint((DPRINT_REACTOS, " Start: %x \n", (int)StartValue)); + /* Read the Tag */ + ValueSize = sizeof(ULONG); + rc = RegQueryValue(hDriverKey, L"Tag", &ValueType, (PUCHAR)&TagValue, &ValueSize); + if (rc != ERROR_SUCCESS) TagValue = (ULONG)-1; + DbgPrint((DPRINT_REACTOS, " Tag: %x \n", (int)TagValue)); - /* Read the Tag */ - ValueSize = sizeof(ULONG); - rc = RegQueryValue(hDriverKey, L"Tag", &ValueType, (PUCHAR)&TagValue, &ValueSize); - if (rc != ERROR_SUCCESS) TagValue = (ULONG)-1; - DbgPrint((DPRINT_REACTOS, " Tag: %x \n", (int)TagValue)); + /* Read the driver's group */ + DriverGroupSize = sizeof(DriverGroup); + rc = RegQueryValue(hDriverKey, L"Group", NULL, (PUCHAR)DriverGroup, &DriverGroupSize); + DbgPrint((DPRINT_REACTOS, " Group: '%S' \n", DriverGroup)); - /* Read the driver's group */ - DriverGroupSize = sizeof(DriverGroup); - rc = RegQueryValue(hDriverKey, L"Group", NULL, (PUCHAR)DriverGroup, &DriverGroupSize); - DbgPrint((DPRINT_REACTOS, " Group: '%S' \n", DriverGroup)); + /* Make sure it should be started */ + if ((StartValue == 0) && + (TagValue == OrderList[TagIndex]) && + (_wcsicmp(DriverGroup, GroupName) == 0)) { - /* Make sure it should be started */ - if ((StartValue == 0) && - (TagValue == OrderList[TagIndex]) && - (_wcsicmp(DriverGroup, GroupName) == 0)) { + /* Get the Driver's Location */ + ValueSize = sizeof(TempImagePath); + rc = RegQueryValue(hDriverKey, L"ImagePath", NULL, (PUCHAR)TempImagePath, &ValueSize); - /* Get the Driver's Location */ - ValueSize = sizeof(TempImagePath); - rc = RegQueryValue(hDriverKey, L"ImagePath", NULL, (PUCHAR)TempImagePath, &ValueSize); + /* Write the whole path if it suceeded, else prepare to fail */ + if (rc != ERROR_SUCCESS) { + DbgPrint((DPRINT_REACTOS, " ImagePath: not found\n")); + sprintf(ImagePath, "%s\\system32\\drivers\\%S.sys", szSystemRoot, ServiceName); + } else if (TempImagePath[0] != L'\\') { + sprintf(ImagePath, "%s%S", szSystemRoot, TempImagePath); + } else { + sprintf(ImagePath, "%S", TempImagePath); + DbgPrint((DPRINT_REACTOS, " ImagePath: '%s'\n", ImagePath)); + } - /* Write the whole path if it suceeded, else prepare to fail */ - if (rc != ERROR_SUCCESS) { - DbgPrint((DPRINT_REACTOS, " ImagePath: not found\n")); - sprintf(ImagePath, "%s\\system32\\drivers\\%S.sys", szSystemRoot, ServiceName); - } else if (TempImagePath[0] != L'\\') { - sprintf(ImagePath, "%s%S", szSystemRoot, TempImagePath); - } else { - sprintf(ImagePath, "%S", TempImagePath); - DbgPrint((DPRINT_REACTOS, " ImagePath: '%s'\n", ImagePath)); - } + DbgPrint((DPRINT_REACTOS, " Loading driver: '%s'\n", ImagePath)); - DbgPrint((DPRINT_REACTOS, " Loading driver: '%s'\n", ImagePath)); + /* Update the position if needed */ + if (nPos < 100) nPos += 5; - /* Update the position if needed */ - if (nPos < 100) nPos += 5; + FrLdrLoadDriver(ImagePath, nPos); - FrLdrLoadDriver(ImagePath, nPos); + } else { - } else { - - DbgPrint((DPRINT_REACTOS, " Skipping driver '%S' with Start %d, Tag %d and Group '%S' (Current Tag %d, current group '%S')\n", - ServiceName, StartValue, TagValue, DriverGroup, OrderList[TagIndex], GroupName)); + DbgPrint((DPRINT_REACTOS, " Skipping driver '%S' with Start %d, Tag %d and Group '%S' (Current Tag %d, current group '%S')\n", + ServiceName, StartValue, TagValue, DriverGroup, OrderList[TagIndex], GroupName)); + } } Index++;

1 0

[weiden] 20865: remove debug information I forgot to remove
by weiden＠svn.reactos.org 14 Jan '06

14 Jan '06

remove debug information I forgot to remove Modified: trunk/reactos/ntoskrnl/ke/i386/thread.c _____ Modified: trunk/reactos/ntoskrnl/ke/i386/thread.c --- trunk/reactos/ntoskrnl/ke/i386/thread.c 2006-01-14 20:36:01 UTC (rev 20864) +++ trunk/reactos/ntoskrnl/ke/i386/thread.c 2006-01-14 20:36:49 UTC (rev 20865) @@ -122,12 +122,12 @@ PKKINIT_FRAME InitFrame; InitFrame = (PKKINIT_FRAME)((ULONG_PTR)Thread->InitialStack - sizeof(KKINIT_FRAME)); DPRINT("Setting up a kernel thread with the Frame at: %x\n", InitFrame); -extern ULONG kernel_stack[]; + /* Setup the Fx Area */ FxSaveArea = &InitFrame->FxSaveArea; - DbgPrint("->a Ldr: %d kernel_stack:0%p r0x%p InitialStack: %p Initframe: %p-%p FxSav: %p-%p\n", KeLoaderBlock.ModsCount, &kernel_stack, PAGE_ROUND_UP(&kernel_stack), Thread->InitialStack, InitFrame, (ULONG_PTR)InitFrame + sizeof(KKINIT_FRAME), FxSaveArea, (ULONG_PTR)FxSaveArea + sizeof(FX_SAVE_AREA)); + RtlZeroMemory(FxSaveArea, sizeof(FX_SAVE_AREA)); - DbgPrint("->b Ldr: %d kernel_stack:0%p r0x%p InitialStack: %p Initframe: %p-%p FxSav: %p-%p\n", KeLoaderBlock.ModsCount, &kernel_stack, PAGE_ROUND_UP(&kernel_stack), Thread->InitialStack, InitFrame, (ULONG_PTR)InitFrame + sizeof(KKINIT_FRAME), FxSaveArea, (ULONG_PTR)FxSaveArea + sizeof(FX_SAVE_AREA)); + Thread->NpxState = NPX_STATE_INVALID; /* Setup the Stack for KiThreadStartup and Context Switching */

1 0

[weiden] 20864: make the initial kernel_stack large enough to have enough space for the fx savings area
by weiden＠svn.reactos.org 14 Jan '06

14 Jan '06

make the initial kernel_stack large enough to have enough space for the fx savings area Modified: trunk/reactos/ntoskrnl/ke/i386/main_asm.S Modified: trunk/reactos/ntoskrnl/ke/i386/thread.c Modified: trunk/reactos/ntoskrnl/ke/main.c _____ Modified: trunk/reactos/ntoskrnl/ke/i386/main_asm.S --- trunk/reactos/ntoskrnl/ke/i386/main_asm.S 2006-01-14 19:45:50 UTC (rev 20863) +++ trunk/reactos/ntoskrnl/ke/i386/main_asm.S 2006-01-14 20:36:01 UTC (rev 20864) @@ -35,7 +35,7 @@ .m1: /* Load the initial kernel stack */ lea _kernel_stack, %eax - add $0x1000, %eax + add $0x2000, %eax and $0xFFFFE000, %eax add $(0x3000 - SIZEOF_FX_SAVE_AREA), %eax movl %eax, %esp _____ Modified: trunk/reactos/ntoskrnl/ke/i386/thread.c --- trunk/reactos/ntoskrnl/ke/i386/thread.c 2006-01-14 19:45:50 UTC (rev 20863) +++ trunk/reactos/ntoskrnl/ke/i386/thread.c 2006-01-14 20:36:01 UTC (rev 20864) @@ -122,10 +122,12 @@ PKKINIT_FRAME InitFrame; InitFrame = (PKKINIT_FRAME)((ULONG_PTR)Thread->InitialStack - sizeof(KKINIT_FRAME)); DPRINT("Setting up a kernel thread with the Frame at: %x\n", InitFrame); - +extern ULONG kernel_stack[]; /* Setup the Fx Area */ FxSaveArea = &InitFrame->FxSaveArea; + DbgPrint("->a Ldr: %d kernel_stack:0%p r0x%p InitialStack: %p Initframe: %p-%p FxSav: %p-%p\n", KeLoaderBlock.ModsCount, &kernel_stack, PAGE_ROUND_UP(&kernel_stack), Thread->InitialStack, InitFrame, (ULONG_PTR)InitFrame + sizeof(KKINIT_FRAME), FxSaveArea, (ULONG_PTR)FxSaveArea + sizeof(FX_SAVE_AREA)); RtlZeroMemory(FxSaveArea, sizeof(FX_SAVE_AREA)); + DbgPrint("->b Ldr: %d kernel_stack:0%p r0x%p InitialStack: %p Initframe: %p-%p FxSav: %p-%p\n", KeLoaderBlock.ModsCount, &kernel_stack, PAGE_ROUND_UP(&kernel_stack), Thread->InitialStack, InitFrame, (ULONG_PTR)InitFrame + sizeof(KKINIT_FRAME), FxSaveArea, (ULONG_PTR)FxSaveArea + sizeof(FX_SAVE_AREA)); Thread->NpxState = NPX_STATE_INVALID; /* Setup the Stack for KiThreadStartup and Context Switching */ _____ Modified: trunk/reactos/ntoskrnl/ke/main.c --- trunk/reactos/ntoskrnl/ke/main.c 2006-01-14 19:45:50 UTC (rev 20863) +++ trunk/reactos/ntoskrnl/ke/main.c 2006-01-14 20:36:01 UTC (rev 20864) @@ -48,9 +48,9 @@ ULONG KeLargestCacheLine = 0x40; /* FIXME: Arch-specific */ -/* We allocate 4 pages, but we only use 3. The 4th is to guarantee page alignment */ -ULONG kernel_stack[4096]; -ULONG double_trap_stack[4096]; +/* We allocate 5 pages, but we only use 4. The 5th is to guarantee page alignment */ +ULONG kernel_stack[5120]; +ULONG double_trap_stack[5120]; /* These point to the aligned 3 pages */ ULONG init_stack; @@ -155,10 +155,11 @@ PIMAGE_OPTIONAL_HEADER OptHead; CHAR* s; - /* Set up the Stacks (Initial Kernel Stack and Double Trap Stack)*/ - trap_stack = PAGE_ROUND_UP(&double_trap_stack); + /* Set up the Stacks (Initial Kernel Stack and Double Trap Stack) + and save a page for the fx savings area */ + trap_stack = PAGE_ROUND_UP(&double_trap_stack) + PAGE_SIZE; trap_stack_top = trap_stack + 3 * PAGE_SIZE; - init_stack = PAGE_ROUND_UP(&kernel_stack); + init_stack = PAGE_ROUND_UP(&kernel_stack) + PAGE_SIZE; init_stack_top = init_stack + 3 * PAGE_SIZE; /* Copy the Loader Block Data locally since Low-Memory will be wiped */

1 0

[gvg] 20863: Tag Wine 0.9.5
by gvg＠svn.reactos.org 14 Jan '06

14 Jan '06

Tag Wine 0.9.5 Added: vendor/wine/dlls/mapi32/Wine-0_9_5/ Deleted: vendor/wine/dlls/mapi32/Wine-0_9_5/mapi32.spec Added: vendor/wine/dlls/mapi32/Wine-0_9_5/mapi32.spec _____ Copied: vendor/wine/dlls/mapi32/Wine-0_9_5 (from rev 20859, vendor/wine/dlls/mapi32/current) _____ Deleted: vendor/wine/dlls/mapi32/Wine-0_9_5/mapi32.spec --- vendor/wine/dlls/mapi32/current/mapi32.spec 2006-01-14 19:29:26 UTC (rev 20859) +++ vendor/wine/dlls/mapi32/Wine-0_9_5/mapi32.spec 2006-01-14 19:45:50 UTC (rev 20863) @@ -1,191 +0,0 @@ - 8 stub @ - 10 stdcall MAPILogonEx(long ptr ptr long ptr) - 11 stdcall MAPILogonEx@20(long ptr ptr long ptr) MAPILogonEx - 12 stdcall MAPIAllocateBuffer(long ptr) - 13 stdcall MAPIAllocateBuffer@8(long ptr) MAPIAllocateBuffer - 14 stdcall MAPIAllocateMore(long ptr ptr) - 15 stdcall MAPIAllocateMore@12(long ptr ptr) MAPIAllocateMore - 16 stdcall MAPIFreeBuffer(ptr) - 17 stdcall MAPIFreeBuffer@4(ptr) MAPIFreeBuffer - 18 stub MAPIAdminProfiles - 19 stub MAPIAdminProfiles@8 - 20 stdcall MAPIInitialize(ptr) - 21 stdcall MAPIInitialize@4(ptr) MAPIInitialize - 22 stdcall MAPIUninitialize() - 23 stdcall MAPIUninitialize@0() MAPIUninitialize - 24 stub PRProviderInit - 25 stub LAUNCHWIZARD - 26 stub LaunchWizard@20 - 27 stub DllGetClassObject - 28 stdcall -private DllCanUnloadNow() - 29 stub MAPIOpenFormMgr - 30 stub MAPIOpenFormMgr@8 - 31 stub MAPIOpenLocalFormContainer - 32 stub MAPIOpenLocalFormContainer@4 - 33 stdcall ScInitMapiUtil@4(long) ScInitMapiUtil - 34 stdcall DeinitMapiUtil@0() DeinitMapiUtil - 35 stub ScGenerateMuid@4 - 36 stub HrAllocAdviseSink@12 - 41 stdcall WrapProgress@20(ptr ptr ptr ptr ptr) WrapProgress - 42 stdcall HrThisThreadAdviseSink@8(ptr ptr) HrThisThreadAdviseSink - 43 stub ScBinFromHexBounded@12 - 44 stdcall FBinFromHex@8(ptr ptr) FBinFromHex - 45 stdcall HexFromBin@12(ptr long ptr) HexFromBin - 46 stub BuildDisplayTable@40 - 47 stdcall SwapPlong@8(ptr long) SwapPlong - 48 stdcall SwapPword@8(ptr long) SwapPword - 49 stub MAPIInitIdle@4 - 50 stub MAPIDeinitIdle@0 - 51 stub InstallFilterHook@4 - 52 stub FtgRegisterIdleRoutine@20 - 53 stub EnableIdleRoutine@8 - 54 stub DeregisterIdleRoutine@4 - 55 stub ChangeIdleRoutine@28 - 59 stdcall MAPIGetDefaultMalloc@0() MAPIGetDefaultMalloc - 60 stdcall CreateIProp@24(ptr ptr ptr ptr ptr ptr) CreateIProp - 61 stub CreateTable@36 - 62 stdcall MNLS_lstrlenW@4(wstr) MNLS_lstrlenW - 63 stdcall MNLS_lstrcmpW@8(wstr wstr) MNLS_lstrcmpW - 64 stdcall MNLS_lstrcpyW@8(ptr wstr) MNLS_lstrcpyW - 65 stdcall MNLS_CompareStringW@24(long wstr wstr) MNLS_CompareStringW - 66 stdcall MNLS_MultiByteToWideChar@24(long long str long ptr long) kernel32.MultiByteToWideChar - 67 stdcall MNLS_WideCharToMultiByte@32(long long wstr long ptr long ptr ptr) kernel32.WideCharToMultiByte - 68 stdcall MNLS_IsBadStringPtrW@8(ptr long) kernel32.IsBadStringPtrW - 72 stdcall FEqualNames@8(ptr ptr) FEqualNames - 73 stub WrapStoreEntryID@24 - 74 stdcall IsBadBoundedStringPtr@8(ptr long) IsBadBoundedStringPtr - 75 stub HrQueryAllRows@24 - 76 stdcall PropCopyMore@16(ptr ptr ptr ptr) PropCopyMore - 77 stdcall UlPropSize@4(ptr) UlPropSize - 78 stdcall FPropContainsProp@12(ptr ptr long) FPropContainsProp - 79 stdcall FPropCompareProp@12(ptr long ptr) FPropCompareProp - 80 stdcall LPropCompareProp@8(ptr ptr) LPropCompareProp - 81 stub HrAddColumns@16 - 82 stub HrAddColumnsEx@20 -121 stdcall -ret64 FtAddFt@16(double double) MAPI32_FtAddFt -122 stub FtAdcFt@20 -123 stdcall -ret64 FtSubFt@16(double double) MAPI32_FtSubFt -124 stdcall -ret64 FtMulDw@12(long double) MAPI32_FtMulDw -125 stdcall -ret64 FtMulDwDw@8(long long) MAPI32_FtMulDwDw -126 stdcall -ret64 FtNegFt@8(double) MAPI32_FtNegFt -127 stub FtDivFtBogus@20 -128 stdcall UlAddRef@4(ptr) UlAddRef -129 stdcall UlRelease@4(ptr) UlRelease -130 stdcall SzFindCh@8(str long) shlwapi.StrChrA -131 stdcall SzFindLastCh@8(str str long) shlwapi.StrRChrA -132 stdcall SzFindSz@8(str str) shlwapi.StrStrA -133 stdcall UFromSz@4(str) UFromSz -135 stdcall HrGetOneProp@12(ptr long ptr) HrGetOneProp -136 stdcall HrSetOneProp@8(ptr ptr) HrSetOneProp -137 stdcall FPropExists@8(ptr long) FPropExists -138 stdcall PpropFindProp@12(ptr long long) PpropFindProp -139 stdcall FreePadrlist@4(ptr) FreePadrlist -140 stdcall FreeProws@4(ptr) FreeProws -141 stub HrSzFromEntryID@12 -142 stub HrEntryIDFromSz@12 -143 stub HrComposeEID@28 -144 stub HrDecomposeEID@28 -145 stub HrComposeMsgID@24 -146 stub HrDecomposeMsgID@24 -147 stdcall OpenStreamOnFile@24(ptr ptr ptr ptr ptr ptr) OpenStreamOnFile -148 stdcall OpenStreamOnFile(ptr ptr ptr ptr ptr ptr) -149 stub OpenTnefStream@28 -150 stub OpenTnefStream -151 stub OpenTnefStreamEx@32 -152 stub OpenTnefStreamEx -153 stub GetTnefStreamCodepage@12 -154 stub GetTnefStreamCodepage -155 stdcall UlFromSzHex@4(ptr) UlFromSzHex -156 stub UNKOBJ_ScAllocate@12 -157 stub UNKOBJ_ScAllocateMore@16 -158 stub UNKOBJ_Free@8 -159 stub UNKOBJ_FreeRows@8 -160 stub UNKOBJ_ScCOAllocate@12 -161 stub UNKOBJ_ScCOReallocate@12 -162 stub UNKOBJ_COFree@8 -163 stub UNKOBJ_ScSzFromIdsAlloc@20 -164 stub ScCountNotifications@12 -165 stub ScCopyNotifications@16 -166 stub ScRelocNotifications@20 -170 stdcall ScCountProps@12(long ptr ptr) ScCountProps -171 stdcall ScCopyProps@16(long ptr ptr ptr) ScCopyProps -172 stdcall ScRelocProps@20(long ptr ptr ptr ptr) ScRelocProps -173 stdcall LpValFindProp@12(long long ptr) LpValFindProp -174 stdcall ScDupPropset@16(long ptr ptr ptr) ScDupPropset -175 stdcall FBadRglpszA@8(ptr long) FBadRglpszA -176 stdcall FBadRglpszW@8(ptr long) FBadRglpszW -177 stdcall FBadRowSet@4(ptr) FBadRowSet -178 stub FBadRglpNameID@8 -179 stdcall FBadPropTag@4(long) FBadPropTag -180 stdcall FBadRow@4(ptr) FBadRow -181 stdcall FBadProp@4(ptr) FBadProp -182 stdcall FBadColumnSet@4(ptr) FBadColumnSet -183 stub RTFSync@12 -184 stub RTFSync -185 stub WrapCompressedRTFStream@12 -186 stub WrapCompressedRTFStream -187 stub __ValidateParameters@8 -188 stub __CPPValidateParameters@8 -189 stub FBadSortOrderSet@4 -190 stdcall FBadEntryList@4(ptr) FBadEntryList -191 stub FBadRestriction@4 -192 stub ScUNCFromLocalPath@12 -193 stub ScLocalPathFromUNC@12 -194 stub HrIStorageFromStream@16 -195 stub HrValidateIPMSubtree@20 -196 stub OpenIMsgSession@12 -197 stub CloseIMsgSession@4 -198 stub OpenIMsgOnIStg@44 -199 stub SetAttribIMsgOnIStg@16 -200 stub GetAttribIMsgOnIStg@12 -201 stub MapStorageSCode@4 -202 stub ScMAPIXFromCMC -203 stub ScMAPIXFromSMAPI -204 stub EncodeID@12 -205 stub FDecodeID@12 -206 stub CchOfEncoding@4 -207 stdcall CbOfEncoded@4(ptr) CbOfEncoded -208 stub MAPISendDocuments -209 stdcall MAPILogon(long ptr ptr long long ptr) -210 stub MAPILogoff -211 stub MAPISendMail -212 stub MAPISaveMail -213 stub MAPIReadMail -214 stub MAPIFindNext -215 stub MAPIDeleteMail -217 stub MAPIAddress -218 stub MAPIDetails -219 stub MAPIResolveName -220 stub BMAPISendMail -221 stub BMAPISaveMail -222 stub BMAPIReadMail -223 stub BMAPIGetReadMail -224 stub BMAPIFindNext -225 stub BMAPIAddress -226 stub BMAPIGetAddress -227 stub BMAPIDetails -228 stub BMAPIResolveName -229 stub cmc_act_on -230 stub cmc_free -231 stub cmc_list -232 stub cmc_logoff -233 stub cmc_logon -234 stub cmc_look_up -235 stdcall cmc_query_configuration( long long ptr ptr ) -236 stub cmc_read -237 stub cmc_send -238 stub cmc_send_documents -239 stub HrDispatchNotifications@4 -241 stub HrValidateParameters@8 -244 stub ScCreateConversationIndex@16 -246 stub HrGetOmiProvidersFlags -247 stub HrGetOmiProvidersFlags@8 -248 stub HrSetOmiProvidersFlagsInvalid -249 stub HrSetOmiProvidersFlagsInvalid@4 -250 stub GetOutlookVersion -251 stub GetOutlookVersion@0 -252 stub FixMAPI -253 stub FixMAPI@0 -# This entry point is sometimes used to detect if the mapi dll came from Outlook -#254 stub FGetComponentPath -#255 stub FGetComponentPath@20 _____ Copied: vendor/wine/dlls/mapi32/Wine-0_9_5/mapi32.spec (from rev 20860, vendor/wine/dlls/mapi32/current/mapi32.spec)

1 0

[gvg] 20862: SVN maintenance
by gvg＠svn.reactos.org 14 Jan '06

14 Jan '06

SVN maintenance Property changes on: trunk/reactos/lib/icmp ___________________________________________________________________ Name: svn:ignore - *.coff *.dll *.d *.a *.o *.sym *.map *.tmp Makefile.ros *.spec.def *.stubs.c *.ico *.bmp *.cur + GNUmakefile Property changes on: trunk/reactos/lib/keyboard/kbdsk ___________________________________________________________________ Name: svn:ignore + GNUmakefile Property changes on: trunk/reactos/subsys/system/servman ___________________________________________________________________ Name: svn:ignore + GNUmakefile

1 0

[gvg] 20861: Import mapi32 from Wine
by gvg＠svn.reactos.org 14 Jan '06

14 Jan '06

Import mapi32 from Wine Modified: trunk/reactos/baseaddress.xml Modified: trunk/reactos/bootdata/packages/reactos.dff Modified: trunk/reactos/include/wine/shlwapi.h Modified: trunk/reactos/lib/directory.xml Added: trunk/reactos/lib/mapi32/ Deleted: trunk/reactos/lib/mapi32/Makefile.in Added: trunk/reactos/lib/mapi32/mapi32.xml Modified: trunk/reactos/lib/mapi32/prop.c Modified: trunk/reactos/lib/uuid/uuid.c Modified: trunk/reactos/media/doc/README.WINE Added: trunk/reactos/w32api/include/mapicode.h Added: trunk/reactos/w32api/include/mapidefs.h Added: trunk/reactos/w32api/include/mapiguid.h Added: trunk/reactos/w32api/include/mapitags.h Added: trunk/reactos/w32api/include/mapiutil.h Added: trunk/reactos/w32api/include/mapival.h Added: trunk/reactos/w32api/include/mapix.h Modified: trunk/reactos/w32api/include/wtypes.h Added: trunk/reactos/w32api/include/xcmc.h _____ Modified: trunk/reactos/baseaddress.xml --- trunk/reactos/baseaddress.xml 2006-01-14 19:31:10 UTC (rev 20860) +++ trunk/reactos/baseaddress.xml 2006-01-14 19:36:04 UTC (rev 20861) @@ -10,6 +10,7 @@ <property name="BASEADDRESS_OBJSEL" value="0x5B400000" /> <property name="BASEADDRESS_SLAYER" value="0x5C7E0000" /> <property name="BASEADDRESS_DINPUT" value="0x5F580000" /> +<property name="BASEADDRESS_MAPI32" value="0x62250000" /> <property name="BASEADDRESS_HDWWIZ" value="0x64D40000" /> <property name="BASEADDRESS_TIMEDATE" value="0x64DA0000" /> <property name="BASEADDRESS_SYSDM" value="0x64DD0000" /> _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2006-01-14 19:31:10 UTC (rev 20860) +++ trunk/reactos/bootdata/packages/reactos.dff 2006-01-14 19:36:04 UTC (rev 20861) @@ -120,6 +120,7 @@ lib\kernel32\kernel32.dll 1 lib\lsasrv\lsasrv.dll 1 lib\lzexpand\lz32.dll 1 +lib\mapi32\mapi32.dll 1 lib\mesa32\mesa32.dll 1 lib\winmm\midimap\midimap.dll 1 lib\mmdrv\mmdrv.dll 1 _____ Modified: trunk/reactos/include/wine/shlwapi.h --- trunk/reactos/include/wine/shlwapi.h 2006-01-14 19:31:10 UTC (rev 20860) +++ trunk/reactos/include/wine/shlwapi.h 2006-01-14 19:36:04 UTC (rev 20861) @@ -14,6 +14,8 @@ #define URL_FILE_USE_PATHURL 0x00010000 +HRESULT WINAPI SHCreateStreamOnFileEx(LPCWSTR,DWORD,DWORD,BOOL,struct IStream*,struct IStream**); + #define INTERFACE IQueryAssociations DECLARE_INTERFACE_(IQueryAssociations,IUnknown) { _____ Modified: trunk/reactos/lib/directory.xml --- trunk/reactos/lib/directory.xml 2006-01-14 19:31:10 UTC (rev 20860) +++ trunk/reactos/lib/directory.xml 2006-01-14 19:36:04 UTC (rev 20861) @@ -152,6 +152,9 @@ <directory name="lzexpand"> <xi:include href="lzexpand/lz32.xml" /> </directory> +<directory name="mapi32"> + <xi:include href="mapi32/mapi32.xml" /> +</directory> <directory name="mesa32"> <xi:include href="mesa32/mesa32.xml" /> </directory> _____ Copied: trunk/reactos/lib/mapi32 (from rev 20860, vendor/wine/dlls/mapi32/current) Property changes on: trunk/reactos/lib/mapi32 ___________________________________________________________________ Name: svn:ignore + GNUmakefile _____ Deleted: trunk/reactos/lib/mapi32/Makefile.in --- vendor/wine/dlls/mapi32/current/Makefile.in 2006-01-14 19:31:10 UTC (rev 20860) +++ trunk/reactos/lib/mapi32/Makefile.in 2006-01-14 19:36:04 UTC (rev 20861) @@ -1,20 +0,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = mapi32.dll -IMPORTLIB = libmapi32.$(IMPLIBEXT) -IMPORTS = shlwapi ole32 user32 kernel32 ntdll -EXTRALIBS = -luuid $(LIBUNICODE) - -C_SRCS = \ - imalloc.c \ - mapi32_main.c \ - prop.c \ - util.c - -SUBDIRS = tests - -@MAKE_DLL_RULES@ - -### Dependencies: _____ Added: trunk/reactos/lib/mapi32/mapi32.xml --- vendor/wine/dlls/mapi32/current/mapi32.xml 2006-01-14 19:31:10 UTC (rev 20860) +++ trunk/reactos/lib/mapi32/mapi32.xml 2006-01-14 19:36:04 UTC (rev 20861) @@ -0,0 +1,19 @@ +<module name="mapi32" type="win32dll" baseaddress="${BASEADDRESS_MAPI32}" installbase="system32" installname="mapi32.dll"> + <importlibrary definition="mapi32.spec.def" /> + <include base="mapi32">.</include> + <include base="ReactOS">include/wine</include> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x501</define> + <define name="__WINESRC__" /> + <library>ntdll</library> + <library>kernel32</library> + <library>shlwapi</library> + <library>wine</library> + <library>uuid</library> + <library>advapi32</library> + <file>mapi32_main.c</file> + <file>imalloc.c</file> + <file>prop.c</file> + <file>util.c</file> + <file>mapi32.spec</file> +</module> Property changes on: trunk/reactos/lib/mapi32/mapi32.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/mapi32/prop.c --- vendor/wine/dlls/mapi32/current/prop.c 2006-01-14 19:31:10 UTC (rev 20860) +++ trunk/reactos/lib/mapi32/prop.c 2006-01-14 19:36:04 UTC (rev 20861) @@ -1404,7 +1404,7 @@ ULONG ulObjAccess; /* Object access level */ ULONG ulNumValues; /* Number of items in values list */ struct list values; /* List of property values */ - CRITICAL_SECTION cs; /* Lock for thread safety */ + RTL_CRITICAL_SECTION cs; /* Lock for thread safety */ } IPropDataImpl; /* Internal - Get a property value, assumes lock is held */ _____ Modified: trunk/reactos/lib/uuid/uuid.c --- trunk/reactos/lib/uuid/uuid.c 2006-01-14 19:31:10 UTC (rev 20860) +++ trunk/reactos/lib/uuid/uuid.c 2006-01-14 19:36:04 UTC (rev 20861) @@ -60,6 +60,7 @@ /* other GUIDs */ #include "vfw.h" +#include "mapiguid.h" #if 0 /* FIXME */ #include "uuids.h" _____ Modified: trunk/reactos/media/doc/README.WINE --- trunk/reactos/media/doc/README.WINE 2006-01-14 19:31:10 UTC (rev 20860) +++ trunk/reactos/media/doc/README.WINE 2006-01-14 19:36:04 UTC (rev 20861) @@ -51,6 +51,7 @@ reactos/lib/imm32 # Synced to Wine-0_9_5 reactos/lib/iphlpapi # Out of sync reactos/lib/imagehlp # Patches for BindImage need review and submission to winehq. +reactos/lib/mapi32 # Synced to Wine-0_9_5 reactos/lib/msvcrt20 # Out of sync reactos/lib/mpr # Synced to Wine-0_9_5 reactos/lib/msacm # Out of sync _____ Added: trunk/reactos/w32api/include/mapicode.h --- trunk/reactos/w32api/include/mapicode.h 2006-01-14 19:31:10 UTC (rev 20860) +++ trunk/reactos/w32api/include/mapicode.h 2006-01-14 19:36:04 UTC (rev 20861) @@ -0,0 +1,110 @@ +/* + * Status codes returned by MAPI + * + * Copyright (C) 2002 Aric Stewart + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef MAPICODE_H +#define MAPICODE_H + +#include <winerror.h> + +#define MAKE_MAPI_SCODE(sev,fac,code) \ + ((SCODE)(((ULONG)(sev)<<31)|((ULONG)(fac)<<16)|((ULONG)(code)))) + +#define MAKE_MAPI_E(e) (MAKE_MAPI_SCODE(1,FACILITY_ITF,(e))) +#define MAKE_MAPI_S(e) (MAKE_MAPI_SCODE(0,FACILITY_ITF,(e))) + +/* Errors */ +#define MAPI_E_ACCOUNT_DISABLED ((SCODE)0x80040124) +#define MAPI_E_AMBIGUOUS_RECIP ((SCODE)0x80040700) +#define MAPI_E_BAD_CHARWIDTH ((SCODE)0x80040103) +#define MAPI_E_BAD_COLUMN ((SCODE)0x80040118) +#define MAPI_E_BAD_VALUE ((SCODE)0x80040301) +#define MAPI_E_BUSY ((SCODE)0x8004010B) +#define MAPI_E_CALL_FAILED E_FAIL +#define MAPI_E_CANCEL ((SCODE)0x80040501) +#define MAPI_E_COLLISION ((SCODE)0x80040604) +#define MAPI_E_COMPUTED ((SCODE)0x8004011A) +#define MAPI_E_CORRUPT_DATA ((SCODE)0x8004011B) +#define MAPI_E_CORRUPT_STORE ((SCODE)0x80040600) +#define MAPI_E_DECLINE_COPY ((SCODE)0x80040306) +#define MAPI_E_DISK_ERROR ((SCODE)0x80040116) +#define MAPI_E_END_OF_SESSION ((SCODE)0x80040200) +#define MAPI_E_EXTENDED_ERROR ((SCODE)0x80040119) +#define MAPI_E_FAILONEPROVIDER ((SCODE)0x8004011D) +#define MAPI_E_FOLDER_CYCLE ((SCODE)0x8004060B) +#define MAPI_E_HAS_FOLDERS ((SCODE)0x80040609) +#define MAPI_E_HAS_MESSAGES ((SCODE)0x8004060A) +#define MAPI_E_INTERFACE_NOT_SUPPORTED E_NOINTERFACE +#define MAPI_E_INVALID_ACCESS_TIME ((SCODE)0x80040123) +#define MAPI_E_INVALID_BOOKMARK ((SCODE)0x80040405) +#define MAPI_E_INVALID_ENTRYID ((SCODE)0x80040107) +#define MAPI_E_INVALID_OBJECT ((SCODE)0x80040108) +#define MAPI_E_INVALID_PARAMETER E_INVALIDARG +#define MAPI_E_INVALID_TYPE ((SCODE)0x80040302) +#define MAPI_E_INVALID_WORKSTATION_ACCOUNT ((SCODE)0x80040122) +#define MAPI_E_LOGON_FAILED ((SCODE)0x80040111) +#define MAPI_E_MISSING_REQUIRED_COLUMN ((SCODE)0x80040202) +#define MAPI_E_NETWORK_ERROR ((SCODE)0x80040115) +#define MAPI_E_NO_ACCESS E_ACCESSDENIED +#define MAPI_E_NON_STANDARD ((SCODE)0x80040606) +#define MAPI_E_NO_RECIPIENTS ((SCODE)0x80040607) +#define MAPI_E_NO_SUPPORT ((SCODE)0x80040102) +#define MAPI_E_NO_SUPPRESS ((SCODE)0x80040602) +#define MAPI_E_NOT_ENOUGH_DISK ((SCODE)0x8004010D) +#define MAPI_E_NOT_ENOUGH_MEMORY E_OUTOFMEMORY +#define MAPI_E_NOT_ENOUGH_RESOURCES ((SCODE)0x8004010E) +#define MAPI_E_NOT_FOUND ((SCODE)0x8004010F) +#define MAPI_E_NOT_INITIALIZED ((SCODE)0x80040605) +#define MAPI_E_NOT_IN_QUEUE ((SCODE)0x80040601) +#define MAPI_E_NOT_ME ((SCODE)0x80040502) +#define MAPI_E_OBJECT_CHANGED ((SCODE)0x80040109) +#define MAPI_E_OBJECT_DELETED ((SCODE)0x8004010A) +#define MAPI_E_PASSWORD_CHANGE_REQUIRED ((SCODE)0x80040120) +#define MAPI_E_PASSWORD_EXPIRED ((SCODE)0x80040121) +#define MAPI_E_SESSION_LIMIT ((SCODE)0x80040112) +#define MAPI_E_STRING_TOO_LONG ((SCODE)0x80040105) +#define MAPI_E_SUBMITTED ((SCODE)0x80040608) +#define MAPI_E_TABLE_EMPTY ((SCODE)0x80040402) +#define MAPI_E_TABLE_TOO_BIG ((SCODE)0x80040403) +#define MAPI_E_TIMEOUT ((SCODE)0x80040401) +#define MAPI_E_TOO_BIG ((SCODE)0x80040305) +#define MAPI_E_TOO_COMPLEX ((SCODE)0x80040117) +#define MAPI_E_TYPE_NO_SUPPORT ((SCODE)0x80040303) +#define MAPI_E_UNABLE_TO_ABORT ((SCODE)0x80040114) +#define MAPI_E_UNABLE_TO_COMPLETE ((SCODE)0x80040400) +#define MAPI_E_UNCONFIGURED ((SCODE)0x8004011C) +#define MAPI_E_UNEXPECTED_ID ((SCODE)0x80040307) +#define MAPI_E_UNEXPECTED_TYPE ((SCODE)0x80040304) +#define MAPI_E_UNKNOWN_CPID ((SCODE)0x8004011E) +#define MAPI_E_UNKNOWN_ENTRYID ((SCODE)0x80040201) +#define MAPI_E_UNKNOWN_FLAGS ((SCODE)0x80040106) +#define MAPI_E_UNKNOWN_LCID ((SCODE)0x8004011F) +#define MAPI_E_USER_CANCEL ((SCODE)0x80040113) +#define MAPI_E_VERSION ((SCODE)0x80040110) +#define MAPI_E_WAIT ((SCODE)0x80040500) + +/* Warnings */ +#define MAPI_W_APPROX_COUNT ((SCODE)0x00040482) +#define MAPI_W_CANCEL_MESSAGE ((SCODE)0x00040580) +#define MAPI_W_ERRORS_RETURNED ((SCODE)0x00040380) +#define MAPI_W_NO_SERVICE ((SCODE)0x00040203) +#define MAPI_W_PARTIAL_COMPLETION ((SCODE)0x00040680) +#define MAPI_W_POSITION_CHANGED ((SCODE)0x00040481) + +#endif /* MAPICODE_H */ Property changes on: trunk/reactos/w32api/include/mapicode.h ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: trunk/reactos/w32api/include/mapidefs.h --- trunk/reactos/w32api/include/mapidefs.h 2006-01-14 19:31:10 UTC (rev 20860) +++ trunk/reactos/w32api/include/mapidefs.h 2006-01-14 19:36:04 UTC (rev 20861) @@ -0,0 +1,953 @@ +/* + * Copyright (C) 1998 Justin Bradford + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef MAPIDEFS_H +#define MAPIDEFS_H + +#ifndef __WINESRC__ +# include <windows.h> +#endif + +#include <winerror.h> +#ifndef _OBJBASE_H_ +#include <objbase.h> +#endif + +/* Some types from other headers */ +#ifndef __LHANDLE +#define __LHANDLE +typedef ULONG_PTR LHANDLE, *LPLHANDLE; +#endif + +#ifndef _tagCY_DEFINED +#define _tagCY_DEFINED +typedef union tagCY +{ + struct + { +#ifdef WORDS_BIGENDIAN + LONG Hi; + ULONG Lo; +#else + ULONG Lo; + LONG Hi; +#endif + } DUMMYSTRUCTNAME; + LONGLONG int64; +} CY; +typedef CY CURRENCY; +#endif /* _tagCY_DEFINED */ + + +#ifndef _FILETIME_ +#define _FILETIME_ +typedef struct _FILETIME +{ +#ifdef WORDS_BIGENDIAN + DWORD dwHighDateTime; + DWORD dwLowDateTime; +#else + DWORD dwLowDateTime; + DWORD dwHighDateTime; +#endif +} FILETIME, *PFILETIME, *LPFILETIME; +#endif + +/* Memory allocation routines */ +typedef SCODE (WINAPI ALLOCATEBUFFER)(ULONG,LPVOID*); +typedef SCODE (WINAPI ALLOCATEMORE)(ULONG,LPVOID,LPVOID*); +typedef ULONG (WINAPI FREEBUFFER)(LPVOID); + +typedef ALLOCATEBUFFER *LPALLOCATEBUFFER; +typedef ALLOCATEMORE *LPALLOCATEMORE; +typedef FREEBUFFER *LPFREEBUFFER; + +/* MAPI exposed interfaces */ +typedef const IID *LPCIID; + +typedef struct IAddrBook IAddrBook; +typedef IAddrBook *LPADRBOOK; +typedef struct IABContainer IABContainer; +typedef IABContainer *LPABCONT; +typedef struct IAttach IAttach; +typedef IAttach *LPATTACH; +typedef struct IDistList IDistList; +typedef IDistList *LPDISTLIST; +typedef struct IMailUser IMailUser; +typedef IMailUser *LPMAILUSER; +typedef struct IMAPIAdviseSink *LPMAPIADVISESINK; +typedef struct IMAPIContainer IMAPIContainer; +typedef IMAPIContainer *LPMAPICONTAINER; +typedef struct IMAPIFolder IMAPIFolder; +typedef IMAPIFolder *LPMAPIFOLDER; +typedef struct IMAPIProgress IMAPIProgress; +typedef IMAPIProgress *LPMAPIPROGRESS; +typedef struct IMAPIStatus IMAPIStatus; +typedef IMAPIStatus *LPMAPISTATUS; +typedef struct IMessage IMessage; +typedef IMessage *LPMESSAGE; +typedef struct IMsgStore IMsgStore; +typedef IMsgStore *LPMDB; +typedef struct IProfSect IProfSect; +typedef IProfSect *LPPROFSECT; +typedef struct IProviderAdmin IProviderAdmin; +typedef IProviderAdmin *LPPROVIDERADMIN; + +#ifndef MAPI_DIM +# define MAPI_DIM 1 /* Default to one dimension for variable length arrays */ +#endif + +/* Flags for abFlags[0] */ +#define MAPI_NOTRESERVED 0x08 +#define MAPI_NOW 0x10 +#define MAPI_THISSESSION 0x20 +#define MAPI_NOTRECIP 0x40 +#define MAPI_SHORTTERM 0x80 + +/* Flags for abFlags[1] */ +#define MAPI_COMPOUND 0x80 + +typedef struct _ENTRYID +{ + BYTE abFlags[4]; + BYTE ab[MAPI_DIM]; +} ENTRYID, *LPENTRYID; + +/* MAPI GUID's */ +typedef struct _MAPIUID +{ + BYTE ab[sizeof(GUID)]; +} MAPIUID, *LPMAPIUID; + +#define IsEqualMAPIUID(pl,pr) (!memcmp((pl),(pr),sizeof(MAPIUID))) + +#define MAPI_ONE_OFF_UID { 0x81,0x2b,0x1f,0xa4,0xbe,0xa3,0x10,0x19,0x9d,0x6e, \ + 0x00,0xdd,0x01,0x0f,0x54,0x02 } +#define MAPI_ONE_OFF_UNICODE 0x8000 +#define MAPI_ONE_OFF_NO_RICH_INFO 0x0001 + +/* Object types */ +#define MAPI_STORE 1U +#define MAPI_ADDRBOOK 2U +#define MAPI_FOLDER 3U +#define MAPI_ABCONT 4U +#define MAPI_MESSAGE 5U +#define MAPI_MAILUSER 6U +#define MAPI_ATTACH 7U +#define MAPI_DISTLIST 8U +#define MAPI_PROFSECT 9U +#define MAPI_STATUS 10U +#define MAPI_SESSION 11U +#define MAPI_FORMINFO 12U + +/* Flags for various calls */ +#define MAPI_MODIFY 0x00000001U /* Object can be modified */ +#define MAPI_ACCESS_MODIFY MAPI_MODIFY /* Want write access */ +#define MAPI_ACCESS_READ 0x00000002U /* Want read access */ +#define MAPI_ACCESS_DELETE 0x00000004U /* Want delete access */ +#define MAPI_ACCESS_CREATE_HIERARCHY 0x00000008U +#define MAPI_ACCESS_CREATE_CONTENTS 0x00000010U +#define MAPI_ACCESS_CREATE_ASSOCIATED 0x00000020U +#define MAPI_UNICODE 0x80000000U /* Strings in this call are Unicode */ + +#if defined (UNICODE) || defined (__WINESRC__) +#define fMapiUnicode MAPI_UNICODE +#else +#define fMapiUnicode 0U +#endif + +/* Types of message receivers */ +#ifndef MAPI_ORIG +#define MAPI_ORIG 0 /* The original author */ +#define MAPI_TO 1 /* The primary message receiver */ +#define MAPI_CC 2 /* A carbon copy receiver */ +#define MAPI_BCC 3 /* A blind carbon copy receiver */ +#define MAPI_P1 0x10000000 /* A message resend */ +#define MAPI_SUBMITTED 0x80000000 /* This message has already been sent */ +#endif + +#ifndef cchProfileNameMax +#define cchProfileNameMax 64 /* Maximum length of a profile name */ +#define cchProfilePassMax 64 /* Maximum length of a profile password */ +#endif + +/* Properties: The are the contents of cells in MAPI tables, as well as the + * values returned when object properties are queried. + */ + +/* Property types */ +#define PT_UNSPECIFIED 0U +#define PT_NULL 1U +#define PT_I2 2U +#define PT_SHORT PT_I2 +#define PT_LONG 3U +#define PT_I4 PT_LONG +#define PT_R4 4U +#define PT_FLOAT PT_R4 +#define PT_DOUBLE 5U +#define PT_R8 PT_DOUBLE +#define PT_CURRENCY 6U +#define PT_APPTIME 7U +#define PT_ERROR 10U +#define PT_BOOLEAN 11U +#define PT_OBJECT 13U +#define PT_I8 20U +#define PT_LONGLONG PT_I8 +#define PT_STRING8 30U +#define PT_UNICODE 31U +#define PT_SYSTIME 64U +#define PT_CLSID 72U +#define PT_BINARY 258U + +#define MV_FLAG 0x1000 /* This property type is multi-valued (an array) */ +#define MV_INSTANCE 0x2000 +#define MVI_FLAG (MV_FLAG|MV_INSTANCE) +#define MVI_PROP(t) ((t)|MVI_FLAG) + +#ifndef __WINESRC__ +# ifdef UNICODE +# define PT_TSTRING PT_UNICODE +# define PT_MV_TSTRING (MV_FLAG|PT_UNICODE) +# define LPSZ lpszW +# define LPPSZ lppszW +# define MVSZ MVszW +# else +# define PT_TSTRING PT_STRING8 +# define PT_MV_TSTRING (MV_FLAG|PT_STRING8) +# define LPSZ lpszA +# define LPPSZ lppszA +# define MVSZ MVszA +# endif +#endif + +#define PROP_TYPE_MASK 0xFFFFU +#define PROP_TYPE(t) ((t) & PROP_TYPE_MASK) +#define PROP_ID(t) ((t) >> 16) +#define PROP_TAG(t,id) (((id) << 16) | t) +#define PROP_ID_NULL 0 +#define PROP_ID_INVALID 0xFFFF +#define PR_NULL PROP_TAG(PT_NULL, PROP_ID_NULL) + +#define CHANGE_PROP_TYPE(t,typ) ((0xFFFF0000 & t) | typ) + +/* Multi-valued property types */ +#define PT_MV_I2 (MV_FLAG|PT_I2) +#define PT_MV_SHORT PT_MV_I2 +#define PT_MV_LONG (MV_FLAG|PT_LONG) +#define PT_MV_I4 PT_MV_LONG +#define PT_MV_R4 (MV_FLAG|PT_R4) +#define PT_MV_FLOAT PT_MV_R4 +#define PT_MV_DOUBLE (MV_FLAG|PT_DOUBLE) +#define PT_MV_R8 PT_MV_DOUBLE +#define PT_MV_CURRENCY (MV_FLAG|PT_CURRENCY) +#define PT_MV_APPTIME (MV_FLAG|PT_APPTIME) +#define PT_MV_SYSTIME (MV_FLAG|PT_SYSTIME) +#define PT_MV_STRING8 (MV_FLAG|PT_STRING8) +#define PT_MV_BINARY (MV_FLAG|PT_BINARY) +#define PT_MV_UNICODE (MV_FLAG|PT_UNICODE) +#define PT_MV_CLSID (MV_FLAG|PT_CLSID) +#define PT_MV_I8 (MV_FLAG|PT_I8) +#define PT_MV_LONGLONG PT_MV_I8 + + +/* The property tag structure. This describes a list of columns */ +typedef struct _SPropTagArray +{ + ULONG cValues; /* Number of elements in aulPropTag */ + ULONG aulPropTag[MAPI_DIM]; /* Property tags */ +} SPropTagArray, *LPSPropTagArray; + +#define CbNewSPropTagArray(c) (offsetof(SPropTagArray,aulPropTag)+(c)*sizeof(ULONG)) +#define CbSPropTagArray(p) CbNewSPropTagArray((p)->cValues) +#define SizedSPropTagArray(n,id) \ + struct _SPropTagArray_##id { ULONG cValues; ULONG aulPropTag[n]; } id + +/* Multi-valued PT_APPTIME property value */ +typedef struct _SAppTimeArray +{ + ULONG cValues; /* Number of doubles in lpat */ + double *lpat; /* Pointer to double array of length cValues */ +} SAppTimeArray; + +/* PT_BINARY property value */ +typedef struct _SBinary +{ + ULONG cb; /* Number of bytes in lpb */ + LPBYTE lpb; /* Pointer to byte array of length cb */ +} SBinary, *LPSBinary; + +/* Multi-valued PT_BINARY property value */ +typedef struct _SBinaryArray +{ + ULONG cValues; /* Number of SBinarys in lpbin */ + SBinary *lpbin; /* Pointer to SBinary array of length cValues */ +} SBinaryArray; + +typedef SBinaryArray ENTRYLIST, *LPENTRYLIST; + +/* Multi-valued PT_CY property value */ +typedef struct _SCurrencyArray +{ + ULONG cValues; /* Number of CYs in lpcu */ + CY *lpcur; /* Pointer to CY array of length cValues */ +} SCurrencyArray; + +/* Multi-valued PT_SYSTIME property value */ +typedef struct _SDateTimeArray +{ + ULONG cValues; /* Number of FILETIMEs in lpft */ + FILETIME *lpft; /* Pointer to FILETIME array of length cValues */ +} SDateTimeArray; + +/* Multi-valued PT_DOUBLE property value */ +typedef struct _SDoubleArray +{ + ULONG cValues; /* Number of doubles in lpdbl */ + double *lpdbl; /* Pointer to double array of length cValues */ +} SDoubleArray; + +/* Multi-valued PT_CLSID property value */ +typedef struct _SGuidArray +{ + ULONG cValues; /* Number of GUIDs in lpguid */ + GUID *lpguid; /* Pointer to GUID array of length cValues */ +} SGuidArray; + +/* Multi-valued PT_LONGLONG property value */ +typedef struct _SLargeIntegerArray +{ + ULONG cValues; /* Number of long64s in lpli */ + LARGE_INTEGER *lpli; /* Pointer to long64 array of length cValues */ +} SLargeIntegerArray; + +/* Multi-valued PT_LONG property value */ +typedef struct _SLongArray +{ + ULONG cValues; /* Number of longs in lpl */ + LONG *lpl; /* Pointer to long array of length cValues */ +} SLongArray; + +/* Multi-valued PT_STRING8 property value */ +typedef struct _SLPSTRArray +{ + ULONG cValues; /* Number of Ascii strings in lppszA */ + LPSTR *lppszA; /* Pointer to Ascii string array of length cValues */ +} SLPSTRArray; + +/* Multi-valued PT_FLOAT property value */ +typedef struct _SRealArray +{ + ULONG cValues; /* Number of floats in lpflt */ + float *lpflt; /* Pointer to float array of length cValues */ +} SRealArray; + +/* Multi-valued PT_SHORT property value */ +typedef struct _SShortArray +{ + ULONG cValues; /* Number of shorts in lpb */ + short int *lpi; /* Pointer to short array of length cValues */ +} SShortArray; + +/* Multi-valued PT_UNICODE property value */ +typedef struct _SWStringArray +{ + ULONG cValues; /* Number of Unicode strings in lppszW */ + LPWSTR *lppszW; /* Pointer to Unicode string array of length cValues */ +} SWStringArray; + +/* A property value */ +typedef union _PV +{ + short int i; + LONG l; + ULONG ul; + float flt; + double dbl; + unsigned short b; + CY cur; + double at; + FILETIME ft; + LPSTR lpszA; + SBinary bin; + LPWSTR lpszW; + LPGUID lpguid; + LARGE_INTEGER li; + SShortArray MVi; + SLongArray MVl; + SRealArray MVflt; + SDoubleArray MVdbl; + SCurrencyArray MVcur; + SAppTimeArray MVat; + SDateTimeArray MVft; + SBinaryArray MVbin; + SLPSTRArray MVszA; + SWStringArray MVszW; + SGuidArray MVguid; + SLargeIntegerArray MVli; + SCODE err; + LONG x; +} __UPV; + +/* Property value structure. This is essentially a mini-Variant */ +typedef struct _SPropValue +{ + ULONG ulPropTag; /* The property type */ + ULONG dwAlignPad; /* Alignment, treat as reserved */ + union _PV Value; /* The property value */ +} SPropValue, *LPSPropValue; + +/* Structure describing a table row (a collection of property values) */ +typedef struct _SRow +{ + ULONG ulAdrEntryPad; /* Padding, treat as reserved */ + ULONG cValues; /* Count of property values in lpProbs */ + LPSPropValue lpProps; /* Pointer to an array of property values of length cValues */ +} SRow, *LPSRow; + +/* Structure describing a set of table rows */ +typedef struct _SRowSet +{ + ULONG cRows; /* Count of rows in aRow */ + SRow aRow[MAPI_DIM]; /* Array of rows of length cRows */ +} SRowSet, *LPSRowSet; + +#define CbNewSRowSet(c) (offsetof(SRowSet,aRow)+(c)*sizeof(SRow)) +#define CbSRowSet(p) CbNewSRowSet((p)->cRows) +#define SizedSRowSet(n,id) \ + struct _SRowSet_##id { ULONG cRows; SRow aRow[n]; } id + +/* Structure describing a problem with a property */ +typedef struct _SPropProblem +{ + ULONG ulIndex; /* Index of the property */ + ULONG ulPropTag; /* Proprty tag of the property */ + SCODE scode; /* Error code of the problem */ +} SPropProblem, *LPSPropProblem; + +/* A collection of property problems */ +typedef struct _SPropProblemArray +{ + ULONG cProblem; /* Number of problems in aProblem */ + SPropProblem aProblem[MAPI_DIM]; /* Array of problems of length cProblem */ +} SPropProblemArray, *LPSPropProblemArray; + +/* FPropContainsProp flags */ +#define FL_FULLSTRING 0x00000ul /* Exact string match */ +#define FL_SUBSTRING 0x00001ul /* Substring match */ +#define FL_PREFIX 0x00002ul /* Prefix match */ +#define FL_IGNORECASE 0x10000ul /* Case insensitive */ +#define FL_IGNORENONSPACE 0x20000ul /* Ignore non spacing characters */ +#define FL_LOOSE 0x40000ul /* Try very hard to match */ + + +/* Table types returned by IMAPITable_GetStatus() */ +#define TBLTYPE_SNAPSHOT 0U /* Table is fixed at creation time and contents do not change */ +#define TBLTYPE_KEYSET 1U /* Table has a fixed number of rows, but row values may change */ +#define TBLTYPE_DYNAMIC 2U /* Table values and the number of rows may change */ + +/* Table status returned by IMAPITable_GetStatus() */ +#define TBLSTAT_COMPLETE 0U /* All operations have completed (normal status) */ +#define TBLSTAT_QCHANGED 7U /* Table data has changed as expected */ +#define TBLSTAT_SORTING 9U /* Table is being asynchronously sorted */ +#define TBLSTAT_SORT_ERROR 10U /* An error occurred while sorting the table */ +#define TBLSTAT_SETTING_COLS 11U /* Table columns are being asynchronously changed */ +#define TBLSTAT_SETCOL_ERROR 13U /* An error occurred during column changing */ +#define TBLSTAT_RESTRICTING 14U /* Table rows are being asynchronously restricted */ +#define TBLSTAT_RESTRICT_ERROR 15U /* An error occurred during row restriction */ + +/* Flags for IMAPITable operations that can be asynchronous */ +#define TBL_NOWAIT 1U /* Perform the operation asynchronously */ +#define TBL_BATCH 2U /* Perform the operation when the results are needed */ +#define TBL_ASYNC TBL_NOWAIT /* Synonym for TBL_NOWAIT */ + +/* Flags for IMAPITable_FindRow() */ +#define DIR_BACKWARD 1U /* Read rows backwards from the start bookmark */ + +/* Table bookmarks */ +typedef ULONG BOOKMARK; + +#define BOOKMARK_BEGINNING ((BOOKMARK)0) /* The first row */ +#define BOOKMARK_CURRENT ((BOOKMARK)1) /* The curent table row */ +#define BOOKMARK_END ((BOOKMARK)2) /* The last row */ + +/* Row restrictions */ +typedef struct _SRestriction* LPSRestriction; + +typedef struct _SAndRestriction +{ + ULONG cRes; + LPSRestriction lpRes; +} SAndRestriction; + +typedef struct _SBitMaskRestriction +{ + ULONG relBMR; + ULONG ulPropTag; + ULONG ulMask; +} SBitMaskRestriction; + +typedef struct _SCommentRestriction +{ + ULONG cValues; + LPSRestriction lpRes; + LPSPropValue lpProp; +} SCommentRestriction; + +#define RELOP_LT 0U +#define RELOP_LE 1U +#define RELOP_GT 2U +#define RELOP_GE 3U +#define RELOP_EQ 4U +#define RELOP_NE 5U +#define RELOP_RE 6U + +typedef struct _SComparePropsRestriction +{ + ULONG relop; + ULONG ulPropTag1; + ULONG ulPropTag2; +} SComparePropsRestriction; + +typedef struct _SContentRestriction +{ + ULONG ulFuzzyLevel; + ULONG ulPropTag; + LPSPropValue lpProp; +} SContentRestriction; + +typedef struct _SExistRestriction +{ + ULONG ulReserved1; + ULONG ulPropTag; + ULONG ulReserved2; +} SExistRestriction; + +typedef struct _SNotRestriction +{ + ULONG ulReserved; + LPSRestriction lpRes; +} SNotRestriction; + +typedef struct _SOrRestriction +{ + ULONG cRes; + LPSRestriction lpRes; +} SOrRestriction; + +typedef struct _SPropertyRestriction +{ + ULONG relop; + ULONG ulPropTag; + LPSPropValue lpProp; +} SPropertyRestriction; + +typedef struct _SSizeRestriction +{ + ULONG relop; + ULONG ulPropTag; + ULONG cb; +} SSizeRestriction; + +typedef struct _SSubRestriction +{ + ULONG ulSubObject; + LPSRestriction lpRes; +} SSubRestriction; + +/* Restriction types */ +#define RES_AND 0U +#define RES_OR 1U +#define RES_NOT 2U +#define RES_CONTENT 3U +#define RES_PROPERTY 4U +#define RES_COMPAREPROPS 5U +#define RES_BITMASK 6U +#define RES_SIZE 7U +#define RES_EXIST 8U +#define RES_SUBRESTRICTION 9U +#define RES_COMMENT 10U + +typedef struct _SRestriction +{ + ULONG rt; + union + { + SAndRestriction resAnd; + SBitMaskRestriction resBitMask; + SCommentRestriction resComment; + SComparePropsRestriction resCompareProps; + SContentRestriction resContent; + SExistRestriction resExist; + SNotRestriction resNot; + SOrRestriction resOr; + SPropertyRestriction resProperty; + SSizeRestriction resSize; + SSubRestriction resSub; + } res; +} SRestriction; + +/* Errors */ +typedef struct _MAPIERROR +{ + ULONG ulVersion; /* Mapi version */ +#if defined (UNICODE) || defined (__WINESRC__) + LPWSTR lpszError; /* Error and component strings. These are Ascii */ + LPWSTR lpszComponent; /* unless the MAPI_UNICODE flag is passed in */ +#else + LPSTR lpszError; + LPSTR lpszComponent; +#endif + ULONG ulLowLevelError; + ULONG ulContext; +} MAPIERROR, *LPMAPIERROR; + +/* Sorting */ +#define TABLE_SORT_ASCEND 0U +#define TABLE_SORT_DESCEND 1U +#define TABLE_SORT_COMBINE 2U + +typedef struct _SSortOrder +{ + ULONG ulPropTag; + ULONG ulOrder; +} SSortOrder, *LPSSortOrder; + +typedef struct _SSortOrderSet +{ + ULONG cSorts; + ULONG cCategories; + ULONG cExpanded; + SSortOrder aSort[MAPI_DIM]; +} SSortOrderSet, * LPSSortOrderSet; + +#define MNID_ID 0 +#define MNID_STRING 1 + +typedef struct _MAPINAMEID +{ + LPGUID lpguid; + ULONG ulKind; + union + { + LONG lID; + LPWSTR lpwstrName; + } Kind; +} MAPINAMEID, *LPMAPINAMEID; + +/* Desired notification types (bitflags) */ +#define fnevCriticalError 0x00000001UL +#define fnevNewMail 0x00000002UL +#define fnevObjectCreated 0x00000004UL +#define fnevObjectDeleted 0x00000008UL +#define fnevObjectModified 0x00000010UL +#define fnevObjectMoved 0x00000020UL +#define fnevObjectCopied 0x00000040UL +#define fnevSearchComplete 0x00000080UL +#define fnevTableModified 0x00000100UL +#define fnevStatusObjectModified 0x00000200UL +#define fnevReservedForMapi 0x40000000UL +#define fnevExtended 0x80000000UL + +/* Type of notification event */ +#define TABLE_CHANGED 1U +#define TABLE_ERROR 2U +#define TABLE_ROW_ADDED 3U +#define TABLE_ROW_DELETED 4U +#define TABLE_ROW_MODIFIED 5U +#define TABLE_SORT_DONE 6U +#define TABLE_RESTRICT_DONE 7U +#define TABLE_SETCOL_DONE 8U +#define TABLE_RELOAD 9U + +/* fnevCriticalError notification */ +typedef struct _ERROR_NOTIFICATION +{ + ULONG cbEntryID; + LPENTRYID lpEntryID; + SCODE scode; + ULONG ulFlags; + LPMAPIERROR lpMAPIError; +} ERROR_NOTIFICATION; + +/* fnevNewMail notification */ +typedef struct _NEWMAIL_NOTIFICATION +{ + ULONG cbEntryID; + LPENTRYID lpEntryID; + ULONG cbParentID; + LPENTRYID lpParentID; + ULONG ulFlags; +#if defined (UNICODE) || defined (__WINESRC__) + LPWSTR lpszMessageClass; +#else + LPSTR lpszMessageClass; +#endif + ULONG ulMessageFlags; +} NEWMAIL_NOTIFICATION; + +/* fnevObjectCreated/Deleted/Modified/Moved/Copied notification */ +typedef struct _OBJECT_NOTIFICATION +{ + ULONG cbEntryID; + LPENTRYID lpEntryID; + ULONG ulObjType; + ULONG cbParentID; + LPENTRYID lpParentID; + ULONG cbOldID; + LPENTRYID lpOldID; + ULONG cbOldParentID; + LPENTRYID lpOldParentID; + LPSPropTagArray lpPropTagArray; +} OBJECT_NOTIFICATION; + +/* fnevTableModified notification */ +typedef struct _TABLE_NOTIFICATION +{ + ULONG ulTableEvent; + HRESULT hResult; + SPropValue propIndex; + SPropValue propPrior; + SRow row; + ULONG ulPad; +} TABLE_NOTIFICATION; + [truncated at 1000 lines; 2133 more skipped]

1 0

[gvg] 20860: Set eol-style
by gvg＠svn.reactos.org 14 Jan '06

14 Jan '06

Set eol-style Property changes on: vendor/wine/dlls/mapi32/current/mapi32.spec ___________________________________________________________________ Name: svn:eol-style + native

1 0

[gvg] 20859: mapi32 vendor drop
by gvg＠svn.reactos.org 14 Jan '06

14 Jan '06

mapi32 vendor drop Added: vendor/wine/dlls/mapi32/ Added: vendor/wine/dlls/mapi32/current/ Added: vendor/wine/dlls/mapi32/current/Makefile.in Added: vendor/wine/dlls/mapi32/current/imalloc.c Added: vendor/wine/dlls/mapi32/current/mapi32.spec Added: vendor/wine/dlls/mapi32/current/mapi32_main.c Added: vendor/wine/dlls/mapi32/current/prop.c Added: vendor/wine/dlls/mapi32/current/util.c _____ Added: vendor/wine/dlls/mapi32/current/Makefile.in --- vendor/wine/dlls/mapi32/current/Makefile.in 2006-01-14 18:51:22 UTC (rev 20858) +++ vendor/wine/dlls/mapi32/current/Makefile.in 2006-01-14 19:29:26 UTC (rev 20859) @@ -0,0 +1,20 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = mapi32.dll +IMPORTLIB = libmapi32.$(IMPLIBEXT) +IMPORTS = shlwapi ole32 user32 kernel32 ntdll +EXTRALIBS = -luuid $(LIBUNICODE) + +C_SRCS = \ + imalloc.c \ + mapi32_main.c \ + prop.c \ + util.c + +SUBDIRS = tests + +@MAKE_DLL_RULES@ + +### Dependencies: Property changes on: vendor/wine/dlls/mapi32/current/Makefile.in ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: vendor/wine/dlls/mapi32/current/imalloc.c --- vendor/wine/dlls/mapi32/current/imalloc.c 2006-01-14 18:51:22 UTC (rev 20858) +++ vendor/wine/dlls/mapi32/current/imalloc.c 2006-01-14 19:29:26 UTC (rev 20859) @@ -0,0 +1,182 @@ +/* + * MAPI Default IMalloc implementation + * + * Copyright 2004 Jon Griffiths + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdarg.h> + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winuser.h" +#include "winerror.h" +#include "winternl.h" +#include "objbase.h" +#include "shlwapi.h" +#include "mapiutil.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mapi); + +static const IMallocVtbl MAPI_IMalloc_vt; + +typedef struct +{ + const IMallocVtbl *lpVtbl; + LONG lRef; +} MAPI_IMALLOC; + +static MAPI_IMALLOC MAPI_IMalloc = { &MAPI_IMalloc_vt, 0u }; + +extern LONG MAPI_ObjectCount; /* In mapi32_main.c */ + +/********************************************************************** *** + * MAPIGetDefaultMalloc@0 (MAPI32.59) + * + * Get the default MAPI IMalloc interface. + * + * PARAMS + * None. + * + * RETURNS + * A pointer to the MAPI default allocator. + */ +LPMALLOC WINAPI MAPIGetDefaultMalloc(void) +{ + TRACE("()\n"); + + IMalloc_AddRef((LPMALLOC)&MAPI_IMalloc); + return (LPMALLOC)&MAPI_IMalloc; +} + +/********************************************************************** **** + * IMAPIMalloc_QueryInterface + */ +static HRESULT WINAPI IMAPIMalloc_fnQueryInterface(LPMALLOC iface, REFIID refiid, + LPVOID *ppvObj) +{ + TRACE("(%s,%p)\n", debugstr_guid(refiid), ppvObj); + + if (IsEqualIID(refiid, &IID_IUnknown) || + IsEqualIID(refiid, &IID_IMalloc)) + { + *ppvObj = (LPMALLOC) &MAPI_IMalloc; + TRACE("Returning IMalloc (%p)\n", *ppvObj); + return S_OK; + } + TRACE("Returning E_NOINTERFACE\n"); + return E_NOINTERFACE; +} + +/********************************************************************** **** + * IMAPIMalloc_AddRef + */ +static ULONG WINAPI IMAPIMalloc_fnAddRef(LPMALLOC iface) +{ + TRACE("(%p)\n", iface); + InterlockedIncrement(&MAPI_ObjectCount); + return 1u; +} + +/********************************************************************** **** + * IMAPIMalloc_Release + */ +static ULONG WINAPI IMAPIMalloc_fnRelease(LPMALLOC iface) +{ + TRACE("(%p)\n", iface); + InterlockedDecrement(&MAPI_ObjectCount); + return 1u; +} + +/********************************************************************** **** + * IMAPIMalloc_Alloc + */ +static LPVOID WINAPI IMAPIMalloc_fnAlloc(LPMALLOC iface, DWORD cb) +{ + TRACE("(%p)->(%ld)\n", iface, cb); + + return LocalAlloc(LMEM_FIXED, cb); +} + +/********************************************************************** **** + * IMAPIMalloc_Realloc + */ +static LPVOID WINAPI IMAPIMalloc_fnRealloc(LPMALLOC iface, LPVOID pv, DWORD cb) +{ + TRACE("(%p)->(%p, %ld)\n", iface, pv, cb); + + if (!pv) + return LocalAlloc(LMEM_FIXED, cb); + + if (cb) + return LocalReAlloc((HANDLE) pv, cb, LMEM_MOVEABLE); + + LocalFree((HANDLE) pv); + return NULL; +} + +/********************************************************************** **** + * IMAPIMalloc_Free + */ +static void WINAPI IMAPIMalloc_fnFree(LPMALLOC iface, LPVOID pv) +{ + TRACE("(%p)->(%p)\n", iface, pv); + LocalFree((HANDLE) pv); +} + +/********************************************************************** **** + * IMAPIMalloc_GetSize + */ +static DWORD WINAPI IMAPIMalloc_fnGetSize(LPMALLOC iface, LPVOID pv) +{ + TRACE("(%p)->(%p)\n", iface, pv); + return LocalSize((HANDLE) pv); +} + +/********************************************************************** **** + * IMAPIMalloc_DidAlloc + */ +static INT WINAPI IMAPIMalloc_fnDidAlloc(LPMALLOC iface, LPVOID pv) +{ + TRACE("(%p)->(%p)\n", iface, pv); + return -1; +} + +/********************************************************************** **** + * IMAPIMalloc_HeapMinimize + */ +static void WINAPI IMAPIMalloc_fnHeapMinimize(LPMALLOC iface) +{ + TRACE("(%p)\n", iface); +} + +static const IMallocVtbl MAPI_IMalloc_vt = +{ + IMAPIMalloc_fnQueryInterface, + IMAPIMalloc_fnAddRef, + IMAPIMalloc_fnRelease, + IMAPIMalloc_fnAlloc, + IMAPIMalloc_fnRealloc, + IMAPIMalloc_fnFree, + IMAPIMalloc_fnGetSize, + IMAPIMalloc_fnDidAlloc, + IMAPIMalloc_fnHeapMinimize +}; Property changes on: vendor/wine/dlls/mapi32/current/imalloc.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: vendor/wine/dlls/mapi32/current/mapi32.spec --- vendor/wine/dlls/mapi32/current/mapi32.spec 2006-01-14 18:51:22 UTC (rev 20858) +++ vendor/wine/dlls/mapi32/current/mapi32.spec 2006-01-14 19:29:26 UTC (rev 20859) @@ -0,0 +1,191 @@ + 8 stub @ + 10 stdcall MAPILogonEx(long ptr ptr long ptr) + 11 stdcall MAPILogonEx@20(long ptr ptr long ptr) MAPILogonEx + 12 stdcall MAPIAllocateBuffer(long ptr) + 13 stdcall MAPIAllocateBuffer@8(long ptr) MAPIAllocateBuffer + 14 stdcall MAPIAllocateMore(long ptr ptr) + 15 stdcall MAPIAllocateMore@12(long ptr ptr) MAPIAllocateMore + 16 stdcall MAPIFreeBuffer(ptr) + 17 stdcall MAPIFreeBuffer@4(ptr) MAPIFreeBuffer + 18 stub MAPIAdminProfiles + 19 stub MAPIAdminProfiles@8 + 20 stdcall MAPIInitialize(ptr) + 21 stdcall MAPIInitialize@4(ptr) MAPIInitialize + 22 stdcall MAPIUninitialize() + 23 stdcall MAPIUninitialize@0() MAPIUninitialize + 24 stub PRProviderInit + 25 stub LAUNCHWIZARD + 26 stub LaunchWizard@20 + 27 stub DllGetClassObject + 28 stdcall -private DllCanUnloadNow() + 29 stub MAPIOpenFormMgr + 30 stub MAPIOpenFormMgr@8 + 31 stub MAPIOpenLocalFormContainer + 32 stub MAPIOpenLocalFormContainer@4 + 33 stdcall ScInitMapiUtil@4(long) ScInitMapiUtil + 34 stdcall DeinitMapiUtil@0() DeinitMapiUtil + 35 stub ScGenerateMuid@4 + 36 stub HrAllocAdviseSink@12 + 41 stdcall WrapProgress@20(ptr ptr ptr ptr ptr) WrapProgress + 42 stdcall HrThisThreadAdviseSink@8(ptr ptr) HrThisThreadAdviseSink + 43 stub ScBinFromHexBounded@12 + 44 stdcall FBinFromHex@8(ptr ptr) FBinFromHex + 45 stdcall HexFromBin@12(ptr long ptr) HexFromBin + 46 stub BuildDisplayTable@40 + 47 stdcall SwapPlong@8(ptr long) SwapPlong + 48 stdcall SwapPword@8(ptr long) SwapPword + 49 stub MAPIInitIdle@4 + 50 stub MAPIDeinitIdle@0 + 51 stub InstallFilterHook@4 + 52 stub FtgRegisterIdleRoutine@20 + 53 stub EnableIdleRoutine@8 + 54 stub DeregisterIdleRoutine@4 + 55 stub ChangeIdleRoutine@28 + 59 stdcall MAPIGetDefaultMalloc@0() MAPIGetDefaultMalloc + 60 stdcall CreateIProp@24(ptr ptr ptr ptr ptr ptr) CreateIProp + 61 stub CreateTable@36 + 62 stdcall MNLS_lstrlenW@4(wstr) MNLS_lstrlenW + 63 stdcall MNLS_lstrcmpW@8(wstr wstr) MNLS_lstrcmpW + 64 stdcall MNLS_lstrcpyW@8(ptr wstr) MNLS_lstrcpyW + 65 stdcall MNLS_CompareStringW@24(long wstr wstr) MNLS_CompareStringW + 66 stdcall MNLS_MultiByteToWideChar@24(long long str long ptr long) kernel32.MultiByteToWideChar + 67 stdcall MNLS_WideCharToMultiByte@32(long long wstr long ptr long ptr ptr) kernel32.WideCharToMultiByte + 68 stdcall MNLS_IsBadStringPtrW@8(ptr long) kernel32.IsBadStringPtrW + 72 stdcall FEqualNames@8(ptr ptr) FEqualNames + 73 stub WrapStoreEntryID@24 + 74 stdcall IsBadBoundedStringPtr@8(ptr long) IsBadBoundedStringPtr + 75 stub HrQueryAllRows@24 + 76 stdcall PropCopyMore@16(ptr ptr ptr ptr) PropCopyMore + 77 stdcall UlPropSize@4(ptr) UlPropSize + 78 stdcall FPropContainsProp@12(ptr ptr long) FPropContainsProp + 79 stdcall FPropCompareProp@12(ptr long ptr) FPropCompareProp + 80 stdcall LPropCompareProp@8(ptr ptr) LPropCompareProp + 81 stub HrAddColumns@16 + 82 stub HrAddColumnsEx@20 +121 stdcall -ret64 FtAddFt@16(double double) MAPI32_FtAddFt +122 stub FtAdcFt@20 +123 stdcall -ret64 FtSubFt@16(double double) MAPI32_FtSubFt +124 stdcall -ret64 FtMulDw@12(long double) MAPI32_FtMulDw +125 stdcall -ret64 FtMulDwDw@8(long long) MAPI32_FtMulDwDw +126 stdcall -ret64 FtNegFt@8(double) MAPI32_FtNegFt +127 stub FtDivFtBogus@20 +128 stdcall UlAddRef@4(ptr) UlAddRef +129 stdcall UlRelease@4(ptr) UlRelease +130 stdcall SzFindCh@8(str long) shlwapi.StrChrA +131 stdcall SzFindLastCh@8(str str long) shlwapi.StrRChrA +132 stdcall SzFindSz@8(str str) shlwapi.StrStrA +133 stdcall UFromSz@4(str) UFromSz +135 stdcall HrGetOneProp@12(ptr long ptr) HrGetOneProp +136 stdcall HrSetOneProp@8(ptr ptr) HrSetOneProp +137 stdcall FPropExists@8(ptr long) FPropExists +138 stdcall PpropFindProp@12(ptr long long) PpropFindProp +139 stdcall FreePadrlist@4(ptr) FreePadrlist +140 stdcall FreeProws@4(ptr) FreeProws +141 stub HrSzFromEntryID@12 +142 stub HrEntryIDFromSz@12 +143 stub HrComposeEID@28 +144 stub HrDecomposeEID@28 +145 stub HrComposeMsgID@24 +146 stub HrDecomposeMsgID@24 +147 stdcall OpenStreamOnFile@24(ptr ptr ptr ptr ptr ptr) OpenStreamOnFile +148 stdcall OpenStreamOnFile(ptr ptr ptr ptr ptr ptr) +149 stub OpenTnefStream@28 +150 stub OpenTnefStream +151 stub OpenTnefStreamEx@32 +152 stub OpenTnefStreamEx +153 stub GetTnefStreamCodepage@12 +154 stub GetTnefStreamCodepage +155 stdcall UlFromSzHex@4(ptr) UlFromSzHex +156 stub UNKOBJ_ScAllocate@12 +157 stub UNKOBJ_ScAllocateMore@16 +158 stub UNKOBJ_Free@8 +159 stub UNKOBJ_FreeRows@8 +160 stub UNKOBJ_ScCOAllocate@12 +161 stub UNKOBJ_ScCOReallocate@12 +162 stub UNKOBJ_COFree@8 +163 stub UNKOBJ_ScSzFromIdsAlloc@20 +164 stub ScCountNotifications@12 +165 stub ScCopyNotifications@16 +166 stub ScRelocNotifications@20 +170 stdcall ScCountProps@12(long ptr ptr) ScCountProps +171 stdcall ScCopyProps@16(long ptr ptr ptr) ScCopyProps +172 stdcall ScRelocProps@20(long ptr ptr ptr ptr) ScRelocProps +173 stdcall LpValFindProp@12(long long ptr) LpValFindProp +174 stdcall ScDupPropset@16(long ptr ptr ptr) ScDupPropset +175 stdcall FBadRglpszA@8(ptr long) FBadRglpszA +176 stdcall FBadRglpszW@8(ptr long) FBadRglpszW +177 stdcall FBadRowSet@4(ptr) FBadRowSet +178 stub FBadRglpNameID@8 +179 stdcall FBadPropTag@4(long) FBadPropTag +180 stdcall FBadRow@4(ptr) FBadRow +181 stdcall FBadProp@4(ptr) FBadProp +182 stdcall FBadColumnSet@4(ptr) FBadColumnSet +183 stub RTFSync@12 +184 stub RTFSync +185 stub WrapCompressedRTFStream@12 +186 stub WrapCompressedRTFStream +187 stub __ValidateParameters@8 +188 stub __CPPValidateParameters@8 +189 stub FBadSortOrderSet@4 +190 stdcall FBadEntryList@4(ptr) FBadEntryList +191 stub FBadRestriction@4 +192 stub ScUNCFromLocalPath@12 +193 stub ScLocalPathFromUNC@12 +194 stub HrIStorageFromStream@16 +195 stub HrValidateIPMSubtree@20 +196 stub OpenIMsgSession@12 +197 stub CloseIMsgSession@4 +198 stub OpenIMsgOnIStg@44 +199 stub SetAttribIMsgOnIStg@16 +200 stub GetAttribIMsgOnIStg@12 +201 stub MapStorageSCode@4 +202 stub ScMAPIXFromCMC +203 stub ScMAPIXFromSMAPI +204 stub EncodeID@12 +205 stub FDecodeID@12 +206 stub CchOfEncoding@4 +207 stdcall CbOfEncoded@4(ptr) CbOfEncoded +208 stub MAPISendDocuments +209 stdcall MAPILogon(long ptr ptr long long ptr) +210 stub MAPILogoff +211 stub MAPISendMail +212 stub MAPISaveMail +213 stub MAPIReadMail +214 stub MAPIFindNext +215 stub MAPIDeleteMail +217 stub MAPIAddress +218 stub MAPIDetails +219 stub MAPIResolveName +220 stub BMAPISendMail +221 stub BMAPISaveMail +222 stub BMAPIReadMail +223 stub BMAPIGetReadMail +224 stub BMAPIFindNext +225 stub BMAPIAddress +226 stub BMAPIGetAddress +227 stub BMAPIDetails +228 stub BMAPIResolveName +229 stub cmc_act_on +230 stub cmc_free +231 stub cmc_list +232 stub cmc_logoff +233 stub cmc_logon +234 stub cmc_look_up +235 stdcall cmc_query_configuration( long long ptr ptr ) +236 stub cmc_read +237 stub cmc_send +238 stub cmc_send_documents +239 stub HrDispatchNotifications@4 +241 stub HrValidateParameters@8 +244 stub ScCreateConversationIndex@16 +246 stub HrGetOmiProvidersFlags +247 stub HrGetOmiProvidersFlags@8 +248 stub HrSetOmiProvidersFlagsInvalid +249 stub HrSetOmiProvidersFlagsInvalid@4 +250 stub GetOutlookVersion +251 stub GetOutlookVersion@0 +252 stub FixMAPI +253 stub FixMAPI@0 +# This entry point is sometimes used to detect if the mapi dll came from Outlook +#254 stub FGetComponentPath +#255 stub FGetComponentPath@20 _____ Added: vendor/wine/dlls/mapi32/current/mapi32_main.c --- vendor/wine/dlls/mapi32/current/mapi32_main.c 2006-01-14 18:51:22 UTC (rev 20858) +++ vendor/wine/dlls/mapi32/current/mapi32_main.c 2006-01-14 19:29:26 UTC (rev 20859) @@ -0,0 +1,94 @@ +/* + * MAPI basics + * + * Copyright 2001 CodeWeavers Inc. + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "objbase.h" +#include "mapix.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mapi); + +LONG MAPI_ObjectCount = 0; + +/********************************************************************** * + * DllMain (MAPI32.init) + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) +{ + TRACE("(%p,%ld,%p)\n", hinstDLL, fdwReason, fImpLoad); + + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + TRACE("DLL_PROCESS_DETACH: %ld objects remaining\n", MAPI_ObjectCount); + break; + } + return TRUE; +} + +/********************************************************************** * + * DllCanUnloadNow (MAPI32.28) + * + * Determine if this dll can be unloaded from the callers address space. + * + * PARAMS + * None. + * + * RETURNS + * S_OK, if the dll can be unloaded, + * S_FALSE, otherwise. + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return MAPI_ObjectCount == 0 ? S_OK : S_FALSE; +} + +HRESULT WINAPI MAPIInitialize ( LPVOID lpMapiInit ) +{ + ERR("Stub\n"); + return MAPI_E_NOT_INITIALIZED; +} + +ULONG WINAPI MAPILogon(ULONG ulUIParam, LPSTR lpszProfileName, LPSTR +lpszPassword, FLAGS flFlags, ULONG ulReserver, LPLHANDLE lplhSession) +{ + ERR("Stub\n"); + return MAPI_E_LOGON_FAILED; +} + +HRESULT WINAPI MAPILogonEx(ULONG_PTR ulUIParam, LPWSTR lpszProfileName, + LPWSTR lpszPassword, ULONG flFlags, + LPMAPISESSION *lppSession) +{ + ERR("Stub\n"); + return MAPI_E_LOGON_FAILED; +} + +VOID WINAPI MAPIUninitialize(void) +{ + ERR("Stub\n"); +} Property changes on: vendor/wine/dlls/mapi32/current/mapi32_main.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: vendor/wine/dlls/mapi32/current/prop.c --- vendor/wine/dlls/mapi32/current/prop.c 2006-01-14 18:51:22 UTC (rev 20858) +++ vendor/wine/dlls/mapi32/current/prop.c 2006-01-14 19:29:26 UTC (rev 20859) @@ -0,0 +1,2549 @@ +/* + * Property functions + * + * Copyright 2004 Jon Griffiths + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdarg.h> +#define NONAMELESSUNION +#define NONAMELESSSTRUCT +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winerror.h" +#include "winternl.h" +#include "objbase.h" +#include "shlwapi.h" +#include "wine/list.h" +#include "wine/debug.h" +#include "wine/unicode.h" +#include "mapival.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mapi); + +BOOL WINAPI FBadRglpszA(LPSTR*,ULONG); + +/* Internal: Check if a property value array is invalid */ +static inline ULONG PROP_BadArray(LPSPropValue lpProp, size_t elemSize) +{ + return IsBadReadPtr(lpProp->Value.MVi.lpi, lpProp->Value.MVi.cValues * elemSize); +} + +/********************************************************************** *** + * PropCopyMore@16 (MAPI32.76) + * + * Copy a property value. + * + * PARAMS + * lpDest [O] Destination for the copied value + * lpSrc [I] Property value to copy to lpDest + * lpMore [I] Linked memory allocation function (pass MAPIAllocateMore()) + * lpOrig [I] Original allocation to which memory will be linked + * + * RETURNS + * Success: S_OK. lpDest contains a deep copy of lpSrc. + * Failure: MAPI_E_INVALID_PARAMETER, if any parameter is invalid, + * MAPI_E_NOT_ENOUGH_MEMORY, if memory allocation fails. + * + * NOTES + * Any elements within the property returned should not be individually + * freed, as they will be freed when lpOrig is. + */ +SCODE WINAPI PropCopyMore(LPSPropValue lpDest, LPSPropValue lpSrc, + ALLOCATEMORE *lpMore, LPVOID lpOrig) +{ + ULONG ulLen, i; + SCODE scode = S_OK; + + TRACE("(%p,%p,%p,%p)\n", lpDest, lpSrc, lpMore, lpOrig); + + if (!lpDest || IsBadWritePtr(lpDest, sizeof(SPropValue)) || + FBadProp(lpSrc) || !lpMore) + return MAPI_E_INVALID_PARAMETER; + + /* Shallow copy first, this is sufficient for properties without pointers */ + *lpDest = *lpSrc; + + switch (PROP_TYPE(lpSrc->ulPropTag)) + { + case PT_CLSID: + scode = lpMore(sizeof(GUID), lpOrig, (LPVOID*)&lpDest->Value.lpguid); + if (SUCCEEDED(scode)) + memcpy(lpDest->Value.lpguid, lpSrc->Value.lpguid, sizeof(GUID)); + break; + case PT_STRING8: + ulLen = lstrlenA(lpSrc->Value.lpszA) + 1u; + scode = lpMore(ulLen, lpOrig, (LPVOID*)&lpDest->Value.lpszA); + if (SUCCEEDED(scode)) + memcpy(lpDest->Value.lpszA, lpSrc->Value.lpszA, ulLen); + break; + case PT_UNICODE: + ulLen = (strlenW(lpSrc->Value.lpszW) + 1u) * sizeof(WCHAR); + scode = lpMore(ulLen, lpOrig, (LPVOID*)&lpDest->Value.lpszW); + if (SUCCEEDED(scode)) + memcpy(lpDest->Value.lpszW, lpSrc->Value.lpszW, ulLen); + break; + case PT_BINARY: + scode = lpMore(lpSrc->Value.bin.cb, lpOrig, (LPVOID*)&lpDest->Value.bin.lpb); + if (SUCCEEDED(scode)) + memcpy(lpDest->Value.bin.lpb, lpSrc->Value.bin.lpb, lpSrc->Value.bin.cb); + break; + default: + if (lpSrc->ulPropTag & MV_FLAG) + { + ulLen = UlPropSize(lpSrc); + + if (PROP_TYPE(lpSrc->ulPropTag) == PT_MV_STRING8 || + PROP_TYPE(lpSrc->ulPropTag) == PT_MV_UNICODE) + { + /* UlPropSize doesn't account for the string pointers */ + ulLen += lpSrc->Value.MVszA.cValues * sizeof(char*); + } + else if (PROP_TYPE(lpSrc->ulPropTag) == PT_MV_BINARY) + { + /* UlPropSize doesn't account for the SBinary structs */ + ulLen += lpSrc->Value.MVbin.cValues * sizeof(SBinary); + } + + lpDest->Value.MVi.cValues = lpSrc->Value.MVi.cValues; + scode = lpMore(ulLen, lpOrig, (LPVOID*)&lpDest->Value.MVi.lpi); + if (FAILED(scode)) + break; + + /* Note that we could allocate the memory for each value in a + * multi-value property seperately, however if an allocation failed + * we would be left with a bunch of allocated memory, which (while + * not really leaked) is unusable until lpOrig is freed. So for + * strings and binary arrays we make a single allocation for all + * of the data. This is consistent since individual elements can't + * be freed anyway. + */ + + switch (PROP_TYPE(lpSrc->ulPropTag)) + { + case PT_MV_STRING8: + { + char *lpNextStr = (char*)(lpDest->Value.MVszA.lppszA + + lpDest->Value.MVszA.cValues); + + for (i = 0; i < lpSrc->Value.MVszA.cValues; i++) + { + ULONG ulStrLen = lstrlenA(lpSrc->Value.MVszA.lppszA[i]) + 1u; + + lpDest->Value.MVszA.lppszA[i] = lpNextStr; + memcpy(lpNextStr, lpSrc->Value.MVszA.lppszA[i], ulStrLen); + lpNextStr += ulStrLen; + } + break; + } + case PT_MV_UNICODE: + { + WCHAR *lpNextStr = (WCHAR*)(lpDest->Value.MVszW.lppszW + + lpDest->Value.MVszW.cValues); + + for (i = 0; i < lpSrc->Value.MVszW.cValues; i++) + { + ULONG ulStrLen = strlenW(lpSrc->Value.MVszW.lppszW[i]) + 1u; + + lpDest->Value.MVszW.lppszW[i] = lpNextStr; + memcpy(lpNextStr, lpSrc->Value.MVszW.lppszW[i], ulStrLen * sizeof(WCHAR)); + lpNextStr += ulStrLen; + } + break; + } + case PT_MV_BINARY: + { + LPBYTE lpNext = (LPBYTE)(lpDest->Value.MVbin.lpbin + + lpDest->Value.MVbin.cValues); + + for (i = 0; i < lpSrc->Value.MVszW.cValues; i++) + { + lpDest->Value.MVbin.lpbin[i].cb = lpSrc->Value.MVbin.lpbin[i].cb; + lpDest->Value.MVbin.lpbin[i].lpb = lpNext; + memcpy(lpNext, lpSrc->Value.MVbin.lpbin[i].lpb, lpDest->Value.MVbin.lpbin[i].cb); + lpNext += lpDest->Value.MVbin.lpbin[i].cb; + } + break; + } + default: + /* No embedded pointers, just copy the data over */ + memcpy(lpDest->Value.MVi.lpi, lpSrc->Value.MVi.lpi, ulLen); + break; + } + break; + } + } + return scode; +} + +/********************************************************************** *** + * UlPropSize@4 (MAPI32.77) + * + * Determine the size of a property in bytes. + * + * PARAMS + * lpProp [I] Property to determine the size of + * + * RETURNS + * Success: The size of the value in lpProp. + * Failure: 0, if a multi-value (array) property is invalid or the type of lpProp + * is unknown. + * + * NOTES + * - The size returned does not include the size of the SPropValue struct + * or the size of the array of pointers for multi-valued properties that + * contain pointers (such as PT_MV_STRING8 or PT-MV_UNICODE). + * - MSDN incorrectly states that this function returns MAPI_E_CALL_FAILED if + * lpProp is invalid. In reality no checking is performed and this function + * will crash if passed an invalid property, or return 0 if the property + * type is PT_OBJECT or is unknown. + */ +ULONG WINAPI UlPropSize(LPSPropValue lpProp) +{ + ULONG ulRet = 1u, i; + + TRACE("(%p)\n", lpProp); + + switch (PROP_TYPE(lpProp->ulPropTag)) + { + case PT_MV_I2: ulRet = lpProp->Value.MVi.cValues; + case PT_BOOLEAN: + case PT_I2: ulRet *= sizeof(USHORT); + break; + case PT_MV_I4: ulRet = lpProp->Value.MVl.cValues; + case PT_ERROR: + case PT_I4: ulRet *= sizeof(LONG); + break; + case PT_MV_I8: ulRet = lpProp->Value.MVli.cValues; + case PT_I8: ulRet *= sizeof(LONG64); + break; + case PT_MV_R4: ulRet = lpProp->Value.MVflt.cValues; + case PT_R4: ulRet *= sizeof(float); + break; + case PT_MV_APPTIME: + case PT_MV_R8: ulRet = lpProp->Value.MVdbl.cValues; + case PT_APPTIME: + case PT_R8: ulRet *= sizeof(double); + break; + case PT_MV_CURRENCY: ulRet = lpProp->Value.MVcur.cValues; + case PT_CURRENCY: ulRet *= sizeof(CY); + break; + case PT_MV_SYSTIME: ulRet = lpProp->Value.MVft.cValues; + case PT_SYSTIME: ulRet *= sizeof(FILETIME); + break; + case PT_MV_CLSID: ulRet = lpProp->Value.MVguid.cValues; + case PT_CLSID: ulRet *= sizeof(GUID); + break; + case PT_MV_STRING8: ulRet = 0u; + for (i = 0; i < lpProp->Value.MVszA.cValues; i++) + ulRet += (lstrlenA(lpProp->Value.MVszA.lppszA[i]) + 1u); + break; + case PT_STRING8: ulRet = lstrlenA(lpProp->Value.lpszA) + 1u; + break; + case PT_MV_UNICODE: ulRet = 0u; + for (i = 0; i < lpProp->Value.MVszW.cValues; i++) + ulRet += (strlenW(lpProp->Value.MVszW.lppszW[i]) + 1u); + ulRet *= sizeof(WCHAR); + break; + case PT_UNICODE: ulRet = (lstrlenW(lpProp->Value.lpszW) + 1u) * sizeof(WCHAR); + break; + case PT_MV_BINARY: ulRet = 0u; + for (i = 0; i < lpProp->Value.MVbin.cValues; i++) + ulRet += lpProp->Value.MVbin.lpbin[i].cb; + break; + case PT_BINARY: ulRet = lpProp->Value.bin.cb; + break; + case PT_OBJECT: + default: ulRet = 0u; + break; + } + + return ulRet; +} + +/********************************************************************** *** + * FPropContainsProp@12 (MAPI32.78) + * + * Find a property with a given property tag in a property array. + * + * PARAMS + * lpHaystack [I] Property to match to + * lpNeedle [I] Property to find in lpHaystack + * ulFuzzy [I] Flags controlling match type and strictness (FL_* flags from "mapidefs.h") + * + * RETURNS + * TRUE, if lpNeedle matches lpHaystack according to the criteria of ulFuzzy. + * + * NOTES + * Only property types of PT_STRING8 and PT_BINARY are handled by this function. + */ +BOOL WINAPI FPropContainsProp(LPSPropValue lpHaystack, LPSPropValue lpNeedle, ULONG ulFuzzy) +{ + TRACE("(%p,%p,0x%08lx)\n", lpHaystack, lpNeedle, ulFuzzy); + + if (FBadProp(lpHaystack) || FBadProp(lpNeedle) || + PROP_TYPE(lpHaystack->ulPropTag) != PROP_TYPE(lpNeedle->ulPropTag)) + return FALSE; + + /* FIXME: Do later versions support Unicode as well? */ + + if (PROP_TYPE(lpHaystack->ulPropTag) == PT_STRING8) + { + DWORD dwFlags = 0, dwNeedleLen, dwHaystackLen; + + if (ulFuzzy & FL_IGNORECASE) + dwFlags |= NORM_IGNORECASE; + if (ulFuzzy & FL_IGNORENONSPACE) + dwFlags |= NORM_IGNORENONSPACE; + if (ulFuzzy & FL_LOOSE) + dwFlags |= (NORM_IGNORECASE|NORM_IGNORENONSPACE|NORM_IGNORESYMBOLS); + + dwNeedleLen = lstrlenA(lpNeedle->Value.lpszA); + dwHaystackLen = lstrlenA(lpHaystack->Value.lpszA); + + if ((ulFuzzy & (FL_SUBSTRING|FL_PREFIX)) == FL_PREFIX) + { + if (dwNeedleLen <= dwHaystackLen && + CompareStringA(LOCALE_USER_DEFAULT, dwFlags, + lpHaystack->Value.lpszA, dwNeedleLen, + lpNeedle->Value.lpszA, dwNeedleLen) == CSTR_EQUAL) + return TRUE; /* needle is a prefix of haystack */ + } + else if ((ulFuzzy & (FL_SUBSTRING|FL_PREFIX)) == FL_SUBSTRING) + { + LPSTR (WINAPI *pStrChrFn)(LPCSTR,WORD) = StrChrA; + LPSTR lpStr = lpHaystack->Value.lpszA; + + if (dwFlags & NORM_IGNORECASE) + pStrChrFn = StrChrIA; + + while ((lpStr = pStrChrFn(lpStr, *lpNeedle->Value.lpszA)) != NULL) + { + dwHaystackLen -= (lpStr - lpHaystack->Value.lpszA); + if (dwNeedleLen <= dwHaystackLen && + CompareStringA(LOCALE_USER_DEFAULT, dwFlags, + lpStr, dwNeedleLen, + lpNeedle->Value.lpszA, dwNeedleLen) == CSTR_EQUAL) + return TRUE; /* needle is a substring of haystack */ + lpStr++; + } + } + else if (CompareStringA(LOCALE_USER_DEFAULT, dwFlags, + lpHaystack->Value.lpszA, dwHaystackLen, + lpNeedle->Value.lpszA, dwNeedleLen) == CSTR_EQUAL) + return TRUE; /* full string match */ + } + else if (PROP_TYPE(lpHaystack->ulPropTag) == PT_BINARY) + { + if ((ulFuzzy & (FL_SUBSTRING|FL_PREFIX)) == FL_PREFIX) + { + if (lpNeedle->Value.bin.cb <= lpHaystack->Value.bin.cb && + !memcmp(lpNeedle->Value.bin.lpb, lpHaystack->Value.bin.lpb, + lpNeedle->Value.bin.cb)) + return TRUE; /* needle is a prefix of haystack */ + } + else if ((ulFuzzy & (FL_SUBSTRING|FL_PREFIX)) == FL_SUBSTRING) + { + ULONG ulLen = lpHaystack->Value.bin.cb; + LPBYTE lpb = lpHaystack->Value.bin.lpb; + + while ((lpb = memchr(lpb, *lpNeedle->Value.bin.lpb, ulLen)) != NULL) + { + ulLen = lpHaystack->Value.bin.cb - (lpb - lpHaystack->Value.bin.lpb); + if (lpNeedle->Value.bin.cb <= ulLen && + !memcmp(lpNeedle->Value.bin.lpb, lpb, lpNeedle->Value.bin.cb)) + return TRUE; /* needle is a substring of haystack */ + lpb++; + } + } + else if (!LPropCompareProp(lpHaystack, lpNeedle)) + return TRUE; /* needle is an exact match with haystack */ + + } + return FALSE; +} + +/********************************************************************** *** + * FPropCompareProp@12 (MAPI32.79) + * + * Compare two properties. + * + * PARAMS + * lpPropLeft [I] Left hand property to compare to lpPropRight + * ulOp [I] Comparison operator (RELOP_* enum from "mapidefs.h") + * lpPropRight [I] Right hand property to compare to lpPropLeft + * + * RETURNS + * TRUE, if the comparison is true, FALSE otherwise. + */ +BOOL WINAPI FPropCompareProp(LPSPropValue lpPropLeft, ULONG ulOp, LPSPropValue lpPropRight) +{ + LONG iCmp; + + TRACE("(%p,%ld,%p)\n", lpPropLeft, ulOp, lpPropRight); + + if (ulOp > RELOP_RE || FBadProp(lpPropLeft) || FBadProp(lpPropRight)) + return FALSE; + + if (ulOp == RELOP_RE) + { + FIXME("Comparison operator RELOP_RE not yet implemented!\n"); + return FALSE; + } + + iCmp = LPropCompareProp(lpPropLeft, lpPropRight); + + switch (ulOp) + { + case RELOP_LT: return iCmp < 0 ? TRUE : FALSE; + case RELOP_LE: return iCmp <= 0 ? TRUE : FALSE; + case RELOP_GT: return iCmp > 0 ? TRUE : FALSE; + case RELOP_GE: return iCmp >= 0 ? TRUE : FALSE; + case RELOP_EQ: return iCmp == 0 ? TRUE : FALSE; + case RELOP_NE: return iCmp != 0 ? TRUE : FALSE; + } + return FALSE; +} + +/********************************************************************** *** + * LPropCompareProp@8 (MAPI32.80) + * + * Compare two properties. + * + * PARAMS + * lpPropLeft [I] Left hand property to compare to lpPropRight + * lpPropRight [I] Right hand property to compare to lpPropLeft + * + * RETURNS + * An integer less than, equal to or greater than 0, indicating that + * lpszStr is less than, the same, or greater than lpszComp. + */ +LONG WINAPI LPropCompareProp(LPSPropValue lpPropLeft, LPSPropValue lpPropRight) +{ + LONG iRet; + + TRACE("(%p->0x%08lx,%p->0x%08lx)\n", lpPropLeft, lpPropLeft->ulPropTag, + lpPropRight, lpPropRight->ulPropTag); + + /* If the properties are not the same, sort by property type */ + if (PROP_TYPE(lpPropLeft->ulPropTag) != PROP_TYPE(lpPropRight->ulPropTag)) + return (LONG)PROP_TYPE(lpPropLeft->ulPropTag) - (LONG)PROP_TYPE(lpPropRight->ulPropTag); + + switch (PROP_TYPE(lpPropLeft->ulPropTag)) + { + case PT_UNSPECIFIED: + case PT_NULL: + return 0; /* NULLs are equal */ + case PT_I2: + return lpPropLeft->Value.i - lpPropRight->Value.i; + case PT_I4: + return lpPropLeft->Value.l - lpPropRight->Value.l; + case PT_I8: + if (lpPropLeft->Value.li.QuadPart > lpPropRight->Value.li.QuadPart) + return 1; + if (lpPropLeft->Value.li.QuadPart == lpPropRight->Value.li.QuadPart) + return 0; + return -1; + case PT_R4: + if (lpPropLeft->Value.flt > lpPropRight->Value.flt) + return 1; + if (lpPropLeft->Value.flt == lpPropRight->Value.flt) + return 0; + return -1; + case PT_APPTIME: + case PT_R8: + if (lpPropLeft->Value.dbl > lpPropRight->Value.dbl) + return 1; [truncated at 1000 lines; 2919 more skipped]

1 0

[mbosma] 20858: DJ_Smith (dj_smith_reactos(at)online(dot)de):
by mbosma＠svn.reactos.org 14 Jan '06

14 Jan '06

DJ_Smith (dj_smith_reactos(at)online(dot)de): - Updated and added german translations. - Fixed some small mistakes in .rc files. Added: trunk/reactos/boot/freeldr/fdebug/De.rc Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.rc Added: trunk/reactos/lib/cpl/access/De.rc Modified: trunk/reactos/lib/cpl/access/En.rc Modified: trunk/reactos/lib/cpl/access/access.rc Modified: trunk/reactos/lib/cpl/appwiz/De.rc Modified: trunk/reactos/lib/cpl/desk/de.rc Modified: trunk/reactos/lib/cpl/intl/de.rc Added: trunk/reactos/lib/cpl/liccpa/De.rc Modified: trunk/reactos/lib/cpl/liccpa/liccpa.rc Modified: trunk/reactos/lib/cpl/main/De.rc Modified: trunk/reactos/lib/cpl/ncpa/de.rc Modified: trunk/reactos/lib/cpl/sysdm/de.rc Modified: trunk/reactos/lib/cpl/sysdm/en.rc Modified: trunk/reactos/lib/shell32/shell32_De.rc _____ Added: trunk/reactos/boot/freeldr/fdebug/De.rc --- trunk/reactos/boot/freeldr/fdebug/De.rc 2006-01-14 17:59:59 UTC (rev 20857) +++ trunk/reactos/boot/freeldr/fdebug/De.rc 2006-01-14 18:51:22 UTC (rev 20858) @@ -0,0 +1,198 @@ +/////////////////////////////////////////////////////////////////////// ////// +// German (De) resources by DJ_Smith (dj_smith_reactos at online.de) + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +#pragma code_page(1252) +#endif //_WIN32 + +/////////////////////////////////////////////////////////////////////// ////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_FDEBUG ICON DISCARDABLE "fdebug.ico" + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDC_FDEBUG MENU DISCARDABLE +BEGIN + POPUP "&Datei" + BEGIN + MENUITEM "&Verbinden", ID_FILE_CONNECT + MENUITEM "&Trennen", ID_FILE_DISCONNECT, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Aufnahme starten", ID_FILE_STARTCAPTURE + MENUITEM "A&ufnahme stoppen", ID_FILE_STOPCAPTURE, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Local Echo", ID_FILE_LOCALECHO + MENUITEM SEPARATOR + MENUITEM "B&eenden", IDM_EXIT + END + POPUP "&Hilfe" + BEGIN + MENUITEM "&?ber ...", IDM_ABOUT + END +END + + +/////////////////////////////////////////////////////////////////////// ////// +// +// Accelerator +// + +IDC_FDEBUG ACCELERATORS MOVEABLE PURE +BEGIN + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT +END + + +#ifdef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// TEXTINCLUDE +// + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""resource.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +#endif // APSTUDIO_INVOKED + + +/////////////////////////////////////////////////////////////////////// ////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_ABOUTBOX, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 252 + TOPMARGIN, 7 + BOTTOMMARGIN, 203 + END + + IDD_CONNECTION, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 189 + TOPMARGIN, 7 + BOTTOMMARGIN, 93 + END + + IDD_CAPTURE, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 244 + TOPMARGIN, 7 + BOTTOMMARGIN, 88 + END +END +#endif // APSTUDIO_INVOKED + + +/////////////////////////////////////////////////////////////////////// ////// +// +// Dialog +// + +IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "About FreeLoader Debugger" +FONT 8, "Tahoma" +BEGIN + CONTROL "FreeLoader Debugger v1.0\nCopyright (C) 2003\nby Brian Palmer (brianp(a)reactos.org)", + IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, + 122,26 + DEFPUSHBUTTON "OK",IDOK,183,189,44,14,WS_GROUP + ICON IDI_FDEBUG,IDC_STATIC,19,30,20,20 + EDITTEXT IDC_LICENSE_EDIT,53,63,174,107,ES_MULTILINE | + ES_READONLY | WS_VSCROLL +END + +IDD_CONNECTION DIALOG DISCARDABLE 0, 0, 196, 100 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Verbindungsoptionen" +FONT 8, "Tahoma" +BEGIN + LTEXT "COM Port angeben (z.B. COM1):",IDC_STATIC,7,7,108,8 + EDITTEXT IDC_COMPORT,7,17,182,14,ES_AUTOHSCROLL + LTEXT "Bandbreite angeben (z.B. 115200):",IDC_STATIC,7,38,114, + 8 + EDITTEXT IDC_BAUTRATE,7,48,182,14,ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,45,79,50,14 + PUSHBUTTON "Abbrechen",IDCANCEL,100,79,50,14 +END + +IDD_CAPTURE DIALOG DISCARDABLE 0, 0, 251, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Capture File" +FONT 8, "Tahoma" +BEGIN + LTEXT "Name der aufgenommenden Datei:",IDC_STATIC,7,17,120,8 + EDITTEXT IDC_CAPTUREFILENAME,7,26,181,14,ES_AUTOHSCROLL + PUSHBUTTON "&Durchsuchen",IDC_BROWSE,194,26,50,14 + DEFPUSHBUTTON "OK",IDOK,139,74,50,14 + PUSHBUTTON "Abbrechen",IDCANCEL,194,74,50,14 +END + + +/////////////////////////////////////////////////////////////////////// ////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "fdebug" + IDS_HELLO "Hello World!" + IDC_FDEBUG "FDEBUG" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." +END + +#endif // English (U.S.) resources +/////////////////////////////////////////////////////////////////////// ////// + + + +#ifndef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +/////////////////////////////////////////////////////////////////////// ////// +#endif // not APSTUDIO_INVOKED + _____ Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.rc --- trunk/reactos/boot/freeldr/fdebug/fdebug.rc 2006-01-14 17:59:59 UTC (rev 20857) +++ trunk/reactos/boot/freeldr/fdebug/fdebug.rc 2006-01-14 18:51:22 UTC (rev 20858) @@ -16,6 +16,7 @@ #undef APSTUDIO_READONLY_SYMBOLS #include "En.rc" +#include "De.rc" #include "Hu.rc" #include "Ja.rc" #include "Pl.rc" _____ Added: trunk/reactos/lib/cpl/access/De.rc --- trunk/reactos/lib/cpl/access/De.rc 2006-01-14 17:59:59 UTC (rev 20857) +++ trunk/reactos/lib/cpl/access/De.rc 2006-01-14 18:51:22 UTC (rev 20858) @@ -0,0 +1,110 @@ +// German (De) resources by Friedrich Stange (dj_smith_reactos at online.de) + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDI_CPLACCESS ICON "resources/applet.ico" + + +IDD_PROPPAGEKEYBOARD DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Tastatur" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Einrastfunktion",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PRO PSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING + LTEXT "Benutzen Sie die Feststellfunktion um Kombinationen mit Shift, Strg ode Alt als Tastenfolge eingeben zu k÷nnen.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6 *PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + CHECKBOX "Einrastfunktion a&ktivieren",IDC_STICKY_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROP SHEETPADDING)+4,14 + PUSHBUTTON "&Einstellungen",IDC_STICKY_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING), LABELLINE(5)+2,(15*PROPSHEETPADDING),14 + GROUPBOX "Verz÷gerung",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPS HEETPADDING),LABELLINE(7)+2 + LTEXT "Benutzen Sie die Anschlõgsverz÷gerung, wenn ReactOS kurze oder wiederholte Anschlõge irgnorieren oder die Wiederholungsrate verringern soll.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-( 6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + CHECKBOX "&Verz÷gerung aktivieren",IDC_FILTER_BOX,(4*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROP SHEETPADDING),14 + PUSHBUTTON "E&instellungen",IDC_FILTER_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING), LABELLINE(13)+2,(15*PROPSHEETPADDING),14 + GROUPBOX "Signalfunktion",-1,PROPSHEETPADDING,LABELLINE(16)+3,PROPSHEETWIDTH-(2*P ROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING + LTEXT "Benutzen Sie die Signalfunktion, wenn Sie einen Signalton h÷ren wollen, wenn Sie Caps-, Num-, oder Scroll-Lock dr³cken.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDT H-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + CHECKBOX "&Signalfunktion benutzen",IDC_TOGGLE_BOX,(4*PROPSHEETPADDING),LABELLINE(20)+2,PROPSHEETW IDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) + PUSHBUTTON "Ei&nstellungen",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING), LABELLINE(20)+2,(15*PROPSHEETPADDING),14 +// CHECKBOX "Extra Tastaturhilfe in den P&rogrammen anzeigen ",IDC_KEYBOARD_EXTRA +END + + +IDD_PROPPAGESOUND DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Sound" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Darstellungsoption",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2* PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING + LTEXT "Benutzen Sie die Sounddarstellung, wenn ReactOS Sounds visuelle darstellen soll.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*P ROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + CHECKBOX "&Darstellungsoption aktivieren",IDC_SENTRY_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPS HEETPADDING)+15,14 + PUSHBUTTON "&Einstellungen",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING), LABELLINE(5)+2,(15*PROPSHEETPADDING),14 + + GROUPBOX "Sounddarstellung",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2* PROPSHEETPADDING),LABELLINE(7)+2 + LTEXT "Benutzen Sie die Sounddarstellung, damit die Programme Sprachausgaben und Sounds schriftlich darstellen.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETW IDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + CHECKBOX "&Sounddarstellung aktivieren",IDC_SSHOW_BOX,(4*PROPSHEETPADDING),LABELLINE(12)+2,PROPSHEET WIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) +END + + +IDD_PROPPAGEDISPLAY DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Anzeige" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Hoher Kontrast",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPA DDING),LABELLINE(6)+PROPSHEETPADDING + LTEXT "Aktivieren Sie diese Option, damit ReactOS Farben und Schrift besonders leserlich darstellt.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH -(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + CHECKBOX "&Hohen Kontrast aktivieren",IDC_CONTRAST_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PRO PSHEETPADDING)+5,14 + PUSHBUTTON "&Einstellungen",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING ),LABELLINE(5)+2,(15*PROPSHEETPADDING),14 +END + + + +IDD_PROPPAGEMOUSE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Maus" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Tastaturmaus",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSH EETPADDING),LABELLINE(6)+PROPSHEETPADDING + LTEXT "Aktivieren Sie diese Option, um den Mauszeiger mit dem Nummernpad der Tastatur zu steuern.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-( 6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + CHECKBOX "&Tastaturmaus aktivieren",IDC_MOUSE_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSH EETPADDING),14 + PUSHBUTTON "&Einstellungen",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),L ABELLINE(5)+2,(15*PROPSHEETPADDING),14 +END + + +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Automatischer Reset",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDI NG),LABELLINE(5) + CHECKBOX "Ei&ngabehilfen automatisch deaktivieren nach:",IDC_RESET_BOX,(2*PROPSHEETPADDING),LABELLINE(2)-2,PROPSHEETWIDTH- (6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) + + //POPUP IDC_RESET_POPUP, GRAYED + //{ + // MENUITEM "5 Minuten", IDC_RESET_5 + // MENUITEM "10 Minuten", IDC_RESET_10 + // MENUITEM "15 Minuten", IDC_RESET_15 + // MENUITEM "20 Minuten", IDC_RESET_20 + // MENUITEM "25 Minuten", IDC_RESET_25 + // MENUITEM "30 Minuten", IDC_RESET_30 + //} + + GROUPBOX "Benachrichtigung",-1,PROPSHEETPADDING,LABELLINE(7)-2,PROPSHEETWIDTH-(2* PROPSHEETPADDING),LABELLINE(5) + CHECKBOX "Warnsignal ausgeben, wenn eine Funktion eingeschaltet wird",IDC_NOTIFICATION_MESSAGE,(2*PROPSHEETPADDING),LABELLINE(8)-2,PROPS HEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE+15,LABELLINE(2) + CHECKBOX "Soundsignal beim Ein- und Ausschalten einer Funktion ausgeben",IDC_NOTIFICATION_SOUND,(2*PROPSHEETPADDING),LABELLINE(10)-2,PR OPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE+25,LABELLINE(1) + + + GROUPBOX "Externe Eingabehilfen",-1,PROPSHEETPADDING,LABELLINE(13)-4,PROPSHEETWIDTH-(2*PRO PSHEETPADDING),LABELLINE(5) + LTEXT "Externe Eingabehilfen bieten alternativen Zugriff auf Tastatur- und Mausfunktionen.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(14)-4,PROPSH EETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) + CHECKBOX "E&xterne Eingabehilfen aktivieren",IDC_SERIAL_BOX,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(16)-4 ,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1) + + PUSHBUTTON "&Einstellungen",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1) + + GROUPBOX "Verwaltungsoptionen",-1,PROPSHEETPADDING,LABELLINE(19)-4,PROPSHEETWIDTH -(2*PROPSHEETPADDING),LABELLINE(5) + CHECKBOX "&Alle Einstellungen auf dem Anmeldebildschrim anwenden",IDC_ADMIN_LOGON_BOX,(PROPSHEETPADDING*2),LABELLINE(20)-4,PROPS HEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) + CHECKBOX "Alle Einstellungen als &Standart f³r neue Benutzer anwenden",IDC_ADMIN_USERS_BOX,(2*PROPSHEETPADDING),LABELLINE(22)-4,PROPS HEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE+10,LABELLINE(1) +END + + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Bedienbarkeit" + IDS_CPLSYSTEMDESCRIPTION "Stellen sie die Bedienbarkeitsfunktionen f³r ihren Computer ein." +END + _____ Modified: trunk/reactos/lib/cpl/access/En.rc --- trunk/reactos/lib/cpl/access/En.rc 2006-01-14 17:59:59 UTC (rev 20857) +++ trunk/reactos/lib/cpl/access/En.rc 2006-01-14 18:51:22 UTC (rev 20858) @@ -17,8 +17,8 @@ CHECKBOX "Use &FilterKeys",IDC_FILTER_BOX,(4*PROPSHEETPADDING),LABELLINE(13)+2,(15*PRO PSHEETPADDING),14 PUSHBUTTON "S&ettings",IDC_FILTER_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABEL LINE(13)+2,(15*PROPSHEETPADDING),14 GROUPBOX "ToggleKeys",-1,PROPSHEETPADDING,LABELLINE(16)+3,PROPSHEETWIDTH-(2*PROPS HEETPADDING),LABELLINE(6)+PROPSHEETPADDING - LTEXT "Use &ToggleKeys if you want to hear tones when pressing Caps Lock, Num Lock, and Scroll Lock.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-( 6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) - CHECKBOX "Use ToggleKeys",IDC_TOGGLE_BOX,(4*PROPSHEETPADDING),LABELLINE(20)+2,PROPSHEE TWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) + LTEXT "Use ToggleKeys if you want to hear tones when pressing Caps Lock, Num Lock, and Scroll Lock.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-( 6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) + CHECKBOX "Use &ToggleKeys",IDC_TOGGLE_BOX,(4*PROPSHEETPADDING),LABELLINE(20)+2,PROPSHE ETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) PUSHBUTTON "Setti&ngs",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABEL LINE(20)+2,(15*PROPSHEETPADDING),14 // CHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA END _____ Modified: trunk/reactos/lib/cpl/access/access.rc --- trunk/reactos/lib/cpl/access/access.rc 2006-01-14 17:59:59 UTC (rev 20857) +++ trunk/reactos/lib/cpl/access/access.rc 2006-01-14 18:51:22 UTC (rev 20858) @@ -8,6 +8,7 @@ #include <reactos/version.rc> #include "En.rc" +#include "De.rc" #include "Ja.rc" #include "Hu.rc" #include "Nl.rc" _____ Modified: trunk/reactos/lib/cpl/appwiz/De.rc --- trunk/reactos/lib/cpl/appwiz/De.rc 2006-01-14 17:59:59 UTC (rev 20857) +++ trunk/reactos/lib/cpl/appwiz/De.rc 2006-01-14 18:51:22 UTC (rev 20858) @@ -24,7 +24,25 @@ END +IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Create link" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Text1", -1, 115, 15, 160, 24 + LTEXT "Text2", -1, 115, 35, 160, 17 +END +IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Create link" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Text1",-1,10,0,225,40 + LTEXT "Text2",-1,10,40,120,20 + LTEXT "Text3",-1,10,55,120,20 +END + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Add/Remove Programs" _____ Modified: trunk/reactos/lib/cpl/desk/de.rc --- trunk/reactos/lib/cpl/desk/de.rc 2006-01-14 17:59:59 UTC (rev 20857) +++ trunk/reactos/lib/cpl/desk/de.rc 2006-01-14 18:51:22 UTC (rev 20858) @@ -24,8 +24,32 @@ CAPTION "Bildschrimschoner" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 90,112,8 + GROUPBOX "&Bildschrimschoner",IDC_SCREENS_DUMMY, 5, 7, 238, 136 + + LTEXT "Liste der Bildschrimschoner:",IDC_STATIC,13, 24, 100, 9 + CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | + WS_BORDER | WS_TABSTOP,13, 34, 171, 69 + PUSHBUTTON "&L÷schen",IDC_SCREENS_DELETE, 190,47,45,10 + PUSHBUTTON "&Hinzuf³gen",IDC_SCREENS_ADD_BUTTON, 190,34,45,10 + + PUSHBUTTON "&Einstellungen...",IDC_SCREENS_SETTINGS,140, 124, 55, 12,WS_GROUP + PUSHBUTTON "&Vorschau",IDC_SCREENS_TESTSC,200, 124, 37, 12 + + CONTROL "&Passwortschutz bei Reaktivierung.",IDC_SCREENS_USEPASSCHK,"button", + BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 122, 18 + + LTEXT "&Warte:",IDC_STATIC,13, 110, 20, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY,38, 109, 31, 12,ES_RIGHT | WS_GROUP + CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | + UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | + WS_BORDER | WS_GROUP,52, 109, 12, 12 + LTEXT "Minuten, bis der Bildschirmschoner angezeigt wird.",IDC_STATIC,75, 111, 165, 9 + + GROUPBOX "&Energiesparfunktion des Bildschirms",IDC_SCREENS_DUMMY2,5, 146, 238, 35 + LTEXT "Um die Energiesparfunktion des Bildschrims einzustellen, klicken Sie auf Energiesparfunktion.", + IDC_STATIC,16, 159, 155, 19 + PUSHBUTTON "Energ&iesparfunk.",IDC_SCREENS_POWER_BUTTON,175, 162, 60, 12 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 _____ Modified: trunk/reactos/lib/cpl/intl/de.rc --- trunk/reactos/lib/cpl/intl/de.rc 2006-01-14 17:59:59 UTC (rev 20857) +++ trunk/reactos/lib/cpl/intl/de.rc 2006-01-14 18:51:22 UTC (rev 20858) @@ -36,19 +36,19 @@ BEGIN GROUPBOX "Darstellung", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE LTEXT "Beispiel:", -1, 13, 21, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP - EDITTEXT IDC_TIMESAMPLE, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_TIMESAMPLE, 100, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "&Zeitformat:", -1, 13, 52, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP - COMBOBOX IDC_TIMEFORMAT, 68, 50, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + COMBOBOX IDC_TIMEFORMAT, 100, 50, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "&Trennzeichen:", -1, 13, 70, 54, 10, WS_VISIBLE | WS_GROUP - COMBOBOX IDC_TIMESEPARATOR, 68, 68, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Symbol f³r &Vormittag:", -1, 13, 88, 54, 10, WS_VISIBLE | WS_GROUP - COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Symbol f³r &Nachmittag:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP - COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + COMBOBOX IDC_TIMESEPARATOR, 100, 68, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Symbol f³r &Vormittag:", -1, 13, 88, 86, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEAMSYMBOL, 100, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Symbol f³r &Nachmittag:", -1, 13, 106, 86, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEPMSYMBOL, 100, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP GROUPBOX "", -1, 7, 124, 228, 60, WS_VISIBLE LTEXT "Zeitformat\n\n\ -h = Stunde m = Minute s = Sekunde t = Vor-/Nachmittag\n\n\ -h = 12 Stunden H = 24 Stunden\n\ +h = Stunde m = Minute s = Sekunde t = Vor-/Nachmittag\n\ +h = 12 Stunden H = 24 Stunden\n\n\ hh, mm, ss = f³hrende Null h, m, s = keine f³hrende Null", -1, 13, 133, 214, 47, WS_CHILD |WS_VISIBLE | WS_GROUP END _____ Added: trunk/reactos/lib/cpl/liccpa/De.rc --- trunk/reactos/lib/cpl/liccpa/De.rc 2006-01-14 17:59:59 UTC (rev 20857) +++ trunk/reactos/lib/cpl/liccpa/De.rc 2006-01-14 18:51:22 UTC (rev 20858) @@ -0,0 +1,29 @@ +// German (De) resources by DJ_Smith (dj_smith_reactos at online.de) + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDD_PROPPAGE1 DIALOG DISCARDABLE 20, 40, 315, 104 +STYLE DS_MODALFRAME | WS_OVERLAPPED | WS_CAPTION | WS_VISIBLE | WS_SYSMENU +CAPTION "Chose Licensing Mode" +FONT 8, "Helv" +BEGIN + CONTROL "Client Lizenzierungs Modus", 100, "BUTTON", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 4, 4, 239, 94 + CONTROL "Per Gerõt oder Per Benutzer", 102, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 13, 79, 107, 12 + CONTROL "Per Server. Nummer der gleichzeitigen Verbindungen:", 103, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 13, 38, 163, 9 + CONTROL "Produkt:", 105, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 13, 20, 31, 8 + CONTROL "", 106, "COMBOBOX", CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP, 49, 20, 171, 12 + CONTROL "OK", 107, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 7, 46, 14 + CONTROL "Abbrechen", 108, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 27, 46, 14 + CONTROL "Hilfe", 109, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 48, 46, 14 + CONTROL "Replikation...", 110, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 68, 46, 14 + CONTROL "Lizenz hinzuf³gen", 111, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 30, 56, 65, 15 + CONTROL "Lizenz entfernen", 112, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 112, 56, 61, 16 + CONTROL "", 114, "EDIT", ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 187, 39, 32, 12 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME_1 "Lizenz Manager" + IDS_CPLDESCRIPTION_1 "Lizenz Manager" + IDS_REACTOS "ReactOS - Freie Software" +END _____ Modified: trunk/reactos/lib/cpl/liccpa/liccpa.rc --- trunk/reactos/lib/cpl/liccpa/liccpa.rc 2006-01-14 17:59:59 UTC (rev 20857) +++ trunk/reactos/lib/cpl/liccpa/liccpa.rc 2006-01-14 18:51:22 UTC (rev 20858) @@ -13,5 +13,6 @@ IDC_CPLICON_1 ICON "resources/cpl_icon1.ico" #include "En.rc" +#include "De.rc" #include "Ja.rc" #include "Es.rc" _____ Modified: trunk/reactos/lib/cpl/main/De.rc --- trunk/reactos/lib/cpl/main/De.rc 2006-01-14 17:59:59 UTC (rev 20857) +++ trunk/reactos/lib/cpl/main/De.rc 2006-01-14 18:51:22 UTC (rev 20858) @@ -1,9 +1,26 @@ +// German (De) resources by DJ_Smith (dj_smith_reactos at online.de) + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +IDD_KEYBSPEED DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Geschwindigkeit" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Tastaturgeschwindikeit",-1,73,74,130,8 +END + +IDD_HARDWARE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Hardware" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_CPLNAME_1 "Maus" - IDS_CPLDESCRIPTION_1 "Eigenschaften von Maus." + IDS_CPLDESCRIPTION_1 "Mauseinstellungen õndern." IDS_CPLNAME_2 "Tastatur" - IDS_CPLDESCRIPTION_2 "Eigenschaften von Tastatur." + IDS_CPLDESCRIPTION_2 "Tastatureinstellungen õndern." END _____ Modified: trunk/reactos/lib/cpl/ncpa/de.rc --- trunk/reactos/lib/cpl/ncpa/de.rc 2006-01-14 17:59:59 UTC (rev 20857) +++ trunk/reactos/lib/cpl/ncpa/de.rc 2006-01-14 18:51:22 UTC (rev 20858) @@ -60,22 +60,22 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "IP-Einstellungen k÷nnen automatisch zugewiesen werden, wenn das Netzwerk diese Funktion unterst³tzt. Wenden Sie sich andernfalls an den Netzwerkadministrator, um die geeigneten IP-Einstellungen zu beziehen.", -1, 9, 9, 228, 27 - CONTROL "I&P-Adresse automatisch beziehen", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 43, 210, 12 + CONTROL "I&P-Adresse automatisch beziehen", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX CONTROL "Folgende IP-&Adresse verwenden:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 105, 12 LTEXT "&IP-Addresse:", -1, 14, 75, 135, 8 - CONTROL "",IDC_IPADDR,"SysIPAddress32",0,150,75-2,80,12 + CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP,0,150,75-2,80,12 LTEXT "S&ubnetzmaske:", -1, 14, 90, 135, 8 - CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",0,150,90-2,80,12 + CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",WS_TABSTOP,0,150,90-2,80,12 LTEXT "&Standardgateway:", -1, 14, 105, 135, 8 - CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",0,150,105-2,80,12 - CONTROL "D&NS-Serveradresse automatisch beziehen", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 139, 210, 12 + CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",WS_TABSTOP,0,150,105-2,80,12 + CONTROL "D&NS-Serveradresse automatisch beziehen", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12 GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX CONTROL "Folgende DNS-Serveradressen &verwenden:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 142, 12 LTEXT "&Bevorzugter DNS-Server:", -1, 14, 171, 135, 8 - CONTROL "",IDC_DNS1,"SysIPAddress32",0,150,171-2,80,12 + CONTROL "",IDC_DNS1,"SysIPAddress32",WS_TABSTOP,0,150,171-2,80,12 LTEXT "A&lternativer DNS-Server:", -1, 14, 186, 135, 8 - CONTROL "",IDC_DNS2,"SysIPAddress32",0,150,186-2,80,12 + CONTROL "",IDC_DNS2,"SysIPAddress32",WS_TABSTOP,0,150,186-2,80,12 PUSHBUTTON "&Erweitert...", IDC_ADVANCED, 186, 209, 50, 14, WS_DISABLED | WS_TABSTOP } @@ -85,3 +85,14 @@ IDS_CPLSYSTEMNAME "Netzwerk Einstellungen" IDS_CPLSYSTEMDESCRIPTION "Bearbeite Netzwerkeinstellungen." END + +STRINGTABLE +BEGIN + IDS_ERROR "Error" + IDS_ENTER_VALID_IPADDRESS "You must enter a valid IP address" + IDS_ENTER_VALID_SUBNET "You must enter a valid subnet mask" + IDS_CANNOT_LOAD_CONFIG "Unable to load current config data" + IDS_CANNOT_CREATE_PROPSHEET "Unable to create property sheet" + IDS_OUT_OF_MEMORY "Out of memory" + IDS_CANNOT_SAVE_CHANGES "Unable to save the changes you made" +END _____ Modified: trunk/reactos/lib/cpl/sysdm/de.rc --- trunk/reactos/lib/cpl/sysdm/de.rc 2006-01-14 17:59:59 UTC (rev 20857) +++ trunk/reactos/lib/cpl/sysdm/de.rc 2006-01-14 18:51:22 UTC (rev 20858) @@ -1,5 +1,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN +RC_LICENSE RTDATA "resources/gpl.txt" + IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Allgemein" @@ -41,7 +43,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Hardware Assistent",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETP ADDING),LABELLINE(6)+PROPSHEETPADDING - LTEXT "Der Hardware Assistent hilft ihnen Hardware zu installieren, zu enfernen, zu reparieren,zu konfigurieren und zu konfigurieren.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETW IDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + LTEXT "Der Hardware Assistent hilft ihnen Hardware zu installieren, zu enfernen, zu reparieren und zu konfigurieren.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETW IDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON PUSHBUTTON "&Hardware Assistent..",IDC_HARDWARE_WIZARD,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LA BELLINE(5)+2,(15*PROPSHEETPADDING),14 @@ -51,7 +53,7 @@ PUSHBUTTON "&Gerõte Manager...",IDC_HARDWARE_DEVICE_MANAGER,PROPSHEETWIDTH-(17*PROPSHEETPADD ING),LABELLINE(13)+2,(15*PROPSHEETPADDING),14 - GROUPBOX "Hardware Profiles",-1,PROPSHEETPADDING,LABELLINE(16)+3,PROPSHEETWIDTH-(2*PROPSHEE TPADDING),LABELLINE(6)+PROPSHEETPADDING + GROUPBOX "Hardware Profile",-1,PROPSHEETPADDING,LABELLINE(16)+3,PROPSHEETWIDTH-(2*PROPSHEET PADDING),LABELLINE(6)+PROPSHEETPADDING ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(18)-5, ICONSIZE, ICONSIZE, SS_ICON LTEXT "Hardwareprofile k÷nnen zur Speicherung mehrere Hardwareprofile verwendet werden.",0,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(18)-5,PROPSHEETWIDTH- (6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) PUSHBUTTON "Hard&wareprofile...",IDC_HARDWARE_PROFILE,PROPSHEETWIDTH-(17*PROPSHEETP ADDING),LABELLINE(20)+2,(15*PROPSHEETPADDING),14 @@ -91,6 +93,34 @@ PUSHBUTTON "&Start und Wiederherstellung...",IDC_STAREC,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LA BELLINE(19)+2,(18*PROPSHEETPADDING),14 END + +IDD_VIRTMEM DIALOGEX 6, 6, 223, 248 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Virtueller " +FONT 8, "MS Sans Serif", 0, 0, 0x0 +BEGIN + CONTROL "",IDC_PAGEFILELIST,"ListBox",0x50010141,10,16,204,52,0x00000200 + LTEXT "Laufwerk [Bezeichnung]", -1, 12, 5, 96, 9 + LTEXT "Auslagerungsdatei (MB)", -1, 114, 5, 100, 9 + CONTROL "Gr÷?e der Auslagerungsdatei f³r das Laufwerk",IDC_DRIVEGROUP,"Button",0x50000007,10,70,204,104 + LTEXT "", IDC_DRIVE, 20, 84, 100, 9 + LTEXT "", IDC_SPACEAVAIL, 20, 94, 112, 8 + CONTROL "Benutzerdefinierte Gr÷ ?e",IDC_CUSTOM,"Button",0x50010009,20,105,54,9 + CONTROL "",IDC_INITIALSIZE,"Edit",0x50010000,100,114,44,13,0x00000200 + CONTROL "",IDC_MAXSIZE,"Edit",0x50010000,100,129,44,13,0x00000200 + LTEXT "Anfangsgr÷?e (MB):", -1 ,22,118,54,9 + LTEXT "Maximale Gr÷?e (MB):", -1 ,22,131,64,9 + CONTROL "System verwaltet die Gr÷ ?e",IDC_SYSMANSIZE,"Button",0x50010009,20,145,88,9 + CONTROL "Keine Auslagerungsdatei",IDC_NOPAGEFILE,"Button",0x50010009,20,158,78,9 + PUSHBUTTON "Festlegen",IDC_SET, 158, 155, 50, 13 + CONTROL "Gesamtgr÷?e der Auslagerungsdatei f³r alle Laufwerke", IDC_TOTALGROUP, "Button", 0x50000007, 10, 179, 204, 46 + PUSHBUTTON "OK", IDOK, 114, 232, 48, 13 + PUSHBUTTON "Abbrechen", IDCANCEL, 168, 232, 48, 13 + LTEXT "", IDC_MINIMUM, 18, 200, 100, 9 + LTEXT "", IDC_RECOMMENDED, 18, 200, 100, 9 + LTEXT "", IDC_CURRENT, 18, 200, 100, 9 +END + IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Benutzervariablen" @@ -134,4 +164,9 @@ BEGIN IDS_CPLSYSTEMNAME "System" IDS_CPLSYSTEMDESCRIPTION "Zeigt Informationen ³ber Ihren Computer an und õndert System und Hardwareeinstellungen." + IDS_DRIVE "Laufwerk: %s" + IDS_SPACE "Verf³gbarer Speicherplatz: %s" + IDS_MIN "Minimal m÷glich: %s" + IDS_REC "Empfohlen: %s" + IDS_CUR "Zur Zeit zugewiesen: %s" END _____ Modified: trunk/reactos/lib/cpl/sysdm/en.rc --- trunk/reactos/lib/cpl/sysdm/en.rc 2006-01-14 17:59:59 UTC (rev 20857) +++ trunk/reactos/lib/cpl/sysdm/en.rc 2006-01-14 18:51:22 UTC (rev 20858) @@ -165,7 +165,7 @@ IDS_CPLSYSTEMNAME "System" IDS_CPLSYSTEMDESCRIPTION "See information about your computer and change various system and hardware settings." IDS_DRIVE "Drive: %s" - IDS_SPACE "Space available %s" + IDS_SPACE "Space available: %s" IDS_MIN "Minimum allowed: %s" IDS_REC "Recommended: %s" IDS_CUR "Currently allocated: %s" _____ Modified: trunk/reactos/lib/shell32/shell32_De.rc --- trunk/reactos/lib/shell32/shell32_De.rc 2006-01-14 17:59:59 UTC (rev 20857) +++ trunk/reactos/lib/shell32/shell32_De.rc 2006-01-14 18:51:22 UTC (rev 20858) @@ -115,7 +115,7 @@ ICON "", 1088, 10, 10, 14, 16 LTEXT "", 100, 30, 10, 137, 10 LTEXT "", 101, 30, 22, 137, 10 - LTEXT "ReactOS wurde Ihnen zur Verf³gung gestellt von:", 98, 8, 55, 137, 10 + LTEXT "ReactOS wurde Ihnen zur Verf³gung gestellt von:", 98, 8, 55, 170, 10 } SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs