November 2005 - Wine-Commits

wine/dlls iccvid/rsrc.rc msvidc32/rsrc.rc iccv ...
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21510 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 14:11:31 Modified files: dlls/iccvid : rsrc.rc dlls/msvidc32 : rsrc.rc Added files: dlls/iccvid : iccvid_De.rc dlls/msvidc32 : msvidc32_De.rc Log message: Henning Gerhardt <henning.gerhardt(a)web.de> Add German resources. Patch: http://cvs.winehq.org/patch.py?id=21510 Old revision New revision Changes Path 1.1 1.2 +1 -0 wine/dlls/iccvid/rsrc.rc Added 1.1 +0 -0 wine/dlls/iccvid/iccvid_De.rc 1.1 1.2 +1 -0 wine/dlls/msvidc32/rsrc.rc Added 1.1 +0 -0 wine/dlls/msvidc32/msvidc32_De.rc Index: wine/dlls/iccvid/rsrc.rc diff -u -p wine/dlls/iccvid/rsrc.rc:1.1 wine/dlls/iccvid/rsrc.rc:1.2 --- wine/dlls/iccvid/rsrc.rc:1.1 28 Nov 2005 20:11:31 -0000 +++ wine/dlls/iccvid/rsrc.rc 28 Nov 2005 20:11:31 -0000 @@ -19,4 +19,5 @@ #include "windef.h" #include "iccvid_private.h" +#include "iccvid_De.rc" #include "iccvid_En.rc" Index: wine/dlls/iccvid/iccvid_De.rc diff -u -p /dev/null wine/dlls/iccvid/iccvid_De.rc:1.1 --- /dev/null 28 Nov 2005 20:11:31 -0000 +++ wine/dlls/iccvid/iccvid_De.rc 28 Nov 2005 20:11:31 -0000 @@ -0,0 +1,26 @@ +/* + * Copyright 2005 Dmitry Timoshkov + * Copyright 2005 Henning Gerhardt + * + * 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 + */ + +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "Cinepak Video Codec" + IDS_DESCRIPTION "Cinepak Video Codec" +} Index: wine/dlls/msvidc32/rsrc.rc diff -u -p wine/dlls/msvidc32/rsrc.rc:1.1 wine/dlls/msvidc32/rsrc.rc:1.2 --- wine/dlls/msvidc32/rsrc.rc:1.1 28 Nov 2005 20:11:31 -0000 +++ wine/dlls/msvidc32/rsrc.rc 28 Nov 2005 20:11:31 -0000 @@ -19,4 +19,5 @@ #include "windef.h" #include "msvidc32_private.h" +#include "msvidc32_De.rc" #include "msvidc32_En.rc" Index: wine/dlls/msvidc32/msvidc32_De.rc diff -u -p /dev/null wine/dlls/msvidc32/msvidc32_De.rc:1.1 --- /dev/null 28 Nov 2005 20:11:31 -0000 +++ wine/dlls/msvidc32/msvidc32_De.rc 28 Nov 2005 20:11:31 -0000 @@ -0,0 +1,26 @@ +/* + * Copyright 2005 Dmitry Timoshkov + * Copyright 2005 Henning Gerhardt + * + * 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 + */ + +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "WINE-MS-CRAM" + IDS_DESCRIPTION "Wine Video 1 Video Codec" +}

1 0

wine/dlls/wldap32 add.c bind.c
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21509 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 14:11:22 Modified files: dlls/wldap32 : add.c bind.c Log message: Hans Leidekker <hans(a)it.vu.nl> Document the ldap_bind* functions. Patch: http://cvs.winehq.org/patch.py?id=21509 Old revision New revision Changes Path 1.4 1.5 +2 -1 wine/dlls/wldap32/add.c 1.7 1.8 +165 -0 wine/dlls/wldap32/bind.c

1 0

wine/dlls/shell32 shfldr_unixfs.c
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21508 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 14:11:14 Modified files: dlls/shell32 : shfldr_unixfs.c Log message: Michael Jung <mjung(a)iss.tu-darmstadt.de> Enhanced UnixFolder's IDropTarget implementation. Use STATIC_CAST macro more consistently. Patch: http://cvs.winehq.org/patch.py?id=21508 Old revision New revision Changes Path 1.62 1.63 +147 -34 wine/dlls/shell32/shfldr_unixfs.c

1 0

wine/tools/winebuild spec16.c
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21507 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 14:11:02 Modified files: tools/winebuild: spec16.c Log message: Preserve 16-byte stack alignment in 16-bit relays. Patch: http://cvs.winehq.org/patch.py?id=21507 Old revision New revision Changes Path 1.64 1.65 +14 -6 wine/tools/winebuild/spec16.c Index: wine/tools/winebuild/spec16.c diff -u -p wine/tools/winebuild/spec16.c:1.64 wine/tools/winebuild/spec16.c:1.65 --- wine/tools/winebuild/spec16.c:1.64 28 Nov 2005 20:11: 2 -0000 +++ wine/tools/winebuild/spec16.c 28 Nov 2005 20:11: 2 -0000 @@ -286,7 +286,7 @@ static int get_function_argsize( const O static void output_call16_function( FILE *outfile, ORDDEF *odp ) { char name[256]; - int i, pos; + int i, pos, stack_words; const char *args = odp->u.func.arg_types; int argsize = get_function_argsize( odp ); int needs_ldt = strchr( args, 'p' ) || strchr( args, 't' ); @@ -298,19 +298,25 @@ static void output_call16_function( FILE fprintf( outfile, "%s:\n", name ); fprintf( outfile, "\tpushl %%ebp\n" ); fprintf( outfile, "\tmovl %%esp,%%ebp\n" ); + stack_words = 2; if (needs_ldt) { fprintf( outfile, "\tpushl %%esi\n" ); + stack_words++; if (UsePIC) { - fprintf( outfile, "\tcall 1f\n" ); - fprintf( outfile, "1:\tpopl %%eax\n" ); - fprintf( outfile, "\tmovl wine_ldt_copy_ptr-1b(%%eax),%%esi\n" ); + fprintf( outfile, "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); + fprintf( outfile, "1:\tmovl wine_ldt_copy_ptr-1b(%%eax),%%esi\n" ); } else fprintf( outfile, "\tmovl $%s,%%esi\n", asm_name("wine_ldt_copy") ); } + /* preserve 16-byte stack alignment */ + stack_words += strlen(args); + if ((odp->flags & FLAG_REGISTER) || (odp->type == TYPE_VARARGS)) stack_words++; + if (stack_words % 4) fprintf( outfile, "\tsubl $%d,%%esp\n", 16 - 4 * (stack_words % 4) ); + if (args[0] || odp->type == TYPE_VARARGS) fprintf( outfile, "\tmovl 12(%%ebp),%%ecx\n" ); /* args */ @@ -456,6 +462,7 @@ static void output_init_code( FILE *outf fprintf( outfile, "\t.align 4\n" ); fprintf( outfile, "\t%s\n", func_declaration(name) ); fprintf( outfile, "%s:\n", name ); + fprintf( outfile, "subl $4,%%esp\n" ); if (UsePIC) { fprintf( outfile, "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); @@ -470,7 +477,7 @@ static void output_init_code( FILE *outf fprintf( outfile, "\tpushl $%s\n", header_name ); } fprintf( outfile, "\tcall %s\n", asm_name("__wine_dll_register_16") ); - fprintf( outfile, "\taddl $8,%%esp\n" ); + fprintf( outfile, "\taddl $12,%%esp\n" ); fprintf( outfile, "\tret\n" ); output_function_size( outfile, name ); @@ -479,6 +486,7 @@ static void output_init_code( FILE *outf fprintf( outfile, "\t.align 4\n" ); fprintf( outfile, "\t%s\n", func_declaration(name) ); fprintf( outfile, "%s:\n", name ); + fprintf( outfile, "subl $8,%%esp\n" ); if (UsePIC) { fprintf( outfile, "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); @@ -490,7 +498,7 @@ static void output_init_code( FILE *outf fprintf( outfile, "\tpushl $%s\n", header_name ); } fprintf( outfile, "\tcall %s\n", asm_name("__wine_dll_unregister_16") ); - fprintf( outfile, "\taddl $4,%%esp\n" ); + fprintf( outfile, "\taddl $12,%%esp\n" ); fprintf( outfile, "\tret\n" ); output_function_size( outfile, name );

1 0

wine/tools/winebuild relay.c
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21506 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 14:10:56 Modified files: tools/winebuild: relay.c Log message: Enforce 16-byte stack alignment when returning from 16-bit code and when calling a register function. Patch: http://cvs.winehq.org/patch.py?id=21506 Old revision New revision Changes Path 1.52 1.53 +18 -7 wine/tools/winebuild/relay.c Index: wine/tools/winebuild/relay.c diff -u -p wine/tools/winebuild/relay.c:1.52 wine/tools/winebuild/relay.c:1.53 --- wine/tools/winebuild/relay.c:1.52 28 Nov 2005 20:10:56 -0000 +++ wine/tools/winebuild/relay.c 28 Nov 2005 20:10:56 -0000 @@ -270,7 +270,16 @@ static void BuildCallFrom16Core( FILE *o #endif /* Push address of CONTEXT86 structure -- popped by the relay routine */ - fprintf( outfile, "\tpushl %%esp\n" ); + fprintf( outfile, "\tmovl %%esp,%%eax\n" ); + fprintf( outfile, "\tandl $~15,%%esp\n" ); + fprintf( outfile, "\tsubl $4,%%esp\n" ); + fprintf( outfile, "\tpushl %%eax\n" ); + } + else + { + fprintf( outfile, "\tsubl $8,%%esp\n" ); + fprintf( outfile, "\tandl $~15,%%esp\n" ); + fprintf( outfile, "\taddl $8,%%esp\n" ); } /* Call relay routine (which will call the API entry point) */ @@ -726,7 +735,8 @@ static void BuildCallTo32CBClient( FILE * (ebp+0) saved ebp * (ebp-128) buffer area to allow stack frame manipulation * (ebp-332) CONTEXT86 struct - * (ebp-336) CONTEXT86 *argument + * (ebp-336) padding for stack alignment + * (ebp-336-n) CONTEXT86 *argument * .... other arguments copied from (ebp+12) * * The entry point routine is called with a CONTEXT* extra argument, @@ -747,7 +757,7 @@ static void BuildCallFrom32Regs( FILE *o fprintf( outfile, "\tpushl %%ebp\n" ); fprintf( outfile, "\tmovl %%esp,%%ebp\n "); - fprintf( outfile, "\tleal -%d(%%esp), %%esp\n", STACK_SPACE ); + fprintf( outfile, "\tleal -%d(%%esp), %%esp\n", STACK_SPACE + 4 /* for context arg */); /* Build the context structure */ @@ -788,17 +798,18 @@ static void BuildCallFrom32Regs( FILE *o /* Transfer the arguments */ fprintf( outfile, "\tmovl 4(%%ebp),%%ebx\n" ); /* get relay code addr */ - fprintf( outfile, "\tpushl %%esp\n" ); /* push ptr to context struct */ fprintf( outfile, "\tmovzbl 4(%%ebx),%%ecx\n" ); /* fetch number of args to copy */ - fprintf( outfile, "\tjecxz 1f\n" ); fprintf( outfile, "\tsubl %%ecx,%%esp\n" ); + fprintf( outfile, "\tandl $~15,%%esp\n" ); fprintf( outfile, "\tleal 16(%%ebp),%%esi\n" ); /* get %esp at time of call */ fprintf( outfile, "\tmovl %%esp,%%edi\n" ); fprintf( outfile, "\tshrl $2,%%ecx\n" ); + fprintf( outfile, "\tjz 1f\n" ); fprintf( outfile, "\tcld\n" ); fprintf( outfile, "\trep\n\tmovsl\n" ); /* copy args */ - - fprintf( outfile, "1:\tmovzbl 5(%%ebx),%%eax\n" ); /* fetch number of args to remove */ + fprintf( outfile, "1:\tleal %d(%%ebp),%%eax\n", -STACK_SPACE ); /* get addr of context struct */ + fprintf( outfile, "\tmovl %%eax,(%%edi)\n" ); /* and pass it as extra arg */ + fprintf( outfile, "\tmovzbl 5(%%ebx),%%eax\n" ); /* fetch number of args to remove */ fprintf( outfile, "\tleal 16(%%ebp,%%eax),%%eax\n" ); fprintf( outfile, "\tmovl %%eax,%d(%%ebp)\n", CONTEXTOFFSET(Esp) - STACK_SPACE );

1 0

wine/ dlls/advapi32/crypt.c dlls/advapi32/cryp ...
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21505 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 14:10:43 Modified files: dlls/advapi32 : crypt.c crypt_lmhash.c lsa.c registry.c security.c dlls/dbghelp : minidump.c path.c stack.c dlls/dplayx : dplayx_messages.c dlls/imagehlp : integrity.c dlls/kernel : actctx.c change.c comm.c computername.c debugger.c environ.c except.c file.c format_msg.c global16.c instr.c locale.c module.c oldconfig.c path.c process.c resource.c sync.c thread.c time.c version.c virtual.c volume.c dlls/mcicda : mcicda.c dlls/netapi32 : wksta.c dlls/ntdll : atom.c cdrom.c critsection.c debugbuffer.c debugtools.c directory.c env.c error.c exception.c file.c handletable.c heap.c large_int.c loader.c nt.c ntdll_misc.h om.c path.c process.c reg.c resource.c rtl.c rtlstr.c sec.c server.c sync.c thread.c time.c version.c virtual.c dlls/ntdll/tests: large_int.c rtlstr.c dlls/powrprof : powrprof.c dlls/psapi : psapi_main.c dlls/quartz : filesource.c dlls/rpcrt4 : rpc_server.c rpcss_np_client.c dlls/user : cursoricon.c message.c painting.c winpos.c dlls/vmm.vxd : vmm.c dlls/winedos : int2f.c vxd.c dlls/wininet : internet.c dlls/winmm : mmsystem.c dlls/winsock : socket.c dlls/x11drv : dce.c winpos.c include : ntstatus.h winnt.h programs/rpcss : np_server.c programs/wcmd : wcmdmain.c programs/winedbg: dbg.y debugger.h gdbproxy.c server : atom.c change.c class.c clipboard.c console.c debugger.c event.c fd.c file.c handle.c hook.c mailslot.c mapping.c mutex.c named_pipe.c object.c process.c ptrace.c queue.c region.c registry.c semaphore.c serial.c snapshot.c sock.c thread.c thread.h timer.c token.c trace.c window.c winstation.c Log message: Ge van Geldorp <gvg(a)reactos.org> Match PSDK STATUS_* definitions. Patch: http://cvs.winehq.org/patch.py?id=21505 Old revision New revision Changes Path 1.74 1.75 +2 -1 wine/dlls/advapi32/crypt.c 1.2 1.3 +2 -1 wine/dlls/advapi32/crypt_lmhash.c 1.3 1.4 +2 -1 wine/dlls/advapi32/lsa.c 1.86 1.87 +2 -1 wine/dlls/advapi32/registry.c 1.118 1.119 +2 -1 wine/dlls/advapi32/security.c 1.5 1.6 +2 -1 wine/dlls/dbghelp/minidump.c 1.6 1.7 +0 -1 wine/dlls/dbghelp/path.c 1.10 1.11 +2 -2 wine/dlls/dbghelp/stack.c 1.16 1.17 +0 -1 wine/dlls/dplayx/dplayx_messages.c 1.13 1.14 +0 -1 wine/dlls/imagehlp/integrity.c 1.3 1.4 +0 -1 wine/dlls/kernel/actctx.c 1.10 1.11 +2 -1 wine/dlls/kernel/change.c 1.101 1.102 +0 -1 wine/dlls/kernel/comm.c 1.18 1.19 +1 -0 wine/dlls/kernel/computername.c 1.31 1.32 +0 -1 wine/dlls/kernel/debugger.c 1.7 1.8 +1 -0 wine/dlls/kernel/environ.c 1.16 1.17 +1 -0 wine/dlls/kernel/except.c 1.45 1.46 +1 -0 wine/dlls/kernel/file.c 1.42 1.43 +1 -0 wine/dlls/kernel/format_msg.c 1.15 1.16 +0 -1 wine/dlls/kernel/global16.c 1.27 1.28 +0 -1 wine/dlls/kernel/instr.c 1.69 1.70 +1 -0 wine/dlls/kernel/locale.c 1.21 1.22 +2 -1 wine/dlls/kernel/module.c 1.11 1.12 +0 -1 wine/dlls/kernel/oldconfig.c 1.27 1.28 +1 -0 wine/dlls/kernel/path.c 1.110 1.111 +2 -1 wine/dlls/kernel/process.c 1.13 1.14 +1 -0 wine/dlls/kernel/resource.c 1.93 1.94 +1 -0 wine/dlls/kernel/sync.c 1.32 1.33 +1 -0 wine/dlls/kernel/thread.c 1.57 1.58 +2 -1 wine/dlls/kernel/time.c 1.9 1.10 +1 -0 wine/dlls/kernel/version.c 1.12 1.13 +1 -0 wine/dlls/kernel/virtual.c 1.35 1.36 +2 -1 wine/dlls/kernel/volume.c 1.2 1.3 +3 -1 wine/dlls/mcicda/mcicda.c 1.17 1.18 +2 -1 wine/dlls/netapi32/wksta.c 1.4 1.5 +2 -1 wine/dlls/ntdll/atom.c 1.73 1.74 +1 -0 wine/dlls/ntdll/cdrom.c 1.36 1.37 +2 -0 wine/dlls/ntdll/critsection.c 1.3 1.4 +2 -0 wine/dlls/ntdll/debugbuffer.c 1.44 1.45 +0 -1 wine/dlls/ntdll/debugtools.c 1.41 1.42 +2 -1 wine/dlls/ntdll/directory.c 1.20 1.21 +2 -0 wine/dlls/ntdll/env.c 1.18 1.19 +1 -0 wine/dlls/ntdll/error.c 1.89 1.90 +1 -0 wine/dlls/ntdll/exception.c 1.105 1.106 +2 -0 wine/dlls/ntdll/file.c 1.5 1.6 +2 -0 wine/dlls/ntdll/handletable.c 1.52 1.53 +1 -0 wine/dlls/ntdll/heap.c 1.14 1.15 +1 -0 wine/dlls/ntdll/large_int.c 1.108 1.109 +2 -0 wine/dlls/ntdll/loader.c 1.103 1.104 +3 -1 wine/dlls/ntdll/nt.c 1.69 1.70 +0 -1 wine/dlls/ntdll/ntdll_misc.h 1.36 1.37 +3 -1 wine/dlls/ntdll/om.c 1.36 1.37 +2 -0 wine/dlls/ntdll/path.c 1.14 1.15 +3 -1 wine/dlls/ntdll/process.c 1.65 1.66 +2 -0 wine/dlls/ntdll/reg.c 1.20 1.21 +1 -0 wine/dlls/ntdll/resource.c 1.80 1.81 +2 -0 wine/dlls/ntdll/rtl.c 1.56 1.57 +2 -0 wine/dlls/ntdll/rtlstr.c 1.68 1.69 +2 -0 wine/dlls/ntdll/sec.c 1.37 1.38 +1 -0 wine/dlls/ntdll/server.c 1.52 1.53 +2 -0 wine/dlls/ntdll/sync.c 1.46 1.47 +1 -0 wine/dlls/ntdll/thread.c 1.82 1.83 +2 -0 wine/dlls/ntdll/time.c 1.28 1.29 +1 -0 wine/dlls/ntdll/version.c 1.72 1.73 +1 -0 wine/dlls/ntdll/virtual.c 1.9 1.10 +4 -4 wine/dlls/ntdll/tests/large_int.c 1.20 1.21 +9 -9 wine/dlls/ntdll/tests/rtlstr.c 1.3 1.4 +2 -1 wine/dlls/powrprof/powrprof.c 1.27 1.28 +2 -1 wine/dlls/psapi/psapi_main.c 1.19 1.20 +0 -1 wine/dlls/quartz/filesource.c 1.43 1.44 +0 -1 wine/dlls/rpcrt4/rpc_server.c 1.5 1.6 +0 -1 wine/dlls/rpcrt4/rpcss_np_client.c 1.20 1.21 +0 -1 wine/dlls/user/cursoricon.c 1.97 1.98 +1 -0 wine/dlls/user/message.c 1.35 1.36 +2 -1 wine/dlls/user/painting.c 1.5 1.6 +2 -1 wine/dlls/user/winpos.c 1.2 1.3 +0 -1 wine/dlls/vmm.vxd/vmm.c 1.7 1.8 +3 -1 wine/dlls/winedos/int2f.c 1.10 1.11 +2 -1 wine/dlls/winedos/vxd.c 1.146 1.147 +0 -1 wine/dlls/wininet/internet.c 1.121 1.122 +0 -1 wine/dlls/winmm/mmsystem.c 1.198 1.199 +2 -1 wine/dlls/winsock/socket.c 1.8 1.9 +2 -1 wine/dlls/x11drv/dce.c 1.141 1.142 +0 -1 wine/dlls/x11drv/winpos.c 1.1 1.2 +1066 -1057 wine/include/ntstatus.h 1.223 1.224 +43 -43 wine/include/winnt.h 1.4 1.5 +0 -1 wine/programs/rpcss/np_server.c 1.47 1.48 +0 -1 wine/programs/wcmd/wcmdmain.c 1.31 1.32 +1 -1 wine/programs/winedbg/dbg.y 1.34 1.35 +3 -1 wine/programs/winedbg/debugger.h 1.29 1.30 +2 -2 wine/programs/winedbg/gdbproxy.c 1.26 1.27 +4 -0 wine/server/atom.c 1.27 1.28 +3 -0 wine/server/change.c 1.4 1.5 +4 -0 wine/server/class.c 1.8 1.9 +3 -0 wine/server/clipboard.c 1.62 1.63 +3 -0 wine/server/console.c 1.60 1.61 +3 -0 wine/server/debugger.c 1.37 1.38 +2 -0 wine/server/event.c 1.51 1.52 +2 -0 wine/server/fd.c 1.101 1.102 +2 -0 wine/server/file.c 1.43 1.44 +2 -0 wine/server/handle.c 1.18 1.19 +3 -0 wine/server/hook.c 1.15 1.16 +2 -0 wine/server/mailslot.c 1.62 1.63 +2 -0 wine/server/mapping.c 1.35 1.36 +2 -0 wine/server/mutex.c 1.55 1.56 +2 -0 wine/server/named_pipe.c 1.40 1.41 +2 -0 wine/server/object.c 1.145 1.146 +2 -0 wine/server/process.c 1.30 1.31 +5 -0 wine/server/ptrace.c 1.72 1.73 +3 -0 wine/server/queue.c 1.8 1.9 +3 -0 wine/server/region.c 1.83 1.84 +2 -0 wine/server/registry.c 1.35 1.36 +2 -0 wine/server/semaphore.c 1.44 1.45 +2 -0 wine/server/serial.c 1.26 1.27 +3 -0 wine/server/snapshot.c 1.59 1.60 +3 -0 wine/server/sock.c 1.131 1.132 +4 -1 wine/server/thread.c 1.66 1.67 +0 -1 wine/server/thread.h 1.34 1.35 +2 -0 wine/server/timer.c 1.16 1.17 +4 -0 wine/server/token.c 1.270 1.271 +2 -0 wine/server/trace.c 1.60 1.61 +3 -0 wine/server/window.c 1.17 1.18 +2 -0 wine/server/winstation.c

1 0

wine/ dlls/iccvid/iccvid.c dlls/msrle32/msrle3 ...
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21504 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 14:04:55 Modified files: dlls/iccvid : iccvid.c dlls/msrle32 : msrle32.c msrle_private.h dlls/msvidc32 : msvideo1.c dlls/msvideo : msvideo_main.c include : vfw.h Log message: Dmitry Timoshkov <dmitry(a)codeweavers.com> Set both dwVersionICM and dwVersion to ICVERSION in Wine builtin codecs. Patch: http://cvs.winehq.org/patch.py?id=21504 Old revision New revision Changes Path 1.8 1.9 +2 -2 wine/dlls/iccvid/iccvid.c 1.15 1.16 +2 -2 wine/dlls/msrle32/msrle32.c 1.1 1.2 +0 -1 wine/dlls/msrle32/msrle_private.h 1.6 1.7 +2 -2 wine/dlls/msvidc32/msvideo1.c 1.69 1.70 +1 -1 wine/dlls/msvideo/msvideo_main.c 1.53 1.54 +2 -0 wine/include/vfw.h Index: wine/dlls/iccvid/iccvid.c diff -u -p wine/dlls/iccvid/iccvid.c:1.8 wine/dlls/iccvid/iccvid.c:1.9 --- wine/dlls/iccvid/iccvid.c:1.8 28 Nov 2005 20: 4:55 -0000 +++ wine/dlls/iccvid/iccvid.c 28 Nov 2005 20: 4:55 -0000 @@ -921,8 +921,8 @@ static LRESULT ICCVID_GetInfo( ICCVID_In icinfo->fccType = ICTYPE_VIDEO; icinfo->fccHandler = info ? info->dwMagic : ICCVID_MAGIC; icinfo->dwFlags = 0; - icinfo->dwVersion = 0x00010000; /* Version 1.0 build 0 */ - icinfo->dwVersionICM = 0x01040000; /* Version 1.4 build 0 */ + icinfo->dwVersion = ICVERSION; + icinfo->dwVersionICM = ICVERSION; LoadStringW(ICCVID_hModule, IDS_NAME, icinfo->szName, sizeof(icinfo->szName)/sizeof(WCHAR)); LoadStringW(ICCVID_hModule, IDS_DESCRIPTION, icinfo->szDescription, sizeof(icinfo->szDescription)/sizeof(WCHAR)); Index: wine/dlls/msrle32/msrle32.c diff -u -p wine/dlls/msrle32/msrle32.c:1.15 wine/dlls/msrle32/msrle32.c:1.16 --- wine/dlls/msrle32/msrle32.c:1.15 28 Nov 2005 20: 4:55 -0000 +++ wine/dlls/msrle32/msrle32.c 28 Nov 2005 20: 4:55 -0000 @@ -1167,8 +1167,8 @@ static LRESULT GetInfo(CodecInfo *pi, IC icinfo->fccType = ICTYPE_VIDEO; icinfo->fccHandler = (pi != NULL ? pi->fccHandler : FOURCC_MRLE); icinfo->dwFlags = VIDCF_QUALITY | VIDCF_TEMPORAL | VIDCF_CRUNCH | VIDCF_FASTTEMPORALC; - icinfo->dwVersion = MSRLE32_VERSION; - icinfo->dwVersionICM = 0x01040000; /* Version 1.4 build 0 */ + icinfo->dwVersion = ICVERSION; + icinfo->dwVersionICM = ICVERSION; LoadStringW(MSRLE32_hModule, IDS_NAME, icinfo->szName, sizeof(icinfo->szName)/sizeof(WCHAR)); LoadStringW(MSRLE32_hModule, IDS_DESCRIPTION, icinfo->szDescription, sizeof(icinfo->szDescription)/sizeof(WCHAR)); Index: wine/dlls/msrle32/msrle_private.h diff -u -p wine/dlls/msrle32/msrle_private.h:1.1 wine/dlls/msrle32/msrle_private.h:1.2 --- wine/dlls/msrle32/msrle_private.h:1.1 28 Nov 2005 20: 4:55 -0000 +++ wine/dlls/msrle32/msrle_private.h 28 Nov 2005 20: 4:55 -0000 @@ -35,7 +35,6 @@ #define IDS_DESCRIPTION 101 #define IDS_ABOUT 102 -#define MSRLE32_VERSION 0x00010000 /* Version 1.0 build 0 */ #define MSRLE32_DEFAULTQUALITY (75 * ICQUALITY_HIGH) / 100 #define FOURCC_RLE mmioFOURCC('R','L','E',' ') Index: wine/dlls/msvidc32/msvideo1.c diff -u -p wine/dlls/msvidc32/msvideo1.c:1.6 wine/dlls/msvidc32/msvideo1.c:1.7 --- wine/dlls/msvidc32/msvideo1.c:1.6 28 Nov 2005 20: 4:55 -0000 +++ wine/dlls/msvidc32/msvideo1.c 28 Nov 2005 20: 4:55 -0000 @@ -465,8 +465,8 @@ static LRESULT CRAM_GetInfo( Msvideo1Con icinfo->fccType = ICTYPE_VIDEO; icinfo->fccHandler = info ? info->dwMagic : CRAM_MAGIC; icinfo->dwFlags = 0; - icinfo->dwVersion = 0x00010000; /* Version 1.0 build 0 */ - icinfo->dwVersionICM = 0x01040000; /* Version 1.4 build 0 */ + icinfo->dwVersion = ICVERSION; + icinfo->dwVersionICM = ICVERSION; LoadStringW(MSVIDC32_hModule, IDS_NAME, icinfo->szName, sizeof(icinfo->szName)/sizeof(WCHAR)); LoadStringW(MSVIDC32_hModule, IDS_DESCRIPTION, icinfo->szDescription, sizeof(icinfo->szDescription)/sizeof(WCHAR)); Index: wine/dlls/msvideo/msvideo_main.c diff -u -p wine/dlls/msvideo/msvideo_main.c:1.69 wine/dlls/msvideo/msvideo_main.c:1.70 --- wine/dlls/msvideo/msvideo_main.c:1.69 28 Nov 2005 20: 4:55 -0000 +++ wine/dlls/msvideo/msvideo_main.c 28 Nov 2005 20: 4:55 -0000 @@ -185,7 +185,7 @@ static BOOL ICInfo_enum_handler(const ch lpicinfo->fccHandler = fccHandler; lpicinfo->dwFlags = 0; lpicinfo->dwVersion = 0; - lpicinfo->dwVersionICM = 0x104; + lpicinfo->dwVersionICM = ICVERSION; lpicinfo->szName[0] = 0; lpicinfo->szDescription[0] = 0; MultiByteToWideChar(CP_ACP, 0, drv + 10, -1, lpicinfo->szDriver, Index: wine/include/vfw.h diff -u -p wine/include/vfw.h:1.53 wine/include/vfw.h:1.54 --- wine/include/vfw.h:1.53 28 Nov 2005 20: 4:55 -0000 +++ wine/include/vfw.h 28 Nov 2005 20: 4:55 -0000 @@ -42,6 +42,8 @@ typedef struct IAVIEditStream *PAVIEDITS /* Installable Compressor Manager */ +#define ICVERSION 0x0104 + DECLARE_HANDLE(HIC); /* error return codes */

1 0

wine/dlls/wininet http.c
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21503 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 14:04:34 Modified files: dlls/wininet : http.c Log message: Aric Stewart <aric(a)codeweavers.com> Allow HttpEndRequest to process 302 and 301 redirects. Append Host port if non standard on the redirect host header and make sure to append the extra information (parameters) and such to the location if present. Additionally check to see if we are redirecting to https and if so set the appropriate port. Patch: http://cvs.winehq.org/patch.py?id=21503 Old revision New revision Changes Path 1.123 1.124 +56 -5 wine/dlls/wininet/http.c Index: wine/dlls/wininet/http.c diff -u -p wine/dlls/wininet/http.c:1.123 wine/dlls/wininet/http.c:1.124 --- wine/dlls/wininet/http.c:1.123 28 Nov 2005 20: 4:34 -0000 +++ wine/dlls/wininet/http.c 28 Nov 2005 20: 4:34 -0000 @@ -95,7 +95,12 @@ static BOOL HTTP_DeleteCustomHeader(LPWI static LPWSTR HTTP_build_req( LPCWSTR *list, int len ); static BOOL HTTP_InsertProxyAuthorization( LPWININETHTTPREQW lpwhr, LPCWSTR username, LPCWSTR password ); - +static BOOL WINAPI HTTP_HttpQueryInfoW( LPWININETHTTPREQW lpwhr, DWORD + dwInfoLevel, LPVOID lpBuffer, LPDWORD lpdwBufferLength, LPDWORD + lpdwIndex); +static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl, + LPCWSTR lpszHeaders, DWORD dwHeaderLength, LPVOID lpOptional, DWORD + dwOptionalLength); /*********************************************************************** * HTTP_Tokenize (internal) @@ -608,6 +613,26 @@ BOOL WINAPI HttpEndRequestW(HINTERNET hR /* We appear to do nothing with the buffer.. is that correct? */ + if(!(lpwhr->hdr.dwFlags & INTERNET_FLAG_NO_AUTO_REDIRECT)) + { + DWORD dwCode,dwCodeLength=sizeof(DWORD),dwIndex=0; + if(HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_STATUS_CODE,&dwCode,&dwCodeLength,&dwIndex) && + (dwCode==302 || dwCode==301)) + { + WCHAR szNewLocation[2048]; + DWORD dwBufferSize=2048; + dwIndex=0; + if(HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_LOCATION,szNewLocation,&dwBufferSize,&dwIndex)) + { + static const WCHAR szGET[] = { 'G','E','T', 0 }; + /* redirects are always GETs */ + HeapFree(GetProcessHeap(),0,lpwhr->lpszVerb); + lpwhr->lpszVerb = WININET_strdupW(szGET); + return HTTP_HandleRedirect(lpwhr, szNewLocation, NULL, 0, NULL, 0); + } + } + } + TRACE("%i <--\n",rc); return rc; } @@ -1783,6 +1808,12 @@ static BOOL HTTP_HandleRedirect(LPWININE URL_COMPONENTSW urlComponents; WCHAR protocol[32], hostName[MAXHOSTNAME], userName[1024]; WCHAR password[1024], extra[1024]; + extra[0] = 0; + password[0] = 0; + userName[0] = 0; + hostName[0] = 0; + protocol[0] = 0; + urlComponents.dwStructSize = sizeof(URL_COMPONENTSW); urlComponents.lpszScheme = protocol; urlComponents.dwSchemeLength = 32; @@ -1800,7 +1831,12 @@ static BOOL HTTP_HandleRedirect(LPWININE return FALSE; if (urlComponents.nPort == INTERNET_INVALID_PORT_NUMBER) - urlComponents.nPort = INTERNET_DEFAULT_HTTP_PORT; + { + if (lstrlenW(protocol)>4) /*https*/ + urlComponents.nPort = INTERNET_DEFAULT_HTTPS_PORT; + else /*http*/ + urlComponents.nPort = INTERNET_DEFAULT_HTTP_PORT; + } #if 0 /* @@ -1822,13 +1858,26 @@ static BOOL HTTP_HandleRedirect(LPWININE HeapFree(GetProcessHeap(), 0, lpwhs->lpszHostName); lpwhs->lpszHostName = WININET_strdupW(hostName); HeapFree(GetProcessHeap(), 0, lpwhs->lpszServerName); - lpwhs->lpszServerName = WININET_strdupW(hostName); + if (urlComponents.nPort != INTERNET_DEFAULT_HTTP_PORT && + urlComponents.nPort != INTERNET_DEFAULT_HTTPS_PORT) + { + int len; + static WCHAR fmt[] = {'%','s',':','%','i',0}; + len = lstrlenW(hostName); + len+=6; + lpwhs->lpszServerName = HeapAlloc(GetProcessHeap(),0,len*sizeof(WCHAR)); + sprintfW(lpwhs->lpszServerName,fmt,hostName,urlComponents.nPort); + } + else + lpwhs->lpszServerName = WININET_strdupW(hostName); + + HTTP_ProcessHeader(lpwhr, g_szHost, lpwhs->lpszServerName, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ); + + HeapFree(GetProcessHeap(), 0, lpwhs->lpszUserName); lpwhs->lpszUserName = WININET_strdupW(userName); lpwhs->nServerPort = urlComponents.nPort; - HTTP_ProcessHeader(lpwhr, g_szHost, hostName, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ); - SendAsyncCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_RESOLVING_NAME, lpwhs->lpszServerName, @@ -1841,6 +1890,8 @@ static BOOL HTTP_HandleRedirect(LPWININE return FALSE; } + StrCatW(path,extra); + SendAsyncCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_NAME_RESOLVED, &(lpwhs->socketAddress),

1 0

wine/dlls/shdocvw dochost.c
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21502 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 14:04:22 Modified files: dlls/shdocvw : dochost.c Log message: Jacek Caban <jacek(a)codeweavers.com> Added GetOverrideKeyPath and GetOptionKeyPath implementation. Patch: http://cvs.winehq.org/patch.py?id=21502 Old revision New revision Changes Path 1.3 1.4 +34 -4 wine/dlls/shdocvw/dochost.c Index: wine/dlls/shdocvw/dochost.c diff -u -p wine/dlls/shdocvw/dochost.c:1.3 wine/dlls/shdocvw/dochost.c:1.4 --- wine/dlls/shdocvw/dochost.c:1.3 28 Nov 2005 20: 4:22 -0000 +++ wine/dlls/shdocvw/dochost.c 28 Nov 2005 20: 4:22 -0000 @@ -193,8 +193,23 @@ static HRESULT WINAPI DocHostUIHandler_G LPOLESTR *pchKey, DWORD dw) { WebBrowser *This = DOCHOSTUI_THIS(iface); - FIXME("(%p)->(%p %ld)\n", This, pchKey, dw); - return E_NOTIMPL; + IDocHostUIHandler *handler; + HRESULT hres; + + TRACE("(%p)->(%p %ld)\n", This, pchKey, dw); + + if(!This->client) + return S_OK; + + hres = IOleClientSite_QueryInterface(This->client, &IID_IDocHostUIHandler, + (void**)&handler); + if(SUCCEEDED(hres)) { + hres = IDocHostUIHandler_GetOptionKeyPath(handler, pchKey, dw); + IDocHostUIHandler_Release(handler); + return hres; + } + + return S_OK; } static HRESULT WINAPI DocHostUIHandler_GetDropTarget(IDocHostUIHandler2 *iface, @@ -233,8 +248,23 @@ static HRESULT WINAPI DocHostUIHandler_G LPOLESTR *pchKey, DWORD dw) { WebBrowser *This = DOCHOSTUI_THIS(iface); - FIXME("(%p)->(%p %ld)\n", This, pchKey, dw); - return E_NOTIMPL; + IDocHostUIHandler2 *handler; + HRESULT hres; + + TRACE("(%p)->(%p %ld)\n", This, pchKey, dw); + + if(!This->client) + return S_OK; + + hres = IOleClientSite_QueryInterface(This->client, &IID_IDocHostUIHandler2, + (void**)&handler); + if(SUCCEEDED(hres)) { + hres = IDocHostUIHandler2_GetOverrideKeyPath(handler, pchKey, dw); + IDocHostUIHandler2_Release(handler); + return hres; + } + + return S_OK; } #undef DOCHOSTUI_THIS

1 0

wine/dlls/shell32 shlview.c
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21501 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 14:04:18 Modified files: dlls/shell32 : shlview.c Log message: Michael Jung <mjung(a)iss.tu-darmstadt.de> Use GetUIObjectOf instead of BindToObject to get a IDropTarget object. Patch: http://cvs.winehq.org/patch.py?id=21501 Old revision New revision Changes Path 1.121 1.122 +3 -3 wine/dlls/shell32/shlview.c Index: wine/dlls/shell32/shlview.c diff -u -p wine/dlls/shell32/shlview.c:1.121 wine/dlls/shell32/shlview.c:1.122 --- wine/dlls/shell32/shlview.c:1.121 28 Nov 2005 20: 4:18 -0000 +++ wine/dlls/shell32/shlview.c 28 Nov 2005 20: 4:18 -0000 @@ -2223,9 +2223,9 @@ static HRESULT drag_notify_subitem(IShel lvItem.iItem = lResult; ListView_GetItemA(This->hWndList, &lvItem); - /* ... and bind pCurDropTarget to this folder's IDropTarget interface */ - hr = IShellFolder_BindToObject(This->pSFParent, (LPITEMIDLIST)lvItem.lParam, NULL, - &IID_IDropTarget, (LPVOID*)&This->pCurDropTarget); + /* ... and bind pCurDropTarget to the IDropTarget interface of an UIObject of this object */ + hr = IShellFolder_GetUIObjectOf(This->pSFParent, This->hWndList, 1, + (LPCITEMIDLIST*)&lvItem.lParam, &IID_IDropTarget, NULL, (LPVOID*)&This->pCurDropTarget); } /* If anything failed, pCurDropTarget should be NULL now, which ought to be a save state. */

1 0