January 2011 - Wine-Commits

Hans Leidekker : kernel32/tests: Add a test for ioctl 0x560000.
by Alexandre Julliard Jan. 31, 2011

Jan. 31, 2011

Module: wine Branch: master Commit: 541c116368a95674976b9417c695d2b4c99ab9f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=541c116368a95674976b9417c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 31 11:32:04 2011 +0100 kernel32/tests: Add a test for ioctl 0x560000. --- dlls/kernel32/tests/volume.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 482ff16..f632eb0 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -509,6 +509,32 @@ static void test_enum_vols(void) pFindVolumeClose( hFind ); } +static void test_ioctl_560000(void) +{ + BOOL ret; + DWORD size; + HANDLE handle; + static DWORD data[16]; + + handle = CreateFileA( "\\\\.\\c:", GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); + if (handle == INVALID_HANDLE_VALUE) + { + win_skip("can't open c: drive %u\n", GetLastError()); + return; + } + size = 0; + ret = DeviceIoControl( handle, 0x560000, &data, sizeof(data), &data, sizeof(data), &size, NULL ); + if (!ret && GetLastError() == ERROR_INVALID_FUNCTION) + { + win_skip("ioctl 0x560000 not supported\n"); + CloseHandle( handle ); + return; + } + ok(ret, "DeviceIoControl failed %u\n", GetLastError()); + ok(size == 32, "expected 32, got %u\n", size); + CloseHandle( handle ); +} + START_TEST(volume) { hdll = GetModuleHandleA("kernel32.dll"); @@ -529,4 +555,5 @@ START_TEST(volume) test_GetLogicalDriveStringsW(); test_GetVolumeInformationA(); test_enum_vols(); + test_ioctl_560000(); }

1 0

Eric Pouech : kernel32: Added shift & ctrl modifiers for function keys.
by Alexandre Julliard Jan. 31, 2011

Jan. 31, 2011

Module: wine Branch: master Commit: 6d75a47b6de3758ac1a2abd30491eaba6c72dbc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d75a47b6de3758ac1a2abd30… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jan 29 20:02:30 2011 +0100 kernel32: Added shift & ctrl modifiers for function keys. --- dlls/kernel32/term.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/term.c b/dlls/kernel32/term.c index c0aacd9..7f78fa3 100644 --- a/dlls/kernel32/term.c +++ b/dlls/kernel32/term.c @@ -247,6 +247,58 @@ static struct dbkey_init TERM_dbkey_init[] = { {"kf10", NULL, {dbk_complex, 0x44, 0x79, 0}}, {"kf11", NULL, {dbk_complex, 0xd9, 0x7a, 0}}, {"kf12", NULL, {dbk_complex, 0xda, 0x7b, 0}}, + {"kf13", NULL, {dbk_complex, 0x3b, 0x70, SHIFT_PRESSED}}, + {"kf14", NULL, {dbk_complex, 0x3c, 0x71, SHIFT_PRESSED}}, + {"kf15", NULL, {dbk_complex, 0x3d, 0x72, SHIFT_PRESSED}}, + {"kf16", NULL, {dbk_complex, 0x3e, 0x73, SHIFT_PRESSED}}, + {"kf17", NULL, {dbk_complex, 0x3f, 0x74, SHIFT_PRESSED}}, + {"kf18", NULL, {dbk_complex, 0x40, 0x75, SHIFT_PRESSED}}, + {"kf19", NULL, {dbk_complex, 0x41, 0x76, SHIFT_PRESSED}}, + {"kf20", NULL, {dbk_complex, 0x42, 0x77, SHIFT_PRESSED}}, + {"kf21", NULL, {dbk_complex, 0x43, 0x78, SHIFT_PRESSED}}, + {"kf22", NULL, {dbk_complex, 0x44, 0x79, SHIFT_PRESSED}}, + {"kf23", NULL, {dbk_complex, 0xd9, 0x7a, SHIFT_PRESSED}}, + {"kf24", NULL, {dbk_complex, 0xda, 0x7b, SHIFT_PRESSED}}, + {"kf25", NULL, {dbk_complex, 0x3b, 0x70, LEFT_CTRL_PRESSED}}, + {"kf26", NULL, {dbk_complex, 0x3c, 0x71, LEFT_CTRL_PRESSED}}, + {"kf27", NULL, {dbk_complex, 0x3d, 0x72, LEFT_CTRL_PRESSED}}, + {"kf28", NULL, {dbk_complex, 0x3e, 0x73, LEFT_CTRL_PRESSED}}, + {"kf29", NULL, {dbk_complex, 0x3f, 0x74, LEFT_CTRL_PRESSED}}, + {"kf30", NULL, {dbk_complex, 0x40, 0x75, LEFT_CTRL_PRESSED}}, + {"kf31", NULL, {dbk_complex, 0x41, 0x76, LEFT_CTRL_PRESSED}}, + {"kf32", NULL, {dbk_complex, 0x42, 0x77, LEFT_CTRL_PRESSED}}, + {"kf33", NULL, {dbk_complex, 0x43, 0x78, LEFT_CTRL_PRESSED}}, + {"kf34", NULL, {dbk_complex, 0x44, 0x79, LEFT_CTRL_PRESSED}}, + {"kf35", NULL, {dbk_complex, 0xd9, 0x7a, LEFT_CTRL_PRESSED}}, + {"kf36", NULL, {dbk_complex, 0xda, 0x7b, LEFT_CTRL_PRESSED}}, + {"kf37", NULL, {dbk_complex, 0x3b, 0x70, LEFT_CTRL_PRESSED|SHIFT_PRESSED}}, + {"kf38", NULL, {dbk_complex, 0x3c, 0x71, LEFT_CTRL_PRESSED|SHIFT_PRESSED}}, + {"kf39", NULL, {dbk_complex, 0x3d, 0x72, LEFT_CTRL_PRESSED|SHIFT_PRESSED}}, + {"kf40", NULL, {dbk_complex, 0x3e, 0x73, LEFT_CTRL_PRESSED|SHIFT_PRESSED}}, + {"kf41", NULL, {dbk_complex, 0x3f, 0x74, LEFT_CTRL_PRESSED|SHIFT_PRESSED}}, + {"kf42", NULL, {dbk_complex, 0x40, 0x75, LEFT_CTRL_PRESSED|SHIFT_PRESSED}}, + {"kf43", NULL, {dbk_complex, 0x41, 0x76, LEFT_CTRL_PRESSED|SHIFT_PRESSED}}, + {"kf44", NULL, {dbk_complex, 0x42, 0x77, LEFT_CTRL_PRESSED|SHIFT_PRESSED}}, + {"kf45", NULL, {dbk_complex, 0x43, 0x78, LEFT_CTRL_PRESSED|SHIFT_PRESSED}}, + {"kf46", NULL, {dbk_complex, 0x44, 0x79, LEFT_CTRL_PRESSED|SHIFT_PRESSED}}, + {"kf47", NULL, {dbk_complex, 0xd9, 0x7a, LEFT_CTRL_PRESSED|SHIFT_PRESSED}}, + {"kf48", NULL, {dbk_complex, 0xda, 0x7b, LEFT_CTRL_PRESSED|SHIFT_PRESSED}}, + {"kf49", NULL, {dbk_complex, 0x3b, 0x70, LEFT_ALT_PRESSED}}, + {"kf50", NULL, {dbk_complex, 0x3c, 0x71, LEFT_ALT_PRESSED}}, + {"kf51", NULL, {dbk_complex, 0x3d, 0x72, LEFT_ALT_PRESSED}}, + {"kf52", NULL, {dbk_complex, 0x3e, 0x73, LEFT_ALT_PRESSED}}, + {"kf53", NULL, {dbk_complex, 0x3f, 0x74, LEFT_ALT_PRESSED}}, + {"kf54", NULL, {dbk_complex, 0x40, 0x75, LEFT_ALT_PRESSED}}, + {"kf55", NULL, {dbk_complex, 0x41, 0x76, LEFT_ALT_PRESSED}}, + {"kf56", NULL, {dbk_complex, 0x42, 0x77, LEFT_ALT_PRESSED}}, + {"kf57", NULL, {dbk_complex, 0x43, 0x78, LEFT_ALT_PRESSED}}, + {"kf58", NULL, {dbk_complex, 0x44, 0x79, LEFT_ALT_PRESSED}}, + {"kf59", NULL, {dbk_complex, 0xd9, 0x7a, LEFT_ALT_PRESSED}}, + {"kf60", NULL, {dbk_complex, 0xda, 0x7b, LEFT_ALT_PRESSED}}, + {"kf61", NULL, {dbk_complex, 0x3b, 0x70, LEFT_ALT_PRESSED|SHIFT_PRESSED}}, + {"kf62", NULL, {dbk_complex, 0x3c, 0x71, LEFT_ALT_PRESSED|SHIFT_PRESSED}}, + {"kf63", NULL, {dbk_complex, 0x3d, 0x72, LEFT_ALT_PRESSED|SHIFT_PRESSED}}, + {"kdch1", "kDC", {dbk_complex, 0x53, 0x2e, 0}}, {"kich1", "kIC", {dbk_complex, 0x52, 0x2d, 0}}, {"knp", "kNXT", {dbk_complex, 0x51, 0x22, 0}},

1 0

Charles Davis : winecoreaudio: Don't use Component Manager on Mac OS 10.6.
by Alexandre Julliard Jan. 31, 2011

Jan. 31, 2011

Module: wine Branch: master Commit: 459d9427a8b233ad31e7044fa2a647a1b7792dc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=459d9427a8b233ad31e7044fa… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Sat Jan 29 16:45:53 2011 -0700 winecoreaudio: Don't use Component Manager on Mac OS 10.6. --- configure | 9 ++++++- configure.ac | 10 ++++++- dlls/winecoreaudio.drv/audiounit.c | 50 ++++++++++++++++++++++++++--------- include/config.h.in | 3 ++ 4 files changed, 56 insertions(+), 16 deletions(-) diff --git a/configure b/configure index 124b7cd..89bfefa 100755 --- a/configure +++ b/configure @@ -5764,6 +5764,7 @@ for ac_header in \ ApplicationServices/ApplicationServices.h \ AudioToolbox/AudioConverter.h \ AudioUnit/AudioUnit.h \ + AudioUnit/AudioComponent.h \ CL/cl.h \ Carbon/Carbon.h \ CoreAudio/CoreAudio.h \ @@ -6526,8 +6527,14 @@ fi fi if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes" then - COREAUDIO="-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI" + if test "$ac_cv_header_AudioUnit_AudioComponent_h" = "yes" + then + COREAUDIO="-framework CoreFoundation -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreMIDI" + + else + COREAUDIO="-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI" + fi fi if test "$ac_cv_header_OpenAL_al_h" = "yes" then diff --git a/configure.ac b/configure.ac index eb7b4a1..c0a9d7f 100644 --- a/configure.ac +++ b/configure.ac @@ -371,6 +371,7 @@ AC_CHECK_HEADERS(\ ApplicationServices/ApplicationServices.h \ AudioToolbox/AudioConverter.h \ AudioUnit/AudioUnit.h \ + AudioUnit/AudioComponent.h \ CL/cl.h \ Carbon/Carbon.h \ CoreAudio/CoreAudio.h \ @@ -711,8 +712,13 @@ case $host_os in fi if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes" then - dnl CoreServices needed by AudioUnit - AC_SUBST(COREAUDIO,"-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI") + if test "$ac_cv_header_AudioUnit_AudioComponent_h" = "yes" + then + AC_SUBST(COREAUDIO,"-framework CoreFoundation -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreMIDI") + else + dnl CoreServices needed by AudioUnit + AC_SUBST(COREAUDIO,"-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI") + fi fi if test "$ac_cv_header_OpenAL_al_h" = "yes" then diff --git a/dlls/winecoreaudio.drv/audiounit.c b/dlls/winecoreaudio.drv/audiounit.c index bef882b..5191669 100644 --- a/dlls/winecoreaudio.drv/audiounit.c +++ b/dlls/winecoreaudio.drv/audiounit.c @@ -24,7 +24,9 @@ #define ULONG CoreFoundation_ULONG #define HRESULT CoreFoundation_HRESULT +#ifndef HAVE_AUDIOUNIT_AUDIOCOMPONENT_H #include <CoreServices/CoreServices.h> +#endif #include <AudioUnit/AudioUnit.h> #include <AudioToolbox/AudioToolbox.h> #undef ULONG @@ -35,6 +37,28 @@ #include "coreaudio.h" #include "wine/debug.h" +#ifndef HAVE_AUDIOUNIT_AUDIOCOMPONENT_H +/* Define new AudioComponent Manager functions for compatibility's sake */ +typedef Component AudioComponent; +typedef ComponentDescription AudioComponentDescription; +typedef ComponentInstance AudioComponentInstance; + +static inline AudioComponent AudioComponentFindNext(AudioComponent ac, AudioComponentDescription *desc) +{ + return FindNextComponent(ac, desc); +} + +static inline OSStatus AudioComponentInstanceNew(AudioComponent ac, AudioComponentInstance *aci) +{ + return OpenAComponent(ac, aci); +} + +static inline OSStatus AudioComponentInstanceDispose(AudioComponentInstance aci) +{ + return CloseComponent(aci); +} +#endif + WINE_DEFAULT_DEBUG_CHANNEL(wave); WINE_DECLARE_DEBUG_CHANNEL(midi); @@ -68,8 +92,8 @@ extern OSStatus CoreAudio_wiAudioUnitIOProc(void *inRefCon, int AudioUnit_CreateDefaultAudioUnit(void *wwo, AudioUnit *au) { OSStatus err; - Component comp; - ComponentDescription desc; + AudioComponent comp; + AudioComponentDescription desc; AURenderCallbackStruct callbackStruct; TRACE("\n"); @@ -80,11 +104,11 @@ int AudioUnit_CreateDefaultAudioUnit(void *wwo, AudioUnit *au) desc.componentFlags = 0; desc.componentFlagsMask = 0; - comp = FindNextComponent(NULL, &desc); + comp = AudioComponentFindNext(NULL, &desc); if (comp == NULL) return 0; - err = OpenAComponent(comp, au); + err = AudioComponentInstanceNew(comp, au); if (err != noErr || *au == NULL) return 0; @@ -102,7 +126,7 @@ int AudioUnit_CreateDefaultAudioUnit(void *wwo, AudioUnit *au) int AudioUnit_CloseAudioUnit(AudioUnit au) { - OSStatus err = CloseComponent(au); + OSStatus err = AudioComponentInstanceDispose(au); return (err == noErr); } @@ -198,8 +222,8 @@ int AudioUnit_CreateInputUnit(void* wwi, AudioUnit* out_au, UInt32* outFrameCount) { OSStatus err = noErr; - ComponentDescription description; - Component component; + AudioComponentDescription description; + AudioComponent component; AudioUnit au; UInt32 param; AURenderCallbackStruct callback; @@ -220,17 +244,17 @@ int AudioUnit_CreateInputUnit(void* wwi, AudioUnit* out_au, description.componentFlags = 0; description.componentFlagsMask = 0; - component = FindNextComponent(NULL, &description); + component = AudioComponentFindNext(NULL, &description); if (!component) { - ERR("FindNextComponent(kAudioUnitSubType_HALOutput) failed\n"); + ERR("AudioComponentFindNext(kAudioUnitSubType_HALOutput) failed\n"); return 0; } - err = OpenAComponent(component, &au); + err = AudioComponentInstanceNew(component, &au); if (err != noErr || au == NULL) { - ERR("OpenAComponent failed: %08lx\n", err); + ERR("AudioComponentInstanceNew failed: %08lx\n", err); return 0; } @@ -343,7 +367,7 @@ int AudioUnit_CreateInputUnit(void* wwi, AudioUnit* out_au, error: if (au) - CloseComponent(au); + AudioComponentInstanceDispose(au); return 0; } @@ -353,7 +377,7 @@ error: int SynthUnit_CreateDefaultSynthUnit(AUGraph *graph, AudioUnit *synth) { OSStatus err; - ComponentDescription desc; + AudioComponentDescription desc; AUNode synthNode; AUNode outNode; diff --git a/include/config.h.in b/include/config.h.in index dab00b2..5cae81b 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -40,6 +40,9 @@ /* Define to 1 if you have the <AudioToolbox/AudioConverter.h> header file. */ #undef HAVE_AUDIOTOOLBOX_AUDIOCONVERTER_H +/* Define to 1 if you have the <AudioUnit/AudioComponent.h> header file. */ +#undef HAVE_AUDIOUNIT_AUDIOCOMPONENT_H + /* Define to 1 if you have the <AudioUnit/AudioUnit.h> header file. */ #undef HAVE_AUDIOUNIT_AUDIOUNIT_H

1 0

Eric Pouech : kernel32: Added support for extended capacities in terminfo for xterm-like terminals .
by Alexandre Julliard Jan. 31, 2011

Jan. 31, 2011

Module: wine Branch: master Commit: be69efa51d70a259b9d86ae617f6bb30a6a06691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be69efa51d70a259b9d86ae61… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jan 29 20:02:21 2011 +0100 kernel32: Added support for extended capacities in terminfo for xterm-like terminals. --- dlls/kernel32/term.c | 98 ++++++++++++++++++++++++++++++-------------------- 1 files changed, 59 insertions(+), 39 deletions(-) diff --git a/dlls/kernel32/term.c b/dlls/kernel32/term.c index dd3b788..c0aacd9 100644 --- a/dlls/kernel32/term.c +++ b/dlls/kernel32/term.c @@ -22,6 +22,7 @@ #include "wine/port.h" #include <stdarg.h> +#include <stdlib.h> #ifdef HAVE_NCURSES_H # include <ncurses.h> #elif defined(HAVE_CURSES_H) @@ -220,47 +221,40 @@ struct dbkey_descr DWORD_PTR p3; }; -struct dbkey_pair +struct dbkey_init { - const char* string; - unsigned string_len; + const char* string_normal; + const char* string_xterm; struct dbkey_descr descr; }; -static struct dbkey_pair TERM_dbkey_init[] = { - {"kcud1", {dbk_complex, 0x50, 0x28, 0}}, - {"kcuu1", {dbk_complex, 0x48, 0x26, 0}}, - {"kcub1", {dbk_complex, 0x4b, 0x25, 0}}, - {"kcuf1", {dbk_complex, 0x4d, 0x27, 0}}, - {"khome", {dbk_complex, 0x47, 0x24, 0}}, - {"kbs", {dbk_simple, 0x7f, 0x00, 0}}, - {"kf1", {dbk_complex, 0x3b, 0x70, 0}}, - {"kf2", {dbk_complex, 0x3c, 0x71, 0}}, - {"kf3", {dbk_complex, 0x3d, 0x72, 0}}, - {"kf4", {dbk_complex, 0x3e, 0x73, 0}}, - {"kf5", {dbk_complex, 0x3f, 0x74, 0}}, - {"kf6", {dbk_complex, 0x40, 0x75, 0}}, - {"kf7", {dbk_complex, 0x41, 0x76, 0}}, - {"kf8", {dbk_complex, 0x42, 0x77, 0}}, - {"kf9", {dbk_complex, 0x43, 0x78, 0}}, - {"kf10", {dbk_complex, 0x44, 0x79, 0}}, - {"kf11", {dbk_complex, 0xd9, 0x7a, 0}}, - {"kf12", {dbk_complex, 0xda, 0x7b, 0}}, - {"kdch1", {dbk_complex, 0x53, 0x2e, 0}}, - {"kich1", {dbk_complex, 0x52, 0x2d, 0}}, - {"knp", {dbk_complex, 0x51, 0x22, 0}}, - {"kpp", {dbk_complex, 0x49, 0x21, 0}}, - {"kcbt", {dbk_simple, 0x09, 0x00, SHIFT_PRESSED}}, - - {"kend", {dbk_complex, 0x4f, 0x23, 0}}, - /* {"kmous", NULL, }, */ - {"kDC", {dbk_complex, 0x53, 0x2e, SHIFT_PRESSED}}, - {"kEND", {dbk_complex, 0x4f, 0x23, SHIFT_PRESSED}}, - {"kHOM", {dbk_complex, 0x47, 0x24, SHIFT_PRESSED}}, - {"kIC", {dbk_complex, 0x52, 0x2d, SHIFT_PRESSED}}, - {"kLFT", {dbk_complex, 0x4b, 0x25, SHIFT_PRESSED}}, - {"kRIT", {dbk_complex, 0x4d, 0x27, SHIFT_PRESSED}}, +static struct dbkey_init TERM_dbkey_init[] = { + {"kcud1", "kDN", {dbk_complex, 0x50, 0x28, 0}}, + {"kcuu1", "kUP", {dbk_complex, 0x48, 0x26, 0}}, + {"kcub1", "kLFT", {dbk_complex, 0x4b, 0x25, 0}}, + {"kcuf1", "kRIT", {dbk_complex, 0x4d, 0x27, 0}}, + {"khome", "kHOM", {dbk_complex, 0x47, 0x24, 0}}, + {"kbs", NULL, {dbk_simple, 0x7f, 0x00, 0}}, + {"kf1", NULL, {dbk_complex, 0x3b, 0x70, 0}}, + {"kf2", NULL, {dbk_complex, 0x3c, 0x71, 0}}, + {"kf3", NULL, {dbk_complex, 0x3d, 0x72, 0}}, + {"kf4", NULL, {dbk_complex, 0x3e, 0x73, 0}}, + {"kf5", NULL, {dbk_complex, 0x3f, 0x74, 0}}, + {"kf6", NULL, {dbk_complex, 0x40, 0x75, 0}}, + {"kf7", NULL, {dbk_complex, 0x41, 0x76, 0}}, + {"kf8", NULL, {dbk_complex, 0x42, 0x77, 0}}, + {"kf9", NULL, {dbk_complex, 0x43, 0x78, 0}}, + {"kf10", NULL, {dbk_complex, 0x44, 0x79, 0}}, + {"kf11", NULL, {dbk_complex, 0xd9, 0x7a, 0}}, + {"kf12", NULL, {dbk_complex, 0xda, 0x7b, 0}}, + {"kdch1", "kDC", {dbk_complex, 0x53, 0x2e, 0}}, + {"kich1", "kIC", {dbk_complex, 0x52, 0x2d, 0}}, + {"knp", "kNXT", {dbk_complex, 0x51, 0x22, 0}}, + {"kpp", "kPRV", {dbk_complex, 0x49, 0x21, 0}}, + {"kcbt", NULL, {dbk_simple, 0x09, 0x00, SHIFT_PRESSED}}, + {"kend", "kEND", {dbk_complex, 0x4f, 0x23, 0}}, + /* {"kmous", NULL, }, */ /* Still some keys to manage: KEY_DL KEY_IL KEY_EIC KEY_CLEAR KEY_EOS KEY_EOL KEY_SF KEY_SR KEY_STAB KEY_CTAB @@ -279,13 +273,20 @@ static struct dbkey_pair TERM_dbkey_init[] = { */ }; +struct dbkey_pair +{ + const char* string; + unsigned string_len; + struct dbkey_descr descr; +}; + static struct dbkey_pair* TERM_dbkey; static unsigned TERM_dbkey_size; static unsigned TERM_dbkey_index; static BOOL TERM_AddKeyDescr(const char* string, struct dbkey_descr* descr) { - if (!string) return FALSE; + if (!string || string == (const char*)-1) return TRUE; if (!TERM_dbkey) { TERM_dbkey_size = 32; @@ -310,11 +311,30 @@ static BOOL TERM_AddKeyDescr(const char* string, struct dbkey_descr* descr) static BOOL TERM_BuildKeyDB(void) { - unsigned i; + unsigned i, len; + struct dbkey_descr descr; + char tmp[64]; + for (i = 0; i < sizeof(TERM_dbkey_init) / sizeof(TERM_dbkey_init[0]); i++) { - if (!TERM_AddKeyDescr(tigetstr(TERM_dbkey_init[i].string), &TERM_dbkey_init[i].descr)) + if (!TERM_AddKeyDescr(tigetstr(TERM_dbkey_init[i].string_normal), &TERM_dbkey_init[i].descr)) return FALSE; + if (TERM_dbkey_init[i].string_xterm) + { + descr = TERM_dbkey_init[i].descr; + strcpy(tmp, TERM_dbkey_init[i].string_xterm); + len = strlen(tmp); + tmp[len + 1] = '\0'; +#define X(v, f) do { tmp[len] = v; descr.p3 = (f); if (!TERM_AddKeyDescr(tigetstr(tmp), &descr)) return FALSE; } while (0) + X('\0', SHIFT_PRESSED); + X('3', LEFT_ALT_PRESSED); + X('4', SHIFT_PRESSED | LEFT_ALT_PRESSED); + X('5', LEFT_CTRL_PRESSED); + X('6', LEFT_CTRL_PRESSED|SHIFT_PRESSED); + X('7', LEFT_CTRL_PRESSED|LEFT_ALT_PRESSED); + X('8', LEFT_CTRL_PRESSED|LEFT_ALT_PRESSED|SHIFT_PRESSED); +#undef X + } } return TRUE; }

1 0

Michael Stefaniuc : d3d8: COM cleanup for the IDirect3DTexture8 iface.
by Alexandre Julliard Jan. 31, 2011

Jan. 31, 2011

Module: wine Branch: master Commit: 8bf1940c623d7bf44020509325a601dbd9fa2ce6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bf1940c623d7bf4402050932… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 31 01:47:39 2011 +0100 d3d8: COM cleanup for the IDirect3DTexture8 iface. --- dlls/d3d8/d3d8_private.h | 9 ++-- dlls/d3d8/device.c | 2 +- dlls/d3d8/texture.c | 106 +++++++++++++++++++++++++++++---------------- 3 files changed, 73 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8bf1940c623d7bf440205…

1 0

Michael Stefaniuc : d3d8: COM cleanup for the IDirect3DVolume8 iface.
by Alexandre Julliard Jan. 31, 2011

Jan. 31, 2011

Module: wine Branch: master Commit: 05b6032fb655f6b9e57f2cdab862935c05a1a973 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05b6032fb655f6b9e57f2cdab… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 31 01:37:33 2011 +0100 d3d8: COM cleanup for the IDirect3DVolume8 iface. --- dlls/d3d8/d3d8_private.h | 11 +++---- dlls/d3d8/device.c | 2 +- dlls/d3d8/volume.c | 69 +++++++++++++++++++++++++++++---------------- 3 files changed, 50 insertions(+), 32 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 372d51c..d8f79f0 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -204,18 +204,17 @@ HRESULT device_init(IDirect3DDevice8Impl *device, IWineD3D *wined3d, UINT adapte */ struct IDirect3DVolume8Impl { - /* IUnknown fields */ - const IDirect3DVolume8Vtbl *lpVtbl; - LONG ref; + IDirect3DVolume8 IDirect3DVolume8_iface; + LONG ref; /* IDirect3DVolume8 fields */ - IWineD3DVolume *wineD3DVolume; + IWineD3DVolume *wineD3DVolume; /* The volume container */ - IUnknown *container; + IUnknown *container; /* If set forward refcounting to this object */ - IUnknown *forwardReference; + IUnknown *forwardReference; }; HRESULT volume_init(IDirect3DVolume8Impl *volume, IDirect3DDevice8Impl *device, UINT width, UINT height, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index b5c5da3..6f6622a 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2873,7 +2873,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateVolume(IWineD3DDeviceParent *volume = object->wineD3DVolume; IWineD3DVolume_AddRef(*volume); - IDirect3DVolume8_Release((IDirect3DVolume8 *)object); + IDirect3DVolume8_Release(&object->IDirect3DVolume8_iface); object->container = superior; object->forwardReference = superior; diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 75fb07c..3fd67da 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -23,9 +23,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8); -/* IDirect3DVolume8 IUnknown parts follow: */ -static HRESULT WINAPI IDirect3DVolume8Impl_QueryInterface(LPDIRECT3DVOLUME8 iface, REFIID riid, LPVOID *ppobj) { - IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; +static inline IDirect3DVolume8Impl *impl_from_IDirect3DVolume8(IDirect3DVolume8 *iface) +{ + return CONTAINING_RECORD(iface, IDirect3DVolume8Impl, IDirect3DVolume8_iface); +} + +static HRESULT WINAPI IDirect3DVolume8Impl_QueryInterface(IDirect3DVolume8 *iface, REFIID riid, + void **ppobj) +{ + IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); @@ -41,8 +47,9 @@ static HRESULT WINAPI IDirect3DVolume8Impl_QueryInterface(LPDIRECT3DVOLUME8 ifac return E_NOINTERFACE; } -static ULONG WINAPI IDirect3DVolume8Impl_AddRef(LPDIRECT3DVOLUME8 iface) { - IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; +static ULONG WINAPI IDirect3DVolume8Impl_AddRef(IDirect3DVolume8 *iface) +{ + IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); TRACE("iface %p.\n", iface); @@ -67,8 +74,9 @@ static ULONG WINAPI IDirect3DVolume8Impl_AddRef(LPDIRECT3DVOLUME8 iface) { } } -static ULONG WINAPI IDirect3DVolume8Impl_Release(LPDIRECT3DVOLUME8 iface) { - IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; +static ULONG WINAPI IDirect3DVolume8Impl_Release(IDirect3DVolume8 *iface) +{ + IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); TRACE("iface %p.\n", iface); @@ -93,10 +101,10 @@ static ULONG WINAPI IDirect3DVolume8Impl_Release(LPDIRECT3DVOLUME8 iface) { } } -/* IDirect3DVolume8 Interface follow: */ -static HRESULT WINAPI IDirect3DVolume8Impl_GetDevice(IDirect3DVolume8 *iface, IDirect3DDevice8 **device) +static HRESULT WINAPI IDirect3DVolume8Impl_GetDevice(IDirect3DVolume8 *iface, + IDirect3DDevice8 **device) { - IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; + IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); IDirect3DResource8 *resource; HRESULT hr; @@ -114,8 +122,10 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetDevice(IDirect3DVolume8 *iface, ID return hr; } -static HRESULT WINAPI IDirect3DVolume8Impl_SetPrivateData(LPDIRECT3DVOLUME8 iface, REFGUID refguid, CONST void *pData, DWORD SizeOfData, DWORD Flags) { - IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; +static HRESULT WINAPI IDirect3DVolume8Impl_SetPrivateData(IDirect3DVolume8 *iface, REFGUID refguid, + const void *pData, DWORD SizeOfData, DWORD Flags) +{ + IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); HRESULT hr; TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", @@ -128,8 +138,10 @@ static HRESULT WINAPI IDirect3DVolume8Impl_SetPrivateData(LPDIRECT3DVOLUME8 ifac return hr; } -static HRESULT WINAPI IDirect3DVolume8Impl_GetPrivateData(LPDIRECT3DVOLUME8 iface, REFGUID refguid, void *pData, DWORD* pSizeOfData) { - IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; +static HRESULT WINAPI IDirect3DVolume8Impl_GetPrivateData(IDirect3DVolume8 *iface, REFGUID refguid, + void *pData, DWORD *pSizeOfData) +{ + IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); HRESULT hr; TRACE("iface %p, guid %s, data %p, data_size %p.\n", @@ -142,8 +154,9 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetPrivateData(LPDIRECT3DVOLUME8 ifac return hr; } -static HRESULT WINAPI IDirect3DVolume8Impl_FreePrivateData(LPDIRECT3DVOLUME8 iface, REFGUID refguid) { - IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; +static HRESULT WINAPI IDirect3DVolume8Impl_FreePrivateData(IDirect3DVolume8 *iface, REFGUID refguid) +{ + IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); HRESULT hr; TRACE("iface %p, guid %s.\n", iface, debugstr_guid(refguid)); @@ -155,8 +168,10 @@ static HRESULT WINAPI IDirect3DVolume8Impl_FreePrivateData(LPDIRECT3DVOLUME8 ifa return hr; } -static HRESULT WINAPI IDirect3DVolume8Impl_GetContainer(LPDIRECT3DVOLUME8 iface, REFIID riid, void **ppContainer) { - IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; +static HRESULT WINAPI IDirect3DVolume8Impl_GetContainer(IDirect3DVolume8 *iface, REFIID riid, + void **ppContainer) +{ + IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); HRESULT res; TRACE("iface %p, riid %s, container %p.\n", @@ -171,8 +186,9 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetContainer(LPDIRECT3DVOLUME8 iface, return res; } -static HRESULT WINAPI IDirect3DVolume8Impl_GetDesc(LPDIRECT3DVOLUME8 iface, D3DVOLUME_DESC *pDesc) { - IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; +static HRESULT WINAPI IDirect3DVolume8Impl_GetDesc(IDirect3DVolume8 *iface, D3DVOLUME_DESC *pDesc) +{ + IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); WINED3DVOLUME_DESC wined3ddesc; TRACE("iface %p, desc %p.\n", iface, pDesc); @@ -193,8 +209,10 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetDesc(LPDIRECT3DVOLUME8 iface, D3DV return D3D_OK; } -static HRESULT WINAPI IDirect3DVolume8Impl_LockBox(LPDIRECT3DVOLUME8 iface, D3DLOCKED_BOX *pLockedVolume, CONST D3DBOX *pBox, DWORD Flags) { - IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; +static HRESULT WINAPI IDirect3DVolume8Impl_LockBox(IDirect3DVolume8 *iface, + D3DLOCKED_BOX *pLockedVolume, const D3DBOX *pBox, DWORD Flags) +{ + IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); HRESULT hr; TRACE("iface %p, locked_box %p, box %p, flags %#x.\n", @@ -208,8 +226,9 @@ static HRESULT WINAPI IDirect3DVolume8Impl_LockBox(LPDIRECT3DVOLUME8 iface, D3DL return hr; } -static HRESULT WINAPI IDirect3DVolume8Impl_UnlockBox(LPDIRECT3DVOLUME8 iface) { - IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; +static HRESULT WINAPI IDirect3DVolume8Impl_UnlockBox(IDirect3DVolume8 *iface) +{ + IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); HRESULT hr; TRACE("iface %p.\n", iface); @@ -253,7 +272,7 @@ HRESULT volume_init(IDirect3DVolume8Impl *volume, IDirect3DDevice8Impl *device, { HRESULT hr; - volume->lpVtbl = &Direct3DVolume8_Vtbl; + volume->IDirect3DVolume8_iface.lpVtbl = &Direct3DVolume8_Vtbl; volume->ref = 1; hr = IWineD3DDevice_CreateVolume(device->WineD3DDevice, width, height, depth, usage,

1 0

Michael Stefaniuc : d3d8: COM cleanup for the IDirect3DSwapChain8 iface.
by Alexandre Julliard Jan. 31, 2011

Jan. 31, 2011

Module: wine Branch: master Commit: 8ec3238b5ee6e937da22c0069f86d7fc233b2839 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ec3238b5ee6e937da22c0069… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 31 01:40:25 2011 +0100 d3d8: COM cleanup for the IDirect3DSwapChain8 iface. --- dlls/d3d8/d3d8_private.h | 8 ++++---- dlls/d3d8/device.c | 2 +- dlls/d3d8/swapchain.c | 33 +++++++++++++++++++++------------ 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index d8f79f0..11ae25f 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -230,14 +230,14 @@ HRESULT volume_init(IDirect3DVolume8Impl *volume, IDirect3DDevice8Impl *device, struct IDirect3DSwapChain8Impl { /* IUnknown fields */ - const IDirect3DSwapChain8Vtbl *lpVtbl; - LONG ref; + IDirect3DSwapChain8 IDirect3DSwapChain8_iface; + LONG ref; /* IDirect3DSwapChain8 fields */ - IWineD3DSwapChain *wineD3DSwapChain; + IWineD3DSwapChain *wineD3DSwapChain; /* Parent reference */ - LPDIRECT3DDEVICE8 parentDevice; + IDirect3DDevice8 *parentDevice; }; HRESULT swapchain_init(IDirect3DSwapChain8Impl *swapchain, IDirect3DDevice8Impl *device, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 6f6622a..0cd56e5 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -547,7 +547,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateAdditionalSwapChain(IDirect3DDe } TRACE("Created swapchain %p.\n", object); - *swapchain = (IDirect3DSwapChain8 *)object; + *swapchain = &object->IDirect3DSwapChain8_iface; return D3D_OK; } diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 4875d3a..d6b7a28 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -23,10 +23,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8); -/* IDirect3DSwapChain IUnknown parts follow: */ -static HRESULT WINAPI IDirect3DSwapChain8Impl_QueryInterface(LPDIRECT3DSWAPCHAIN8 iface, REFIID riid, LPVOID* ppobj) +static inline IDirect3DSwapChain8Impl *impl_from_IDirect3DSwapChain8(IDirect3DSwapChain8 *iface) { - IDirect3DSwapChain8Impl *This = (IDirect3DSwapChain8Impl *)iface; + return CONTAINING_RECORD(iface, IDirect3DSwapChain8Impl, IDirect3DSwapChain8_iface); +} + +static HRESULT WINAPI IDirect3DSwapChain8Impl_QueryInterface(IDirect3DSwapChain8 *iface, + REFIID riid, void **ppobj) +{ + IDirect3DSwapChain8Impl *This = impl_from_IDirect3DSwapChain8(iface); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); @@ -42,8 +47,9 @@ static HRESULT WINAPI IDirect3DSwapChain8Impl_QueryInterface(LPDIRECT3DSWAPCHAIN return E_NOINTERFACE; } -static ULONG WINAPI IDirect3DSwapChain8Impl_AddRef(LPDIRECT3DSWAPCHAIN8 iface) { - IDirect3DSwapChain8Impl *This = (IDirect3DSwapChain8Impl *)iface; +static ULONG WINAPI IDirect3DSwapChain8Impl_AddRef(IDirect3DSwapChain8 *iface) +{ + IDirect3DSwapChain8Impl *This = impl_from_IDirect3DSwapChain8(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("%p increasing refcount to %u.\n", iface, ref); @@ -51,8 +57,9 @@ static ULONG WINAPI IDirect3DSwapChain8Impl_AddRef(LPDIRECT3DSWAPCHAIN8 iface) { return ref; } -static ULONG WINAPI IDirect3DSwapChain8Impl_Release(LPDIRECT3DSWAPCHAIN8 iface) { - IDirect3DSwapChain8Impl *This = (IDirect3DSwapChain8Impl *)iface; +static ULONG WINAPI IDirect3DSwapChain8Impl_Release(IDirect3DSwapChain8 *iface) +{ + IDirect3DSwapChain8Impl *This = impl_from_IDirect3DSwapChain8(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("%p decreasing refcount to %u.\n", iface, ref); @@ -68,9 +75,11 @@ static ULONG WINAPI IDirect3DSwapChain8Impl_Release(LPDIRECT3DSWAPCHAIN8 iface) return ref; } -/* IDirect3DSwapChain8 parts follow: */ -static HRESULT WINAPI IDirect3DSwapChain8Impl_Present(LPDIRECT3DSWAPCHAIN8 iface, CONST RECT *pSourceRect, CONST RECT *pDestRect, HWND hDestWindowOverride, CONST RGNDATA *pDirtyRegion) { - IDirect3DSwapChain8Impl *This = (IDirect3DSwapChain8Impl *)iface; +static HRESULT WINAPI IDirect3DSwapChain8Impl_Present(IDirect3DSwapChain8 *iface, + const RECT *pSourceRect, const RECT *pDestRect, HWND hDestWindowOverride, + const RGNDATA *pDirtyRegion) +{ + IDirect3DSwapChain8Impl *This = impl_from_IDirect3DSwapChain8(iface); HRESULT hr; TRACE("iface %p, src_rect %p, dst_rect %p, dst_window_override %p, dirty_region %p.\n", @@ -86,7 +95,7 @@ static HRESULT WINAPI IDirect3DSwapChain8Impl_Present(LPDIRECT3DSWAPCHAIN8 iface static HRESULT WINAPI IDirect3DSwapChain8Impl_GetBackBuffer(IDirect3DSwapChain8 *iface, UINT iBackBuffer, D3DBACKBUFFER_TYPE Type, IDirect3DSurface8 **ppBackBuffer) { - IDirect3DSwapChain8Impl *This = (IDirect3DSwapChain8Impl *)iface; + IDirect3DSwapChain8Impl *This = impl_from_IDirect3DSwapChain8(iface); IWineD3DSurface *mySurface = NULL; HRESULT hr; @@ -123,7 +132,7 @@ HRESULT swapchain_init(IDirect3DSwapChain8Impl *swapchain, IDirect3DDevice8Impl HRESULT hr; swapchain->ref = 1; - swapchain->lpVtbl = &Direct3DSwapChain8_Vtbl; + swapchain->IDirect3DSwapChain8_iface.lpVtbl = &Direct3DSwapChain8_Vtbl; wined3d_parameters.BackBufferWidth = present_parameters->BackBufferWidth; wined3d_parameters.BackBufferHeight = present_parameters->BackBufferHeight;

1 0

Eric Pouech : kernel32: Use binary search for key lookup in terminfo generated data.
by Alexandre Julliard Jan. 31, 2011

Jan. 31, 2011

Module: wine Branch: master Commit: 1f0e9499e51a8dfc4df9cc82211cd828a6286170 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f0e9499e51a8dfc4df9cc822… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jan 29 20:02:36 2011 +0100 kernel32: Use binary search for key lookup in terminfo generated data. --- dlls/kernel32/term.c | 57 ++++++++++++++++++++++++++++++++++--------------- 1 files changed, 39 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/term.c b/dlls/kernel32/term.c index 7f78fa3..df0719a 100644 --- a/dlls/kernel32/term.c +++ b/dlls/kernel32/term.c @@ -336,6 +336,13 @@ static struct dbkey_pair* TERM_dbkey; static unsigned TERM_dbkey_size; static unsigned TERM_dbkey_index; +static int TERM_dbkey_cmp(const void* p1, const void* p2) +{ + const struct dbkey_pair* kp1 = p1; + const struct dbkey_pair* kp2 = p2; + return strcmp(kp1->string, kp2->string); +} + static BOOL TERM_AddKeyDescr(const char* string, struct dbkey_descr* descr) { if (!string || string == (const char*)-1) return TRUE; @@ -363,7 +370,7 @@ static BOOL TERM_AddKeyDescr(const char* string, struct dbkey_descr* descr) static BOOL TERM_BuildKeyDB(void) { - unsigned i, len; + unsigned i, j, len; struct dbkey_descr descr; char tmp[64]; @@ -388,6 +395,17 @@ static BOOL TERM_BuildKeyDB(void) #undef X } } + for (i = 0; i < TERM_dbkey_index; i++) + { + for (j = 0; j < TERM_dbkey_index; j++) + { + if (i != j && + TERM_dbkey[i].string_len >= TERM_dbkey[j].string_len && + !memcmp(TERM_dbkey[i].string, TERM_dbkey[j].string, TERM_dbkey[j].string_len)) + FIXME("substring %d/%s %d/%s\n", i, TERM_dbkey[i].string, j, TERM_dbkey[j].string); + } + } + qsort(TERM_dbkey, TERM_dbkey_index, sizeof(TERM_dbkey[0]), TERM_dbkey_cmp); return TRUE; } @@ -419,27 +437,30 @@ BOOL TERM_Exit(void) /* -1 not found, 0 cannot decide, > 0 found */ int TERM_FillInputRecord(const char* in, size_t len, INPUT_RECORD* ir) { - unsigned i; - struct dbkey_descr* found = NULL; + int low = 0, high = TERM_dbkey_index - 1, mid, res; + struct dbkey_descr* found; - for (i = 0; i < TERM_dbkey_index; i++) + while (low <= high) { - if (!memcmp(TERM_dbkey[i].string, in, len)) + mid = low + (high - low) / 2; + res = memcmp(in, TERM_dbkey[mid].string, len); + if (!res) { - if (len < TERM_dbkey[i].string_len) return 0; - if (found) return 0; - found = &TERM_dbkey[i].descr; + if (len < TERM_dbkey[mid].string_len) return 0; + found = &TERM_dbkey[mid].descr; + switch (found->kind) + { + case dbk_simple: + return TERM_FillSimpleChar(found->p1, ir); + case dbk_complex: + init_complex_char(&ir[0], 1, found->p1, found->p2, ENHANCED_KEY | found->p3); + init_complex_char(&ir[1], 0, found->p1, found->p2, ENHANCED_KEY | found->p3); + return 2; + } + return -1; } - } - if (!found) return -1; - switch (found->kind) - { - case dbk_simple: - return TERM_FillSimpleChar(found->p1, ir); - case dbk_complex: - init_complex_char(&ir[0], 1, found->p1, found->p2, ENHANCED_KEY | found->p3); - init_complex_char(&ir[1], 0, found->p1, found->p2, ENHANCED_KEY | found->p3); - return 2; + else if (res < 0) high = mid - 1; + else low = mid + 1; } return -1; }

1 0

Michael Stefaniuc : d3d8: Remove the unused struct IDirect3DResource8Impl.
by Alexandre Julliard Jan. 31, 2011

Jan. 31, 2011

Module: wine Branch: master Commit: 75cc89857ef477e3bec9729603529ef02d2fdc2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=75cc89857ef477e3bec972960… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 31 01:44:00 2011 +0100 d3d8: Remove the unused struct IDirect3DResource8Impl. The rest was removed in cdb7a94ae2dc. --- dlls/d3d8/d3d8_private.h | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 11ae25f..7e852ad 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -109,7 +109,6 @@ typedef struct IDirect3DCubeTexture8Impl IDirect3DCubeTexture8Impl; typedef struct IDirect3DIndexBuffer8Impl IDirect3DIndexBuffer8Impl; typedef struct IDirect3DSurface8Impl IDirect3DSurface8Impl; typedef struct IDirect3DSwapChain8Impl IDirect3DSwapChain8Impl; -typedef struct IDirect3DResource8Impl IDirect3DResource8Impl; typedef struct IDirect3DVolume8Impl IDirect3DVolume8Impl; typedef struct IDirect3DVertexBuffer8Impl IDirect3DVertexBuffer8Impl; typedef struct IDirect3DVertexShader8Impl IDirect3DVertexShader8Impl; @@ -273,16 +272,6 @@ HRESULT surface_init(IDirect3DSurface8Impl *surface, IDirect3DDevice8Impl *devic UINT width, UINT height, D3DFORMAT format, BOOL lockable, BOOL discard, UINT level, DWORD usage, D3DPOOL pool, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality) DECLSPEC_HIDDEN; -struct IDirect3DResource8Impl -{ - /* IUnknown fields */ - const IDirect3DResource8Vtbl *lpVtbl; - LONG ref; - - /* IDirect3DResource8 fields */ - IWineD3DResource *wineD3DResource; -}; - /* ---------------------- */ /* IDirect3DVertexBuffer8 */ /* ---------------------- */

1 0

Jacek Caban : mshtml: Added support for recursive script runners.
by Alexandre Julliard Jan. 31, 2011

Jan. 31, 2011

Module: wine Branch: master Commit: c8a953c5d0f7b559235805ff6ecf89fa785671a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8a953c5d0f7b559235805ff6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 31 00:32:30 2011 +0100 mshtml: Added support for recursive script runners. --- dlls/mshtml/mshtml_private.h | 10 -- dlls/mshtml/mutation.c | 343 +++++++++++++++++++-------------------- dlls/mshtml/tests/exectest.html | 2 +- 3 files changed, 171 insertions(+), 184 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8a953c5d0f7b55923580…

1 0