Ros-diffs October 2009

ros-diffs@reactos.org

26 participants
641 discussions

[fireball] 43629: Daniel Zimmermann <netzimme@aim.com> - Print module and function name when a wine unimplemented function exception is raised. See issue #4546 for more details.
by fireball＠svn.reactos.org 19 Oct '09

19 Oct '09

Author: fireball Date: Mon Oct 19 23:42:27 2009 New Revision: 43629 URL: http://svn.reactos.org/svn/reactos?rev=43629&view=rev Log: Daniel Zimmermann <netzimme(a)aim.com> - Print module and function name when a wine unimplemented function exception is raised. See issue #4546 for more details. Modified: trunk/reactos/dll/win32/kernel32/except/except.c Modified: trunk/reactos/dll/win32/kernel32/except/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/except/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/except/except.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/except/except.c [iso-8859-1] Mon Oct 19 23:42:27 2009 @@ -395,7 +395,18 @@ { DPRINT1("Delphi Exception at address: %p\n", ExceptionRecord.ExceptionInformation[0]); DPRINT1("Exception-Object: %p\n", ExceptionRecord.ExceptionInformation[1]); - DPRINT1("Exception text: %s\n", ExceptionRecord.ExceptionInformation[2]); + DPRINT1("Exception text: %s\n", ExceptionRecord.ExceptionInformation[2]); + } + + /* Trace the wine special error and show the modulename and functionname */ + if (dwExceptionCode == 0x80000100 /*EXCEPTION_WINE_STUB*/) + { + /* Numbers of parameter must be equal to two */ + if (ExceptionRecord.NumberParameters == 2) + { + DPRINT1("Missing function in : %s\n", ExceptionRecord.ExceptionInformation[0]); + DPRINT1("with the functionname : %s\n", ExceptionRecord.ExceptionInformation[1]); + } } /* Raise the exception */

1 0

[cwittich] 43628: sync widl to wine 1.1.31
by cwittich＠svn.reactos.org 19 Oct '09

19 Oct '09

Author: cwittich Date: Mon Oct 19 23:30:54 2009 New Revision: 43628 URL: http://svn.reactos.org/svn/reactos?rev=43628&view=rev Log: sync widl to wine 1.1.31 Modified: trunk/reactos/tools/widl/header.c trunk/reactos/tools/widl/typegen.c trunk/reactos/tools/widl/widl.c trunk/reactos/tools/widl/widl.h Modified: trunk/reactos/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.c?rev=43… ============================================================================== --- trunk/reactos/tools/widl/header.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/header.c [iso-8859-1] Mon Oct 19 23:30:54 2009 @@ -346,9 +346,14 @@ if (name) fprintf(h, "%s%s", needs_space_after(t) ? " " : "", name ); if (type_get_type_detect_alias(pt) == TYPE_FUNCTION) { + const var_list_t *args = type_function_get_args(pt); + if (ptr_level) fputc(')', h); fputc('(', h); - write_args(h, type_function_get_args(pt), NULL, 0, FALSE); + if (args) + write_args(h, args, NULL, 0, FALSE); + else + fprintf(h, "void"); fputc(')', h); } else write_type_right(h, t, is_field); Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=4… ============================================================================== --- trunk/reactos/tools/widl/typegen.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/typegen.c [iso-8859-1] Mon Oct 19 23:30:54 2009 @@ -144,6 +144,13 @@ } } +static inline unsigned int clamp_align(unsigned int align) +{ + unsigned int packing = (pointer_size == 4) ? win32_packing : win64_packing; + if(align > packing) align = packing; + return align; +} + unsigned char get_pointer_fc(const type_t *type, const attr_list_t *attrs, int toplevel_param) { const type_t *t; @@ -1164,13 +1171,12 @@ unsigned int falign = 0; unsigned int fsize = type_memsize(v->type, &falign); if (*align < falign) *align = falign; - if (falign > packing) falign = packing; + falign = clamp_align(falign); size = ROUND_SIZE(size, falign); size += fsize; } - max_align = *align; - if(max_align > packing) max_align = packing; + max_align = clamp_align(*align); size = ROUND_SIZE(size, max_align); return size; @@ -1210,7 +1216,7 @@ type_t *ft = f->type; unsigned int align = 0; unsigned int size = type_memsize(ft, &align); - if (align > packing) align = packing; + align = clamp_align(align); if (align > salign) salign = align; offset = ROUND_SIZE(offset, align); offset += size; @@ -2279,7 +2285,7 @@ type_t *ft = field->type; unsigned int align = 0; unsigned int size = type_memsize(ft, &align); - if(align > packing) align = packing; + align = clamp_align(align); if (salign < align) salign = align; if (!is_conformant_array(ft) || type_array_is_decl_as_ptr(ft)) Modified: trunk/reactos/tools/widl/widl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.c?rev=4362… ============================================================================== --- trunk/reactos/tools/widl/widl.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/widl.c [iso-8859-1] Mon Oct 19 23:30:54 2009 @@ -52,7 +52,6 @@ static const char usage[] = "Usage: widl [options...] infile.idl\n" " or: widl [options...] --dlldata-only name1 [name2...]\n" -" -a n Set structure alignment to 'n'\n" " -b arch Set the target architecture\n" " -c Generate client stub\n" " -C file Name of client stub file (default is infile_c.c)\n" @@ -82,6 +81,8 @@ " -W Enable pedantic warnings\n" " --win32 Only generate 32-bit code\n" " --win64 Only generate 64-bit code\n" +" --win32-align n Set win32 structure alignment to 'n'\n" +" --win64-align n Set win64 structure alignment to 'n'\n" "Debug level 'n' is a bitmask with following meaning:\n" " * 0x01 Tell which resource is parsed (verbose mode)\n" " * 0x02 Dump internal structures\n" @@ -111,7 +112,8 @@ int old_names = 0; int do_win32 = 1; int do_win64 = 1; -int packing = 8; +int win32_packing = 8; +int win64_packing = 8; char *input_name; char *header_name; @@ -150,11 +152,13 @@ PREFIX_CLIENT_OPTION, PREFIX_SERVER_OPTION, WIN32_OPTION, - WIN64_OPTION + WIN64_OPTION, + WIN32_ALIGN_OPTION, + WIN64_ALIGN_OPTION }; static const char short_options[] = - "a:b:cC:d:D:EhH:I:m:NpP:sS:tT:uU:VW"; + "b:cC:d:D:EhH:I:m:NpP:sS:tT:uU:VW"; static const struct option long_options[] = { { "dlldata", 1, 0, DLLDATA_OPTION }, { "dlldata-only", 0, 0, DLLDATA_ONLY_OPTION }, @@ -165,6 +169,8 @@ { "prefix-server", 1, 0, PREFIX_SERVER_OPTION }, { "win32", 0, 0, WIN32_OPTION }, { "win64", 0, 0, WIN64_OPTION }, + { "win32-align", 1, 0, WIN32_ALIGN_OPTION }, + { "win64-align", 1, 0, WIN64_ALIGN_OPTION }, { 0, 0, 0, 0 } }; @@ -246,7 +252,8 @@ { "x86_64", SYS_WIN64 }, { "sparc", SYS_WIN32 }, { "alpha", SYS_WIN32 }, - { "powerpc", SYS_WIN32 } + { "powerpc", SYS_WIN32 }, + { "arm", SYS_WIN32 } }; unsigned int i; @@ -522,9 +529,14 @@ do_win32 = 0; do_win64 = 1; break; - case 'a': - packing = strtol(optarg, NULL, 0); - if(packing != 2 && packing != 4 && packing != 8) + case WIN32_ALIGN_OPTION: + win32_packing = strtol(optarg, NULL, 0); + if(win32_packing != 2 && win32_packing != 4 && win32_packing != 8) + error("Packing must be one of 2, 4 or 8\n"); + break; + case WIN64_ALIGN_OPTION: + win64_packing = strtol(optarg, NULL, 0); + if(win64_packing != 2 && win64_packing != 4 && win64_packing != 8) error("Packing must be one of 2, 4 or 8\n"); break; case 'b': Modified: trunk/reactos/tools/widl/widl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.h?rev=4362… ============================================================================== --- trunk/reactos/tools/widl/widl.h [iso-8859-1] (original) +++ trunk/reactos/tools/widl/widl.h [iso-8859-1] Mon Oct 19 23:30:54 2009 @@ -46,7 +46,8 @@ extern int old_names; extern int do_win32; extern int do_win64; -extern int packing; +extern int win32_packing; +extern int win64_packing; extern char *input_name; extern char *header_name;

1 0

[cwittich] 43627: move widl compilerflags to ReactOS-i386.rbuild
by cwittich＠svn.reactos.org 19 Oct '09

19 Oct '09

Author: cwittich Date: Mon Oct 19 23:30:34 2009 New Revision: 43627 URL: http://svn.reactos.org/svn/reactos?rev=43627&view=rev Log: move widl compilerflags to ReactOS-i386.rbuild Modified: trunk/reactos/ReactOS-generic.rbuild trunk/reactos/ReactOS-i386.rbuild Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… ============================================================================== --- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Mon Oct 19 23:30:34 2009 @@ -91,7 +91,6 @@ <compilerflag compiler="cxx">-Wno-non-virtual-dtor</compilerflag> <compilerflag compiler="cc,cxx">-gstabs+</compilerflag> <compilerflag compiler="as">-gstabs+</compilerflag> - <compilerflag compiler="midl">-m32 --win32</compilerflag> </group> <group compilerset="msc"> Modified: trunk/reactos/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-i386.rbuild?rev=43… ============================================================================== --- trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] Mon Oct 19 23:30:34 2009 @@ -25,6 +25,7 @@ <compilerflag>-momit-leaf-frame-pointer</compilerflag> </if> <compilerflag>-mpreferred-stack-boundary=2</compilerflag> + <compilerflag compiler="midl">-m32 --win32</compilerflag> </group> <group linkerset="ld">

1 0

[cwittich] 43626: partial rpcrt4 sync to wine 1.1.31
by cwittich＠svn.reactos.org 19 Oct '09

19 Oct '09

Author: cwittich Date: Mon Oct 19 23:18:07 2009 New Revision: 43626 URL: http://svn.reactos.org/svn/reactos?rev=43626&view=rev Log: partial rpcrt4 sync to wine 1.1.31 Modified: trunk/reactos/dll/win32/rpcrt4/ndr_es.c trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec Modified: trunk/reactos/dll/win32/rpcrt4/ndr_es.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_es.c?… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_es.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_es.c [iso-8859-1] Mon Oct 19 23:18:07 2009 @@ -439,3 +439,15 @@ if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_FULLPTR) NdrFullPointerXlatFree(pEsMsg->StubMsg.FullPtrXlatTables); } + +void RPC_ENTRY NdrMesTypeDecode2(handle_t Handle, const MIDL_TYPE_PICKLING_INFO *pPicklingInfo, + const MIDL_STUB_DESC *pStubDesc, PFORMAT_STRING pFormatString, void *pObject) +{ + FIXME("(%p, %p, %p, %p, %p)\n", Handle, pPicklingInfo, pStubDesc, pFormatString, pObject); +} + +void RPC_ENTRY NdrMesTypeFree2(handle_t Handle, const MIDL_TYPE_PICKLING_INFO *pPicklingInfo, + const MIDL_STUB_DESC *pStubDesc, PFORMAT_STRING pFormatString, void *pObject) +{ + FIXME("(%p, %p, %p, %p, %p)\n", Handle, pPicklingInfo, pStubDesc, pFormatString, pObject); +} Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_marsh… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c [iso-8859-1] Mon Oct 19 23:18:07 2009 @@ -32,6 +32,7 @@ #include <string.h> #include <limits.h> +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "winerror.h" @@ -4379,15 +4380,15 @@ if (level != 1) return RPC_S_INVALID_ARG; - memset(&umi->Level1, 0, sizeof(umi->Level1)); + memset(&umi->u1.Level1, 0, sizeof(umi->u1.Level1)); umi->InformationLevel = level; if (umcb->Signature != USER_MARSHAL_CB_SIGNATURE) return RPC_S_INVALID_ARG; - umi->Level1.pfnAllocate = umcb->pStubMsg->pfnAllocate; - umi->Level1.pfnFree = umcb->pStubMsg->pfnFree; - umi->Level1.pRpcChannelBuffer = umcb->pStubMsg->pRpcChannelBuffer; + umi->u1.Level1.pfnAllocate = umcb->pStubMsg->pfnAllocate; + umi->u1.Level1.pfnFree = umcb->pStubMsg->pfnFree; + umi->u1.Level1.pRpcChannelBuffer = umcb->pStubMsg->pRpcChannelBuffer; switch (umcb->CBType) { @@ -4403,8 +4404,8 @@ umcb->pStubMsg->Buffer > buffer_end) return ERROR_INVALID_USER_BUFFER; - umi->Level1.Buffer = umcb->pStubMsg->Buffer; - umi->Level1.BufferSize = buffer_end - umcb->pStubMsg->Buffer; + umi->u1.Level1.Buffer = umcb->pStubMsg->Buffer; + umi->u1.Level1.BufferSize = buffer_end - umcb->pStubMsg->Buffer; break; } case USER_MARSHAL_CB_BUFFER_SIZE: Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.sp… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec [iso-8859-1] Mon Oct 19 23:18:07 2009 @@ -224,11 +224,11 @@ @ stub NdrMesSimpleTypeEncode @ stub NdrMesTypeAlignSize2 @ stub NdrMesTypeAlignSize -@ stub NdrMesTypeDecode2 +@ stdcall NdrMesTypeDecode2(ptr ptr ptr ptr ptr) @ stub NdrMesTypeDecode @ stub NdrMesTypeEncode2 @ stub NdrMesTypeEncode -@ stub NdrMesTypeFree2 +@ stdcall NdrMesTypeFree2(ptr ptr ptr ptr ptr) @ stdcall NdrNonConformantStringBufferSize(ptr ptr ptr) @ stdcall NdrNonConformantStringMarshall(ptr ptr ptr) @ stdcall NdrNonConformantStringMemorySize(ptr ptr)

1 0

[cwittich] 43625: -sync msi_winetest with wine 1.1.31
by cwittich＠svn.reactos.org 19 Oct '09

19 Oct '09

Author: cwittich Date: Mon Oct 19 23:11:46 2009 New Revision: 43625 URL: http://svn.reactos.org/svn/reactos?rev=43625&view=rev Log: -sync msi_winetest with wine 1.1.31 Modified: trunk/rostests/winetests/msi/automation.c trunk/rostests/winetests/msi/install.c trunk/rostests/winetests/msi/msi.c trunk/rostests/winetests/msi/package.c trunk/rostests/winetests/msi/suminfo.c Modified: trunk/rostests/winetests/msi/automation.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/automation.… ============================================================================== --- trunk/rostests/winetests/msi/automation.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/automation.c [iso-8859-1] Mon Oct 19 23:11:46 2009 @@ -369,8 +369,8 @@ { CHAR str1A[MAX_PATH], str2A[MAX_PATH]; - WideCharToMultiByte(CP_ACP, 0, str1, -1, str1A, MAX_PATH, NULL, NULL); \ - WideCharToMultiByte(CP_ACP, 0, str2, -1, str2A, MAX_PATH, NULL, NULL); \ + WideCharToMultiByte(CP_ACP, 0, str1, -1, str1A, MAX_PATH, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, str2, -1, str2A, MAX_PATH, NULL, NULL); return lstrcmpA(str1A, str2A); } Modified: trunk/rostests/winetests/msi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/install.c?r… ============================================================================== --- trunk/rostests/winetests/msi/install.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/install.c [iso-8859-1] Mon Oct 19 23:11:46 2009 @@ -124,6 +124,8 @@ "MoveFiles\t\t1700\n" "InstallFiles\t\t4000\n" "DuplicateFiles\t\t4500\n" + "WriteEnvironmentStrings\t\t4550\n" + "CreateShortcuts\t\t4600\n" "InstallServices\t\t5000\n" "InstallFinalize\t\t6600\n" "InstallInitialize\t\t1500\n" @@ -158,6 +160,24 @@ "ROOTDRIVE\tC:\\\n" "SERVNAME\tTestService\n" "SERVDISP\tTestServiceDisp\n"; + +static const CHAR shortcut_dat[] = "Shortcut\tDirectory_\tName\tComponent_\tTarget\tArguments\tDescription\tHotkey\tIcon_\tIconIndex\tShowCmd\tWkDir\n" + "s72\ts72\tl128\ts72\ts72\tS255\tL255\tI2\tS72\tI2\tI2\tS72\n" + "Shortcut\tShortcut\n" + "Shortcut\tMSITESTDIR\tShortcut\tcomponent\tShortcut\t\tShortcut\t\t\t\t\t\n"; + +static const CHAR environment_dat[] = "Environment\tName\tValue\tComponent_\n" + "s72\tl255\tL255\ts72\n" + "Environment\tEnvironment\n" + "Var1\t=-MSITESTVAR1\t1\tOne\n" + "Var2\tMSITESTVAR2\t1\tOne\n" + "Var3\t=-MSITESTVAR3\t1\tOne\n" + "Var4\tMSITESTVAR4\t1\tOne\n"; + +static const CHAR condition_dat[] = "Feature_\tLevel\tCondition\n" + "s38\ti2\tS255\n" + "Condition\tFeature_\tLevel\n" + "One\t4\t1\n"; static const CHAR up_property_dat[] = "Property\tValue\n" "s72\tl0\n" @@ -381,6 +401,21 @@ "Media\tDiskId\n" "1\t1\t\t\tDISK1\t\n"; +static const CHAR rofc_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "maximus\tmaximus\tmaximus\t500\t\t\t16384\t1"; + +static const CHAR rofc_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" + "i2\ti4\tL64\tS255\tS32\tS72\n" + "Media\tDiskId\n" + "1\t1\t\ttest1.cab\tDISK1\t\n"; + +static const CHAR lus2_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" + "i2\ti4\tL64\tS255\tS32\tS72\n" + "Media\tDiskId\n" + "1\t1\t\t#test1.cab\tDISK1\t\n"; + static const CHAR sdp_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "s72\tS255\tI2\n" "InstallExecuteSequence\tAction\n" @@ -851,6 +886,32 @@ "file\tcomponent\tfilename\t100\t\t\t8192\t1\n" "service_file\tservice_comp\tservice.exe\t100\t\t\t8192\t1"; +static const CHAR ip_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "CostFinalize\t\t1000\n" + "ValidateProductID\t\t700\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "RemoveFiles\t\t3500\n" + "InstallFiles\t\t4000\n" + "RegisterUser\t\t6000\n" + "RegisterProduct\t\t6100\n" + "PublishFeatures\t\t6300\n" + "PublishProduct\t\t6400\n" + "InstallFinalize\t\t6600\n" + "InstallInitialize\t\t1500\n" + "ProcessComponents\t\t1600\n" + "UnpublishFeatures\t\t1800\n" + "InstallValidate\t\t1400\n" + "LaunchConditions\t\t100\n" + "TestInstalledProp\tInstalled AND NOT REMOVE\t950\n"; + +static const CHAR ip_custom_action_dat[] = "Action\tType\tSource\tTarget\tISComments\n" + "s72\ti2\tS64\tS0\tS255\n" + "CustomAction\tAction\n" + "TestInstalledProp\t19\t\tTest failed\t\n"; + typedef struct _msi_table { const CHAR *filename; @@ -875,6 +936,45 @@ ADD_TABLE(service_control) }; +static const msi_table sc_tables[] = +{ + ADD_TABLE(component), + ADD_TABLE(directory), + ADD_TABLE(feature), + ADD_TABLE(feature_comp), + ADD_TABLE(file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(media), + ADD_TABLE(property), + ADD_TABLE(shortcut) +}; + +static const msi_table ps_tables[] = +{ + ADD_TABLE(component), + ADD_TABLE(directory), + ADD_TABLE(feature), + ADD_TABLE(feature_comp), + ADD_TABLE(file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(media), + ADD_TABLE(property), + ADD_TABLE(condition) +}; + +static const msi_table env_tables[] = +{ + ADD_TABLE(component), + ADD_TABLE(directory), + ADD_TABLE(feature), + ADD_TABLE(feature_comp), + ADD_TABLE(file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(media), + ADD_TABLE(property), + ADD_TABLE(environment) +}; + static const msi_table up_tables[] = { ADD_TABLE(component), @@ -1078,6 +1178,18 @@ ADD_TABLE(property), }; +static const msi_table rofc_tables[] = +{ + ADD_TABLE(rof_component), + ADD_TABLE(directory), + ADD_TABLE(rof_feature), + ADD_TABLE(rof_feature_comp), + ADD_TABLE(rofc_file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(rofc_media), + ADD_TABLE(property), +}; + static const msi_table sdp_tables[] = { ADD_TABLE(rof_component), @@ -1166,6 +1278,42 @@ ADD_TABLE(property), }; +static const msi_table lus0_tables[] = +{ + ADD_TABLE(ci_component), + ADD_TABLE(directory), + ADD_TABLE(rof_feature), + ADD_TABLE(rof_feature_comp), + ADD_TABLE(rof_file), + ADD_TABLE(pp_install_exec_seq), + ADD_TABLE(rof_media), + ADD_TABLE(property), +}; + +static const msi_table lus1_tables[] = +{ + ADD_TABLE(ci_component), + ADD_TABLE(directory), + ADD_TABLE(rof_feature), + ADD_TABLE(rof_feature_comp), + ADD_TABLE(rof_file), + ADD_TABLE(pp_install_exec_seq), + ADD_TABLE(rofc_media), + ADD_TABLE(property), +}; + +static const msi_table lus2_tables[] = +{ + ADD_TABLE(ci_component), + ADD_TABLE(directory), + ADD_TABLE(rof_feature), + ADD_TABLE(rof_feature_comp), + ADD_TABLE(rof_file), + ADD_TABLE(pp_install_exec_seq), + ADD_TABLE(lus2_media), + ADD_TABLE(property), +}; + static const msi_table tp_tables[] = { ADD_TABLE(tp_component), @@ -1376,6 +1524,43 @@ ADD_TABLE(install_exec_seq), ADD_TABLE(rof_media), ADD_TABLE(property) +}; + +static const msi_table ip_tables[] = +{ + ADD_TABLE(component), + ADD_TABLE(directory), + ADD_TABLE(feature), + ADD_TABLE(feature_comp), + ADD_TABLE(file), + ADD_TABLE(ip_install_exec_seq), + ADD_TABLE(ip_custom_action), + ADD_TABLE(media), + ADD_TABLE(property) +}; + +static const msi_table fiu_tables[] = +{ + ADD_TABLE(rof_component), + ADD_TABLE(directory), + ADD_TABLE(rof_feature), + ADD_TABLE(rof_feature_comp), + ADD_TABLE(rof_file), + ADD_TABLE(pp_install_exec_seq), + ADD_TABLE(rof_media), + ADD_TABLE(property), +}; + +static const msi_table fiuc_tables[] = +{ + ADD_TABLE(rof_component), + ADD_TABLE(directory), + ADD_TABLE(rof_feature), + ADD_TABLE(rof_feature_comp), + ADD_TABLE(rofc_file), + ADD_TABLE(pp_install_exec_seq), + ADD_TABLE(rofc_media), + ADD_TABLE(property), }; /* cabinet definitions */ @@ -2576,6 +2761,219 @@ DeleteFile("msitest\\maximus"); RemoveDirectory("msitest"); DeleteFile(msifile); +} + +static void test_readonlyfile_cab(void) +{ + UINT r; + DWORD size; + HANDLE file; + CHAR path[MAX_PATH]; + CHAR buf[16]; + + CreateDirectoryA("msitest", NULL); + create_file("maximus", 500); + create_cab_file("test1.cab", MEDIA_SIZE, "maximus\0"); + DeleteFile("maximus"); + + create_database(msifile, rofc_tables, sizeof(rofc_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + lstrcpy(path, PROG_FILES_DIR); + lstrcat(path, "\\msitest"); + CreateDirectory(path, NULL); + + lstrcat(path, "\\maximus"); + file = CreateFile(path, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, CREATE_NEW, FILE_ATTRIBUTE_READONLY, NULL); + + WriteFile(file, "readonlyfile", strlen("readonlyfile"), &size, NULL); + CloseHandle(file); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + memset( buf, 0, sizeof(buf) ); + if ((file = CreateFile(path, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, NULL)) != INVALID_HANDLE_VALUE) + { + ReadFile(file, buf, sizeof(buf) - 1, &size, NULL); + CloseHandle(file); + } + ok( !lstrcmp( buf, "maximus" ), "Expected file to be overwritten, got '%s'\n", buf ); + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + + /* Delete the files in the temp (current) folder */ + delete_cab_files(); + DeleteFile("msitest\\maximus"); + RemoveDirectory("msitest"); + DeleteFile(msifile); +} + +static BOOL add_cabinet_storage(LPCSTR db, LPCSTR cabinet) +{ + WCHAR dbW[MAX_PATH], cabinetW[MAX_PATH]; + IStorage *stg; + IStream *stm; + HRESULT hr; + HANDLE handle; + + MultiByteToWideChar(CP_ACP, 0, db, -1, dbW, MAX_PATH); + hr = StgOpenStorage(dbW, NULL, STGM_DIRECT|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, NULL, 0, &stg); + if (FAILED(hr)) + return FALSE; + + MultiByteToWideChar(CP_ACP, 0, cabinet, -1, cabinetW, MAX_PATH); + hr = IStorage_CreateStream(stg, cabinetW, STGM_WRITE|STGM_SHARE_EXCLUSIVE, 0, 0, &stm); + if (FAILED(hr)) + { + IStorage_Release(stg); + return FALSE; + } + + handle = CreateFileW(cabinetW, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + if (handle != INVALID_HANDLE_VALUE) + { + DWORD count; + char buffer[1024]; + if (ReadFile(handle, buffer, sizeof(buffer), &count, NULL)) + IStream_Write(stm, buffer, count, &count); + CloseHandle(handle); + } + + IStream_Release(stm); + IStorage_Release(stg); + + return TRUE; +} + +static void test_lastusedsource(void) +{ + static char prodcode[] = "{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"; + + UINT r; + char value[MAX_PATH], path[MAX_PATH]; + DWORD size; + + if (!pMsiSourceListGetInfoA) + { + win_skip("MsiSourceListGetInfoA is not available\n"); + return; + } + + CreateDirectoryA("msitest", NULL); + create_file("maximus", 500); + create_cab_file("test1.cab", MEDIA_SIZE, "maximus\0"); + DeleteFile("maximus"); + + create_database("msifile0.msi", lus0_tables, sizeof(lus0_tables) / sizeof(msi_table)); + create_database("msifile1.msi", lus1_tables, sizeof(lus1_tables) / sizeof(msi_table)); + create_database("msifile2.msi", lus2_tables, sizeof(lus2_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + /* no cabinet file */ + + size = MAX_PATH; + lstrcpyA(value, "aaa"); + r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); + ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %u\n", r); + ok(!lstrcmpA(value, "aaa"), "Expected \"aaa\", got \"%s\"\n", value); + + r = MsiInstallProductA("msifile0.msi", "PUBLISH_PRODUCT=1"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + lstrcpyA(path, CURR_DIR); + lstrcatA(path, "\\"); + + size = MAX_PATH; + lstrcpyA(value, "aaa"); + r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + todo_wine + { + ok(!lstrcmpA(value, path), "Expected \"%s\", got \"%s\"\n", path, value); + ok(size == lstrlenA(path), "Expected %d, got %d\n", lstrlenA(path), size); + } + + r = MsiInstallProductA("msifile0.msi", "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + /* separate cabinet file */ + + size = MAX_PATH; + lstrcpyA(value, "aaa"); + r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); + ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %u\n", r); + ok(!lstrcmpA(value, "aaa"), "Expected \"aaa\", got \"%s\"\n", value); + + r = MsiInstallProductA("msifile1.msi", "PUBLISH_PRODUCT=1"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + lstrcpyA(path, CURR_DIR); + lstrcatA(path, "\\"); + + size = MAX_PATH; + lstrcpyA(value, "aaa"); + r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + todo_wine + { + ok(!lstrcmpA(value, path), "Expected \"%s\", got \"%s\"\n", path, value); + ok(size == lstrlenA(path), "Expected %d, got %d\n", lstrlenA(path), size); + } + + r = MsiInstallProductA("msifile1.msi", "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + size = MAX_PATH; + lstrcpyA(value, "aaa"); + r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); + ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %u\n", r); + ok(!lstrcmpA(value, "aaa"), "Expected \"aaa\", got \"%s\"\n", value); + + /* embedded cabinet stream */ + + add_cabinet_storage("msifile2.msi", "test1.cab"); + + r = MsiInstallProductA("msifile2.msi", "PUBLISH_PRODUCT=1"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + size = MAX_PATH; + lstrcpyA(value, "aaa"); + r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + todo_wine + { + ok(!lstrcmpA(value, path), "Expected \"%s\", got \"%s\"\n", path, value); + ok(size == lstrlenA(path), "Expected %d, got %d\n", lstrlenA(path), size); + } + + r = MsiInstallProductA("msifile2.msi", "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + size = MAX_PATH; + lstrcpyA(value, "aaa"); + r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); + ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %u\n", r); + ok(!lstrcmpA(value, "aaa"), "Expected \"aaa\", got \"%s\"\n", value); + + /* Delete the files in the temp (current) folder */ + delete_cab_files(); + DeleteFile("msitest\\maximus"); + RemoveDirectory("msitest"); + DeleteFile("msifile0.msi"); + DeleteFile("msifile1.msi"); + DeleteFile("msifile2.msi"); } static void test_setdirproperty(void) @@ -4401,10 +4799,7 @@ ok(r == ERROR_SUCCESS, "Failed to set summary info\n"); r = MsiSummaryInfoPersist(suminfo); - todo_wine - { - ok(r == ERROR_SUCCESS , "Failed to make summary info persist\n"); - } + ok(r == ERROR_SUCCESS , "Failed to make summary info persist\n"); r = MsiCloseHandle(suminfo); ok(r == ERROR_SUCCESS , "Failed to close suminfo\n"); @@ -6110,6 +6505,370 @@ RemoveDirectoryA(tmpdir); } +static void test_shortcut(void) +{ + UINT r; + HRESULT hr; + + create_test_files(); + create_database(msifile, sc_tables, sizeof(sc_tables) / sizeof(msi_table)); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); + ok(SUCCEEDED(hr), "CoInitialize failed 0x%08x\n", hr); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + CoUninitialize(); + + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + ok(SUCCEEDED(hr), "CoInitialize failed 0x%08x\n", hr); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + CoUninitialize(); + + delete_pf("msitest\\cabout\\new\\five.txt", TRUE); + delete_pf("msitest\\cabout\\new", FALSE); + delete_pf("msitest\\cabout\\four.txt", TRUE); + delete_pf("msitest\\cabout", FALSE); + delete_pf("msitest\\changed\\three.txt", TRUE); + delete_pf("msitest\\changed", FALSE); + delete_pf("msitest\\first\\two.txt", TRUE); + delete_pf("msitest\\first", FALSE); + delete_pf("msitest\\filename", TRUE); + delete_pf("msitest\\one.txt", TRUE); + delete_pf("msitest\\service.exe", TRUE); + delete_pf("msitest\\Shortcut.lnk", TRUE); + delete_pf("msitest", FALSE); + delete_test_files(); +} + +static void test_envvar(void) +{ + UINT r; + HKEY env; + LONG res; + DWORD type, size; + char buffer[16]; + + if (on_win9x) + { + win_skip("Environment variables are handled differently on Win9x and WinMe\n"); + return; + } + + create_test_files(); + create_database(msifile, env_tables, sizeof(env_tables) / sizeof(msi_table)); + + res = RegCreateKeyExA(HKEY_CURRENT_USER, "Environment", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &env, NULL); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = RegSetValueExA(env, "MSITESTVAR1", 0, REG_SZ, (const BYTE *)"0", 2); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = RegSetValueExA(env, "MSITESTVAR2", 0, REG_SZ, (const BYTE *)"0", 2); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + type = REG_NONE; + size = sizeof(buffer); + buffer[0] = 0; + res = RegQueryValueExA(env, "MSITESTVAR1", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(type == REG_SZ, "Expected REG_SZ, got %u\n", type); + ok(!lstrcmp(buffer, "1"), "Expected \"1\", got %s\n", buffer); + + res = RegDeleteValueA(env, "MSITESTVAR1"); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + type = REG_NONE; + size = sizeof(buffer); + buffer[0] = 0; + res = RegQueryValueExA(env, "MSITESTVAR2", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(type == REG_SZ, "Expected REG_SZ, got %u\n", type); + ok(!lstrcmp(buffer, "1"), "Expected \"1\", got %s\n", buffer); + + res = RegDeleteValueA(env, "MSITESTVAR2"); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = RegDeleteValueA(env, "MSITESTVAR3"); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = RegDeleteValueA(env, "MSITESTVAR4"); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + RegCloseKey(env); + + delete_pf("msitest\\cabout\\new\\five.txt", TRUE); + delete_pf("msitest\\cabout\\new", FALSE); + delete_pf("msitest\\cabout\\four.txt", TRUE); + delete_pf("msitest\\cabout", FALSE); + delete_pf("msitest\\changed\\three.txt", TRUE); + delete_pf("msitest\\changed", FALSE); + delete_pf("msitest\\first\\two.txt", TRUE); + delete_pf("msitest\\first", FALSE); + delete_pf("msitest\\filename", TRUE); + delete_pf("msitest\\one.txt", TRUE); + delete_pf("msitest\\service.exe", TRUE); + delete_pf("msitest", FALSE); + delete_test_files(); +} + +static void test_preselected(void) +{ + UINT r; + + create_test_files(); + create_database(msifile, ps_tables, sizeof(ps_tables) / sizeof(msi_table)); + + r = MsiInstallProductA(msifile, "ADDLOCAL=One"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(!delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\cabout\\new", FALSE), "File installed\n"); + ok(!delete_pf("msitest\\cabout\\four.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\cabout", FALSE), "File installed\n"); + ok(!delete_pf("msitest\\changed\\three.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\changed", FALSE), "File installed\n"); + ok(!delete_pf("msitest\\first\\two.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\first", FALSE), "File installed\n"); + ok(!delete_pf("msitest\\filename", TRUE), "File installed\n"); + todo_wine ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n"); + ok(!delete_pf("msitest\\service.exe", TRUE), "File installed\n"); + todo_wine ok(delete_pf("msitest", FALSE), "File not installed\n"); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout\\new", FALSE), "File not installed\n"); + ok(delete_pf("msitest\\cabout\\four.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout", FALSE), "File not installed\n"); + ok(delete_pf("msitest\\changed\\three.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\changed", FALSE), "File not installed\n"); + ok(delete_pf("msitest\\first\\two.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\first", FALSE), "File not installed\n"); + ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); + ok(!delete_pf("msitest\\one.txt", TRUE), "File installed\n"); + ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + delete_test_files(); +} + +static void test_installed_prop(void) +{ + static char prodcode[] = "{7df88a48-996f-4ec8-a022-bf956f9b2cbb}"; + UINT r; + + create_test_files(); + create_database(msifile, ip_tables, sizeof(ip_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, "FULL=1"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + r = MsiInstallProductA(msifile, "FULL=1"); + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + + r = MsiConfigureProductExA(prodcode, INSTALLLEVEL_DEFAULT, INSTALLSTATE_DEFAULT, "FULL=1"); + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + + ok(delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout\\new", FALSE), "File not installed\n"); + ok(delete_pf("msitest\\cabout\\four.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout", FALSE), "File not installed\n"); + ok(delete_pf("msitest\\changed\\three.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\changed", FALSE), "File not installed\n"); + ok(delete_pf("msitest\\first\\two.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\first", FALSE), "File not installed\n"); + ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\one.txt", TRUE), "File installed\n"); + ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + delete_test_files(); +} + +static char session_manager[] = "System\\CurrentControlSet\\Control\\Session Manager"; +static char rename_ops[] = "PendingFileRenameOperations"; + +static void process_pending_renames(HKEY hkey) +{ + char *buf, *src, *dst; + DWORD size; + LONG ret; + + ret = RegQueryValueExA(hkey, rename_ops, NULL, NULL, NULL, &size); + buf = HeapAlloc(GetProcessHeap(), 0, size); + buf[0] = 0; + + ret = RegQueryValueExA(hkey, rename_ops, NULL, NULL, (LPBYTE)buf, &size); + ok(!ret, "RegQueryValueExA failed %d (%u)\n", ret, GetLastError()); + ok(strstr(buf, "msitest\\maximus") != NULL, "Unexpected value \"%s\"\n", buf); + + for (src = buf; *src; src = dst + strlen(dst) + 1) + { + DWORD flags = MOVEFILE_COPY_ALLOWED; + + dst = src + strlen(src) + 1; + if (*dst == '!') + { + flags |= MOVEFILE_REPLACE_EXISTING; + dst++; + } + if (src[0] == '\\' && src[1] == '?' && src[2] == '?' && src[3] == '\\') src += 4; + if (*dst) + { + if (dst[0] == '\\' && dst[1] == '?' && dst[2] == '?' && dst[3] == '\\') dst += 4; + ok(MoveFileExA(src, dst, flags), "Failed to move file %s -> %s (%u)\n", src, dst, GetLastError()); + } + else + ok(DeleteFileA(src), "Failed to delete file %s (%u)\n", src, GetLastError()); + } + HeapFree(GetProcessHeap(), 0, buf); + RegDeleteValueA(hkey, rename_ops); +} + +static BOOL file_matches_data(LPCSTR file, LPCSTR data) +{ + DWORD len, data_len = strlen(data); + HANDLE handle; + char buf[128]; + + handle = CreateFile(file, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); + ok(handle != INVALID_HANDLE_VALUE, "failed to open %s (%u)\n", file, GetLastError()); + + if (ReadFile(handle, buf, sizeof(buf), &len, NULL) && len >= data_len) + { + CloseHandle(handle); + return !memcmp(buf, data, data_len); + } + CloseHandle(handle); + return FALSE; +} + +static void test_file_in_use(void) +{ + UINT r; + DWORD size; + HANDLE file; + HKEY hkey; + char path[MAX_PATH]; + + if (on_win9x) + { + win_skip("Pending file renaming is implemented differently on Win9x and WinMe\n"); + return; + } + + RegOpenKeyExA(HKEY_LOCAL_MACHINE, session_manager, 0, KEY_ALL_ACCESS, &hkey); + if (!RegQueryValueExA(hkey, rename_ops, NULL, NULL, NULL, &size)) + { + skip("Pending file rename operations, skipping test\n"); + return; + } + + CreateDirectoryA("msitest", NULL); + create_file("msitest\\maximus", 500); + create_database(msifile, fiu_tables, sizeof(fiu_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + lstrcpy(path, PROG_FILES_DIR); + lstrcat(path, "\\msitest"); + CreateDirectoryA(path, NULL); + + lstrcat(path, "\\maximus"); + file = CreateFileA(path, GENERIC_READ, FILE_SHARE_READ, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); + + r = MsiInstallProductA(msifile, "REBOOT=ReallySuppress FULL=1"); + ok(r == ERROR_SUCCESS_REBOOT_REQUIRED, "Expected ERROR_SUCCESS_REBOOT_REQUIRED got %u\n", r); + ok(!file_matches_data(path, "msitest\\maximus"), "Expected file not to match\n"); + CloseHandle(file); + ok(!file_matches_data(path, "msitest\\maximus"), "Expected file not to match\n"); + + process_pending_renames(hkey); + RegCloseKey(hkey); + + ok(file_matches_data(path, "msitest\\maximus"), "Expected file to match\n"); + ok(delete_pf("msitest\\maximus", TRUE), "File not present\n"); + ok(delete_pf("msitest", FALSE), "Directory not present or not empty\n"); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + delete_test_files(); +} + +static void test_file_in_use_cab(void) +{ + UINT r; + DWORD size; + HANDLE file; + HKEY hkey; + char path[MAX_PATH]; + + if (on_win9x) + { + win_skip("Pending file renaming is implemented differently on Win9x and WinMe\n"); + return; + } + + RegOpenKeyExA(HKEY_LOCAL_MACHINE, session_manager, 0, KEY_ALL_ACCESS, &hkey); + if (!RegQueryValueExA(hkey, rename_ops, NULL, NULL, NULL, &size)) + { + skip("Pending file rename operations, skipping test\n"); + return; + } + + CreateDirectoryA("msitest", NULL); + create_file("maximus", 500); + create_cab_file("test1.cab", MEDIA_SIZE, "maximus\0"); + DeleteFile("maximus"); + + create_database(msifile, fiuc_tables, sizeof(fiuc_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + lstrcpy(path, PROG_FILES_DIR); + lstrcat(path, "\\msitest"); + CreateDirectoryA(path, NULL); + + lstrcat(path, "\\maximus"); + file = CreateFileA(path, GENERIC_READ, FILE_SHARE_READ, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); + + r = MsiInstallProductA(msifile, "REBOOT=ReallySuppress FULL=1"); + ok(r == ERROR_SUCCESS_REBOOT_REQUIRED, "Expected ERROR_SUCCESS_REBOOT_REQUIRED got %u\n", r); + ok(!file_matches_data(path, "maximus"), "Expected file not to match\n"); + CloseHandle(file); + ok(!file_matches_data(path, "maximus"), "Expected file not to match\n"); + + process_pending_renames(hkey); + RegCloseKey(hkey); + + ok(file_matches_data(path, "maximus"), "Expected file to match\n"); + ok(delete_pf("msitest\\maximus", TRUE), "File not present\n"); + ok(delete_pf("msitest", FALSE), "Directory not present or not empty\n"); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + delete_cab_files(); + delete_test_files(); +} + START_TEST(install) { DWORD len; @@ -6160,6 +6919,7 @@ test_samesequence(); test_uiLevelFlags(); test_readonlyfile(); + test_readonlyfile_cab(); test_setdirproperty(); test_cabisextracted(); test_concurrentinstall(); @@ -6190,6 +6950,13 @@ test_adminimage(); test_propcase(); test_int_widths(); + test_shortcut(); + test_envvar(); + test_lastusedsource(); + test_preselected(); + test_installed_prop(); + test_file_in_use(); + test_file_in_use_cab(); DeleteFileA(log_file); Modified: trunk/rostests/winetests/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/msi.c?rev=4… ============================================================================== --- trunk/rostests/winetests/msi/msi.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/msi.c [iso-8859-1] Mon Oct 19 23:11:46 2009 @@ -8510,7 +8510,7 @@ RegCloseKey(prodkey); } -static void test_MsiEnumPatchesEx_machine() +static void test_MsiEnumPatchesEx_machine(void) { CHAR keypath[MAX_PATH], patch[MAX_PATH]; CHAR patch_squashed[MAX_PATH], patchcode[MAX_PATH]; Modified: trunk/rostests/winetests/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/package.c?r… ============================================================================== --- trunk/rostests/winetests/msi/package.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/package.c [iso-8859-1] Mon Oct 19 23:11:46 2009 @@ -26,6 +26,7 @@ #include <msidefs.h> #include <msi.h> #include <msiquery.h> +#include <srrestoreptapi.h> #include "wine/test.h" @@ -35,11 +36,15 @@ static UINT (WINAPI *pMsiApplyMultiplePatchesA)(LPCSTR, LPCSTR, LPCSTR); static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR*); + +static BOOL (WINAPI *pSRRemoveRestorePoint)(DWORD); +static BOOL (WINAPI *pSRSetRestorePointA)(RESTOREPOINTINFOA*, STATEMGRSTATUS*); static void init_functionpointers(void) { HMODULE hmsi = GetModuleHandleA("msi.dll"); HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); + HMODULE hsrclient; #define GET_PROC(mod, func) \ p ## func = (void*)GetProcAddress(mod, #func); @@ -48,6 +53,9 @@ GET_PROC(hadvapi32, ConvertSidToStringSidA); + hsrclient = LoadLibraryA("srclient.dll"); + GET_PROC(hsrclient, SRRemoveRestorePoint); + GET_PROC(hsrclient, SRSetRestorePointA); #undef GET_PROC } @@ -738,7 +746,8 @@ BOOL ret = FALSE; GetSystemDirectory(path, MAX_PATH); - lstrcatA(path, "\\kernel32.dll"); + /* Some dlls can't be updated on Vista/W2K8 */ + lstrcatA(path, "\\version.dll"); CopyFileA(path, name, FALSE); @@ -772,6 +781,27 @@ done: HeapFree(GetProcessHeap(), 0, buffer); return ret; +} + +static BOOL notify_system_change(DWORD event_type, STATEMGRSTATUS *status) +{ + RESTOREPOINTINFOA spec; + + spec.dwEventType = event_type; + spec.dwRestorePtType = APPLICATION_INSTALL; + spec.llSequenceNumber = status->llSequenceNumber; + lstrcpyA(spec.szDescription, "msitest restore point"); + + return pSRSetRestorePointA(&spec, status); +} + +static void remove_restore_point(DWORD seq_number) +{ + DWORD res; + + res = pSRRemoveRestorePoint(seq_number); + if (res != ERROR_SUCCESS) + trace("Failed to remove the restore point : %08x\n", res); } static void test_createpackage(void) @@ -11870,9 +11900,21 @@ START_TEST(package) { + STATEMGRSTATUS status; + BOOL ret = FALSE; + init_functionpointers(); GetCurrentDirectoryA(MAX_PATH, CURR_DIR); + + /* Create a restore point ourselves so we circumvent the multitude of restore points + * that would have been created by all the installation and removal tests. + */ + if (pSRSetRestorePointA) + { + memset(&status, 0, sizeof(status)); + ret = notify_system_change(BEGIN_NESTED_SYSTEM_CHANGE, &status); + } test_createpackage(); test_doaction(); @@ -11905,4 +11947,11 @@ test_MsiSetProperty(); test_MsiApplyMultiplePatches(); test_MsiApplyPatch(); + + if (pSRSetRestorePointA && ret) + { + ret = notify_system_change(END_NESTED_SYSTEM_CHANGE, &status); + if (ret) + remove_restore_point(status.llSequenceNumber); + } } Modified: trunk/rostests/winetests/msi/suminfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/suminfo.c?r… ============================================================================== --- trunk/rostests/winetests/msi/suminfo.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/suminfo.c [iso-8859-1] Mon Oct 19 23:11:46 2009 @@ -239,6 +239,32 @@ r = MsiCloseHandle(hdb); ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + /* filename, non-zero update count */ + MsiGetSummaryInformation(0, msifile, 1, &hsuminfo); + ok(r == ERROR_SUCCESS, "MsiGetSummaryInformation failed\n"); + + r = MsiSummaryInfoSetProperty(hsuminfo, PID_AUTHOR, VT_LPSTR, 1, &ft, "Mike"); + ok(r == ERROR_SUCCESS, "MsiSummaryInfoSetProperty wrong error\n"); + + r = MsiSummaryInfoPersist(hsuminfo); + ok(r == ERROR_SUCCESS, "MsiSummaryInfoPersist failed %u\n", r); + + r = MsiCloseHandle(hsuminfo); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed %u\n", r); + + /* filename, zero update count */ + MsiGetSummaryInformation(0, msifile, 0, &hsuminfo); + ok(r == ERROR_SUCCESS, "MsiGetSummaryInformation failed %u\n", r); + + r = MsiSummaryInfoSetProperty(hsuminfo, PID_AUTHOR, VT_LPSTR, 1, &ft, "Mike"); + todo_wine ok(r == ERROR_FUNCTION_FAILED, "MsiSummaryInfoSetProperty wrong error, %u\n", r); + + r = MsiSummaryInfoPersist(hsuminfo); + ok(r == ERROR_FUNCTION_FAILED, "MsiSummaryInfoPersist wrong error %u\n", r); + + r = MsiCloseHandle(hsuminfo); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + r = DeleteFile(msifile); ok(r, "DeleteFile failed\n"); } @@ -409,6 +435,12 @@ ok(r == ERROR_SUCCESS, "getpropcount failed\n"); todo_wine ok(count == 10, "prop count incorrect\n"); + r = MsiSummaryInfoSetProperty( hsuminfo, PID_TITLE, VT_LPSTR, 0, NULL, "Mike" ); + ok(r == ERROR_FUNCTION_FAILED, "MsiSummaryInfoSetProperty failed %u\n", r); + + r = MsiSummaryInfoPersist( hsuminfo ); + ok(r == ERROR_FUNCTION_FAILED, "MsiSummaryInfoPersist failed %u\n", r); + MsiCloseHandle( hsuminfo ); MsiCloseHandle( hdb );

1 0

[cwittich] 43624: update libxml2 to version 2.7.6
by cwittich＠svn.reactos.org 19 Oct '09

19 Oct '09

Author: cwittich Date: Mon Oct 19 21:59:37 2009 New Revision: 43624 URL: http://svn.reactos.org/svn/reactos?rev=43624&view=rev Log: update libxml2 to version 2.7.6 Modified: trunk/reactos/dll/3rdparty/libxslt/xsltconfig.h trunk/reactos/include/reactos/libs/libxml/Makefile.in trunk/reactos/include/reactos/libs/libxml/c14n.h trunk/reactos/include/reactos/libs/libxml/globals.h trunk/reactos/include/reactos/libs/libxml/parser.h trunk/reactos/include/reactos/libs/libxml/relaxng.h trunk/reactos/include/reactos/libs/libxml/valid.h trunk/reactos/include/reactos/libs/libxml/xinclude.h trunk/reactos/include/reactos/libs/libxml/xmlerror.h trunk/reactos/include/reactos/libs/libxml/xmlexports.h trunk/reactos/include/reactos/libs/libxml/xmlmemory.h trunk/reactos/include/reactos/libs/libxml/xmlschemas.h trunk/reactos/include/reactos/libs/libxml/xmlstring.h trunk/reactos/include/reactos/libs/libxml/xmlversion.h trunk/reactos/include/reactos/libs/libxml/xmlversion.h.in trunk/reactos/include/reactos/libs/libxml/xmlwriter.h trunk/reactos/include/reactos/libs/libxslt/xsltconfig.h trunk/reactos/lib/3rdparty/libxml2/ChangeLog trunk/reactos/lib/3rdparty/libxml2/HTMLparser.c trunk/reactos/lib/3rdparty/libxml2/HTMLtree.c trunk/reactos/lib/3rdparty/libxml2/INSTALL trunk/reactos/lib/3rdparty/libxml2/Makefile.am trunk/reactos/lib/3rdparty/libxml2/Makefile.in trunk/reactos/lib/3rdparty/libxml2/NEWS trunk/reactos/lib/3rdparty/libxml2/README trunk/reactos/lib/3rdparty/libxml2/SAX2.c trunk/reactos/lib/3rdparty/libxml2/TODO trunk/reactos/lib/3rdparty/libxml2/aclocal.m4 trunk/reactos/lib/3rdparty/libxml2/c14n.c trunk/reactos/lib/3rdparty/libxml2/catalog.c trunk/reactos/lib/3rdparty/libxml2/config.guess trunk/reactos/lib/3rdparty/libxml2/config.h.in trunk/reactos/lib/3rdparty/libxml2/config.sub trunk/reactos/lib/3rdparty/libxml2/configure trunk/reactos/lib/3rdparty/libxml2/configure.in trunk/reactos/lib/3rdparty/libxml2/debugXML.c trunk/reactos/lib/3rdparty/libxml2/depcomp trunk/reactos/lib/3rdparty/libxml2/dict.c trunk/reactos/lib/3rdparty/libxml2/elfgcchack.h trunk/reactos/lib/3rdparty/libxml2/encoding.c trunk/reactos/lib/3rdparty/libxml2/entities.c trunk/reactos/lib/3rdparty/libxml2/error.c trunk/reactos/lib/3rdparty/libxml2/globals.c trunk/reactos/lib/3rdparty/libxml2/hash.c trunk/reactos/lib/3rdparty/libxml2/include/Makefile.in trunk/reactos/lib/3rdparty/libxml2/include/win32config.h trunk/reactos/lib/3rdparty/libxml2/include/wsockcompat.h trunk/reactos/lib/3rdparty/libxml2/libxml.spec.in trunk/reactos/lib/3rdparty/libxml2/libxml2.spec trunk/reactos/lib/3rdparty/libxml2/ltmain.sh trunk/reactos/lib/3rdparty/libxml2/nanoftp.c trunk/reactos/lib/3rdparty/libxml2/nanohttp.c trunk/reactos/lib/3rdparty/libxml2/parser.c trunk/reactos/lib/3rdparty/libxml2/parserInternals.c trunk/reactos/lib/3rdparty/libxml2/relaxng.c trunk/reactos/lib/3rdparty/libxml2/runsuite.c trunk/reactos/lib/3rdparty/libxml2/runtest.c trunk/reactos/lib/3rdparty/libxml2/schematron.c trunk/reactos/lib/3rdparty/libxml2/testC14N.c trunk/reactos/lib/3rdparty/libxml2/testapi.c trunk/reactos/lib/3rdparty/libxml2/threads.c trunk/reactos/lib/3rdparty/libxml2/tree.c trunk/reactos/lib/3rdparty/libxml2/trio.c trunk/reactos/lib/3rdparty/libxml2/trio.h trunk/reactos/lib/3rdparty/libxml2/triodef.h trunk/reactos/lib/3rdparty/libxml2/trionan.c trunk/reactos/lib/3rdparty/libxml2/trionan.h trunk/reactos/lib/3rdparty/libxml2/triop.h trunk/reactos/lib/3rdparty/libxml2/triostr.c trunk/reactos/lib/3rdparty/libxml2/triostr.h trunk/reactos/lib/3rdparty/libxml2/uri.c trunk/reactos/lib/3rdparty/libxml2/valid.c trunk/reactos/lib/3rdparty/libxml2/xinclude.c trunk/reactos/lib/3rdparty/libxml2/xmlIO.c trunk/reactos/lib/3rdparty/libxml2/xmlcatalog.c trunk/reactos/lib/3rdparty/libxml2/xmllint.c trunk/reactos/lib/3rdparty/libxml2/xmlmemory.c trunk/reactos/lib/3rdparty/libxml2/xmlreader.c trunk/reactos/lib/3rdparty/libxml2/xmlregexp.c trunk/reactos/lib/3rdparty/libxml2/xmlsave.c trunk/reactos/lib/3rdparty/libxml2/xmlschemas.c trunk/reactos/lib/3rdparty/libxml2/xmlschemastypes.c trunk/reactos/lib/3rdparty/libxml2/xmlstring.c trunk/reactos/lib/3rdparty/libxml2/xmlwriter.c trunk/reactos/lib/3rdparty/libxml2/xpath.c trunk/reactos/lib/3rdparty/libxml2/xpointer.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/3rdparty/libxslt/xsltconfig.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/xsltc… Modified: trunk/reactos/include/reactos/libs/libxml/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/c14n.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/globals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/parser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/relaxng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/valid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xinclude.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xmlerror.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xmlexports.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xmlmemory.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xmlschemas.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xmlstring.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xmlversion.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xmlversion.h.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xmlwriter.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxslt/xsltconfig.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxs… Modified: trunk/reactos/lib/3rdparty/libxml2/ChangeLog URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/Chang… Modified: trunk/reactos/lib/3rdparty/libxml2/HTMLparser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/HTMLp… Modified: trunk/reactos/lib/3rdparty/libxml2/HTMLtree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/HTMLt… Modified: trunk/reactos/lib/3rdparty/libxml2/INSTALL URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/INSTA… Modified: trunk/reactos/lib/3rdparty/libxml2/Makefile.am URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/Makef… Modified: trunk/reactos/lib/3rdparty/libxml2/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/Makef… Modified: trunk/reactos/lib/3rdparty/libxml2/NEWS URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/NEWS?… Modified: trunk/reactos/lib/3rdparty/libxml2/README URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/READM… Modified: trunk/reactos/lib/3rdparty/libxml2/SAX2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/SAX2.… Modified: trunk/reactos/lib/3rdparty/libxml2/TODO URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/TODO?… Modified: trunk/reactos/lib/3rdparty/libxml2/aclocal.m4 URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/acloc… Modified: trunk/reactos/lib/3rdparty/libxml2/c14n.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/c14n.… Modified: trunk/reactos/lib/3rdparty/libxml2/catalog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/catal… Modified: trunk/reactos/lib/3rdparty/libxml2/config.guess URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/confi… Modified: trunk/reactos/lib/3rdparty/libxml2/config.h.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/confi… Modified: trunk/reactos/lib/3rdparty/libxml2/config.sub URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/confi… Modified: trunk/reactos/lib/3rdparty/libxml2/configure URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/confi… Modified: trunk/reactos/lib/3rdparty/libxml2/configure.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/confi… Modified: trunk/reactos/lib/3rdparty/libxml2/debugXML.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/debug… Modified: trunk/reactos/lib/3rdparty/libxml2/depcomp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/depco… Modified: trunk/reactos/lib/3rdparty/libxml2/dict.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/dict.… Modified: trunk/reactos/lib/3rdparty/libxml2/elfgcchack.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/elfgc… Modified: trunk/reactos/lib/3rdparty/libxml2/encoding.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/encod… Modified: trunk/reactos/lib/3rdparty/libxml2/entities.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/entit… Modified: trunk/reactos/lib/3rdparty/libxml2/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/error… Modified: trunk/reactos/lib/3rdparty/libxml2/globals.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/globa… Modified: trunk/reactos/lib/3rdparty/libxml2/hash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/hash.… Modified: trunk/reactos/lib/3rdparty/libxml2/include/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/inclu… Modified: trunk/reactos/lib/3rdparty/libxml2/include/win32config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/inclu… Modified: trunk/reactos/lib/3rdparty/libxml2/include/wsockcompat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/inclu… Modified: trunk/reactos/lib/3rdparty/libxml2/libxml.spec.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/libxm… Modified: trunk/reactos/lib/3rdparty/libxml2/libxml2.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/libxm… Modified: trunk/reactos/lib/3rdparty/libxml2/ltmain.sh URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/ltmai… Modified: trunk/reactos/lib/3rdparty/libxml2/nanoftp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/nanof… Modified: trunk/reactos/lib/3rdparty/libxml2/nanohttp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/nanoh… Modified: trunk/reactos/lib/3rdparty/libxml2/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/parse… Modified: trunk/reactos/lib/3rdparty/libxml2/parserInternals.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/parse… Modified: trunk/reactos/lib/3rdparty/libxml2/relaxng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/relax… Modified: trunk/reactos/lib/3rdparty/libxml2/runsuite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/runsu… Modified: trunk/reactos/lib/3rdparty/libxml2/runtest.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/runte… Modified: trunk/reactos/lib/3rdparty/libxml2/schematron.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/schem… Modified: trunk/reactos/lib/3rdparty/libxml2/testC14N.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/testC… Modified: trunk/reactos/lib/3rdparty/libxml2/testapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/testa… Modified: trunk/reactos/lib/3rdparty/libxml2/threads.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/threa… Modified: trunk/reactos/lib/3rdparty/libxml2/tree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/tree.… Modified: trunk/reactos/lib/3rdparty/libxml2/trio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/trio.… Modified: trunk/reactos/lib/3rdparty/libxml2/trio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/trio.… Modified: trunk/reactos/lib/3rdparty/libxml2/triodef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/triod… Modified: trunk/reactos/lib/3rdparty/libxml2/trionan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/trion… Modified: trunk/reactos/lib/3rdparty/libxml2/trionan.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/trion… Modified: trunk/reactos/lib/3rdparty/libxml2/triop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/triop… Modified: trunk/reactos/lib/3rdparty/libxml2/triostr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/trios… Modified: trunk/reactos/lib/3rdparty/libxml2/triostr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/trios… Modified: trunk/reactos/lib/3rdparty/libxml2/uri.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/uri.c… Modified: trunk/reactos/lib/3rdparty/libxml2/valid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/valid… Modified: trunk/reactos/lib/3rdparty/libxml2/xinclude.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xincl… Modified: trunk/reactos/lib/3rdparty/libxml2/xmlIO.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlIO… Modified: trunk/reactos/lib/3rdparty/libxml2/xmlcatalog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlca… Modified: trunk/reactos/lib/3rdparty/libxml2/xmllint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlli… Modified: trunk/reactos/lib/3rdparty/libxml2/xmlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlme… Modified: trunk/reactos/lib/3rdparty/libxml2/xmlreader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlre… Modified: trunk/reactos/lib/3rdparty/libxml2/xmlregexp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlre… Modified: trunk/reactos/lib/3rdparty/libxml2/xmlsave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlsa… Modified: trunk/reactos/lib/3rdparty/libxml2/xmlschemas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlsc… Modified: trunk/reactos/lib/3rdparty/libxml2/xmlschemastypes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlsc… Modified: trunk/reactos/lib/3rdparty/libxml2/xmlstring.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlst… Modified: trunk/reactos/lib/3rdparty/libxml2/xmlwriter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlwr… Modified: trunk/reactos/lib/3rdparty/libxml2/xpath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xpath… Modified: trunk/reactos/lib/3rdparty/libxml2/xpointer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xpoin…

1 0

[fireball] 43623: - Add VLC to rapps. See issue #4882 for more details.
by fireball＠svn.reactos.org 19 Oct '09

19 Oct '09

Author: fireball Date: Mon Oct 19 21:38:57 2009 New Revision: 43623 URL: http://svn.reactos.org/svn/reactos?rev=43623&view=rev Log: - Add VLC to rapps. See issue #4882 for more details. Added: trunk/reactos/base/applications/rapps/rapps/vlc.txt (with props) Added: trunk/reactos/base/applications/rapps/rapps/vlc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vlc.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/vlc.txt [iso-8859-1] Mon Oct 19 21:38:57 2009 @@ -1,0 +1,12 @@ +; UTF-8 + +[Section] +Name = VLC media player +Version = 1.0.2 +Licence = GPL +Description = A media player. +Size = 18MB +Category = 1 +URLSite = http://www.videolan.org/vlc/ +URLDownload = http://mirror.services.wisc.edu/mirrors/videolan/vlc/1.0.2/win32/vlc-1.0.2-… +CDPath = none Propchange: trunk/reactos/base/applications/rapps/rapps/vlc.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cwittich] 43622: update libxslt headers as well
by cwittich＠svn.reactos.org 19 Oct '09

19 Oct '09

Author: cwittich Date: Mon Oct 19 21:28:32 2009 New Revision: 43622 URL: http://svn.reactos.org/svn/reactos?rev=43622&view=rev Log: update libxslt headers as well Added: trunk/reactos/include/reactos/libs/libxslt/xsltlocale.h (with props) Modified: trunk/reactos/include/reactos/libs/libxslt/extensions.h trunk/reactos/include/reactos/libs/libxslt/libxslt.h trunk/reactos/include/reactos/libs/libxslt/xsltconfig.h Modified: trunk/reactos/include/reactos/libs/libxslt/extensions.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxs… ============================================================================== --- trunk/reactos/include/reactos/libs/libxslt/extensions.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/libxslt/extensions.h [iso-8859-1] Mon Oct 19 21:28:32 2009 @@ -22,6 +22,16 @@ /** * Extension Modules API. */ + +/** + * xsltInitGlobals: + * + * Initialize the global variables for extensions + * + */ + +XSLTPUBFUN void XSLTCALL + xsltInitGlobals (void); /** * xsltStyleExtInitFunction: @@ -86,11 +96,11 @@ XSLTPUBFUN int XSLTCALL xsltUnregisterExtModule (const xmlChar * URI); -XSLTPUBFUN void * XSLTCALL +XSLTPUBFUN void * XSLTCALL xsltGetExtData (xsltTransformContextPtr ctxt, const xmlChar *URI); -XSLTPUBFUN void * XSLTCALL +XSLTPUBFUN void * XSLTCALL xsltStyleGetExtData (xsltStylesheetPtr style, const xmlChar *URI); #ifdef XSLT_REFACTORED @@ -99,33 +109,29 @@ xsltStylesheetPtr style, const xmlChar * URI); #endif -XSLTPUBFUN void XSLTCALL - xsltShutdownCtxtExts (xsltTransformContextPtr ctxt); - -XSLTPUBFUN void XSLTCALL - xsltShutdownExts (xsltStylesheetPtr style); - -XSLTPUBFUN xsltTransformContextPtr XSLTCALL - xsltXPathGetTransformContext +XSLTPUBFUN void XSLTCALL + xsltShutdownCtxtExts (xsltTransformContextPtr ctxt); + +XSLTPUBFUN void XSLTCALL + xsltShutdownExts (xsltStylesheetPtr style); + +XSLTPUBFUN xsltTransformContextPtr XSLTCALL + xsltXPathGetTransformContext (xmlXPathParserContextPtr ctxt); /* * extension functions */ -XSLTPUBFUN int XSLTCALL - xsltRegisterExtModuleFunction +XSLTPUBFUN int XSLTCALL + xsltRegisterExtModuleFunction (const xmlChar *name, const xmlChar *URI, xmlXPathFunction function); XSLTPUBFUN xmlXPathFunction XSLTCALL - xsltExtFunctionLookup (xsltTransformContextPtr ctxt, - const xmlChar *name, - const xmlChar *URI); -XSLTPUBFUN xmlXPathFunction XSLTCALL xsltExtModuleFunctionLookup (const xmlChar *name, const xmlChar *URI); -XSLTPUBFUN int XSLTCALL - xsltUnregisterExtModuleFunction +XSLTPUBFUN int XSLTCALL + xsltUnregisterExtModuleFunction (const xmlChar *name, const xmlChar *URI); @@ -133,7 +139,7 @@ * extension elements */ typedef xsltElemPreCompPtr (*xsltPreComputeFunction) - (xsltStylesheetPtr style, + (xsltStylesheetPtr style, xmlNodePtr inst, xsltTransformFunction function); @@ -141,33 +147,33 @@ xsltNewElemPreComp (xsltStylesheetPtr style, xmlNodePtr inst, xsltTransformFunction function); -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltInitElemPreComp (xsltElemPreCompPtr comp, xsltStylesheetPtr style, xmlNodePtr inst, xsltTransformFunction function, xsltElemPreCompDeallocator freeFunc); -XSLTPUBFUN int XSLTCALL - xsltRegisterExtModuleElement +XSLTPUBFUN int XSLTCALL + xsltRegisterExtModuleElement (const xmlChar *name, const xmlChar *URI, xsltPreComputeFunction precomp, xsltTransformFunction transform); -XSLTPUBFUN xsltTransformFunction XSLTCALL +XSLTPUBFUN xsltTransformFunction XSLTCALL xsltExtElementLookup (xsltTransformContextPtr ctxt, const xmlChar *name, const xmlChar *URI); -XSLTPUBFUN xsltTransformFunction XSLTCALL +XSLTPUBFUN xsltTransformFunction XSLTCALL xsltExtModuleElementLookup (const xmlChar *name, const xmlChar *URI); -XSLTPUBFUN xsltPreComputeFunction XSLTCALL - xsltExtModuleElementPreComputeLookup - (const xmlChar *name, - const xmlChar *URI); -XSLTPUBFUN int XSLTCALL - xsltUnregisterExtModuleElement +XSLTPUBFUN xsltPreComputeFunction XSLTCALL + xsltExtModuleElementPreComputeLookup + (const xmlChar *name, + const xmlChar *URI); +XSLTPUBFUN int XSLTCALL + xsltUnregisterExtModuleElement (const xmlChar *name, const xmlChar *URI); @@ -177,28 +183,28 @@ typedef void (*xsltTopLevelFunction) (xsltStylesheetPtr style, xmlNodePtr inst); -XSLTPUBFUN int XSLTCALL +XSLTPUBFUN int XSLTCALL xsltRegisterExtModuleTopLevel (const xmlChar *name, const xmlChar *URI, xsltTopLevelFunction function); -XSLTPUBFUN xsltTopLevelFunction XSLTCALL - xsltExtModuleTopLevelLookup - (const xmlChar *name, - const xmlChar *URI); -XSLTPUBFUN int XSLTCALL - xsltUnregisterExtModuleTopLevel +XSLTPUBFUN xsltTopLevelFunction XSLTCALL + xsltExtModuleTopLevelLookup + (const xmlChar *name, + const xmlChar *URI); +XSLTPUBFUN int XSLTCALL + xsltUnregisterExtModuleTopLevel (const xmlChar *name, const xmlChar *URI); /* These 2 functions are deprecated for use within modules. */ -XSLTPUBFUN int XSLTCALL +XSLTPUBFUN int XSLTCALL xsltRegisterExtFunction (xsltTransformContextPtr ctxt, const xmlChar *name, const xmlChar *URI, xmlXPathFunction function); -XSLTPUBFUN int XSLTCALL +XSLTPUBFUN int XSLTCALL xsltRegisterExtElement (xsltTransformContextPtr ctxt, const xmlChar *name, const xmlChar *URI, @@ -209,24 +215,24 @@ * Those are used by the XSLT (pre)processor. */ -XSLTPUBFUN int XSLTCALL +XSLTPUBFUN int XSLTCALL xsltRegisterExtPrefix (xsltStylesheetPtr style, const xmlChar *prefix, const xmlChar *URI); -XSLTPUBFUN int XSLTCALL +XSLTPUBFUN int XSLTCALL xsltCheckExtPrefix (xsltStylesheetPtr style, const xmlChar *URI); XSLTPUBFUN int XSLTCALL xsltCheckExtURI (xsltStylesheetPtr style, const xmlChar *URI); -XSLTPUBFUN int XSLTCALL +XSLTPUBFUN int XSLTCALL xsltInitCtxtExts (xsltTransformContextPtr ctxt); -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltFreeCtxtExts (xsltTransformContextPtr ctxt); -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltFreeExts (xsltStylesheetPtr style); -XSLTPUBFUN xsltElemPreCompPtr XSLTCALL +XSLTPUBFUN xsltElemPreCompPtr XSLTCALL xsltPreComputeExtModuleElement (xsltStylesheetPtr style, xmlNodePtr inst); @@ -235,16 +241,16 @@ * Used by exslt initialisation */ -XSLTPUBFUN xmlHashTablePtr XSLTCALL - xsltGetExtInfo (xsltStylesheetPtr style, +XSLTPUBFUN xmlHashTablePtr XSLTCALL + xsltGetExtInfo (xsltStylesheetPtr style, const xmlChar *URI); /** * Test module http://xmlsoft.org/XSLT/ */ -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltRegisterTestModule (void); -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltDebugDumpExtensions (FILE * output); Modified: trunk/reactos/include/reactos/libs/libxslt/libxslt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxs… ============================================================================== --- trunk/reactos/include/reactos/libs/libxslt/libxslt.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/libxslt/libxslt.h [iso-8859-1] Mon Oct 19 21:28:32 2009 @@ -16,7 +16,7 @@ #include "config.h" #endif -#include "xsltconfig.h" +#include <libxslt/xsltconfig.h> #include <libxml/xmlversion.h> #if !defined LIBXSLT_PUBLIC Modified: trunk/reactos/include/reactos/libs/libxslt/xsltconfig.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxs… ============================================================================== --- trunk/reactos/include/reactos/libs/libxslt/xsltconfig.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/libxslt/xsltconfig.h [iso-8859-1] Mon Oct 19 21:28:32 2009 @@ -20,28 +20,28 @@ * * the version string like "1.2.3" */ -#define LIBXSLT_DOTTED_VERSION "1.1.24" +#define LIBXSLT_DOTTED_VERSION "1.1.26" /** * LIBXSLT_VERSION: * * the version number: 1.2.3 value is 10203 */ -#define LIBXSLT_VERSION 10124 +#define LIBXSLT_VERSION 10126 /** * LIBXSLT_VERSION_STRING: * * the version number string, 1.2.3 value is "10203" */ -#define LIBXSLT_VERSION_STRING "10124" +#define LIBXSLT_VERSION_STRING "10126" /** * LIBXSLT_VERSION_EXTRA: * * extra version information, used to show a CVS compilation */ -#define LIBXSLT_VERSION_EXTRA "-CVS1070" +#define LIBXSLT_VERSION_EXTRA "-GITv1.1.26" /** * WITH_XSLT_DEBUG: @@ -124,6 +124,19 @@ #endif /** + * Locale support + */ +#if 1 +#ifndef XSLT_LOCALE_XLOCALE +#define XSLT_LOCALE_XLOCALE +#endif +#elif 0 +#ifndef XSLT_LOCALE_WINAPI +#define XSLT_LOCALE_WINAPI +#endif +#endif + +/** * ATTRIBUTE_UNUSED: * * This macro is used to flag unused function parameters to GCC Added: trunk/reactos/include/reactos/libs/libxslt/xsltlocale.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxs… ============================================================================== --- trunk/reactos/include/reactos/libs/libxslt/xsltlocale.h (added) +++ trunk/reactos/include/reactos/libs/libxslt/xsltlocale.h [iso-8859-1] Mon Oct 19 21:28:32 2009 @@ -1,0 +1,57 @@ +/* + * Summary: Locale handling + * Description: Interfaces for locale handling. Needed for language dependent + * sorting. + * + * Copy: See Copyright for the status of this software. + * + * Author: Nick Wellnhofer + */ + +#ifndef __XML_XSLTLOCALE_H__ +#define __XML_XSLTLOCALE_H__ + +#include <libxml/xmlstring.h> + +#ifdef XSLT_LOCALE_XLOCALE + +#include <locale.h> +#include <xlocale.h> + +#ifdef __GLIBC__ +/*locale_t is defined only if _GNU_SOURCE is defined*/ +typedef __locale_t xsltLocale; +#else +typedef locale_t xsltLocale; +#endif +typedef xmlChar xsltLocaleChar; + +#elif defined(XSLT_LOCALE_WINAPI) + +#include <windows.h> +#include <winnls.h> + +typedef LCID xsltLocale; +typedef wchar_t xsltLocaleChar; + +#else + +/* + * XSLT_LOCALE_NONE: + * Macro indicating that locale are not supported + */ +#ifndef XSLT_LOCALE_NONE +#define XSLT_LOCALE_NONE +#endif + +typedef void *xsltLocale; +typedef xmlChar xsltLocaleChar; + +#endif + +xsltLocale xsltNewLocale(const xmlChar *langName); +void xsltFreeLocale(xsltLocale locale); +xsltLocaleChar *xsltStrxfrm(xsltLocale locale, const xmlChar *string); +int xsltLocaleStrcmp(xsltLocale locale, const xsltLocaleChar *str1, const xsltLocaleChar *str2); + +#endif /* __XML_XSLTLOCALE_H__ */ Propchange: trunk/reactos/include/reactos/libs/libxslt/xsltlocale.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[fireball] 43621: - Revert 43599: "Temporarily disable hanging gdi32:metafile test."
by fireball＠svn.reactos.org 19 Oct '09

19 Oct '09

Author: fireball Date: Mon Oct 19 21:24:39 2009 New Revision: 43621 URL: http://svn.reactos.org/svn/reactos?rev=43621&view=rev Log: - Revert 43599: "Temporarily disable hanging gdi32:metafile test." Modified: trunk/rostests/winetests/gdi32/testlist.c Modified: trunk/rostests/winetests/gdi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/testlist.… ============================================================================== --- trunk/rostests/winetests/gdi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/testlist.c [iso-8859-1] Mon Oct 19 21:24:39 2009 @@ -31,7 +31,7 @@ { "generated", func_generated }, { "icm", func_icm }, { "mapping", func_mapping }, - //{ "metafile", func_metafile }, + { "metafile", func_metafile }, { "palette", func_palette }, { "path", func_path }, { "pen", func_pen },

1 0

[cwittich] 43620: update libxslt to version 1.1.26
by cwittich＠svn.reactos.org 19 Oct '09

19 Oct '09

Author: cwittich Date: Mon Oct 19 21:11:29 2009 New Revision: 43620 URL: http://svn.reactos.org/svn/reactos?rev=43620&view=rev Log: update libxslt to version 1.1.26 Added: trunk/reactos/dll/3rdparty/libxslt/xsltlocale.c (with props) trunk/reactos/dll/3rdparty/libxslt/xsltlocale.h (with props) Modified: trunk/reactos/dll/3rdparty/libxslt/ChangeLog trunk/reactos/dll/3rdparty/libxslt/Makefile.am trunk/reactos/dll/3rdparty/libxslt/Makefile.in trunk/reactos/dll/3rdparty/libxslt/attributes.c trunk/reactos/dll/3rdparty/libxslt/attrvt.c trunk/reactos/dll/3rdparty/libxslt/extensions.c trunk/reactos/dll/3rdparty/libxslt/extensions.h trunk/reactos/dll/3rdparty/libxslt/extra.c trunk/reactos/dll/3rdparty/libxslt/functions.c trunk/reactos/dll/3rdparty/libxslt/imports.c trunk/reactos/dll/3rdparty/libxslt/keys.c trunk/reactos/dll/3rdparty/libxslt/libxslt.h trunk/reactos/dll/3rdparty/libxslt/libxslt.rbuild trunk/reactos/dll/3rdparty/libxslt/namespaces.c trunk/reactos/dll/3rdparty/libxslt/pattern.c trunk/reactos/dll/3rdparty/libxslt/preproc.c trunk/reactos/dll/3rdparty/libxslt/security.c trunk/reactos/dll/3rdparty/libxslt/templates.c trunk/reactos/dll/3rdparty/libxslt/transform.c trunk/reactos/dll/3rdparty/libxslt/transform.h trunk/reactos/dll/3rdparty/libxslt/trio.h trunk/reactos/dll/3rdparty/libxslt/triodef.h trunk/reactos/dll/3rdparty/libxslt/variables.c trunk/reactos/dll/3rdparty/libxslt/xslt.c trunk/reactos/dll/3rdparty/libxslt/xsltInternals.h trunk/reactos/dll/3rdparty/libxslt/xsltconfig.h trunk/reactos/dll/3rdparty/libxslt/xsltconfig.h.in trunk/reactos/dll/3rdparty/libxslt/xsltutils.c trunk/reactos/dll/3rdparty/libxslt/xsltwin32config.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/3rdparty/libxslt/ChangeLog URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/Chang… Modified: trunk/reactos/dll/3rdparty/libxslt/Makefile.am URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/Makef… Modified: trunk/reactos/dll/3rdparty/libxslt/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/Makef… Modified: trunk/reactos/dll/3rdparty/libxslt/attributes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/attri… Modified: trunk/reactos/dll/3rdparty/libxslt/attrvt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/attrv… Modified: trunk/reactos/dll/3rdparty/libxslt/extensions.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/exten… Modified: trunk/reactos/dll/3rdparty/libxslt/extensions.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/exten… Modified: trunk/reactos/dll/3rdparty/libxslt/extra.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/extra… Modified: trunk/reactos/dll/3rdparty/libxslt/functions.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/funct… Modified: trunk/reactos/dll/3rdparty/libxslt/imports.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/impor… Modified: trunk/reactos/dll/3rdparty/libxslt/keys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/keys.… Modified: trunk/reactos/dll/3rdparty/libxslt/libxslt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/libxs… Modified: trunk/reactos/dll/3rdparty/libxslt/libxslt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/libxs… Modified: trunk/reactos/dll/3rdparty/libxslt/namespaces.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/names… Modified: trunk/reactos/dll/3rdparty/libxslt/pattern.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/patte… Modified: trunk/reactos/dll/3rdparty/libxslt/preproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/prepr… Modified: trunk/reactos/dll/3rdparty/libxslt/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/secur… Modified: trunk/reactos/dll/3rdparty/libxslt/templates.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/templ… Modified: trunk/reactos/dll/3rdparty/libxslt/transform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/trans… Modified: trunk/reactos/dll/3rdparty/libxslt/transform.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/trans… Modified: trunk/reactos/dll/3rdparty/libxslt/trio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/trio.… Modified: trunk/reactos/dll/3rdparty/libxslt/triodef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/triod… Modified: trunk/reactos/dll/3rdparty/libxslt/variables.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/varia… Modified: trunk/reactos/dll/3rdparty/libxslt/xslt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/xslt.… Modified: trunk/reactos/dll/3rdparty/libxslt/xsltInternals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/xsltI… Modified: trunk/reactos/dll/3rdparty/libxslt/xsltconfig.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/xsltc… Modified: trunk/reactos/dll/3rdparty/libxslt/xsltconfig.h.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/xsltc… Added: trunk/reactos/dll/3rdparty/libxslt/xsltlocale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/xsltl… Added: trunk/reactos/dll/3rdparty/libxslt/xsltlocale.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/xsltl… Modified: trunk/reactos/dll/3rdparty/libxslt/xsltutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/xsltu… Modified: trunk/reactos/dll/3rdparty/libxslt/xsltwin32config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/xsltw…

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
65
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2009