wine-commits January 2011

wine-commits@winehq.org

2 participants
879 discussions

Loïc Maury : ntdll : Implement CDROM_Verify to work on Mac OS X.
by Alexandre Julliard 25 Jan '11

25 Jan '11

Module: wine Branch: master Commit: 1b767a5948d36f35405da8329978695d5d7ac733 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b767a5948d36f35405da8329… Author: Loïc Maury <lmaury(a)gmail.com> Date: Tue Jan 25 13:25:27 2011 +0100 ntdll : Implement CDROM_Verify to work on Mac OS X. --- dlls/ntdll/cdrom.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 59f85a0..6a6d8e0 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -1121,6 +1121,10 @@ static NTSTATUS CDROM_Verify(int dev, int fd) return STATUS_SUCCESS; else return STATUS_NO_MEDIA_IN_DEVICE; +#elif defined(__APPLE__) + /* At this point, we know that we have media, because in Mac OS X, the + * device file is only created when media is present. */ + return STATUS_SUCCESS; #else FIXME("not supported on this O/S\n"); return STATUS_NOT_SUPPORTED;

1 0

Eric Pouech : kernel32: Properly manage UTF-8 (and any wcs) input strings.
by Alexandre Julliard 25 Jan '11

25 Jan '11

Module: wine Branch: master Commit: aee674c9b8fc73302ecf6a77d7cb78970a7e6c29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aee674c9b8fc73302ecf6a77d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jan 24 22:13:32 2011 +0100 kernel32: Properly manage UTF-8 (and any wcs) input strings. --- dlls/kernel32/console.c | 18 ++++++++++++++---- dlls/kernel32/console_private.h | 2 +- dlls/kernel32/term.c | 11 ++++------- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index b7253f8..fc7d7f0 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1101,8 +1101,9 @@ static enum read_console_input_return bare_console_fetch_input(HANDLE handle, in { enum read_console_input_return ret; char input[8]; + WCHAR inputw[8]; int i; - size_t idx = 0; + size_t idx = 0, idxw; unsigned numEvent; INPUT_RECORD ir[8]; DWORD written; @@ -1157,12 +1158,21 @@ static enum read_console_input_return bare_console_fetch_input(HANDLE handle, in break; case -1: /* we haven't found the string into key-db, push full input string into server */ - for (i = 0; i < idx; i++) + idxw = MultiByteToWideChar(CP_UNIXCP, 0, input, idx, inputw, sizeof(inputw) / sizeof(inputw[0])); + + /* we cannot translate yet... likely we need more chars (wait max 1/2s for next char) */ + if (idxw == 0) + { + timeout = 500; + next_char = TRUE; + break; + } + for (i = 0; i < idxw; i++) { - numEvent = TERM_FillSimpleChar(input[i], ir); + numEvent = TERM_FillSimpleChar(inputw[i], ir); WriteConsoleInputW(handle, ir, numEvent, &written); } - ret = idx == 0 ? rci_timeout : rci_gotone; + ret = rci_gotone; break; default: /* we got a transformation from key-db... push this into server */ diff --git a/dlls/kernel32/console_private.h b/dlls/kernel32/console_private.h index b25f65c..d4bc996 100644 --- a/dlls/kernel32/console_private.h +++ b/dlls/kernel32/console_private.h @@ -36,7 +36,7 @@ extern WCHAR* CONSOLE_Readline(HANDLE, BOOL); /* term.c */ extern BOOL TERM_Init(void); extern BOOL TERM_Exit(void); -extern unsigned TERM_FillSimpleChar(unsigned real_inchar, INPUT_RECORD* ir); +extern unsigned TERM_FillSimpleChar(WCHAR real_inchar, INPUT_RECORD* ir); extern int TERM_FillInputRecord(const char* in, size_t len, INPUT_RECORD* ir); #endif /* __WINE_CONSOLE_PRIVATE_H */ diff --git a/dlls/kernel32/term.c b/dlls/kernel32/term.c index ee879e3..f3dd77b 100644 --- a/dlls/kernel32/term.c +++ b/dlls/kernel32/term.c @@ -87,11 +87,10 @@ static inline void init_complex_char(INPUT_RECORD* ir, BOOL down, WORD vk, WORD * TERM_FillSimpleChar * */ -unsigned TERM_FillSimpleChar(unsigned real_inchar, INPUT_RECORD* ir) +unsigned TERM_FillSimpleChar(WCHAR real_inchar, INPUT_RECORD* ir) { unsigned vk; - unsigned inchar; - char ch; + WCHAR inchar; unsigned numEvent = 0; DWORD cks = 0; @@ -110,8 +109,7 @@ unsigned TERM_FillSimpleChar(unsigned real_inchar, INPUT_RECORD* ir) inchar = real_inchar; break; } - if ((inchar & ~0xFF) != 0) FIXME("What a char (%u)\n", inchar); - vk = vkkeyscan_table[inchar]; + vk = (inchar < 256) ? vkkeyscan_table[inchar] : 0; if (vk & 0x0100) init_complex_char(&ir[numEvent++], 1, 0x2a, 0x10, SHIFT_PRESSED); if ((vk & 0x0200) || (unsigned char)real_inchar <= 26) @@ -132,8 +130,7 @@ unsigned TERM_FillSimpleChar(unsigned real_inchar, INPUT_RECORD* ir) ir[numEvent].Event.KeyEvent.wVirtualKeyCode = vk; ir[numEvent].Event.KeyEvent.wVirtualScanCode = mapvkey_0[vk & 0x00ff]; /* VirtualKeyCodes to ScanCode */ - ch = inchar; - MultiByteToWideChar(CP_UNIXCP, 0, &ch, 1, &ir[numEvent].Event.KeyEvent.uChar.UnicodeChar, 1); + ir[numEvent].Event.KeyEvent.uChar.UnicodeChar = inchar; ir[numEvent + 1] = ir[numEvent]; ir[numEvent + 1].Event.KeyEvent.bKeyDown = 0;

1 0

Eric Pouech : kernel32: No longer init the terminfo database nor application key mode when 0 or 1 are not bound to a tty .
by Alexandre Julliard 25 Jan '11

25 Jan '11

Module: wine Branch: master Commit: ff057db6758e25167dafe92338a3d8895d6edd61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff057db6758e25167dafe9233… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jan 24 22:13:23 2011 +0100 kernel32: No longer init the terminfo database nor application key mode when 0 or 1 are not bound to a tty. --- dlls/kernel32/term.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/term.c b/dlls/kernel32/term.c index 2dce31b..ee879e3 100644 --- a/dlls/kernel32/term.c +++ b/dlls/kernel32/term.c @@ -320,10 +320,15 @@ static BOOL TERM_BuildKeyDB(void) return TRUE; } +static BOOL TERM_init_done /* = FALSE */; + BOOL TERM_Init(void) { + /* if we're not attached to a tty, don't fire the curses support */ + if (!isatty(0) || !isatty(1)) return FALSE; if (!TERM_bind_libcurses()) return FALSE; if (setupterm(NULL, 1 /* really ?? */, NULL) == -1) return FALSE; + TERM_init_done = TRUE; TERM_BuildKeyDB(); /* set application key mode */ putp(tigetstr("smkx")); @@ -332,8 +337,11 @@ BOOL TERM_Init(void) BOOL TERM_Exit(void) { - /* put back the cursor key mode */ - putp(tigetstr("rmkx")); + if (TERM_init_done) + { + /* put back the cursor key mode */ + putp(tigetstr("rmkx")); + } return TRUE; }

1 0

Eric Pouech : kernel32: In edit line, fix the insert key management.
by Alexandre Julliard 25 Jan '11

25 Jan '11

Module: wine Branch: master Commit: 5f2370b0aac2548a9764776104695da08ec38938 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f2370b0aac2548a976477610… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jan 24 22:13:17 2011 +0100 kernel32: In edit line, fix the insert key management. --- dlls/kernel32/editline.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index 2f3cde6..c2799af 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -788,7 +788,6 @@ static const KeyEntry StdKeyMap[] = {/*BACK*/0x08, WCEL_DeletePrevChar }, {/*RETURN*/0x0d, WCEL_Done }, {/*DEL*/127, WCEL_DeleteCurrChar }, - {/*VK_INSERT*/0x2d, WCEL_ToggleInsert }, { 0, NULL } }; @@ -850,6 +849,7 @@ static const KeyEntry EmacsStdKeyMap[] = {/*VK_RIGHT*/0x27, WCEL_MoveRight }, {/*VK_LEFT*/ 0x25, WCEL_MoveLeft }, {/*VK_DEL*/ 0x2e, WCEL_DeleteCurrChar }, + {/*VK_INSERT*/0x2d, WCEL_ToggleInsert }, { 0, NULL } };

1 0

Charles Davis : dinput: Don't link to/include Carbon on Mac OS X.
by Alexandre Julliard 25 Jan '11

25 Jan '11

Module: wine Branch: master Commit: a2e11b452a02bb2ff2589537e75f75fb08250347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2e11b452a02bb2ff2589537e… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Mon Jan 24 11:32:15 2011 -0700 dinput: Don't link to/include Carbon on Mac OS X. --- dlls/dinput/Makefile.in | 2 +- dlls/dinput/joystick_osx.c | 39 ++------------------------------------- 2 files changed, 3 insertions(+), 38 deletions(-) diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in index f2ca481..24502e6 100644 --- a/dlls/dinput/Makefile.in +++ b/dlls/dinput/Makefile.in @@ -1,7 +1,7 @@ MODULE = dinput.dll IMPORTLIB = dinput IMPORTS = dxguid uuid ole32 user32 advapi32 -EXTRALIBS = @CARBONLIB@ @IOKITLIB@ +EXTRALIBS = @IOKITLIB@ C_SRCS = \ data_formats.c \ diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index a36bac8..29c7856 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -23,23 +23,7 @@ #include "config.h" #include "wine/port.h" -#if defined(HAVE_CARBON_CARBON_H) && defined(HAVE_IOKIT_HID_IOHIDLIB_H) -#define LoadResource __carbon_LoadResource -#define CompareString __carbon_CompareString -#define GetCurrentThread __carbon_GetCurrentThread -#define GetCurrentProcess __carbon_GetCurrentProcess -#define AnimatePalette __carbon_AnimatePalette -#define EqualRgn __carbon_EqualRgn -#define FillRgn __carbon_FillRgn -#define FrameRgn __carbon_FrameRgn -#define GetPixel __carbon_GetPixel -#define InvertRgn __carbon_InvertRgn -#define LineTo __carbon_LineTo -#define OffsetRgn __carbon_OffsetRgn -#define PaintRgn __carbon_PaintRgn -#define Polygon __carbon_Polygon -#define ResizePalette __carbon_ResizePalette -#define SetRectRgn __carbon_SetRectRgn +#if defined(HAVE_IOKIT_HID_IOHIDLIB_H) #define ULONG __carbon_ULONG #define E_INVALIDARG __carbon_E_INVALIDARG #define E_OUTOFMEMORY __carbon_E_OUTOFMEMORY @@ -60,26 +44,7 @@ #define MAKE_HRESULT __carbon_MAKE_HRESULT #define HRESULT __carbon_HRESULT #define STDMETHODCALLTYPE __carbon_STDMETHODCALLTYPE -#include <Carbon/Carbon.h> #include <IOKit/hid/IOHIDLib.h> -#undef LoadResource -#undef CompareString -#undef GetCurrentThread -#undef _CDECL -#undef DPRINTF -#undef GetCurrentProcess -#undef AnimatePalette -#undef EqualRgn -#undef FillRgn -#undef FrameRgn -#undef GetPixel -#undef InvertRgn -#undef LineTo -#undef OffsetRgn -#undef PaintRgn -#undef Polygon -#undef ResizePalette -#undef SetRectRgn #undef ULONG #undef E_INVALIDARG #undef E_OUTOFMEMORY @@ -100,7 +65,7 @@ #undef MAKE_HRESULT #undef HRESULT #undef STDMETHODCALLTYPE -#endif /* HAVE_CARBON_CARBON_H */ +#endif /* HAVE_IOKIT_HID_IOHIDLIB_H */ #include "wine/debug.h" #include "wine/unicode.h"

1 0

Greg Geldorp : riched32/tests: Fix editor tests.
by Alexandre Julliard 25 Jan '11

25 Jan '11

Module: wine Branch: master Commit: 55ffeeeec0b0f7635873b787bec0ab81d9ca9cc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55ffeeeec0b0f7635873b787b… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Tue Jan 25 10:45:33 2011 +0100 riched32/tests: Fix editor tests. --- dlls/riched32/tests/editor.c | 68 +++++++++++++++++++++++++++-------------- 1 files changed, 45 insertions(+), 23 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 66005d0..9cf96c1 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -38,7 +38,7 @@ static HMODULE hmoduleRichEdit; static HWND new_window(LPCTSTR lpClassName, DWORD dwStyle, HWND parent) { HWND hwnd; hwnd = CreateWindow(lpClassName, NULL, dwStyle|WS_POPUP|WS_HSCROLL|WS_VSCROLL - |WS_VISIBLE, 0, 0, 200, 60, parent, NULL, + |WS_VISIBLE, 0, 0, 500, 60, parent, NULL, hmoduleRichEdit, NULL); ok(hwnd != NULL, "class: %s, error: %d\n", lpClassName, (int) GetLastError()); return hwnd; @@ -48,32 +48,42 @@ static HWND new_richedit(HWND parent) { return new_window(RICHEDIT_CLASS10A, ES_MULTILINE, parent); } +static BOOL is_rtl(void) { + LOCALESIGNATURE sig; + + return (GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_FONTSIGNATURE, + (LPSTR) &sig, sizeof(LOCALESIGNATURE)) && + (sig.lsUsb[3] & 0x08000000) != 0); +} + static void test_WM_SETTEXT(void) { static const struct { const char *itemtext; DWORD lines; + DWORD lines_rtl; DWORD lines_broken; } testitems[] = { - { "TestSomeText", 1}, - { "TestSomeText\r", 1}, - { "TestSomeText\rSomeMoreText\r", 2, 1}, /* NT4 and below */ - { "TestSomeText\n\nTestSomeText", 3}, - { "TestSomeText\r\r\nTestSomeText", 2}, - { "TestSomeText\r\r\n\rTestSomeText", 3, 2}, /* NT4 and below */ - { "TestSomeText\r\n\r\r\n\rTestSomeText", 4, 3}, /* NT4 and below */ - { "TestSomeText\r\n" ,2}, - { "TestSomeText\r\nSomeMoreText\r\n", 3}, - { "TestSomeText\r\n\r\nTestSomeText", 3}, - { "TestSomeText TestSomeText" ,1}, - { "TestSomeText \r\nTestSomeText", 2}, - { "TestSomeText\r\n \r\nTestSomeText", 3}, - { "TestSomeText\n", 2}, - { "TestSomeText\r\r\r", 3, 1}, /* NT4 and below */ - { "TestSomeText\r\r\rSomeMoreText", 4, 2} /* NT4 and below */ + { "TestSomeText", 1, 1}, + { "TestSomeText\r", 1, 1}, + { "TestSomeText\rSomeMoreText\r", 2, 1, 1}, /* NT4 and below */ + { "TestSomeText\n\nTestSomeText", 3, 3}, + { "TestSomeText\r\r\nTestSomeText", 2, 2}, + { "TestSomeText\r\r\n\rTestSomeText", 3, 2, 2}, /* NT4 and below */ + { "TestSomeText\r\n\r\r\n\rTestSomeText", 4, 3, 3}, /* NT4 and below */ + { "TestSomeText\r\n", 2, 2}, + { "TestSomeText\r\nSomeMoreText\r\n", 3, 3}, + { "TestSomeText\r\n\r\nTestSomeText", 3, 3}, + { "TestSomeText TestSomeText", 1, 1}, + { "TestSomeText \r\nTestSomeText", 2, 2}, + { "TestSomeText\r\n \r\nTestSomeText", 3, 3}, + { "TestSomeText\n", 2, 2}, + { "TestSomeText\r\r\r", 3, 1, 1}, /* NT4 and below */ + { "TestSomeText\r\r\rSomeMoreText", 4, 1, 1} /* NT4 and below */ }; HWND hwndRichEdit = new_richedit(NULL); int i; + BOOL rtl = is_rtl(); /* This test attempts to show that WM_SETTEXT on a riched32 control does not * attempt to modify the text that is pasted into the control, and should @@ -88,6 +98,8 @@ static void test_WM_SETTEXT(void) * is, a run of \r{N} without a terminating \n is considered N line breaks * - \r at the end of the text is NOT a line break. This differs from riched20, * where \r at the end of the text is a proper line break. + * However, on RTL language versions, \r is simply skipped and never used + * for line breaking (only \n adds a line break) */ for (i = 0; i < sizeof(testitems)/sizeof(testitems[0]); i++) { @@ -105,7 +117,7 @@ static void test_WM_SETTEXT(void) ok (result == 0, "[%d] WM_SETTEXT round trip: strcmp = %ld\n", i, result); result = SendMessage(hwndRichEdit, EM_GETLINECOUNT, 0, 0); - ok (result == testitems[i].lines || + ok (result == (rtl ? testitems[i].lines_rtl : testitems[i].lines) || broken(testitems[i].lines_broken && result == testitems[i].lines_broken), "[%d] EM_GETLINECOUNT returned %ld, expected %d\n", i, result, testitems[i].lines); } @@ -374,6 +386,7 @@ static void test_EM_GETLINE(void) "\r\r\n" "bar\n"; BOOL broken_os = FALSE; + BOOL rtl = is_rtl(); SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text); linecount = SendMessage(hwndRichEdit, EM_GETLINECOUNT, 0, 0); @@ -421,9 +434,15 @@ static void test_EM_GETLINE(void) { ok(!strncmp(dest, gl_text, expected_bytes_written), "%d: expected_bytes_written=%d\n", i, expected_bytes_written); - ok(!strncmp(dest + expected_bytes_written, origdest - + expected_bytes_written, nBuf - expected_bytes_written), - "%d: expected_bytes_written=%d\n", i, expected_bytes_written); + if (! rtl || expected_bytes_written == gl[i].buffer_len) + ok(!strncmp(dest + expected_bytes_written, origdest + + expected_bytes_written, nBuf - expected_bytes_written), + "%d: expected_bytes_written=%d\n", i, expected_bytes_written); + else + ok(dest[expected_bytes_written] == 0 && + !strncmp(dest + expected_bytes_written + 1, origdest + + expected_bytes_written + 1, nBuf - (expected_bytes_written + 1)), + "%d: expected_bytes_written=%d\n", i, expected_bytes_written); } } @@ -730,6 +749,7 @@ static void test_EM_POSFROMCHAR(void) LRESULT result; unsigned int height = 0; int xpos = 0; + int xpos_rtl_adjusted = 0; static const char text[] = "aa\n" "this is a long line of text that should be longer than the " "control's width\n" @@ -772,6 +792,7 @@ static void test_EM_POSFROMCHAR(void) broken(pl.x == 0), /* Win9x, WinME and NT4 */ "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x); xpos = pl.x; + xpos_rtl_adjusted = xpos + (is_rtl() ? 7 : 0); } else if (i == 1) { @@ -796,7 +817,8 @@ static void test_EM_POSFROMCHAR(void) result = SendMessage(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pl, 55 * 16); ok(result == 0, "EM_POSFROMCHAR returned %ld, expected 0\n", result); ok(pl.y == 50 * height, "EM_POSFROMCHAR reports y=%d, expected %d\n", pl.y, 50 * height); - ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected %d\n", pl.x, xpos); + + ok(pl.x == xpos_rtl_adjusted, "EM_POSFROMCHAR reports x=%d, expected %d\n", pl.x, xpos_rtl_adjusted); /* Testing that vertical scrolling does, in fact, have an effect on EM_POSFROMCHAR */ @@ -822,7 +844,7 @@ static void test_EM_POSFROMCHAR(void) result = SendMessage(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pl, 55 * 16); ok(result == 0, "EM_POSFROMCHAR returned %ld, expected 0\n", result); ok(pl.y == (50 - 1) * height, "EM_POSFROMCHAR reports y=%d, expected %d\n", pl.y, (50 - 1) * height); - ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected %d\n", pl.x, xpos); + ok(pl.x == xpos_rtl_adjusted, "EM_POSFROMCHAR reports x=%d, expected %d\n", pl.x, xpos_rtl_adjusted); /* Testing that horizontal scrolling does, in fact, have an effect on EM_POSFROMCHAR */ SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text);

1 0

Vitaliy Margolen : dinput: Fix typo. Found by clang.
by Alexandre Julliard 25 Jan '11

25 Jan '11

Module: wine Branch: master Commit: 02be0aee726005dd8b9cebcf3940f7b7120b1be9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02be0aee726005dd8b9cebcf3… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon Jan 24 20:36:01 2011 -0700 dinput: Fix typo. Found by clang. --- dlls/dinput/effect_linuxinput.c | 4 ++-- dlls/dinput/tests/joystick.c | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index b7c27cd..d0e77d6 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -289,8 +289,8 @@ static HRESULT WINAPI LinuxInputEffectImpl_GetEffectGuid( TRACE("(this=%p,%p)\n", This, pguid); - pguid = &This->guid; - + *pguid = This->guid; + return DI_OK; } diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index aad8049..a60d6e2 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -375,6 +375,7 @@ static BOOL CALLBACK EnumJoysticks( { DWORD effect_status; struct DIPROPDWORD diprop_word; + GUID guid = {0}; hr = IDirectInputEffect_Initialize(effect, hInstance, data->version, &GUID_ConstantForce); @@ -429,6 +430,9 @@ static BOOL CALLBACK EnumJoysticks( hr = IDirectInputEffect_GetEffectStatus(effect, &effect_status); ok(hr==DI_OK,"IDirectInputEffect_GetEffectStatus() failed: %08x\n", hr); todo_wine ok(effect_status!=0,"IDirectInputEffect_GetEffectStatus() reported effect as stopped\n"); + hr = IDirectInputEffect_GetEffectGuid(effect, &guid); + ok(hr==DI_OK,"IDirectInputEffect_GetEffectGuid() failed: %08x\n", hr); + ok(IsEqualGUID(&GUID_ConstantForce, &guid), "Wrong guid returned\n"); /* Check autocenter status * State: initialy stopped

1 0

Michael Stefaniuc : ddrawex: COM cleanup for the IDirectDrawSurface3 iface.
by Alexandre Julliard 25 Jan '11

25 Jan '11

Module: wine Branch: master Commit: e415b3828b000d8e809b8ae122f1395fd0ad3bb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e415b3828b000d8e809b8ae12… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 25 00:38:05 2011 +0100 ddrawex: COM cleanup for the IDirectDrawSurface3 iface. --- dlls/ddrawex/ddrawex_private.h | 2 +- dlls/ddrawex/surface.c | 21 ++++++++------------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/ddrawex/ddrawex_private.h b/dlls/ddrawex/ddrawex_private.h index 2b7ed6b..f87ca3a 100644 --- a/dlls/ddrawex/ddrawex_private.h +++ b/dlls/ddrawex/ddrawex_private.h @@ -74,7 +74,7 @@ IDirectDraw4 *dd_get_inner(IDirectDraw4 *outer); ******************************************************************************/ typedef struct { - const IDirectDrawSurface3Vtbl *IDirectDrawSurface3_Vtbl; + IDirectDrawSurface3 IDirectDrawSurface3_iface; const IDirectDrawSurface4Vtbl *IDirectDrawSurface4_Vtbl; LONG ref; diff --git a/dlls/ddrawex/surface.c b/dlls/ddrawex/surface.c index 67c4755..8387e5d 100644 --- a/dlls/ddrawex/surface.c +++ b/dlls/ddrawex/surface.c @@ -35,17 +35,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddrawex); ******************************************************************************/ static IDirectDrawSurfaceImpl *impl_from_IDirectDrawSurface3(IDirectDrawSurface3 *iface) { - return (IDirectDrawSurfaceImpl *)((char*)iface - FIELD_OFFSET(IDirectDrawSurfaceImpl, IDirectDrawSurface3_Vtbl)); + return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirectDrawSurface3_iface); } static IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface3(IDirectDrawSurface3 *iface); -static IDirectDrawSurface3 *dds3_from_impl(IDirectDrawSurfaceImpl *This) -{ - if(!This) return NULL; - return (IDirectDrawSurface3 *) &This->IDirectDrawSurface3_Vtbl; -} - static IDirectDrawSurfaceImpl *impl_from_dds4(IDirectDrawSurface4 *iface) { if(!iface) return NULL; @@ -83,8 +77,8 @@ IDirectDrawSurface4Impl_QueryInterface(IDirectDrawSurface4 *iface, || IsEqualGUID(riid, &IID_IDirectDrawSurface2) || IsEqualGUID(riid, &IID_IDirectDrawSurface) ) { - *obj = dds3_from_impl(This); - IDirectDrawSurface3_AddRef((IDirectDrawSurface3 *) *obj); + *obj = &This->IDirectDrawSurface3_iface; + IDirectDrawSurface3_AddRef(&This->IDirectDrawSurface3_iface); TRACE("(%p) returning IDirectDrawSurface3 interface at %p\n", This, *obj); return S_OK; } @@ -335,10 +329,11 @@ enumsurfaces_thunk_cb(IDirectDrawSurface4 *surf, DDSURFACEDESC2 *desc2, void *vc DDSURFACEDESC desc; TRACE("Thunking back to IDirectDrawSurface3\n"); - IDirectDrawSurface3_AddRef(dds3_from_impl(This)); + IDirectDrawSurface3_AddRef(&This->IDirectDrawSurface3_iface); IDirectDrawSurface3_Release(surf); DDSD2_to_DDSD(desc2, &desc); - return ctx->orig_cb((IDirectDrawSurface *) dds3_from_impl(This), &desc, ctx->orig_ctx); + return ctx->orig_cb((IDirectDrawSurface *)&This->IDirectDrawSurface3_iface, &desc, + ctx->orig_ctx); } static HRESULT WINAPI IDirectDrawSurface3Impl_EnumAttachedSurfaces(IDirectDrawSurface3 *iface, @@ -1166,7 +1161,7 @@ static IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface3(IDirectDrawS { if (!iface) return NULL; if (iface->lpVtbl != &IDirectDrawSurface3_Vtbl) return NULL; - return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirectDrawSurface3_Vtbl); + return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirectDrawSurface3_iface); } /* dds_get_outer @@ -1197,7 +1192,7 @@ IDirectDrawSurface4 *dds_get_outer(IDirectDrawSurface4 *inner) TRACE("Creating new ddrawex surface wrapper for surface %p\n", inner); impl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*impl)); impl->ref = 1; - impl->IDirectDrawSurface3_Vtbl = &IDirectDrawSurface3_Vtbl; + impl->IDirectDrawSurface3_iface.lpVtbl = &IDirectDrawSurface3_Vtbl; impl->IDirectDrawSurface4_Vtbl = &IDirectDrawSurface4_Vtbl; IDirectDrawSurface4_AddRef(inner); impl->parent = inner;

1 0

Michael Stefaniuc : ddrawex: Rename impl_from_dds3() to impl_from_IDirectDrawSurface3().
by Alexandre Julliard 25 Jan '11

25 Jan '11

Module: wine Branch: master Commit: 3d559eb11edea6556b3191ebaff04ee09eed1226 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d559eb11edea6556b3191eba… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 25 00:35:11 2011 +0100 ddrawex: Rename impl_from_dds3() to impl_from_IDirectDrawSurface3(). --- dlls/ddrawex/surface.c | 297 ++++++++++++++++++------------------------------ 1 files changed, 109 insertions(+), 188 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d559eb11edea6556b319…

1 0

Michael Stefaniuc : ddrawex: Use unsafe_impl_from_IDirectDrawSurface3() for application provided ifaces.
by Alexandre Julliard 25 Jan '11

25 Jan '11

Module: wine Branch: master Commit: 1cce3d685438977c917f4034bd3b8e40390a324d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cce3d685438977c917f4034b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 25 00:33:29 2011 +0100 ddrawex: Use unsafe_impl_from_IDirectDrawSurface3() for application provided ifaces. --- dlls/ddrawex/surface.c | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/ddrawex/surface.c b/dlls/ddrawex/surface.c index d0bd273..5d0785e 100644 --- a/dlls/ddrawex/surface.c +++ b/dlls/ddrawex/surface.c @@ -35,9 +35,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddrawex); ******************************************************************************/ static IDirectDrawSurfaceImpl *impl_from_dds3(IDirectDrawSurface3 *iface) { - if(!iface) return NULL; return (IDirectDrawSurfaceImpl *)((char*)iface - FIELD_OFFSET(IDirectDrawSurfaceImpl, IDirectDrawSurface3_Vtbl)); } + +static IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface3(IDirectDrawSurface3 *iface); + static IDirectDrawSurface3 *dds3_from_impl(IDirectDrawSurfaceImpl *This) { if(!This) return NULL; @@ -179,7 +181,7 @@ IDirectDrawSurface3Impl_AddAttachedSurface(IDirectDrawSurface3 *iface, IDirectDrawSurface3 *Attach_iface) { IDirectDrawSurfaceImpl *This = impl_from_dds3(iface); - IDirectDrawSurfaceImpl *attach = impl_from_dds3(Attach_iface); + IDirectDrawSurfaceImpl *attach = unsafe_impl_from_IDirectDrawSurface3(Attach_iface); TRACE("(%p)->(%p): Thunking to IDirectDrawSurface4\n", This, attach); return IDirectDrawSurface4_AddAttachedSurface(dds4_from_impl(This), dds4_from_impl(attach)); } @@ -226,7 +228,7 @@ IDirectDrawSurface3Impl_Blt(IDirectDrawSurface3 *iface, DDBLTFX *DDBltFx) { IDirectDrawSurfaceImpl *This = impl_from_dds3(iface); - IDirectDrawSurfaceImpl *Src = impl_from_dds3(SrcSurface); + IDirectDrawSurfaceImpl *Src = unsafe_impl_from_IDirectDrawSurface3(SrcSurface); TRACE("(%p)->(%p,%p,%p,0x%08x,%p): Thunking to IDirectDrawSurface4\n", This, DestRect, Src, SrcRect, Flags, DDBltFx); return IDirectDrawSurface4_Blt(dds4_from_impl(This), DestRect, dds4_from_impl(Src), SrcRect, Flags, DDBltFx); @@ -278,7 +280,7 @@ IDirectDrawSurface3Impl_BltFast(IDirectDrawSurface3 *iface, DWORD trans) { IDirectDrawSurfaceImpl *This = impl_from_dds3(iface); - IDirectDrawSurfaceImpl *Src = impl_from_dds3(Source); + IDirectDrawSurfaceImpl *Src = unsafe_impl_from_IDirectDrawSurface3(Source); TRACE("(%p)->(%u,%u,%p,%p,0x%08x): Thunking to IDirectDrawSurface4\n", This, dstx, dsty, Src, rsrc, trans); return IDirectDrawSurface4_BltFast(dds4_from_impl(This), dstx, dsty, dds4_from_impl(Src), rsrc, trans); @@ -302,7 +304,7 @@ IDirectDrawSurface3Impl_DeleteAttachedSurface(IDirectDrawSurface3 *iface, IDirectDrawSurface3 *Attach) { IDirectDrawSurfaceImpl *This = impl_from_dds3(iface); - IDirectDrawSurfaceImpl *Att = impl_from_dds3(Attach); + IDirectDrawSurfaceImpl *Att = unsafe_impl_from_IDirectDrawSurface3(Attach); TRACE("(%p)->(0x%08x,%p): Thunking to IDirectDrawSurface4\n", This, Flags, Att); return IDirectDrawSurface4_DeleteAttachedSurface(dds4_from_impl(This), Flags, dds4_from_impl(Att)); @@ -421,7 +423,7 @@ IDirectDrawSurface3Impl_Flip(IDirectDrawSurface3 *iface, DWORD Flags) { IDirectDrawSurfaceImpl *This = impl_from_dds3(iface); - IDirectDrawSurfaceImpl *Dest = impl_from_dds3(DestOverride); + IDirectDrawSurfaceImpl *Dest = unsafe_impl_from_IDirectDrawSurface3(DestOverride); TRACE("(%p)->(%p,0x%08x): Thunking to IDirectDrawSurface4\n", This, Dest, Flags); return IDirectDrawSurface4_Flip(dds4_from_impl(This), dds4_from_impl(Dest), Flags); } @@ -940,7 +942,7 @@ IDirectDrawSurface3Impl_UpdateOverlay(IDirectDrawSurface3 *iface, LPDDOVERLAYFX FX) { IDirectDrawSurfaceImpl *This = impl_from_dds3(iface); - IDirectDrawSurfaceImpl *Dst = impl_from_dds3(DstSurface); + IDirectDrawSurfaceImpl *Dst = unsafe_impl_from_IDirectDrawSurface3(DstSurface); TRACE("(%p)->(%p,%p,%p,0x%08x,%p): Thunking to IDirectDrawSurface4\n", This, SrcRect, Dst, DstRect, Flags, FX); return IDirectDrawSurface4_UpdateOverlay(dds4_from_impl(This), SrcRect, dds4_from_impl(Dst), DstRect, Flags, FX); @@ -981,7 +983,7 @@ IDirectDrawSurface3Impl_UpdateOverlayZOrder(IDirectDrawSurface3 *iface, IDirectDrawSurface3 *DDSRef) { IDirectDrawSurfaceImpl *This = impl_from_dds3(iface); - IDirectDrawSurfaceImpl *Ref = impl_from_dds3(DDSRef); + IDirectDrawSurfaceImpl *Ref = unsafe_impl_from_IDirectDrawSurface3(DDSRef); TRACE("(%p)->(0x%08x,%p): Thunking to IDirectDrawSurface4\n", This, Flags, Ref); return IDirectDrawSurface4_UpdateOverlayZOrder(dds4_from_impl(This), Flags, dds4_from_impl(Ref)); } @@ -1239,6 +1241,13 @@ const IDirectDrawSurface4Vtbl IDirectDrawSurface4_Vtbl = IDirectDrawSurface4Impl_ChangeUniquenessValue, }; +static IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface3(IDirectDrawSurface3 *iface) +{ + if (!iface) return NULL; + if (iface->lpVtbl != &IDirectDrawSurface3_Vtbl) return NULL; + return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirectDrawSurface3_Vtbl); +} + /* dds_get_outer * * Given a surface from ddraw.dll it retrieves the pointer to the ddrawex.dll wrapper around it

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2011