January 2011 - Wine-commits

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

31 Jan '11

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

Hans Leidekker : mountmgr: Add a stub implementation of ioctl 0x560000.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: d49134686190c31d5054b6778ffe7af6d3b51bf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d49134686190c31d5054b6778… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 31 11:31:46 2011 +0100 mountmgr: Add a stub implementation of ioctl 0x560000. --- dlls/mountmgr.sys/device.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 6c182e8..e23d741 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -896,6 +896,16 @@ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) case IOCTL_CDROM_READ_TOC: irp->IoStatus.u.Status = STATUS_INVALID_DEVICE_REQUEST; break; + case 0x560000: + { + DWORD len = min( 32, irpsp->Parameters.DeviceIoControl.OutputBufferLength ); + + FIXME( "returning zero-filled buffer for ioctl 0x560000\n" ); + memset( irp->MdlAddress->StartVa, 0, len ); + irp->IoStatus.Information = len; + irp->IoStatus.u.Status = STATUS_SUCCESS; + break; + } default: FIXME( "unsupported ioctl %x\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED;

1 0

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

31 Jan '11

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: Store key len in dbkey_pair structure for efficiency reasons.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 00767952e7dbebea06c4e4e083db2ee4812d6de5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00767952e7dbebea06c4e4e08… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jan 29 20:02:15 2011 +0100 kernel32: Store key len in dbkey_pair structure for efficiency reasons. --- dlls/kernel32/term.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/term.c b/dlls/kernel32/term.c index f3dd77b..dd3b788 100644 --- a/dlls/kernel32/term.c +++ b/dlls/kernel32/term.c @@ -223,6 +223,7 @@ struct dbkey_descr struct dbkey_pair { const char* string; + unsigned string_len; struct dbkey_descr descr; }; @@ -300,8 +301,9 @@ static BOOL TERM_AddKeyDescr(const char* string, struct dbkey_descr* descr) TERM_dbkey = new; TERM_dbkey_size *= 2; } - TERM_dbkey[TERM_dbkey_index].string = string; - TERM_dbkey[TERM_dbkey_index].descr = *descr; + TERM_dbkey[TERM_dbkey_index].string = string; + TERM_dbkey[TERM_dbkey_index].string_len = strlen(string); + TERM_dbkey[TERM_dbkey_index].descr = *descr; TERM_dbkey_index++; return TRUE; } @@ -352,7 +354,7 @@ int TERM_FillInputRecord(const char* in, size_t len, INPUT_RECORD* ir) { if (!memcmp(TERM_dbkey[i].string, in, len)) { - if (len < strlen(TERM_dbkey[i].string)) return 0; + if (len < TERM_dbkey[i].string_len) return 0; if (found) return 0; found = &TERM_dbkey[i].descr; }

1 0

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

31 Jan '11

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

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

31 Jan '11

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

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

31 Jan '11

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

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

31 Jan '11

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

Charles Davis : winecoreaudio: Fix deprecation warnings in audiounit.c.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: b149d7bc7bf28dc13919a2d6d2c4b79e519e7a58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b149d7bc7bf28dc13919a2d6d… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Sat Jan 29 16:45:54 2011 -0700 winecoreaudio: Fix deprecation warnings in audiounit.c. --- configure | 14 ++++++++++++ configure.ac | 5 ++++ dlls/winecoreaudio.drv/audiounit.c | 40 +++++++++++++++++++++++++++-------- include/config.h.in | 3 ++ 4 files changed, 53 insertions(+), 9 deletions(-) diff --git a/configure b/configure index 89bfefa..c178d92 100755 --- a/configure +++ b/configure @@ -6535,6 +6535,20 @@ fi COREAUDIO="-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI" fi + ac_save_LIBS="$LIBS" + LIBS="$LIBS $COREAUDIO" + for ac_func in AUGraphAddNode +do : + ac_fn_c_check_func "$LINENO" "AUGraphAddNode" "ac_cv_func_AUGraphAddNode" +if test "x$ac_cv_func_AUGraphAddNode" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_AUGRAPHADDNODE 1 +_ACEOF + +fi +done + + LIBS="$ac_save_LIBS" fi if test "$ac_cv_header_OpenAL_al_h" = "yes" then diff --git a/configure.ac b/configure.ac index c0a9d7f..b4be299 100644 --- a/configure.ac +++ b/configure.ac @@ -719,6 +719,11 @@ case $host_os in dnl CoreServices needed by AudioUnit AC_SUBST(COREAUDIO,"-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI") fi + dnl Check for the AUGraphAddNode function + ac_save_LIBS="$LIBS" + LIBS="$LIBS $COREAUDIO" + AC_CHECK_FUNCS(AUGraphAddNode) + LIBS="$ac_save_LIBS" 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 5191669..bd0ad17 100644 --- a/dlls/winecoreaudio.drv/audiounit.c +++ b/dlls/winecoreaudio.drv/audiounit.c @@ -59,6 +59,18 @@ static inline OSStatus AudioComponentInstanceDispose(AudioComponentInstance aci) } #endif +#ifndef HAVE_AUGRAPHADDNODE +static inline OSStatus AUGraphAddNode(AUGraph graph, const AudioComponentDescription *desc, AUNode *node) +{ + return AUGraphNewNode(graph, desc, 0, NULL, node); +} + +static inline OSStatus AUGraphNodeInfo(AUGraph graph, AUNode node, AudioComponentDescription *desc, AudioUnit *au) +{ + return AUGraphGetNodeInfo(graph, node, desc, 0, NULL, au); +} +#endif + WINE_DEFAULT_DEBUG_CHANNEL(wave); WINE_DECLARE_DEBUG_CHANNEL(midi); @@ -194,11 +206,15 @@ int AudioUnit_GetInputDeviceSampleRate(void) { AudioDeviceID defaultInputDevice; UInt32 param; + AudioObjectPropertyAddress propertyAddress; Float64 sampleRate; OSStatus err; param = sizeof(defaultInputDevice); - err = AudioHardwareGetProperty(kAudioHardwarePropertyDefaultInputDevice, &param, &defaultInputDevice); + propertyAddress.mSelector = kAudioHardwarePropertyDefaultInputDevice; + propertyAddress.mScope = kAudioObjectPropertyScopeGlobal; + propertyAddress.mElement = kAudioObjectPropertyElementMaster; + err = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &param, &defaultInputDevice); if (err != noErr || defaultInputDevice == kAudioDeviceUnknown) { ERR("Couldn't get the default audio input device ID: %08lx\n", err); @@ -206,7 +222,9 @@ int AudioUnit_GetInputDeviceSampleRate(void) } param = sizeof(sampleRate); - err = AudioDeviceGetProperty(defaultInputDevice, 0, 1, kAudioDevicePropertyNominalSampleRate, &param, &sampleRate); + propertyAddress.mSelector = kAudioDevicePropertyNominalSampleRate; + propertyAddress.mScope = kAudioDevicePropertyScopeInput; + err = AudioObjectGetPropertyData(defaultInputDevice, &propertyAddress, 0, NULL, &param, &sampleRate); if (err != noErr) { ERR("Couldn't get the device sample rate: %08lx\n", err); @@ -226,6 +244,7 @@ int AudioUnit_CreateInputUnit(void* wwi, AudioUnit* out_au, AudioComponent component; AudioUnit au; UInt32 param; + AudioObjectPropertyAddress propertyAddress; AURenderCallbackStruct callback; AudioDeviceID defaultInputDevice; AudioStreamBasicDescription desiredFormat; @@ -291,7 +310,10 @@ int AudioUnit_CreateInputUnit(void* wwi, AudioUnit* out_au, /* Find the default input device */ param = sizeof(defaultInputDevice); - err = AudioHardwareGetProperty(kAudioHardwarePropertyDefaultInputDevice, &param, &defaultInputDevice); + propertyAddress.mSelector = kAudioHardwarePropertyDefaultInputDevice; + propertyAddress.mScope = kAudioObjectPropertyScopeGlobal; + propertyAddress.mElement = kAudioObjectPropertyElementMaster; + err = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &param, &defaultInputDevice); if (err != noErr || defaultInputDevice == kAudioDeviceUnknown) { ERR("Couldn't get the default audio device ID: %08lx\n", err); @@ -396,10 +418,10 @@ int SynthUnit_CreateDefaultSynthUnit(AUGraph *graph, AudioUnit *synth) desc.componentType = kAudioUnitType_MusicDevice; desc.componentSubType = kAudioUnitSubType_DLSSynth; - err = AUGraphNewNode(*graph, &desc, 0, NULL, &synthNode); + err = AUGraphAddNode(*graph, &desc, &synthNode); if (err != noErr) { - ERR_(midi)("AUGraphNewNode cannot create synthNode : %s\n", wine_dbgstr_fourcc(err)); + ERR_(midi)("AUGraphAddNode cannot create synthNode : %s\n", wine_dbgstr_fourcc(err)); return 0; } @@ -407,10 +429,10 @@ int SynthUnit_CreateDefaultSynthUnit(AUGraph *graph, AudioUnit *synth) desc.componentType = kAudioUnitType_Output; desc.componentSubType = kAudioUnitSubType_DefaultOutput; - err = AUGraphNewNode(*graph, &desc, 0, NULL, &outNode); + err = AUGraphAddNode(*graph, &desc, &outNode); if (err != noErr) { - ERR_(midi)("AUGraphNewNode cannot create outNode %s\n", wine_dbgstr_fourcc(err)); + ERR_(midi)("AUGraphAddNode cannot create outNode %s\n", wine_dbgstr_fourcc(err)); return 0; } @@ -430,10 +452,10 @@ int SynthUnit_CreateDefaultSynthUnit(AUGraph *graph, AudioUnit *synth) } /* Get the synth unit */ - err = AUGraphGetNodeInfo(*graph, synthNode, 0, 0, 0, synth); + err = AUGraphNodeInfo(*graph, synthNode, 0, synth); if (err != noErr) { - ERR_(midi)("AUGraphGetNodeInfo return %s\n", wine_dbgstr_fourcc(err)); + ERR_(midi)("AUGraphNodeInfo return %s\n", wine_dbgstr_fourcc(err)); return 0; } diff --git a/include/config.h.in b/include/config.h.in index 5cae81b..0b16b35 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -52,6 +52,9 @@ /* Define to 1 if you have the <audio/soundlib.h> header file. */ #undef HAVE_AUDIO_SOUNDLIB_H +/* Define to 1 if you have the `AUGraphAddNode' function. */ +#undef HAVE_AUGRAPHADDNODE + /* Define to 1 if you have the <capi20.h> header file. */ #undef HAVE_CAPI20_H

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 9d432ff761ffba4979f458abe3709f721aebdbc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d432ff761ffba4979f458abe… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sat Jan 29 12:57:45 2011 +0200 po: Update Lithuanian translation. --- po/lt.po | 281 +++++++++++++++++++++++--------------------------------------- 1 files changed, 102 insertions(+), 179 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d432ff761ffba4979f45…

1 0