December 2008 - Wine-commits

Vitaliy Margolen : dinput: Fix remaining formatting of the find_joydevs().
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: 8b09a8eb9db3afe1481744570d4bf813e2487592 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b09a8eb9db3afe1481744570… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Dec 28 13:41:08 2008 -0700 dinput: Fix remaining formatting of the find_joydevs(). --- dlls/dinput/joystick_linuxinput.c | 41 +++++++++++++++++++----------------- 1 files changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index b07166c..2511750 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -263,27 +263,30 @@ static void find_joydevs(void) continue; } - /* A true joystick has at least axis X and Y, and at least 1 - * button. copied from linux/drivers/input/joydev.c */ - if (test_bit(joydev.absbits,ABS_X) && test_bit(joydev.absbits,ABS_Y) && - ( test_bit(joydev.keybits,BTN_TRIGGER) || - test_bit(joydev.keybits,BTN_A) || - test_bit(joydev.keybits,BTN_1) - ) - ) { - - if (!(joydev.device = HeapAlloc(GetProcessHeap(), 0, strlen(buf) + 1))) { - close(fd); - continue; + /* A true joystick has at least axis X and Y, and at least 1 + * button. copied from linux/drivers/input/joydev.c */ + if (!test_bit(joydev.absbits, ABS_X) || !test_bit(joydev.absbits, ABS_Y) || + !(test_bit(joydev.keybits, BTN_TRIGGER) || + test_bit(joydev.keybits, BTN_A) || + test_bit(joydev.keybits, BTN_1))) + { + close(fd); + continue; + } + + if (!(joydev.device = HeapAlloc(GetProcessHeap(), 0, strlen(buf) + 1))) + { + close(fd); + continue; } strcpy(joydev.device, buf); buf[MAX_PATH - 1] = 0; if (ioctl(fd, EVIOCGNAME(MAX_PATH - 1), buf) != -1 && (joydev.name = HeapAlloc(GetProcessHeap(), 0, strlen(buf) + 1))) - strcpy(joydev.name, buf); + strcpy(joydev.name, buf); else - joydev.name = joydev.device; + joydev.name = joydev.device; joydev.guid = DInput_Wine_Joystick_Base_GUID; joydev.guid.Data3 += have_joydevs; @@ -305,9 +308,11 @@ static void find_joydevs(void) } #endif - for (j=0;j<ABS_MAX;j++) { - if (test_bit(joydev.absbits,j)) { - if (-1!=ioctl(fd,EVIOCGABS(j),&(joydev.axes[j]))) { + for (j = 0; j < ABS_MAX;j ++) + { + if (!test_bit(joydev.absbits, j)) continue; + if (ioctl(fd, EVIOCGABS(j), &(joydev.axes[j])) != -1) + { TRACE(" ... with axis %d: cur=%d, min=%d, max=%d, fuzz=%d, flat=%d\n", j, joydev.axes[j].value, @@ -317,7 +322,6 @@ static void find_joydevs(void) joydev.axes[j].flat ); } - } } if (!have_joydevs) @@ -333,7 +337,6 @@ static void find_joydevs(void) joydevs = new_joydevs; memcpy(joydevs + have_joydevs, &joydev, sizeof(joydev)); have_joydevs++; - } close(fd); }

1 0

Christian Costa : ntoskrnl.exe: Fix some FIXMEs.
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: 9a95c077fe87bc159666446656ff7d6df1870bf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a95c077fe87bc15966644665… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Dec 28 12:56:29 2008 +0100 ntoskrnl.exe: Fix some FIXMEs. --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index bcf62a5..c52be4b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -267,7 +267,7 @@ NTSTATUS WINAPI IoAllocateDriverObjectExtension( PDRIVER_OBJECT DriverObject, ULONG DriverObjectExtensionSize, PVOID *DriverObjectExtension ) { - FIXME( "%p, %p, %u, %p\n", DriverObject, ClientIdentificationAddress, + FIXME( "stub: %p, %p, %u, %p\n", DriverObject, ClientIdentificationAddress, DriverObjectExtensionSize, DriverObjectExtension ); return STATUS_NOT_IMPLEMENTED; } @@ -279,7 +279,7 @@ NTSTATUS WINAPI IoAllocateDriverObjectExtension( PDRIVER_OBJECT DriverObject, PVOID WINAPI IoGetDriverObjectExtension( PDRIVER_OBJECT DriverObject, PVOID ClientIdentificationAddress ) { - FIXME( "%p, %p\n", DriverObject, ClientIdentificationAddress ); + FIXME( "stub: %p, %p\n", DriverObject, ClientIdentificationAddress ); return NULL; } @@ -875,7 +875,7 @@ void WINAPI KeInitializeEvent( PRKEVENT Event, EVENT_TYPE Type, BOOLEAN State ) */ void WINAPI KeInitializeSpinLock( PKSPIN_LOCK SpinLock ) { - FIXME("%p\n", SpinLock); + FIXME( "stub: %p\n", SpinLock ); } @@ -884,7 +884,7 @@ void WINAPI KeInitializeSpinLock( PKSPIN_LOCK SpinLock ) */ void WINAPI KeInitializeTimerEx( PKTIMER Timer, TIMER_TYPE Type ) { - FIXME("%p %d\n", Timer, Type); + FIXME( "stub: %p %d\n", Timer, Type ); }

1 0

Christian Costa : ntoskrnl.exe: Add stub for PsSetCreateThreadNotifyRoutine .
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: 43b7f268e40a6b96f7e2ef6fabae25c899d69a65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43b7f268e40a6b96f7e2ef6fa… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Dec 28 14:31:51 2008 +0100 ntoskrnl.exe: Add stub for PsSetCreateThreadNotifyRoutine. --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c52be4b..0087683 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -54,6 +54,7 @@ typedef struct _KSERVICE_TABLE_DESCRIPTOR KSERVICE_TABLE_DESCRIPTOR KeServiceDescriptorTable[4] = { { 0 } }; typedef void (WINAPI *PCREATE_PROCESS_NOTIFY_ROUTINE)(HANDLE,HANDLE,BOOLEAN); +typedef void (WINAPI *PCREATE_THREAD_NOTIFY_ROUTINE)(HANDLE,HANDLE,BOOLEAN); static struct list Irps = LIST_INIT(Irps); @@ -1110,6 +1111,17 @@ NTSTATUS WINAPI PsSetCreateProcessNotifyRoutine( PCREATE_PROCESS_NOTIFY_ROUTINE return STATUS_SUCCESS; } + +/*********************************************************************** + * PsSetCreateThreadNotifyRoutine (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI PsSetCreateThreadNotifyRoutine( PCREATE_THREAD_NOTIFY_ROUTINE NotifyRoutine ) +{ + FIXME( "stub: %p\n", NotifyRoutine ); + return STATUS_SUCCESS; +} + + /*********************************************************************** * MmGetSystemRoutineAddress (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 7c11457..7b95852 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -908,7 +908,7 @@ @ stub PsRevertToSelf @ stub PsSetContextThread @ stdcall PsSetCreateProcessNotifyRoutine(ptr long) -@ stub PsSetCreateThreadNotifyRoutine +@ stdcall PsSetCreateThreadNotifyRoutine(ptr) @ stub PsSetJobUIRestrictionsClass @ stub PsSetLegoNotifyRoutine @ stub PsSetLoadImageNotifyRoutine

1 0

Christian Costa : d3dxof: Template names are case insensitive.
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: 0fea04afbf8556e7164292b800e80adbb2e5db7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fea04afbf8556e7164292b80… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Dec 28 11:27:29 2008 +0100 d3dxof: Template names are case insensitive. --- dlls/d3dxof/d3dxof.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 493735b..1913c68 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -1088,13 +1088,13 @@ static BOOL parse_template_members_list(parse_buffer * buf) cur_member->idx_template = 0; while (cur_member->idx_template < buf->pdxf->nb_xtemplates) { - if (!strcmp((char*)buf->value, buf->pdxf->xtemplates[cur_member->idx_template].name)) + if (!strcasecmp((char*)buf->value, buf->pdxf->xtemplates[cur_member->idx_template].name)) break; cur_member->idx_template++; } if (cur_member->idx_template == buf->pdxf->nb_xtemplates) { - TRACE("Reference to a nonexistent template '%s'\n", (char*)buf->value); + ERR("Reference to a nonexistent template '%s'\n", (char*)buf->value); return FALSE; } } @@ -1977,7 +1977,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) /* To do template lookup */ for (j = 0; j < buf->pdxf->nb_xtemplates; j++) { - if (!strcmp(buf->pdxf->xtemplates[pt->members[i].idx_template].name, buf->pdxf->xtemplates[j].name)) + if (!strcasecmp(buf->pdxf->xtemplates[pt->members[i].idx_template].name, buf->pdxf->xtemplates[j].name)) { buf->pxt[buf->level] = &buf->pdxf->xtemplates[j]; break; @@ -1985,7 +1985,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) } if (j == buf->pdxf->nb_xtemplates) { - FIXME("Unknown template %s\n", (char*)buf->value); + ERR("Unknown template %s\n", (char*)buf->value); buf->level--; return FALSE; } @@ -2186,7 +2186,7 @@ static BOOL parse_object(parse_buffer * buf) /* To do template lookup */ for (i = 0; i < buf->pdxf->nb_xtemplates; i++) { - if (!strcmp((char*)buf->value, buf->pdxf->xtemplates[i].name)) + if (!strcasecmp((char*)buf->value, buf->pdxf->xtemplates[i].name)) { buf->pxt[buf->level] = &buf->pdxf->xtemplates[i]; memcpy(&buf->pxo->type, &buf->pdxf->xtemplates[i].class_id, 16); @@ -2195,7 +2195,7 @@ static BOOL parse_object(parse_buffer * buf) } if (i == buf->pdxf->nb_xtemplates) { - FIXME("Unknown template %s\n", (char*)buf->value); + ERR("Unknown template %s\n", (char*)buf->value); return FALSE; }

1 0

Christian Costa : ntoskrnl.exe: Add stub for KeInitializeEvent.
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: 70383b0c4c184371a2ef8baf7f5f38219c54268a URL: http://source.winehq.org/git/wine.git/?a=commit;h=70383b0c4c184371a2ef8baf7… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Dec 28 12:55:00 2008 +0100 ntoskrnl.exe: Add stub for KeInitializeEvent. --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 227e393..bcf62a5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -862,6 +862,15 @@ void WINAPI ExFreePoolWithTag( void *ptr, ULONG tag ) /*********************************************************************** + * KeInitializeEvent (NTOSKRNL.EXE.@) + */ +void WINAPI KeInitializeEvent( PRKEVENT Event, EVENT_TYPE Type, BOOLEAN State ) +{ + FIXME( "stub: %p %d %d\n", Event, Type, State ); +} + + +/*********************************************************************** * KeInitializeSpinLock (NTOSKRNL.EXE.@) */ void WINAPI KeInitializeSpinLock( PKSPIN_LOCK SpinLock ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 946249d..7c11457 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -546,7 +546,7 @@ @ stub KeInitializeApc @ stub KeInitializeDeviceQueue @ stub KeInitializeDpc -@ stub KeInitializeEvent +@ stdcall KeInitializeEvent(ptr long long) @ stub KeInitializeInterrupt @ stub KeInitializeMutant @ stub KeInitializeMutex

1 0

Austin English : winhttp: Fix a missing include for OpenBSD.
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: 87cc3e19bc6faea5d2ca845df200c6abfec079b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87cc3e19bc6faea5d2ca845df… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Dec 28 21:00:24 2008 -0600 winhttp: Fix a missing include for OpenBSD. --- dlls/winhttp/winhttp_private.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 5043235..511e124 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -26,6 +26,7 @@ #include "wine/list.h" #include "wine/unicode.h" +#include <sys/types.h> #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif

1 0

Austin English : configure: Fix sysctl.h check for OpenBSD.
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: 51094be4f98bab2fcbbaa40322df9ecbfa2e5ac1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51094be4f98bab2fcbbaa4032… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Dec 27 14:53:53 2008 -0600 configure: Fix sysctl.h check for OpenBSD. --- configure | 5 ++--- configure.ac | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/configure b/configure index d0ea3a3..96b7d11 100755 --- a/configure +++ b/configure @@ -7444,7 +7444,6 @@ done - for ac_header in \ AudioUnit/AudioUnit.h \ Carbon/Carbon.h \ @@ -7547,7 +7546,6 @@ for ac_header in \ sys/statvfs.h \ sys/strtio.h \ sys/syscall.h \ - sys/sysctl.h \ sys/time.h \ sys/times.h \ sys/uio.h \ @@ -7786,7 +7784,8 @@ fi -for ac_header in sys/mount.h sys/statfs.h sys/user.h sys/vfs.h + +for ac_header in sys/mount.h sys/statfs.h sys/sysctl.h sys/user.h sys/vfs.h do as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 diff --git a/configure.ac b/configure.ac index 5d7dd5c..6dcd72f 100644 --- a/configure.ac +++ b/configure.ac @@ -344,7 +344,6 @@ AC_CHECK_HEADERS(\ sys/statvfs.h \ sys/strtio.h \ sys/syscall.h \ - sys/sysctl.h \ sys/time.h \ sys/times.h \ sys/uio.h \ @@ -363,7 +362,7 @@ AC_HEADER_STAT() dnl **** Checks for headers that depend on other ones **** -AC_CHECK_HEADERS([sys/mount.h sys/statfs.h sys/user.h sys/vfs.h],,, +AC_CHECK_HEADERS([sys/mount.h sys/statfs.h sys/sysctl.h sys/user.h sys/vfs.h],,, [#include <sys/types.h> #ifdef HAVE_SYS_PARAM_H # include <sys/param.h>

1 0

Austin English : configure: Fix libpng detection on OpenBSD.
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: fe8879e6d1fd70ae559ce8ba252238cf485c36ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe8879e6d1fd70ae559ce8ba2… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Dec 28 19:10:19 2008 -0600 configure: Fix libpng detection on OpenBSD. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 96b7d11..31858ad 100755 --- a/configure +++ b/configure @@ -16714,7 +16714,7 @@ if test "${ac_cv_lib_soname_png+set}" = set; then $as_echo_n "(cached) " >&6 else ac_check_soname_save_LIBS=$LIBS -LIBS="-lpng -lm $LIBS" +LIBS="-lpng -lm -lz $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF diff --git a/configure.ac b/configure.ac index 6dcd72f..6bbb4b9 100644 --- a/configure.ac +++ b/configure.ac @@ -1216,7 +1216,7 @@ WINE_WARNING_WITH(jpeg,[test "x$ac_cv_lib_soname_jpeg" = "x"], dnl **** Check for libpng **** if test "$ac_cv_header_png_h" = "yes" then - WINE_CHECK_SONAME(png,png_create_read_struct,,,-lm,[[libpng[[0-9]]*]]) + WINE_CHECK_SONAME(png,png_create_read_struct,,,-lm -lz,[[libpng[[0-9]]*]]) fi WINE_WARNING_WITH(png,[test "x$ac_cv_lib_soname_png" = "x"], [libpng ${notice_platform}development files not found, PNG won't be supported.])

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: 2166afceb77c371c4390b29888d375be9ebd4e90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2166afceb77c371c4390b2988… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 28 10:34:07 2008 +0100 Assorted spelling fixes. --- dlls/d3dxof/tests/d3dxof.c | 2 +- dlls/dmloader/loader.c | 8 ++++---- dlls/shdocvw/tests/shdocvw.c | 4 ++-- dlls/winealsa.drv/midi.c | 2 +- dlls/wined3d/arb_program_shader.c | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 12df0c6..4e74f1a 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -137,7 +137,7 @@ static void test_refcount(void) ok(ref == 0, "Got refcount %ld, expected 0\n", ref); } -/* Set it to 1 to expand the string when dumping the object. This is usefull when there is +/* Set it to 1 to expand the string when dumping the object. This is useful when there is * only one string in a sub-object (very common). Use with care, this may lead to a crash. */ #define EXPAND_STRING 0 diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 059760a..8a31b62 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -212,10 +212,10 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_GetObject (LPDIR else we use info we were given */ if (pObjectEntry) { TRACE(": found alias entry for requested object... using stored info\n"); - /* I think in certain cases it can happen that entry's descriptor lacks info + /* I think in certain cases it can happen that entry's descriptor lacks info about where to load from (e.g.: if we loaded from stream and then released object - from cache; then only it's CLSID, GUID and perhaps name are left); so just - overwrite info entry has (since it ought to be 100% correct) */ + from cache; then only its CLSID, GUID and perhaps name are left); so just + overwrite whatever info the entry has (since it ought to be 100% correct) */ DMUSIC_CopyDescriptor (pDesc, &pObjectEntry->Desc); /*pDesc = &pObjectEntry->Desc; */ /* FIXME: is this OK? */ } else { @@ -476,7 +476,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_SetObject (LPDIR LIST_FOR_EACH (pEntry, This->pObjects) { pObjectEntry = LIST_ENTRY (pEntry, WINE_LOADER_ENTRY, entry); if (!memcmp (&pObjectEntry->Desc, pDesc, sizeof(DMUS_OBJECTDESC))) { - TRACE(": exacly same entry already exists\n"); + TRACE(": exactly same entry already exists\n"); return S_OK; } } diff --git a/dlls/shdocvw/tests/shdocvw.c b/dlls/shdocvw/tests/shdocvw.c index 64a4ca7..963b9a8 100644 --- a/dlls/shdocvw/tests/shdocvw.c +++ b/dlls/shdocvw/tests/shdocvw.c @@ -241,7 +241,7 @@ static void test_ParseURLFromOutsideSourceA(void) len = maxlen; dummy = 0; res = pParseURLFromOutsideSourceA(ParseURL_table[i].url, buffer, &len, &dummy); - /* len includes the terminating 0, when the buffer is to small */ + /* len includes the terminating 0, when the buffer is too small */ ok( res == 0 && len == ParseURL_table[i].len + 1, "#%d (==): got %d and %d (expected '0' and %d)\n", i, res, len, ParseURL_table[i].len + 1); @@ -333,7 +333,7 @@ static void test_ParseURLFromOutsideSourceW(void) len = maxlen; dummy = 0; res = pParseURLFromOutsideSourceW(urlW, bufferW, &len, &dummy); - /* len includes the terminating 0, when the buffer is to small */ + /* len includes the terminating 0, when the buffer is too small */ ok( res == 0 && len == ParseURL_table[0].len + 1, "==: got %d and %d (expected '0' and %d)\n", res, len, ParseURL_table[0].len + 1); diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index c1bcb10..24a9b65 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -388,7 +388,7 @@ static DWORD WINAPI midRecThread(LPVOID arg) len -= copylen; pos += copylen; /* We check if we reach the end of buffer or the end of sysex before notifying - * to handle the case where ALSA splitted the sysex into several events */ + * to handle the case where ALSA split the sysex into several events */ if ((lpMidiHdr->dwBytesRecorded == lpMidiHdr->dwBufferLength) || (*(BYTE*)(lpMidiHdr->lpData + lpMidiHdr->dwBytesRecorded - 1) == 0xF7)) { lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ca6ca58..d55e76e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -314,7 +314,7 @@ static void shader_generate_arb_declarations(IWineD3DBaseShader *iface, const sh FIXME("No free constant to load the luminance parameters\n"); } } else { - FIXME("No free constant found to load environemnt bump mapping matrix into the shader. texbem instruction will not apply bump mapping\n"); + FIXME("No free constant found to load environment bump mapping matrix into the shader. texbem instruction will not apply bump mapping\n"); } ps->numbumpenvmatconsts = cur + 1;

1 0

Francois Gouget : configure: Fix the linux/ipx.h check.
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: da1a35297254f08bf33f4b449000352adbf9476f URL: http://source.winehq.org/git/wine.git/?a=commit;h=da1a35297254f08bf33f4b449… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 28 10:35:02 2008 +0100 configure: Fix the linux/ipx.h check. --- configure | 5 +++++ configure.ac | 4 ++++ dlls/ws2_32/socket.c | 3 +++ include/config.h.in | 3 +++ 4 files changed, 15 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 6381aed..d0ea3a3 100755 --- a/configure +++ b/configure @@ -7444,6 +7444,7 @@ done + for ac_header in \ AudioUnit/AudioUnit.h \ Carbon/Carbon.h \ @@ -7484,6 +7485,7 @@ for ac_header in \ linux/major.h \ linux/param.h \ linux/serial.h \ + linux/types.h \ linux/ucdrom.h \ mach/mach.h \ mach/machine.h \ @@ -8063,6 +8065,9 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif + #ifdef HAVE_LINUX_TYPES_H + # include <linux/types.h> + #endif #include <$ac_header> _ACEOF diff --git a/configure.ac b/configure.ac index df0eb63..5d7dd5c 100644 --- a/configure.ac +++ b/configure.ac @@ -282,6 +282,7 @@ AC_CHECK_HEADERS(\ linux/major.h \ linux/param.h \ linux/serial.h \ + linux/types.h \ linux/ucdrom.h \ mach/mach.h \ mach/machine.h \ @@ -432,6 +433,9 @@ AC_CHECK_HEADERS([linux/ipx.h],,, #endif #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> + #endif + #ifdef HAVE_LINUX_TYPES_H + # include <linux/types.h> #endif]) AC_CHECK_HEADERS([resolv.h],,, diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b1aea8e..e44b2e3 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -103,6 +103,9 @@ # ifdef HAVE_ASM_TYPES_H # include <asm/types.h> # endif +# ifdef HAVE_LINUX_TYPES_H +# include <linux/types.h> +# endif # include <linux/ipx.h> # define HAVE_IPX #endif diff --git a/include/config.h.in b/include/config.h.in index b72a6bb..69c1fee 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -393,6 +393,9 @@ /* Define to 1 if you have the <linux/serial.h> header file. */ #undef HAVE_LINUX_SERIAL_H +/* Define to 1 if you have the <linux/types.h> header file. */ +#undef HAVE_LINUX_TYPES_H + /* Define to 1 if you have the <linux/ucdrom.h> header file. */ #undef HAVE_LINUX_UCDROM_H

1 0