March 2008 - Wine-Commits - list.winehq.org

Alexandre Julliard : winebuild: Add support for 16-bit exe modules.
by Alexandre Julliard March 3, 2008

March 3, 2008

Module: wine Branch: master Commit: 0c214a7091af8efe39ffdaea7fe9e2de4d8006ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c214a7091af8efe39ffdaea7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 3 15:19:53 2008 +0100 winebuild: Add support for 16-bit exe modules. --- tools/winebuild/main.c | 15 ++++----------- tools/winebuild/spec16.c | 39 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 40 insertions(+), 14 deletions(-) diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 3238b2a..82ee59d 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -596,10 +596,12 @@ int main(int argc, char **argv) case MODE_DLL: if (spec->subsystem != IMAGE_SUBSYSTEM_NATIVE) spec->characteristics |= IMAGE_FILE_DLL; + if (!spec_file_name) fatal_error( "missing .spec file\n" ); + /* fall through */ + case MODE_EXE: load_resources( argv, spec ); load_import_libs( argv ); - if (!spec_file_name) fatal_error( "missing .spec file\n" ); - if (!parse_input_file( spec )) break; + if (spec_file_name && !parse_input_file( spec )) break; switch (spec->type) { case SPEC_WIN16: @@ -614,15 +616,6 @@ int main(int argc, char **argv) default: assert(0); } break; - case MODE_EXE: - if (spec->type == SPEC_WIN16) fatal_error( "Cannot build 16-bit exe files\n" ); - if (!spec->file_name) fatal_error( "executable must be named via the -F option\n" ); - load_resources( argv, spec ); - load_import_libs( argv ); - if (spec_file_name && !parse_input_file( spec )) break; - read_undef_symbols( spec, argv ); - BuildSpec32File( spec ); - break; case MODE_DEF: if (argv[0]) fatal_error( "file argument '%s' not allowed in this mode\n", argv[0] ); if (spec->type == SPEC_WIN16) fatal_error( "Cannot yet build .def file for 16-bit dlls\n" ); diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c index f5be830..8fda978 100644 --- a/tools/winebuild/spec16.c +++ b/tools/winebuild/spec16.c @@ -435,6 +435,7 @@ static int sort_func_list( ORDDEF **list, int count, { int i, j; + if (!count) return 0; qsort( list, count, sizeof(*list), compare ); for (i = j = 0; i < count; i++) @@ -528,6 +529,7 @@ static void output_init_code( const DLLSPEC *spec, const char *header_name ) void BuildSpec16File( DLLSPEC *spec ) { ORDDEF **typelist; + ORDDEF *entry_point = NULL; int i, j, nb_funcs; char header_name[256]; @@ -535,6 +537,12 @@ void BuildSpec16File( DLLSPEC *spec ) output_standard_file_header(); + if (!spec->file_name) + { + char *p; + spec->file_name = xstrdup( output_file_name ); + if ((p = strrchr( spec->file_name, '.' ))) *p = 0; + } if (!spec->dll_name) /* set default name from file name */ { char *p; @@ -542,6 +550,28 @@ void BuildSpec16File( DLLSPEC *spec ) if ((p = strrchr( spec->dll_name, '.' ))) *p = 0; } + /* store the main entry point as ordinal 0 */ + + if (!spec->ordinals) + { + spec->ordinals = xmalloc( sizeof(spec->ordinals[0]) ); + spec->ordinals[0] = NULL; + } + if (spec->init_func && !(spec->characteristics & IMAGE_FILE_DLL)) + { + entry_point = xmalloc( sizeof(*entry_point) ); + entry_point->type = TYPE_PASCAL; + entry_point->ordinal = 0; + entry_point->lineno = 0; + entry_point->flags = FLAG_REGISTER; + entry_point->name = NULL; + entry_point->link_name = xstrdup( spec->init_func ); + entry_point->export_name = NULL; + entry_point->u.func.arg_types[0] = 0; + assert( !spec->ordinals[0] ); + spec->ordinals[0] = entry_point; + } + /* Build sorted list of all argument types, without duplicates */ typelist = xmalloc( (spec->limit + 1) * sizeof(*typelist) ); @@ -594,12 +624,15 @@ void BuildSpec16File( DLLSPEC *spec ) get_asm_short_keyword() ); output( "\t.long 0\n" ); /* ne_crc */ output( "\t%s 0x%04x\n", get_asm_short_keyword(), /* ne_flags */ - NE_FFLAGS_SINGLEDATA | NE_FFLAGS_LIBMODULE ); + NE_FFLAGS_SINGLEDATA | + ((spec->characteristics & IMAGE_FILE_DLL) ? NE_FFLAGS_LIBMODULE : 0) ); output( "\t%s 2\n", get_asm_short_keyword() ); /* ne_autodata */ output( "\t%s %u\n", get_asm_short_keyword(), spec->heap_size ); /* ne_heap */ output( "\t%s 0\n", get_asm_short_keyword() ); /* ne_stack */ - output( "\t.long 0\n" ); /* ne_csip */ - output( "\t.long 0\n" ); /* ne_sssp */ + if (!entry_point) output( "\t.long 0\n" ); /* ne_csip */ + else output( "\t%s .L__wine_%s_0-.L__wine_spec_code_segment,1\n", + get_asm_short_keyword(), make_c_identifier(spec->dll_name) ); + output( "\t%s 0,2\n", get_asm_short_keyword() ); /* ne_sssp */ output( "\t%s 2\n", get_asm_short_keyword() ); /* ne_cseg */ output( "\t%s 0\n", get_asm_short_keyword() ); /* ne_cmod */ output( "\t%s 0\n", get_asm_short_keyword() ); /* ne_cbnrestab */

1 0

Dmitry Timoshkov : fonts: Add small cyrillic glyphs to tahoma.sfd.
by Alexandre Julliard March 3, 2008

March 3, 2008

Module: wine Branch: master Commit: 57786d84a103fc107eee59c5c1177f05adcd5610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57786d84a103fc107eee59c5c… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Mar 3 18:14:25 2008 +0800 fonts: Add small cyrillic glyphs to tahoma.sfd. --- fonts/tahoma.sfd | 1294 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 1239 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=57786d84a103fc107eee5…

1 0

Alexandre Julliard : user32/tests: Skip tests instead of crashing if global hook cannot be set.
by Alexandre Julliard March 3, 2008

March 3, 2008

Module: wine Branch: master Commit: 9ac7f205141bba9836d0f1f4afa4627078efb294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ac7f205141bba9836d0f1f4a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 3 17:51:42 2008 +0100 user32/tests: Skip tests instead of crashing if global hook cannot be set. --- dlls/user32/tests/msg.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 575d5d0..feb5d77 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -7239,7 +7239,12 @@ static void test_winevents(void) /****** start of global hook test *************/ hCBT_global_hook = SetWindowsHookExA(WH_CBT, cbt_global_hook_proc, GetModuleHandleA(0), 0); - assert(hCBT_global_hook); + if (!hCBT_global_hook) + { + ok(DestroyWindow(hwnd), "failed to destroy window\n"); + skip( "cannot set global hook\n" ); + return; + } hevent = CreateEventA(NULL, 0, 0, NULL); assert(hevent);

1 0

Jacek Caban : mshtml: Added IHTMLScriptElement stub implementation.
by Alexandre Julliard March 3, 2008

March 3, 2008

Module: wine Branch: master Commit: df294844a49f4a17e0e1e1bd2854fd32b4a5a1b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df294844a49f4a17e0e1e1bd2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 3 01:20:27 2008 +0100 mshtml: Added IHTMLScriptElement stub implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlelem.c | 3 + dlls/mshtml/htmlscript.c | 287 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/tests/dom.c | 19 +++- 5 files changed, 309 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=df294844a49f4a17e0e1e…

1 0

Nathan Beckmann : gdiplus: Implement GdipLoadImageFromFile.
by Alexandre Julliard March 3, 2008

March 3, 2008

Module: wine Branch: master Commit: 484abd472e54f4e2a0a7beaf7d9ad46ea7a8285a URL: http://source.winehq.org/git/wine.git/?a=commit;h=484abd472e54f4e2a0a7beaf7… Author: Nathan Beckmann <nathan.beckmann(a)gmail.com> Date: Sun Feb 24 07:41:29 2008 -0800 gdiplus: Implement GdipLoadImageFromFile. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 21 +++++++++++++++++++++ dlls/gdiplus/tests/image.c | 6 ++++++ 3 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 2118a3d..b4f314a 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -435,7 +435,7 @@ @ stub GdipIsVisibleRegionPointI @ stub GdipIsVisibleRegionRect @ stub GdipIsVisibleRegionRectI -@ stub GdipLoadImageFromFile +@ stdcall GdipLoadImageFromFile(wstr ptr) @ stub GdipLoadImageFromFileICM @ stdcall GdipLoadImageFromStream(ptr ptr) @ stdcall GdipLoadImageFromStreamICM(ptr ptr) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 82b0858..5871209 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -697,6 +697,27 @@ GpStatus WINGDIPAPI GdipImageSelectActiveFrame(GpImage *image, return Ok; } +GpStatus WINGDIPAPI GdipLoadImageFromFile(GDIPCONST WCHAR* filename, + GpImage **image) +{ + GpStatus stat; + IStream *stream; + + if (!filename || !image) + return InvalidParameter; + + stat = GdipCreateStreamOnFile(filename, GENERIC_READ, &stream); + + if (stat != Ok) + return stat; + + stat = GdipLoadImageFromStream(stream, image); + + IStream_Release(stream); + + return stat; +} + GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream* stream, GpImage **image) { IPicture *pic; diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 7228339..5ff164d 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -114,6 +114,12 @@ static void test_LoadingImages(void) stat = GdipCreateBitmapFromFile(0, (GpBitmap**)0xdeadbeef); expect(InvalidParameter, stat); + + stat = GdipLoadImageFromFile(0, 0); + expect(InvalidParameter, stat); + + stat = GdipLoadImageFromFile(0, (GpImage**)0xdeadbeef); + expect(InvalidParameter, stat); } START_TEST(image)

1 0

Nathan Beckmann : gdiplus: Add tests for GdipCreateBitmapFromFile.
by Alexandre Julliard March 3, 2008

March 3, 2008

Module: wine Branch: master Commit: 3d802924cbb1fd92b07edca04c5a6c1e6f6c1b01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d802924cbb1fd92b07edca04… Author: Nathan Beckmann <nathan.beckmann(a)gmail.com> Date: Sun Feb 24 07:41:28 2008 -0800 gdiplus: Add tests for GdipCreateBitmapFromFile. --- dlls/gdiplus/tests/image.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 0918f9d..7228339 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -105,6 +105,17 @@ static void test_GetImageDimension(void) GdipDisposeImage((GpImage*)bm); } +static void test_LoadingImages(void) +{ + GpStatus stat; + + stat = GdipCreateBitmapFromFile(0, 0); + expect(InvalidParameter, stat); + + stat = GdipCreateBitmapFromFile(0, (GpBitmap**)0xdeadbeef); + expect(InvalidParameter, stat); +} + START_TEST(image) { struct GdiplusStartupInput gdiplusStartupInput; @@ -119,6 +130,7 @@ START_TEST(image) test_Scan0(); test_GetImageDimension(); + test_LoadingImages(); GdiplusShutdown(gdiplusToken); }

1 0

Nathan Beckmann : gdiplus: Fix IStream_Release in GdipCreateBitmapFromFile.
by Alexandre Julliard March 3, 2008

March 3, 2008

Module: wine Branch: master Commit: f49c7bb4502f5697a3842f48ee20d4f8a59304a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f49c7bb4502f5697a3842f48e… Author: Nathan Beckmann <nathan.beckmann(a)gmail.com> Date: Sun Feb 24 07:41:27 2008 -0800 gdiplus: Fix IStream_Release in GdipCreateBitmapFromFile. --- dlls/gdiplus/image.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 0e37798..82b0858 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -247,8 +247,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromFile(GDIPCONST WCHAR* filename, stat = GdipCreateBitmapFromStream(stream, bitmap); - if(!stat) - IStream_Release(stream); + IStream_Release(stream); return stat; }

1 0

Francois Gouget : winmm/tests: Don' t use 0x55 to avoid any confusion when running with +heap.
by Alexandre Julliard March 3, 2008

March 3, 2008

Module: wine Branch: master Commit: dcb8dd3ce3c7244fd60700016fa508ad1d32a0fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcb8dd3ce3c7244fd60700016… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Mar 2 13:24:08 2008 +0100 winmm/tests: Don't use 0x55 to avoid any confusion when running with +heap. --- dlls/winmm/tests/mmio.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index dbb049b..72b16b1 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -84,20 +84,20 @@ static void test_mmioDescend(void) /* test various mmioDescend flags */ mmioSeek(hmmio, 0, SEEK_SET); - memset(&ck, 0x55, sizeof(ck)); + memset(&ck, 0x66, sizeof(ck)); ret = mmioDescend(hmmio, &ck, NULL, MMIO_FINDRIFF); ok(ret == MMIOERR_CHUNKNOTFOUND || ret == MMIOERR_INVALIDFILE, "mmioDescend returned %u\n", ret); mmioSeek(hmmio, 0, SEEK_SET); - memset(&ck, 0x55, sizeof(ck)); + memset(&ck, 0x66, sizeof(ck)); ck.ckid = 0; ret = mmioDescend(hmmio, &ck, NULL, MMIO_FINDRIFF); ok(ret == MMIOERR_CHUNKNOTFOUND || ret == MMIOERR_INVALIDFILE, "mmioDescend returned %u\n", ret); mmioSeek(hmmio, 0, SEEK_SET); - memset(&ck, 0x55, sizeof(ck)); + memset(&ck, 0x66, sizeof(ck)); ck.fccType = 0; ret = mmioDescend(hmmio, &ck, NULL, MMIO_FINDRIFF); ok(ret == MMSYSERR_NOERROR, "mmioDescend error %u\n", ret); @@ -105,14 +105,14 @@ static void test_mmioDescend(void) ok(ck.fccType == formtypeAVI, "wrong fccType: %04x\n", ck.fccType); mmioSeek(hmmio, 0, SEEK_SET); - memset(&ck, 0x55, sizeof(ck)); + memset(&ck, 0x66, sizeof(ck)); ret = mmioDescend(hmmio, &ck, NULL, 0); ok(ret == MMSYSERR_NOERROR, "mmioDescend error %u\n", ret); ok(ck.ckid == FOURCC_RIFF, "wrong ckid: %04x\n", ck.ckid); ok(ck.fccType == formtypeAVI, "wrong fccType: %04x\n", ck.fccType); /* do NOT seek, use current file position */ - memset(&ck, 0x55, sizeof(ck)); + memset(&ck, 0x66, sizeof(ck)); ck.fccType = 0; ret = mmioDescend(hmmio, &ck, NULL, MMIO_FINDLIST); ok(ret == MMSYSERR_NOERROR, "mmioDescend error %u\n", ret); @@ -120,7 +120,7 @@ static void test_mmioDescend(void) ok(ck.fccType == listtypeAVIHEADER, "wrong fccType: %04x\n", ck.fccType); mmioSeek(hmmio, 0, SEEK_SET); - memset(&ck, 0x55, sizeof(ck)); + memset(&ck, 0x66, sizeof(ck)); ck.ckid = 0; ck.fccType = listtypeAVIHEADER; ret = mmioDescend(hmmio, &ck, NULL, MMIO_FINDCHUNK); @@ -129,7 +129,7 @@ static void test_mmioDescend(void) ok(ck.fccType == formtypeAVI, "wrong fccType: %04x\n", ck.fccType); /* do NOT seek, use current file position */ - memset(&ck, 0x55, sizeof(ck)); + memset(&ck, 0x66, sizeof(ck)); ck.ckid = FOURCC_LIST; ret = mmioDescend(hmmio, &ck, NULL, MMIO_FINDCHUNK); ok(ret == MMSYSERR_NOERROR, "mmioDescend error %u\n", ret); @@ -137,7 +137,7 @@ static void test_mmioDescend(void) ok(ck.fccType == listtypeAVIHEADER, "wrong fccType: %04x\n", ck.fccType); mmioSeek(hmmio, 0, SEEK_SET); - memset(&ck, 0x55, sizeof(ck)); + memset(&ck, 0x66, sizeof(ck)); ck.ckid = FOURCC_RIFF; ret = mmioDescend(hmmio, &ck, NULL, MMIO_FINDCHUNK); ok(ret == MMSYSERR_NOERROR, "mmioDescend error %u\n", ret); @@ -145,7 +145,7 @@ static void test_mmioDescend(void) ok(ck.fccType == formtypeAVI, "wrong fccType: %04x\n", ck.fccType); /* do NOT seek, use current file position */ - memset(&ckList, 0x55, sizeof(ckList)); + memset(&ckList, 0x66, sizeof(ckList)); ckList.ckid = 0; ret = mmioDescend(hmmio, &ckList, &ck, MMIO_FINDCHUNK); ok(ret == MMSYSERR_NOERROR, "mmioDescend error %u\n", ret); @@ -153,16 +153,16 @@ static void test_mmioDescend(void) ok(ckList.fccType == listtypeAVIHEADER, "wrong fccType: %04x\n", ckList.fccType); mmioSeek(hmmio, 0, SEEK_SET); - memset(&ck, 0x55, sizeof(ck)); + memset(&ck, 0x66, sizeof(ck)); ret = mmioDescend(hmmio, &ck, NULL, MMIO_FINDCHUNK); ok(ret == MMIOERR_CHUNKNOTFOUND || ret == MMIOERR_INVALIDFILE, "mmioDescend returned %u\n", ret); - ok(ck.ckid != 0x55555555, "wrong ckid: %04x\n", ck.ckid); - ok(ck.fccType != 0x55555555, "wrong fccType: %04x\n", ck.fccType); - ok(ck.dwDataOffset != 0x55555555, "wrong dwDataOffset: %04x\n", ck.dwDataOffset); + ok(ck.ckid != 0x66666666, "wrong ckid: %04x\n", ck.ckid); + ok(ck.fccType != 0x66666666, "wrong fccType: %04x\n", ck.fccType); + ok(ck.dwDataOffset != 0x66666666, "wrong dwDataOffset: %04x\n", ck.dwDataOffset); mmioSeek(hmmio, 0, SEEK_SET); - memset(&ck, 0x55, sizeof(ck)); + memset(&ck, 0x66, sizeof(ck)); ret = mmioDescend(hmmio, &ck, NULL, MMIO_FINDRIFF); ok(ret == MMIOERR_CHUNKNOTFOUND || ret == MMIOERR_INVALIDFILE, "mmioDescend returned %u\n", ret);

1 0

Alexandre Julliard : regedit: Include the terminating null in string lengths.
by Alexandre Julliard March 3, 2008

March 3, 2008

Module: wine Branch: master Commit: b9e578528ff19e77bdc2e64c881aad3c77d5054d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9e578528ff19e77bdc2e64c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 3 12:07:16 2008 +0100 regedit: Include the terminating null in string lengths. --- programs/regedit/regproc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 8b1507d..9ee6765 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -274,6 +274,7 @@ static LONG setValue(LPSTR val_name, LPSTR val_data) val_data[dwLen]='\0'; } lpbData = (BYTE*) val_data; + dwLen++; /* include terminating null */ } else if (dwParseType == REG_DWORD) /* Convert the dword types */ {

1 0

Francois Gouget : Assorted spelling, punctuation and case fixes.
by Alexandre Julliard March 3, 2008

March 3, 2008

Module: wine Branch: master Commit: 29ef0b90ee2f9b7dde76ebe159a299e139fdf476 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29ef0b90ee2f9b7dde76ebe15… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 1 21:10:38 2008 +0100 Assorted spelling, punctuation and case fixes. --- configure | 6 +++--- configure.ac | 2 +- dlls/d3drm/tests/vector.c | 4 ++-- dlls/msxml3/tests/xmldoc.c | 2 +- dlls/ole32/compobj.c | 2 +- dlls/ole32/compobj_private.h | 2 +- dlls/ole32/ole2.c | 6 +++--- dlls/usp10/tests/usp10.c | 4 ++-- dlls/wined3d/directx.c | 10 +++++----- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/configure b/configure index 71c9b66..831ac1a 100755 --- a/configure +++ b/configure @@ -10039,11 +10039,11 @@ fi fi if test "$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" != "yes"; then case "x$with_xvidmode" in - x) wine_notices="$wine_notices|libxxf86vm development files not found, XFree86 Vidmode won't be supported." ;; + x) wine_notices="$wine_notices|libXxf86vm development files not found, XFree86 Vidmode won't be supported." ;; xno) ;; - *) { { echo "$as_me:$LINENO: error: libxxf86vm development files not found, XFree86 Vidmode won't be supported. + *) { { echo "$as_me:$LINENO: error: libXxf86vm development files not found, XFree86 Vidmode won't be supported. This is an error since --with-xvidmode was requested." >&5 -echo "$as_me: error: libxxf86vm development files not found, XFree86 Vidmode won't be supported. +echo "$as_me: error: libXxf86vm development files not found, XFree86 Vidmode won't be supported. This is an error since --with-xvidmode was requested." >&2;} { (exit 1); exit 1; }; } ;; esac diff --git a/configure.ac b/configure.ac index 014f601..4ccc1db 100644 --- a/configure.ac +++ b/configure.ac @@ -643,7 +643,7 @@ then $X_LIBS -lXext -lX11 $X_EXTRA_LIBS) fi WINE_NOTICE_WITH(xvidmode,[test "$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" != "yes"], - [libxxf86vm development files not found, XFree86 Vidmode won't be supported.]) + [libXxf86vm development files not found, XFree86 Vidmode won't be supported.]) dnl *** Check for Transform functions in Xrender if test "$ac_cv_header_X11_extensions_Xrender_h" = "yes" -a "x$ac_cv_lib_soname_X11" != "x" -a "x$ac_cv_lib_soname_Xext" != "x" diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c index e900361..4b0f97f 100644 --- a/dlls/d3drm/tests/vector.c +++ b/dlls/d3drm/tests/vector.c @@ -280,7 +280,7 @@ static void ColorTest(void) got_color=pD3DRMCreateColorRGBA(red,green,blue,alpha); ok((expected_color==got_color),"Expected color=%x, Got color=%x\n",expected_color,got_color); -/* if a component is <0 then, then one considers this compenent as 0. The following test proves this fact (test only with the red component). */ +/* if a component is <0 then, then one considers this component as 0. The following test proves this fact (test only with the red component). */ red=-0.88f; green=0.4f; blue=0.6f; @@ -289,7 +289,7 @@ static void ColorTest(void) got_color=pD3DRMCreateColorRGBA(red,green,blue,alpha); ok((expected_color==got_color),"Expected color=%x, Got color=%x\n",expected_color,got_color); -/* if a component is >1 then, then one considers this compenent as 1. The following test proves this fact (test only with the red component). */ +/* if a component is >1 then, then one considers this component as 1. The following test proves this fact (test only with the red component). */ red=2.37f; green=0.4f; blue=0.6f; diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index b4e6823..076d1fe 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -270,7 +270,7 @@ static void test_createElement(void) V_I4(&vType) = -1; V_VT(&vName) = VT_NULL; hr = IXMLDocument_createElement(doc, vType, vName, &element); - /* Upto and including SP7, createElement returns an element. */ + /* Up to and including SP7, createElement returns an element. */ if(hr == S_OK) { ok(element != NULL, "Expected element\n"); diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 8764877..1cb8183 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3529,7 +3529,7 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, /*********************************************************************** * CoGetObject [OLE32.@] * - * Gets the object named by coverting the name to a moniker and binding to it. + * Gets the object named by converting the name to a moniker and binding to it. * * PARAMS * pszName [I] String representing the object. diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index ba80edf..34d4cdb 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -54,7 +54,7 @@ DEFINE_OLEGUID( CLSID_InProcFreeMarshaler, 0x0000033a, 0, 0 ); * locking is required. * LOCK - The value is written to only using Interlocked* functions. * CS - The value is read or written to inside a critical section. - * The identifier following "CS" is the specific critical setion that + * The identifier following "CS" is the specific critical section that * must be used. * MUTEX - The value is read or written to with a mutex held. * The identifier following "MUTEX" is the specific mutex that diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index e8efb47..b34235b 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -118,7 +118,7 @@ static const char OLEDD_DRAGTRACKERCLASS[] = "WineDragDropTracker32"; static struct list targetListHead = LIST_INIT(targetListHead); /****************************************************************************** - * These are the prototypes of miscelaneous utility methods + * These are the prototypes of miscellaneous utility methods */ static void OLEUTL_ReadRegistryDWORDValue(HKEY regKey, DWORD* pdwValue); @@ -2734,7 +2734,7 @@ HRESULT WINAPI PropVariantClear(PROPVARIANT * pvar) /* [in/out] */ case VT_CLSID: case VT_LPSTR: case VT_LPWSTR: - /* pick an arbitary typed pointer - we don't care about the type + /* pick an arbitrary typed pointer - we don't care about the type * as we are just freeing it */ CoTaskMemFree(pvar->u.puuid); break; @@ -2781,7 +2781,7 @@ HRESULT WINAPI PropVariantClear(PROPVARIANT * pvar) /* [in/out] */ } if (pvar->vt & ~VT_VECTOR) { - /* pick an arbitary VT_VECTOR structure - they all have the same + /* pick an arbitrary VT_VECTOR structure - they all have the same * memory layout */ CoTaskMemFree(pvar->u.capropvar.pElems); } diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 9bdcc33..f054e62 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -196,7 +196,7 @@ static void test_ScriptItemIzeShapePlace(HDC hdc, unsigned short pwOutGlyphs[256 cMaxItems = 255; hr = ScriptItemize(TestItem2, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); ok (hr == 0, "ScriptItemize should return 0, returned %08x\n", hr); - /* This test is for the intertrim operation of ScriptItemize where only one SCRIPT_ITEM is * + /* This test is for the interim operation of ScriptItemize where only one SCRIPT_ITEM is * * returned. */ ok (pItem[0].iCharPos == 0 && pItem[1].iCharPos == cInChars, "Start pos not = 0 (%d) or end pos not = %d (%d)\n", @@ -745,7 +745,7 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) BOOL fTrailing; /* Test with hdc, this should be a valid test - * Here we generrate an SCRIPT_STRING_ANALYSIS that will be used as input to the + * Here we generate an SCRIPT_STRING_ANALYSIS that will be used as input to the * following character positions to X and X to character position functions. */ hr = ScriptStringAnalyse( hdc, String, String_len, Glyphs, Charset, Flags, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 42896b6..5b7333c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3004,7 +3004,7 @@ static void test_pbo_functionality(WineD3D_GL_Info *gl_info) { WARN_(d3d_caps)("Disabling PBOs. This may result in slower performance\n"); gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] = FALSE; } else { - TRACE_(d3d_caps)("PBO test successfull\n"); + TRACE_(d3d_caps)("PBO test successful\n"); } } #undef GLINFO_LOCATION @@ -3094,10 +3094,10 @@ static void fixup_extensions(WineD3D_GL_Info *gl_info) { * We don't want to enable this on all cards, as it adds an extra instruction per texcoord used. This * makes the shader slower and eats instruction slots which should be available to the d3d app. * - * ATI Radeon HD 2xxx cards on MacOS have the issue. Instead of checking for the buggy cards blacklist - * all radeon cards on Macs but whitelist the good ones, that way we're prepared for the future. If - * this workaround is activated on cards that do not need it it won't break things, just affect - * performance negatively + * ATI Radeon HD 2xxx cards on MacOS have the issue. Instead of checking for the buggy cards, blacklist + * all radeon cards on Macs and whitelist the good ones. That way we're prepared for the future. If + * this workaround is activated on cards that do not need it, it won't break things, just affect + * performance negatively. */ if(gl_info->gl_vendor == VENDOR_INTEL || (gl_info->gl_vendor == VENDOR_ATI && gl_info->gl_card != CARD_ATI_RADEON_X1600)) {

1 0