November 2005 - Wine-Commits

wine/dlls/atl registrar.c
by Alexandre Julliard Nov. 18, 2005

Nov. 18, 2005

ChangeSet ID: 21320 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/18 06:04:53 Modified files: dlls/atl : registrar.c Log message: Jacek Caban <jacek(a)codeweavers.com> Fix parsing '{' char. Patch: http://cvs.winehq.org/patch.py?id=21320 Old revision New revision Changes Path 1.15 1.16 +2 -2 wine/dlls/atl/registrar.c Index: wine/dlls/atl/registrar.c diff -u -p wine/dlls/atl/registrar.c:1.15 wine/dlls/atl/registrar.c:1.16 --- wine/dlls/atl/registrar.c:1.15 18 Nov 2005 12: 4:53 -0000 +++ wine/dlls/atl/registrar.c 18 Nov 2005 12: 4:53 -0000 @@ -125,7 +125,7 @@ static HRESULT get_word(LPCOLESTR *str, return S_OK; } - if(*iter == '{' || *iter == '}' || *iter == '=') { + if(*iter == '}' || *iter == '=') { strbuf_write(iter++, buf, 1); }else if(*iter == '\'') { iter2 = ++iter; @@ -321,7 +321,7 @@ static HRESULT do_process_key(LPCOLESTR break; } - if(key_type != IS_VAL && key_type != DO_DELETE && *iter == '{') { + if(key_type != IS_VAL && key_type != DO_DELETE && *iter == '{' && isspaceW(iter[1])) { hres = get_word(&iter, buf); if(FAILED(hres)) break;

1 0

wine/dlls/dsound/tests dsound_test.h capture.c
by Alexandre Julliard Nov. 18, 2005

Nov. 18, 2005

ChangeSet ID: 21319 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/18 06:04:36 Modified files: dlls/dsound/tests: dsound_test.h capture.c Log message: Robert Reif <reif(a)earthlink.net> Handle failure on Windows 95 properly. Make two functions available to all files. Make format_string() const correct. Patch: http://cvs.winehq.org/patch.py?id=21319 Old revision New revision Changes Path 1.9 1.10 +2 -0 wine/dlls/dsound/tests/dsound_test.h 1.25 1.26 +8 -6 wine/dlls/dsound/tests/capture.c Index: wine/dlls/dsound/tests/dsound_test.h diff -u -p wine/dlls/dsound/tests/dsound_test.h:1.9 wine/dlls/dsound/tests/dsound_test.h:1.10 --- wine/dlls/dsound/tests/dsound_test.h:1.9 18 Nov 2005 12: 4:36 -0000 +++ wine/dlls/dsound/tests/dsound_test.h 18 Nov 2005 12: 4:36 -0000 @@ -62,3 +62,5 @@ extern void test_buffer8(LPDIRECTSOUND8, extern const char * getDSBCAPS(DWORD xmask); extern int align(int length, int align); extern const char * get_file_version(const char * file_name); +extern const char * get_format_str(WORD format); +extern const char * format_string(const WAVEFORMATEX* wfx); Index: wine/dlls/dsound/tests/capture.c diff -u -p wine/dlls/dsound/tests/capture.c:1.25 wine/dlls/dsound/tests/capture.c:1.26 --- wine/dlls/dsound/tests/capture.c:1.25 18 Nov 2005 12: 4:36 -0000 +++ wine/dlls/dsound/tests/capture.c 18 Nov 2005 12: 4:36 -0000 @@ -38,7 +38,7 @@ static HRESULT (WINAPI *pDirectSoundCaptureCreate)(LPCGUID,LPDIRECTSOUNDCAPTURE*,LPUNKNOWN)=NULL; static HRESULT (WINAPI *pDirectSoundCaptureEnumerateA)(LPDSENUMCALLBACKA,LPVOID)=NULL; -static const char * get_format_str(WORD format) +const char * get_format_str(WORD format) { static char msg[32]; #define WAVE_FORMAT(f) case f: return #f @@ -91,7 +91,7 @@ static const char * get_format_str(WORD return msg; } -static char * format_string(WAVEFORMATEX* wfx) +const char * format_string(const WAVEFORMATEX* wfx) { static char str[64]; @@ -129,8 +129,9 @@ static void IDirectSoundCapture_test(LPD if (initialized == FALSE) { /* try unitialized object */ rc=IDirectSoundCapture_GetCaps(dsco,0); - ok(rc==DSERR_UNINITIALIZED, "IDirectSoundCapture_GetCaps(NULL) " - "should have returned DSERR_UNINITIALIZED, returned: %s\n", + ok(rc==DSERR_UNINITIALIZED||rc==E_INVALIDARG, + "IDirectSoundCapture_GetCaps(NULL) should have returned " + "DSERR_UNINITIALIZED or E_INVALIDARG, returned: %s\n", DXGetErrorString8(rc)); rc=IDirectSoundCapture_GetCaps(dsco, &dsccaps); @@ -139,10 +140,11 @@ static void IDirectSoundCapture_test(LPD DXGetErrorString8(rc)); rc=IDirectSoundCapture_Initialize(dsco, lpGuid); - ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, + ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED|| + rc==E_FAIL||rc==E_INVALIDARG, "IDirectSoundCapture_Initialize() failed: %s\n", DXGetErrorString8(rc)); - if (rc==DSERR_NODRIVER) { + if (rc==DSERR_NODRIVER||rc==E_INVALIDARG) { trace(" No Driver\n"); goto EXIT; } else if (rc==E_FAIL) {

1 0

wine/ include/ws2tcpip.h include/config.h.in d ...
by Alexandre Julliard Nov. 17, 2005

Nov. 17, 2005

ChangeSet ID: 21318 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/17 06:58:35 Modified files: include : ws2tcpip.h config.h.in dlls/winsock : ws2_32.spec socket.c . : configure.ac configure Log message: Marcus Meissner <marcus(a)jet.franken.de> Implemented getaddrinfo(), including full mapping of struct addrinfo between UNIX and Windows. Based on a patch by Mike Hearn. Patch: http://cvs.winehq.org/patch.py?id=21318 Old revision New revision Changes Path 1.6 1.7 +34 -0 wine/include/ws2tcpip.h 1.234 1.235 +3 -0 wine/include/config.h.in 1.42 1.43 +3 -2 wine/dlls/winsock/ws2_32.spec 1.194 1.195 +188 -2 wine/dlls/winsock/socket.c 1.413 1.414 +1 -0 wine/configure.ac 1.716 1.717 +2 -0 wine/configure

1 0

wine/ programs/winedbg/types.c programs/winedb ...
by Alexandre Julliard Nov. 17, 2005

Nov. 17, 2005

ChangeSet ID: 21317 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/17 06:53:41 Modified files: programs/winedbg: types.c dbg.y dlls/dbghelp : type.c dbghelp_private.h dbghelp.c Log message: Eric Pouech <eric.pouech(a)wanadoo.fr> Dbghelp describes the types of function arguments with a specific symbol-type (symt) which links both to arguments' type and to function prototype - added this new type to dbghelp - implemented its use in winedbg Patch: http://cvs.winehq.org/patch.py?id=21317 Old revision New revision Changes Path 1.15 1.16 +1 -0 wine/programs/winedbg/types.c 1.29 1.30 +1 -1 wine/programs/winedbg/dbg.y 1.13 1.14 +16 -4 wine/dlls/dbghelp/type.c 1.17 1.18 +7 -0 wine/dlls/dbghelp/dbghelp_private.h 1.12 1.13 +0 -2 wine/dlls/dbghelp/dbghelp.c Index: wine/programs/winedbg/types.c diff -u -p wine/programs/winedbg/types.c:1.15 wine/programs/winedbg/types.c:1.16 --- wine/programs/winedbg/types.c:1.15 17 Nov 2005 12:53:41 -0000 +++ wine/programs/winedbg/types.c 17 Nov 2005 12:53:41 -0000 @@ -627,6 +627,7 @@ int types_print_type(const struct dbg_ty for (i = 0; i < min(fcp->Count, count); i++) { subtype.id = fcp->ChildId[i]; + types_get_info(&subtype, TI_GET_TYPE, &subtype.id); types_print_type(&subtype, FALSE); if (i < min(fcp->Count, count) - 1 || count > 256) dbg_printf(", "); } Index: wine/programs/winedbg/dbg.y diff -u -p wine/programs/winedbg/dbg.y:1.29 wine/programs/winedbg/dbg.y:1.30 --- wine/programs/winedbg/dbg.y:1.29 17 Nov 2005 12:53:41 -0000 +++ wine/programs/winedbg/dbg.y 17 Nov 2005 12:53:41 -0000 @@ -136,7 +136,7 @@ command: | tSOURCE pathname { parser($2); } | tSYMBOLFILE pathname { symbol_read_symtable($2, 0); } | tSYMBOLFILE pathname expr_rvalue { symbol_read_symtable($2, $3); } - | tWHATIS expr_lvalue { types_print_type(&$2.type, FALSE); dbg_printf("\n"); } + | tWHATIS expr_lvalue { dbg_printf("type = "); types_print_type(&$2.type, FALSE); dbg_printf("\n"); } | tATTACH tNUM { dbg_attach_debuggee($2, FALSE, TRUE); } | tDETACH { dbg_detach_debuggee(); } | tMINIDUMP pathname { minidump_write($2, (dbg_curr_thread && dbg_curr_thread->in_exception) ? &dbg_curr_thread->excpt_record : NULL);} Index: wine/dlls/dbghelp/type.c diff -u -p wine/dlls/dbghelp/type.c:1.13 wine/dlls/dbghelp/type.c:1.14 --- wine/dlls/dbghelp/type.c:1.13 17 Nov 2005 12:53:41 -0000 +++ wine/dlls/dbghelp/type.c 17 Nov 2005 12:53:41 -0000 @@ -316,12 +316,18 @@ BOOL symt_add_function_signature_paramet struct symt_function_signature* sig_type, struct symt* param) { - struct symt** p; + struct symt** p; + struct symt_function_arg_type* arg; assert(sig_type->symt.tag == SymTagFunctionType); + arg = pool_alloc(&module->pool, sizeof(*arg)); + if (!arg) return FALSE; + arg->symt.tag = SymTagFunctionArgType; + arg->arg_type = param; + arg->container = &sig_type->symt; p = vector_add(&sig_type->vchildren, &module->pool); - if (!p) return FALSE; /* FIXME we leak e */ - *p = param; + if (!p) return FALSE; /* FIXME we leak arg */ + *p = &arg->symt; return TRUE; } @@ -620,6 +626,9 @@ BOOL symt_get_info(const struct symt* ty case SymTagThunk: X(DWORD) = (DWORD)((const struct symt_thunk*)type)->container; break; + case SymTagFunctionArgType: + X(DWORD) = (DWORD)((const struct symt_function_arg_type*)type)->container; + break; default: FIXME("Unsupported sym-tag %s for get-lexical-parent\n", symt_get_tag_str(type->tag)); @@ -702,7 +711,10 @@ BOOL symt_get_info(const struct symt* ty case SymTagFunction: X(DWORD) = (DWORD)((const struct symt_function*)type)->type; break; - /* FIXME: should also work for enums and FunctionArgType */ + /* FIXME: should also work for enums */ + case SymTagFunctionArgType: + X(DWORD) = (DWORD)((const struct symt_function_arg_type*)type)->arg_type; + break; default: FIXME("Unsupported sym-tag %s for get-type\n", symt_get_tag_str(type->tag)); Index: wine/dlls/dbghelp/dbghelp_private.h diff -u -p wine/dlls/dbghelp/dbghelp_private.h:1.17 wine/dlls/dbghelp/dbghelp_private.h:1.18 --- wine/dlls/dbghelp/dbghelp_private.h:1.17 17 Nov 2005 12:53:41 -0000 +++ wine/dlls/dbghelp/dbghelp_private.h 17 Nov 2005 12:53:41 -0000 @@ -222,6 +222,13 @@ struct symt_function_signature struct vector vchildren; }; +struct symt_function_arg_type +{ + struct symt symt; + struct symt* arg_type; + struct symt* container; +}; + struct symt_pointer { struct symt symt; Index: wine/dlls/dbghelp/dbghelp.c diff -u -p wine/dlls/dbghelp/dbghelp.c:1.12 wine/dlls/dbghelp/dbghelp.c:1.13 --- wine/dlls/dbghelp/dbghelp.c:1.12 17 Nov 2005 12:53:41 -0000 +++ wine/dlls/dbghelp/dbghelp.c 17 Nov 2005 12:53:41 -0000 @@ -30,8 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); /* TODO * - support for symbols' types is still partly missing * + C++ support - * + funcargtype:s are (partly) wrong: they should be a specific struct (like - * typedef) pointing to the actual type (and not a direct access) * + we should store the underlying type for an enum in the symt_enum struct * + for enums, we store the names & values (associated to the enum type), * but those values are not directly usable from a debugger (that's why, I

1 0

wine/ programs/winedbg/types.c programs/winedb ...
by Alexandre Julliard Nov. 17, 2005

Nov. 17, 2005

ChangeSet ID: 21316 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/17 05:51:53 Modified files: programs/winedbg: types.c symbol.c memory.c expr.c break.c dlls/dbghelp : type.c symbol.c stabs.c msc.c elf_module.c dbghelp.c Log message: Eric Pouech <eric.pouech(a)wanadoo.fr> SymGetType(...,TI_GET_LENGTH,...) requires a 64 bit parameter, not a 32 bit one. Patch: http://cvs.winehq.org/patch.py?id=21316 Old revision New revision Changes Path 1.14 1.15 +38 -33 wine/programs/winedbg/types.c 1.9 1.10 +2 -2 wine/programs/winedbg/symbol.c 1.23 1.24 +7 -6 wine/programs/winedbg/memory.c 1.10 1.11 +5 -5 wine/programs/winedbg/expr.c 1.14 1.15 +4 -3 wine/programs/winedbg/break.c 1.12 1.13 +13 -11 wine/dlls/dbghelp/type.c 1.18 1.19 +8 -6 wine/dlls/dbghelp/symbol.c 1.18 1.19 +2 -2 wine/dlls/dbghelp/stabs.c 1.16 1.17 +8 -8 wine/dlls/dbghelp/msc.c 1.25 1.26 +4 -4 wine/dlls/dbghelp/elf_module.c 1.11 1.12 +0 -1 wine/dlls/dbghelp/dbghelp.c

1 0

wine/libs/unicode cpmap.pl
by Alexandre Julliard Nov. 17, 2005

Nov. 17, 2005

ChangeSet ID: 21315 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/17 05:43:10 Modified files: libs/unicode : cpmap.pl Log message: Only update modified files. Patch: http://cvs.winehq.org/patch.py?id=21315 Old revision New revision Changes Path 1.9 1.10 +28 -6 wine/libs/unicode/cpmap.pl Index: wine/libs/unicode/cpmap.pl diff -u -p wine/libs/unicode/cpmap.pl:1.9 wine/libs/unicode/cpmap.pl:1.10 --- wine/libs/unicode/cpmap.pl:1.9 17 Nov 2005 11:43:10 -0000 +++ wine/libs/unicode/cpmap.pl 17 Nov 2005 11:43:10 -0000 @@ -577,7 +577,7 @@ sub DUMP_SORTKEYS # output the range offsets - open OUTPUT,">collation.c" or die "Cannot create collation.c"; + open OUTPUT,">collation.c.new" or die "Cannot create collation.c"; printf "Building collation.c\n"; printf OUTPUT "/* Unicode collation element table */\n"; printf OUTPUT "/* generated from %s */\n", $SORTKEYS; @@ -602,6 +602,7 @@ sub DUMP_SORTKEYS } printf OUTPUT "\n};\n"; close OUTPUT; + save_file("collation.c"); } @@ -870,7 +871,7 @@ sub DUMP_LB_RANGES # dump the case mapping tables sub DUMP_CASE_MAPPINGS { - open OUTPUT,">casemap.c" or die "Cannot create casemap.c"; + open OUTPUT,">casemap.c.new" or die "Cannot create casemap.c"; printf "Building casemap.c\n"; printf OUTPUT "/* Unicode case mappings */\n"; printf OUTPUT "/* Automatically generated; DO NOT EDIT!! */\n\n"; @@ -881,6 +882,7 @@ sub DUMP_CASE_MAPPINGS DUMP_CASE_TABLE( "wine_digitmap", @digitmap_table ); DUMP_CASE_TABLE( "wine_compatmap", @compatmap_table ); close OUTPUT; + save_file("casemap.c"); } @@ -957,7 +959,7 @@ sub DUMP_CASE_TABLE # dump the ctype tables sub DUMP_CTYPE_TABLES { - open OUTPUT,">wctype.c" or die "Cannot create wctype.c"; + open OUTPUT,">wctype.c.new" or die "Cannot create wctype.c"; printf "Building wctype.c\n"; printf OUTPUT "/* Unicode ctype tables */\n"; printf OUTPUT "/* Automatically generated; DO NOT EDIT!! */\n\n"; @@ -994,6 +996,7 @@ sub DUMP_CTYPE_TABLES printf OUTPUT " /* values */\n%s\n};\n", DUMP_ARRAY( "0x%04x", 0, @array[256..$#array] ); close OUTPUT; + save_file("wctype.c"); } @@ -1001,7 +1004,7 @@ sub DUMP_CTYPE_TABLES # dump the char composition tables sub DUMP_COMPOSE_TABLES { - open OUTPUT,">compose.c" or die "Cannot create compose.c"; + open OUTPUT,">compose.c.new" or die "Cannot create compose.c"; printf "Building compose.c\n"; printf OUTPUT "/* Unicode char composition */\n"; printf OUTPUT "/* Automatically generated; DO NOT EDIT!! */\n\n"; @@ -1131,6 +1134,7 @@ sub DUMP_COMPOSE_TABLES printf OUTPUT "\n};\n"; close OUTPUT; + save_file("compose.c"); } @@ -1150,7 +1154,7 @@ sub HANDLE_FILE ADD_DEFAULT_MAPPINGS(); my $output = sprintf "c_%03d.c", $codepage; - open OUTPUT,">$output" or die "Cannot create $output"; + open OUTPUT,">$output.new" or die "Cannot create $output"; printf "Building %s from %s (%s)\n", $output, $filename, $comment; @@ -1164,6 +1168,23 @@ sub HANDLE_FILE if ($#lead_bytes == -1) { DUMP_SBCS_TABLE( $codepage, $comment ); } else { DUMP_DBCS_TABLE( $codepage, $comment ); } close OUTPUT; + save_file($output); +} + + +################################################################ +# save a file if modified +sub save_file($) +{ + my $file = shift; + if (!system "cmp $file $file.new >/dev/null") + { + unlink "$file.new"; + } + else + { + rename "$file.new", "$file"; + } } @@ -1209,7 +1230,8 @@ sub REPLACE_IN_FILE if (/\#\#\# cpmap end \#\#\#/) { push @lines, "\n", $_; last; } } push @lines, <FILE>; - open(FILE,">$name") or die "Can't modify $name"; + open(FILE,">$name.new") or die "Can't modify $name"; print FILE @lines; close(FILE); + save_file($name); }

1 0

wine/dlls/shdocvw shdocvw.h events.c
by Alexandre Julliard Nov. 17, 2005

Nov. 17, 2005

ChangeSet ID: 21314 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/17 05:40:55 Modified files: dlls/shdocvw : shdocvw.h events.c Log message: Jacek Caban <jack(a)itma.pwr.wroc.pl> Improve IConnectionPoint handling. Patch: http://cvs.winehq.org/patch.py?id=21314 Old revision New revision Changes Path 1.29 1.30 +6 -10 wine/dlls/shdocvw/shdocvw.h 1.16 1.17 +106 -76 wine/dlls/shdocvw/events.c

1 0

wine/dlls/wined3d device.c
by Alexandre Julliard Nov. 17, 2005

Nov. 17, 2005

ChangeSet ID: 21313 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/17 05:40:43 Modified files: dlls/wined3d : device.c Log message: Oliver Stieber <oliver_stieber(a)yahoo.co.uk> Disable support for creation FMT_Unknown textures. This gets most of the d3d8 demos from www.codesampler.com working. Patch: http://cvs.winehq.org/patch.py?id=21313 Old revision New revision Changes Path 1.97 1.98 +21 -0 wine/dlls/wined3d/device.c Index: wine/dlls/wined3d/device.c diff -u -p wine/dlls/wined3d/device.c:1.97 wine/dlls/wined3d/device.c:1.98 --- wine/dlls/wined3d/device.c:1.97 17 Nov 2005 11:40:43 -0000 +++ wine/dlls/wined3d/device.c 17 Nov 2005 11:40:43 -0000 @@ -829,6 +829,13 @@ HRESULT WINAPI IWineD3DDeviceImpl_Creat TRACE("(%p), Width(%d) Height(%d) Levels(%d) Usage(%ld) ....\n", This, Width, Height, Levels, Usage); + /* TODO: It should only be possible to create textures for formats + that are reported as supported */ + if (WINED3DFMT_UNKNOWN >= Format) { + WARN("(%p) : Texture cannot be created with a format of D3DFMT_UNKNOWN\n", This); + return D3DERR_INVALIDCALL; + } + D3DCREATERESOURCEOBJECTINSTANCE(object, Texture, D3DRTYPE_TEXTURE, 0); D3DINITILIZEBASETEXTURE(object->baseTexture); object->width = Width; @@ -907,6 +914,13 @@ HRESULT WINAPI IWineD3DDeviceImpl_Create UINT tmpH; UINT tmpD; + /* TODO: It should only be possible to create textures for formats + that are reported as supported */ + if (WINED3DFMT_UNKNOWN >= Format) { + WARN("(%p) : Texture cannot be created with a format of D3DFMT_UNKNOWN\n", This); + return D3DERR_INVALIDCALL; + } + D3DCREATERESOURCEOBJECTINSTANCE(object, VolumeTexture, D3DRTYPE_VOLUMETEXTURE, 0); D3DINITILIZEBASETEXTURE(object->baseTexture); @@ -1000,6 +1014,13 @@ HRESULT WINAPI IWineD3DDeviceImpl_Create HRESULT hr; unsigned int pow2EdgeLength = EdgeLength; + /* TODO: It should only be possible to create textures for formats + that are reported as supported */ + if (WINED3DFMT_UNKNOWN >= Format) { + WARN("(%p) : Texture cannot be created with a format of D3DFMT_UNKNOWN\n", This); + return D3DERR_INVALIDCALL; + } + D3DCREATERESOURCEOBJECTINSTANCE(object, CubeTexture, D3DRTYPE_CUBETEXTURE, 0); D3DINITILIZEBASETEXTURE(object->baseTexture);

1 0

wine/libs/unicode wctype.c cpmap.pl
by Alexandre Julliard Nov. 17, 2005

Nov. 17, 2005

ChangeSet ID: 21312 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/17 05:07:04 Modified files: libs/unicode : wctype.c cpmap.pl Log message: Robert Shearman <rob(a)codeweavers.com> Remove some incompatibilities in the wctype table by updating the space, blank and cntrl exceptions and fixing the type given to characters in the "Zl" and "Zp" classes. Patch: http://cvs.winehq.org/patch.py?id=21312 Old revision New revision Changes Path 1.3 1.4 +9 -9 wine/libs/unicode/wctype.c 1.8 1.9 +8 -4 wine/libs/unicode/cpmap.pl Index: wine/libs/unicode/wctype.c diff -u -p wine/libs/unicode/wctype.c:1.3 wine/libs/unicode/wctype.c:1.4 --- wine/libs/unicode/wctype.c:1.3 17 Nov 2005 11: 7: 4 -0000 +++ wine/libs/unicode/wctype.c 17 Nov 2005 11: 7: 4 -0000 @@ -55,7 +55,7 @@ const unsigned short wine_wctype_table[1 0x1102, 0x1102, 0x1102, 0x1102, 0x1102, 0x1102, 0x1102, 0x1102, 0x1102, 0x1102, 0x1102, 0x1102, 0x1102, 0x1102, 0x1102, 0x1102, 0x1102, 0x1102, 0x1102, 0xb010, 0xb010, 0xb010, 0xb010, 0x0020, - 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x8020, 0x0020, 0x0020, + 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x8028, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, @@ -264,7 +264,7 @@ const unsigned short wine_wctype_table[1 0x3004, 0x3004, 0x3004, 0x3004, 0x3004, 0x3004, 0x3004, 0x3004, 0x3004, 0x3004, 0x2100, 0x2100, 0x2100, 0x2010, 0x2010, 0x2100, 0x2010, 0x2010, 0x2010, 0x2010, 0x2010, 0x2010, 0x2010, 0x2010, - 0x2010, 0x2010, 0x2010, 0x2010, 0x2010, 0x2010, 0x0000, 0x0000, + 0x2010, 0x2010, 0x2010, 0x2010, 0x2010, 0x2010, 0x0000, 0x0020, 0x2100, 0x0010, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, @@ -808,7 +808,7 @@ const unsigned short wine_wctype_table[1 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, - 0xb010, 0xb010, 0xb010, 0x0010, 0x0010, 0x0010, 0xa008, 0x0000, + 0xb010, 0xb010, 0xb010, 0x0030, 0x0030, 0x0030, 0xa028, 0x0000, 0x1004, 0x1004, 0x1004, 0x1004, 0x1004, 0x1004, 0x1004, 0x1004, 0x1004, 0x1004, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x1100, 0x1100, 0x1100, 0x1100, 0x1100, 0x1100, 0x1100, 0x1100, @@ -968,11 +968,11 @@ const unsigned short wine_wctype_table[1 0x0000, 0x0000, 0x1102, 0x1102, 0x1102, 0x0000, 0x1102, 0x1102, 0x1101, 0x1101, 0x1101, 0x1101, 0x1101, 0xb010, 0xb010, 0x0000, 0xa008, 0xa008, 0xa008, 0xa008, 0xa008, 0xa008, 0xa008, 0xa008, - 0xa008, 0xa008, 0xa008, 0x0008, 0x0000, 0x0000, 0x1000, 0x2000, + 0xa008, 0xa008, 0xa008, 0x0008, 0x0020, 0x0020, 0x1020, 0x2020, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, - 0xa000, 0x8000, 0xb000, 0xb000, 0xb000, 0xb000, 0xb000, 0xa008, + 0xa008, 0x8008, 0xb020, 0xb020, 0xb020, 0xb020, 0xb020, 0xa008, 0x5010, 0x5010, 0x5010, 0x5010, 0x5010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, @@ -980,7 +980,7 @@ const unsigned short wine_wctype_table[1 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0x0000, 0x0000, 0xb010, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xa008, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x3010, 0x1102, 0x0000, 0x0000, 0x3010, 0x3010, 0x3010, 0x3010, 0x3010, 0x3010, 0x5010, 0x5010, 0xb010, 0xb010, 0xb010, 0x1102, 0x3010, 0x3010, 0x3010, 0x3010, 0x3010, 0x3010, 0x3010, 0x3010, @@ -1319,7 +1319,7 @@ const unsigned short wine_wctype_table[1 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0x0000, 0x0000, 0x0000, 0x0000, - 0xa008, 0xb010, 0xb010, 0xb010, 0xb010, 0x1010, 0x1100, 0x1010, + 0xa048, 0xb010, 0xb010, 0xb010, 0xb010, 0x1010, 0x1100, 0x1010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, @@ -1766,7 +1766,7 @@ const unsigned short wine_wctype_table[1 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, - 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x0000, 0x0000, 0x0048, + 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x0000, 0x0000, 0x0060, 0x0000, 0xb010, 0xb010, 0x5010, 0x5010, 0x5010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0x5010, 0x7010, 0x5010, 0x7010, 0x4010, 0x3084, 0x3084, 0x3084, 0x3084, 0x3084, 0x3084, 0x3084, 0x3084, @@ -1798,5 +1798,5 @@ const unsigned short wine_wctype_table[1 0x5010, 0x5010, 0xb010, 0xb010, 0xb010, 0x5010, 0x5010, 0x0000, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0xb010, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0xb010, 0xb010, 0x0000, 0x0000 + 0x0000, 0x0020, 0x0020, 0x0020, 0xb010, 0xb010, 0x0000, 0x0000 }; Index: wine/libs/unicode/cpmap.pl diff -u -p wine/libs/unicode/cpmap.pl:1.8 wine/libs/unicode/cpmap.pl:1.9 --- wine/libs/unicode/cpmap.pl:1.8 17 Nov 2005 11: 7: 4 -0000 +++ wine/libs/unicode/cpmap.pl 17 Nov 2005 11: 7: 4 -0000 @@ -125,8 +125,8 @@ $DEF_CHAR = ord '?'; "Nl" => $ctype{"punct"}, # Number, Letter "No" => $ctype{"punct"}, # Number, Other "Zs" => $ctype{"space"}, # Separator, Space - "Zl" => 0, # Separator, Line - "Zp" => 0, # Separator, Paragraph + "Zl" => $ctype{"space"}, # Separator, Line + "Zp" => $ctype{"space"}, # Separator, Paragraph "Cc" => $ctype{"cntrl"}, # Other, Control "Cf" => 0, # Other, Format "Cs" => 0, # Other, Surrogate @@ -152,8 +152,12 @@ $DEF_CHAR = ord '?'; ( "xdigit" => [ ord('0')..ord('9'),ord('A')..ord('F'),ord('a')..ord('f'), 0xff10..0xff19, 0xff21..0xff26, 0xff41..0xff46 ], - "space" => [ 0x09..0x0d, 0xfeff ], - "blank" => [ 0x09, 0x20, 0xa0, 0xfeff ] + "space" => [ 0x09..0x0d, 0x85 ], + "blank" => [ 0x09, 0x20, 0xa0, 0x3000, 0xfeff ], + "cntrl" => [ 0x070f, 0x180b, 0x180c, 0x180d, 0x180e, 0x200c, 0x200d, + 0x200e, 0x200f, 0x202a, 0x202b, 0x202c, 0x202d, 0x202e, + 0x206a, 0x206b, 0x206c, 0x206d, 0x206e, 0x206f, 0xfeff, + 0xfff9, 0xfffa, 0xfffb ] ); %directions =

1 0

wine/dlls/comctl32 header.c
by Alexandre Julliard Nov. 17, 2005

Nov. 17, 2005

ChangeSet ID: 21311 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/17 05:06:18 Modified files: dlls/comctl32 : header.c Log message: Vitaliy Margolen <wine-patch(a)kievinfo.com> Return false if index is out of bounds in GetItemT. Patch: http://cvs.winehq.org/patch.py?id=21311 Old revision New revision Changes Path 1.88 1.89 +3 -4 wine/dlls/comctl32/header.c Index: wine/dlls/comctl32/header.c diff -u -p wine/dlls/comctl32/header.c:1.88 wine/dlls/comctl32/header.c:1.89 --- wine/dlls/comctl32/header.c:1.88 17 Nov 2005 11: 6:18 -0000 +++ wine/dlls/comctl32/header.c 17 Nov 2005 11: 6:18 -0000 @@ -813,11 +813,10 @@ HEADER_GetItemT (HWND hwnd, INT nItem, L if (phdi->mask == 0) return TRUE; - if ((nItem < 0) || (nItem >= (INT)infoPtr->uNumItem)) - lpItem = NULL; - else - lpItem = &infoPtr->items[nItem]; + return FALSE; + + lpItem = &infoPtr->items[nItem]; if (phdi->mask & HDI_BITMAP) phdi->hbm = (lpItem != NULL) ? lpItem->hbm : 0;

1 0