October 2011 - Wine-commits

Alexandre Julliard : gdi32: Implement GetGlyphOutline as a standard driver entry point.
by Alexandre Julliard 25 Oct '11

25 Oct '11

Module: wine Branch: master Commit: 6376b4cf6f7da4ba7f525ac4bbf967f086d81c99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6376b4cf6f7da4ba7f525ac4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 20 16:34:08 2011 +0200 gdi32: Implement GetGlyphOutline as a standard driver entry point. --- dlls/gdi32/font.c | 9 +++------ dlls/gdi32/freetype.c | 27 ++++++++++++--------------- dlls/gdi32/gdi_private.h | 3 --- 3 files changed, 15 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 8fa9173..26eba55 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2503,6 +2503,7 @@ DWORD WINAPI GetGlyphOutlineW( HDC hdc, UINT uChar, UINT fuFormat, { DC *dc; DWORD ret; + PHYSDEV dev; TRACE("(%p, %04x, %04x, %p, %d, %p, %p)\n", hdc, uChar, fuFormat, lpgm, cbBuffer, lpBuffer, lpmat2 ); @@ -2512,12 +2513,8 @@ DWORD WINAPI GetGlyphOutlineW( HDC hdc, UINT uChar, UINT fuFormat, dc = get_dc_ptr(hdc); if(!dc) return GDI_ERROR; - if(dc->gdiFont) - ret = WineEngGetGlyphOutline(dc->gdiFont, uChar, fuFormat, lpgm, - cbBuffer, lpBuffer, lpmat2); - else - ret = GDI_ERROR; - + dev = GET_DC_PHYSDEV( dc, pGetGlyphOutline ); + ret = dev->funcs->pGetGlyphOutline( dev, uChar, fuFormat, lpgm, cbBuffer, lpBuffer, lpmat2 ); release_dc_ptr( dc ); return ret; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index da9de0d..a98cf36 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6196,18 +6196,23 @@ end: } /************************************************************* - * WineEngGetGlyphOutline - * + * freetype_GetGlyphOutline */ -DWORD WineEngGetGlyphOutline(GdiFont *font, UINT glyph, UINT format, - LPGLYPHMETRICS lpgm, DWORD buflen, LPVOID buf, - const MAT2* lpmat) +static DWORD freetype_GetGlyphOutline( PHYSDEV dev, UINT glyph, UINT format, + LPGLYPHMETRICS lpgm, DWORD buflen, LPVOID buf, const MAT2 *lpmat ) { + struct freetype_physdev *physdev = get_freetype_dev( dev ); DWORD ret; + if (!physdev->font) + { + dev = GET_NEXT_PHYSDEV( dev, pGetGlyphOutline ); + return dev->funcs->pGetGlyphOutline( dev, glyph, format, lpgm, buflen, buf, lpmat ); + } + GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); - ret = get_glyph_outline( font, glyph, format, lpgm, buflen, buf, lpmat ); + ret = get_glyph_outline( physdev->font, glyph, format, lpgm, buflen, buf, lpmat ); LeaveCriticalSection( &freetype_cs ); return ret; } @@ -7089,7 +7094,7 @@ static const struct gdi_dc_funcs freetype_funcs = NULL, /* pGetFontData */ freetype_GetFontUnicodeRanges, /* pGetFontUnicodeRanges */ freetype_GetGlyphIndices, /* pGetGlyphIndices */ - NULL, /* pGetGlyphOutline */ + freetype_GetGlyphOutline, /* pGetGlyphOutline */ NULL, /* pGetICMProfile */ NULL, /* pGetImage */ NULL, /* pGetKerningPairs */ @@ -7190,14 +7195,6 @@ BOOL WineEngDestroyFontInstance(HFONT hfont) return FALSE; } -DWORD WineEngGetGlyphOutline(GdiFont *font, UINT glyph, UINT format, - LPGLYPHMETRICS lpgm, DWORD buflen, LPVOID buf, - const MAT2* lpmat) -{ - ERR("called but we don't have FreeType\n"); - return GDI_ERROR; -} - UINT WineEngGetOutlineTextMetrics(GdiFont *font, UINT cbSize, OUTLINETEXTMETRICW *potm) { diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index c09ecf1..d0727a2 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -293,9 +293,6 @@ extern INT WineEngAddFontResourceEx(LPCWSTR, DWORD, PVOID) DECLSPEC_HIDDEN; extern HANDLE WineEngAddFontMemResourceEx(PVOID, DWORD, PVOID, LPDWORD) DECLSPEC_HIDDEN; extern BOOL WineEngDestroyFontInstance(HFONT handle) DECLSPEC_HIDDEN; extern DWORD WineEngGetFontData(GdiFont*, DWORD, DWORD, LPVOID, DWORD) DECLSPEC_HIDDEN; -extern DWORD WineEngGetGlyphOutline(GdiFont*, UINT glyph, UINT format, - LPGLYPHMETRICS, DWORD buflen, LPVOID buf, - const MAT2*) DECLSPEC_HIDDEN; extern DWORD WineEngGetKerningPairs(GdiFont*, DWORD, KERNINGPAIR *) DECLSPEC_HIDDEN; extern BOOL WineEngGetLinkedHFont(DC *dc, WCHAR c, HFONT *new_hfont, UINT *glyph) DECLSPEC_HIDDEN; extern UINT WineEngGetOutlineTextMetrics(GdiFont*, UINT, LPOUTLINETEXTMETRICW) DECLSPEC_HIDDEN;

1 0

Vitaliy Margolen : dinput: Restore checks for DirectX 3 buffer size.
by Alexandre Julliard 25 Oct '11

25 Oct '11

Module: wine Branch: master Commit: 67e0b356c08e122114ade9786352f097c0fd4521 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67e0b356c08e122114ade9786… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Oct 20 07:42:49 2011 -0600 dinput: Restore checks for DirectX 3 buffer size. --- dlls/dinput/device.c | 4 +- dlls/dinput/tests/device.c | 69 ++++++++++++++++++++++++++----------------- 2 files changed, 44 insertions(+), 29 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index b72b0d5..72670f7 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1288,10 +1288,10 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetDeviceData(LPDIRECTINPUTDEVICE8W ifac TRACE("(%p) %p -> %p(%d) x%d, 0x%08x\n", This, dod, entries, entries ? *entries : 0, dodsize, flags); - if (This->dinput->dwVersion == 0x0800) + if (This->dinput->dwVersion == 0x0800 || dodsize == sizeof(DIDEVICEOBJECTDATA_DX3)) { - if (!This->acquired) return DIERR_NOTACQUIRED; if (!This->queue_len) return DIERR_NOTBUFFERED; + if (!This->acquired) return DIERR_NOTACQUIRED; } if (!This->queue_len) diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c index 7171bb8..f03a3b6 100644 --- a/dlls/dinput/tests/device.c +++ b/dlls/dinput/tests/device.c @@ -78,7 +78,9 @@ static void test_object_info(LPDIRECTINPUTDEVICE device, HWND hwnd) DIDEVICEOBJECTINSTANCE obj_info; DWORD obj_types[] = {DIDFT_BUTTON, DIDFT_AXIS, DIDFT_POV}; int type_index; - int cnt = 0, cnt1 = 0; + int cnt1 = 0; + DWORD cnt = 0; + DIDEVICEOBJECTDATA buffer[5]; hr = IDirectInputDevice_EnumObjects(device, enum_callback, &cnt, DIDFT_ALL); ok(SUCCEEDED(hr), "EnumObjects() failed: %08x\n", hr); @@ -98,18 +100,51 @@ static void test_object_info(LPDIRECTINPUTDEVICE device, HWND hwnd) ok(SUCCEEDED(hr), "EnumObjects() failed: %08x\n", hr); } + /* Test buffered mode */ + memset(&dp, 0, sizeof(dp)); + dp.diph.dwSize = sizeof(DIPROPDWORD); + dp.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dp.diph.dwHow = DIPH_DEVICE; + dp.diph.dwObj = 0; + dp.dwData = 0; + + hr = IDirectInputDevice_SetProperty(device, DIPROP_BUFFERSIZE, (LPCDIPROPHEADER)&dp.diph); + ok(hr == DI_OK, "SetProperty() failed: %08x\n", hr); + cnt = 5; + hr = IDirectInputDevice_GetDeviceData(device, sizeof(buffer[0]), buffer, &cnt, 0); + ok(hr == DI_OK && cnt == 5, "GetDeviceData() failed: %08x cnt: %d\n", hr, cnt); + hr = IDirectInputDevice_GetDeviceData(device, sizeof(DIDEVICEOBJECTDATA_DX3), buffer, &cnt, 0); + ok(hr == DIERR_NOTBUFFERED, "GetDeviceData() should have failed: %08x\n", hr); + IDirectInputDevice_Acquire(device); + hr = IDirectInputDevice_GetDeviceData(device, sizeof(DIDEVICEOBJECTDATA_DX3), buffer, &cnt, 0); + ok(hr == DIERR_NOTBUFFERED, "GetDeviceData() should have failed: %08x\n", hr); + IDirectInputDevice_Unacquire(device); + + dp.dwData = 20; + hr = IDirectInputDevice_SetProperty(device, DIPROP_BUFFERSIZE, (LPCDIPROPHEADER)&dp.diph); + ok(hr == DI_OK, "SetProperty() failed: %08x\n", hr); + cnt = 5; + hr = IDirectInputDevice_GetDeviceData(device, sizeof(buffer[0]), buffer, &cnt, 0); + ok(hr == DI_OK, "GetDeviceData() failed: %08x\n", hr); + hr = IDirectInputDevice_GetDeviceData(device, sizeof(DIDEVICEOBJECTDATA_DX3), buffer, &cnt, 0); + ok(hr == DIERR_NOTACQUIRED, "GetDeviceData() should have failed: %08x\n", hr); + hr = IDirectInputDevice_Acquire(device); + ok(hr == DI_OK, "Acquire() failed: %08x\n", hr); + cnt = 1; + hr = IDirectInputDevice_GetDeviceData(device, sizeof(buffer[0]), buffer, &cnt, 0); + ok(hr == DI_OK, "GetDeviceData() failed: %08x\n", hr); + hr = IDirectInputDevice_Unacquire(device); + ok(hr == DI_OK, "Unacquire() failed: %08x\n", hr); + cnt = 1; + hr = IDirectInputDevice_GetDeviceData(device, sizeof(buffer[0]), buffer, &cnt, 0); + ok(hr == DI_OK, "GetDeviceData() failed: %08x\n", hr); + /* No need to test devices without axis */ obj_info.dwSize = sizeof(obj_info); hr = IDirectInputDevice_GetObjectInfo(device, &obj_info, 16, DIPH_BYOFFSET); if (SUCCEEDED(hr)) { - DWORD cnt; - DIDEVICEOBJECTDATA buffer[5]; - /* No device supports per axis relative/absolute mode */ - memset(&dp, 0, sizeof(dp)); - dp.diph.dwSize = sizeof(DIPROPDWORD); - dp.diph.dwHeaderSize = sizeof(DIPROPHEADER); dp.diph.dwHow = DIPH_BYOFFSET; dp.diph.dwObj = 16; dp.dwData = DIPROPAXISMODE_ABS; @@ -122,29 +157,9 @@ static void test_object_info(LPDIRECTINPUTDEVICE device, HWND hwnd) hr = IDirectInputDevice_SetProperty(device, DIPROP_AXISMODE, &dp.diph); ok(hr == DI_OK, "SetProperty() failed: %08x\n", hr); - dp.dwData = 0; - hr = IDirectInputDevice_SetProperty(device, DIPROP_BUFFERSIZE, (LPCDIPROPHEADER)&dp.diph); - ok(hr == DI_OK, "SetProperty() failed: %08x\n", hr); - - cnt = 5; - hr = IDirectInputDevice_GetDeviceData(device, sizeof(buffer[0]), buffer, &cnt, 0); - ok(hr == DI_OK && cnt == 5, "GetDeviceData() failed: %08x cnt: %d\n", hr, cnt); - - dp.dwData = 20; - hr = IDirectInputDevice_SetProperty(device, DIPROP_BUFFERSIZE, (LPCDIPROPHEADER)&dp.diph); - ok(hr == DI_OK, "SetProperty() failed: %08x\n", hr); - - cnt = 1; - hr = IDirectInputDevice_GetDeviceData(device, sizeof(buffer[0]), buffer, &cnt, 0); - ok(hr == DI_OK, "GetDeviceData() failed: %08x\n", hr); - /* Cannot change mode while acquired */ hr = IDirectInputDevice_Acquire(device); ok(hr == DI_OK, "Acquire() failed: %08x\n", hr); - cnt = 1; - hr = IDirectInputDevice_GetDeviceData(device, sizeof(buffer[0]), buffer, &cnt, 0); - ok(hr == DI_OK, "GetDeviceData() failed: %08x\n", hr); - hr = IDirectInputDevice_SetProperty(device, DIPROP_AXISMODE, &dp.diph); ok(hr == DIERR_ACQUIRED, "SetProperty() returned: %08x\n", hr);

1 0

Dan Kegel : kernel32/tests: fni-> FileName is not nul terminated in test_readdirectorychanges_cr.
by Alexandre Julliard 25 Oct '11

25 Oct '11

Module: wine Branch: master Commit: 6ca1a943eb388fc2e87e1a381136943811bfb806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ca1a943eb388fc2e87e1a381… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Oct 15 11:27:34 2011 -0700 kernel32/tests: fni->FileName is not nul terminated in test_readdirectorychanges_cr. --- dlls/kernel32/tests/change.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index 4d0bc1c..6142e43 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -858,7 +858,7 @@ static void test_readdirectorychanges_cr(void) ok(fni->FileNameLength == lstrlenW(szFile)*sizeof(WCHAR), "FileNameLength = %d\n", fni->FileNameLength); ok(!memcmp(fni->FileName, szFile, lstrlenW(szFile)*sizeof(WCHAR)), - "FileName = %s\n", wine_dbgstr_w(fni->FileName)); + "FileName = %s\n", wine_dbgstr_wn(fni->FileName, fni->FileNameLength/sizeof(WCHAR))); r = pReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, FILE_NOTIFY_CHANGE_FILE_NAME, NULL, &ov, readdirectorychanges_cr); @@ -878,7 +878,7 @@ static void test_readdirectorychanges_cr(void) ok(fni->FileNameLength == lstrlenW(szFile)*sizeof(WCHAR), "FileNameLength = %d\n", fni->FileNameLength); ok(!memcmp(fni->FileName, szFile, lstrlenW(szFile)*sizeof(WCHAR)), - "FileName = %s\n", wine_dbgstr_w(fni->FileName)); + "FileName = %s\n", wine_dbgstr_wn(fni->FileName, fni->FileNameLength/sizeof(WCHAR))); r = pReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, FILE_NOTIFY_CHANGE_FILE_NAME, NULL, &ov, readdirectorychanges_cr); @@ -894,7 +894,7 @@ static void test_readdirectorychanges_cr(void) ok(fni->FileNameLength == lstrlenW(szFile)*sizeof(WCHAR), "FileNameLength = %d\n", fni->FileNameLength); ok(!memcmp(fni->FileName, szFile, lstrlenW(szFile)*sizeof(WCHAR)), - "FileName = %s\n", wine_dbgstr_w(fni->FileName)); + "FileName = %s\n", wine_dbgstr_wn(fni->FileName, fni->FileNameLength/sizeof(WCHAR))); r = pReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, FILE_NOTIFY_CHANGE_FILE_NAME, NULL, &ov, readdirectorychanges_cr); @@ -910,7 +910,7 @@ static void test_readdirectorychanges_cr(void) ok(fni->FileNameLength == lstrlenW(szFile)*sizeof(WCHAR), "FileNameLength = %d\n", fni->FileNameLength); ok(!memcmp(fni->FileName, szFile, lstrlenW(szFile)*sizeof(WCHAR)), - "FileName = %s\n", wine_dbgstr_w(fni->FileName)); + "FileName = %s\n", wine_dbgstr_wn(fni->FileName, fni->FileNameLength/sizeof(WCHAR))); CloseHandle(hdir); @@ -934,7 +934,7 @@ static void test_readdirectorychanges_cr(void) ok(fni->FileNameLength == lstrlenW(szDir)*sizeof(WCHAR), "FileNameLength = %d\n", fni->FileNameLength); ok(!memcmp(fni->FileName, szDir, lstrlenW(szDir)*sizeof(WCHAR)), - "FileName = %s\n", wine_dbgstr_w(fni->FileName)); + "FileName = %s\n", wine_dbgstr_wn(fni->FileName, fni->FileNameLength/sizeof(WCHAR))); ok(fni->NextEntryOffset != 0, "no next entry in movement event\n"); fni_next = (FILE_NOTIFY_INFORMATION*)((char*)fni+fni->NextEntryOffset); ok(fni_next->NextEntryOffset == 0, "there should be no more events in buffer\n"); @@ -942,7 +942,7 @@ static void test_readdirectorychanges_cr(void) ok(fni_next->FileNameLength == lstrlenW(szFile)*sizeof(WCHAR), "FileNameLength = %d\n", fni_next->FileNameLength); ok(!memcmp(fni_next->FileName, szFile, lstrlenW(szFile)*sizeof(WCHAR)), - "FileName = %s\n", wine_dbgstr_w(fni_next->FileName)); + "FileName = %s\n", wine_dbgstr_wn(fni_next->FileName, fni_next->FileNameLength/sizeof(WCHAR))); } else { @@ -975,7 +975,7 @@ static void test_readdirectorychanges_cr(void) ok(fni->FileNameLength == lstrlenW(szDir)*sizeof(WCHAR), "FileNameLength = %d\n", fni->FileNameLength); ok(!memcmp(fni->FileName, szDir, lstrlenW(szDir)*sizeof(WCHAR)), - "FileName = %s\n", wine_dbgstr_w(fni->FileName)); + "FileName = %s\n", wine_dbgstr_wn(fni->FileName, fni->FileNameLength/sizeof(WCHAR))); if (fni->NextEntryOffset) fni_next = (FILE_NOTIFY_INFORMATION*)((char*)fni+fni->NextEntryOffset); else @@ -993,7 +993,7 @@ static void test_readdirectorychanges_cr(void) ok(fni_next->FileNameLength == lstrlenW(szDir)*sizeof(WCHAR), "FileNameLength = %d\n", fni_next->FileNameLength); ok(!memcmp(fni_next->FileName, szDir, lstrlenW(szDir)*sizeof(WCHAR)), - "FileName = %s\n", wine_dbgstr_w(fni_next->FileName)); + "FileName = %s\n", wine_dbgstr_wn(fni_next->FileName, fni_next->FileNameLength/sizeof(WCHAR))); CloseHandle(hdir); RemoveDirectoryW(file);

1 0

Lucas Fialho Zawacki : dinput8/tests: Moved EnumDevicesBySemantics specific tests to dinput. c and added a couple more.
by Alexandre Julliard 25 Oct '11

25 Oct '11

Module: wine Branch: master Commit: 32f79acc4951ac52d03772af76f780ab5144f071 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32f79acc4951ac52d03772af7… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Sat Oct 22 18:53:20 2011 -0200 dinput8/tests: Moved EnumDevicesBySemantics specific tests to dinput.c and added a couple more. --- dlls/dinput8/tests/device.c | 61 ----------------- dlls/dinput8/tests/dinput.c | 155 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 155 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=32f79acc4951ac52d0377…

1 0

Lucas Fialho Zawacki : dinput8/tests: Tests for DIPROP_USERNAME property.
by Alexandre Julliard 25 Oct '11

25 Oct '11

Module: wine Branch: master Commit: 46e408d54c26d4e4b4cfcd536f9bc59fe78ef481 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46e408d54c26d4e4b4cfcd536… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Sat Oct 22 18:53:21 2011 -0200 dinput8/tests: Tests for DIPROP_USERNAME property. --- dlls/dinput8/tests/Makefile.in | 2 +- dlls/dinput8/tests/device.c | 33 +++++++++++++++++++++++++++++++-- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/dinput8/tests/Makefile.in b/dlls/dinput8/tests/Makefile.in index 7584858..fe87118 100644 --- a/dlls/dinput8/tests/Makefile.in +++ b/dlls/dinput8/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dinput8.dll -IMPORTS = dinput8 ole32 user32 +IMPORTS = dinput8 ole32 user32 advapi32 C_SRCS = \ device.c \ diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 8a9b1df..7fbdfaa 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -31,6 +31,7 @@ struct enum_data { LPDIACTIONFORMAT lpdiaf; LPDIRECTINPUTDEVICE8 keyboard; LPDIRECTINPUTDEVICE8 mouse; + const char* username; int ndevices; }; @@ -156,6 +157,9 @@ static BOOL CALLBACK enumeration_callback( HRESULT hr; DIPROPDWORD dp; DIPROPRANGE dpr; + DIPROPSTRING dps; + WCHAR usernameW[MAX_PATH]; + DWORD username_size = MAX_PATH; struct enum_data *data = pvRef; DWORD cnt; DIDEVICEOBJECTDATA buffer[5]; @@ -164,6 +168,15 @@ static BOOL CALLBACK enumeration_callback( data->ndevices++; + /* Convert username to WCHAR */ + if (data->username != NULL) + { + username_size = MultiByteToWideChar(CP_ACP, 0, data->username, -1, usernameW, 0); + MultiByteToWideChar(CP_ACP, 0, data->username, -1, usernameW, username_size); + } + else + GetUserNameW(usernameW, &username_size); + /* collect the mouse and keyboard */ if (IsEqualGUID(&lpddi->guidInstance, &GUID_SysKeyboard)) { @@ -190,12 +203,23 @@ static BOOL CALLBACK enumeration_callback( hr = IDirectInputDevice8_Acquire(lpdid); ok (hr == DIERR_INVALIDPARAM, "Device was acquired before SetActionMap hr=%08x\n", hr); - hr = IDirectInputDevice8_SetActionMap(lpdid, data->lpdiaf, NULL, 0); + hr = IDirectInputDevice8_SetActionMap(lpdid, data->lpdiaf, data->username, 0); ok (SUCCEEDED(hr), "SetActionMap failed hr=%08x\n", hr); /* Some joysticks may have no suitable actions and thus should not be tested */ if (hr == DI_NOEFFECT) return DIENUM_CONTINUE; + /* Test username after SetActionMap */ + dps.diph.dwSize = sizeof(dps); + dps.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dps.diph.dwObj = 0; + dps.diph.dwHow = DIPH_DEVICE; + dps.wsz[0] = '\0'; + + hr = IDirectInputDevice_GetProperty(lpdid, DIPROP_USERNAME, &dps.diph); + todo_wine ok (SUCCEEDED(hr), "GetProperty failed hr=%08x\n", hr); + todo_wine ok (!lstrcmpW(usernameW, dps.wsz), "Username not set correctly expected=%s, got=%s\n", wine_dbgstr_wn(usernameW, -1), wine_dbgstr_wn(dps.wsz, -1)); + /* Test buffer size */ memset(&dp, 0, sizeof(dp)); dp.diph.dwSize = sizeof(dp); @@ -245,7 +269,7 @@ static void test_action_mapping(void) HINSTANCE hinst = GetModuleHandle(NULL); LPDIRECTINPUT8 pDI = NULL; DIACTIONFORMAT af; - struct enum_data data = {pDI, &af, NULL, NULL, 0}; + struct enum_data data = {pDI, &af, NULL, NULL, NULL, 0}; hr = CoCreateInstance(&CLSID_DirectInput8, 0, 1, &IID_IDirectInput8A, (LPVOID*)&pDI); if (hr == DIERR_OLDDIRECTINPUTVERSION || @@ -281,6 +305,11 @@ static void test_action_mapping(void) hr = IDirectInput8_EnumDevicesBySemantics(pDI, 0, &af, enumeration_callback, &data, DIEDBSFL_ATTACHEDONLY); ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed: hr=%08x\n", hr); + /* Repeat tests with a non NULL user */ + data.username = "Ninja Brian"; + hr = IDirectInput8_EnumDevicesBySemantics(pDI, NULL, &af, enumeration_callback, &data, DIEDBSFL_ATTACHEDONLY); + ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed: hr=%08x\n", hr); + if (data.keyboard != NULL) { /* Test keyboard BuildActionMap */

1 0

André Hentschel : cmdlgtst: Add OFN_EXPLORER to allow testing modern file dialogs with multiselection.
by Alexandre Julliard 25 Oct '11

25 Oct '11

Module: wine Branch: master Commit: 65092bbe94596c4e5984d712252611dd2a385e8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=65092bbe94596c4e5984d7122… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 24 21:56:39 2011 +0200 cmdlgtst: Add OFN_EXPLORER to allow testing modern file dialogs with multiselection. --- programs/cmdlgtst/Cs.rc | 27 +++++++++++---------- programs/cmdlgtst/Da.rc | 27 +++++++++++---------- programs/cmdlgtst/De.rc | 27 +++++++++++---------- programs/cmdlgtst/En.rc | 27 +++++++++++---------- programs/cmdlgtst/Es.rc | 27 +++++++++++---------- programs/cmdlgtst/Fr.rc | 27 +++++++++++---------- programs/cmdlgtst/He.rc | 27 +++++++++++---------- programs/cmdlgtst/It.rc | 27 +++++++++++---------- programs/cmdlgtst/Ja.rc | 27 +++++++++++---------- programs/cmdlgtst/Ko.rc | 27 +++++++++++---------- programs/cmdlgtst/Lt.rc | 27 +++++++++++---------- programs/cmdlgtst/Nl.rc | 27 +++++++++++---------- programs/cmdlgtst/No.rc | 27 +++++++++++---------- programs/cmdlgtst/Pl.rc | 27 +++++++++++---------- programs/cmdlgtst/Pt.rc | 54 +++++++++++++++++++++-------------------- programs/cmdlgtst/Ro.rc | 27 +++++++++++---------- programs/cmdlgtst/Ru.rc | 27 +++++++++++---------- programs/cmdlgtst/Si.rc | 27 +++++++++++---------- programs/cmdlgtst/Sv.rc | 27 +++++++++++---------- programs/cmdlgtst/Tr.rc | 27 +++++++++++---------- programs/cmdlgtst/Uk.rc | 27 +++++++++++---------- programs/cmdlgtst/cmdlgtst.c | 1 + programs/cmdlgtst/cmdlgtst.h | 5 ++- 23 files changed, 312 insertions(+), 288 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=65092bbe94596c4e5984d…

1 0

Aric Stewart : user32: When building linedefs prev can be less than 0 if the format width is less than the width of a single character .
by Alexandre Julliard 25 Oct '11

25 Oct '11

Module: wine Branch: master Commit: 94bd422f8918306203a7b4beaa45cb68ca71dffd URL: http://source.winehq.org/git/wine.git/?a=commit;h=94bd422f8918306203a7b4bea… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 25 08:30:52 2011 -0500 user32: When building linedefs prev can be less than 0 if the format width is less than the width of a single character. --- dlls/user32/edit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index e0e0bba..f8cf757 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -638,7 +638,7 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta current_line->width -= piDx[prev]; prev--; } while ( prev > 0 && current_line->width > fw); - if (prev==0) + if (prev<=0) prev = 1; HeapFree(GetProcessHeap(),0,piDx); }

1 0

André Hentschel : winex11.drv: Remove remaining pixmap prefix to fix compilation without libxrender.
by Alexandre Julliard 25 Oct '11

25 Oct '11

Module: wine Branch: master Commit: d63651fe183715f8ef12ea31c5c6485a78c7f9ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d63651fe183715f8ef12ea31c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 25 19:39:22 2011 +0200 winex11.drv: Remove remaining pixmap prefix to fix compilation without libxrender. --- dlls/winex11.drv/xrender.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 59035d6..8ee3f59 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -3149,10 +3149,10 @@ void X11DRV_XRender_Finalize(void) void X11DRV_XRender_CopyBrush(X11DRV_PDEVICE *physDev, X_PHYSBITMAP *physBitmap, int width, int height) { wine_tsx11_lock(); - physDev->brush.pixmap = XCreatePixmap(gdi_display, root_window, width, height, physBitmap->pixmap_depth); + physDev->brush.pixmap = XCreatePixmap(gdi_display, root_window, width, height, physBitmap->depth); XCopyArea( gdi_display, physBitmap->pixmap, physDev->brush.pixmap, - get_bitmap_gc(physBitmap->pixmap_depth), 0, 0, width, height, 0, 0 ); + get_bitmap_gc(physBitmap->depth), 0, 0, width, height, 0, 0 ); wine_tsx11_unlock(); }

1 0

Piotr Caban : msxml3/tests: Tests more XMLSAXReader versions.
by Alexandre Julliard 25 Oct '11

25 Oct '11

Module: wine Branch: master Commit: 6238926a2e5c94891b7b81afa7ef073908ac3c86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6238926a2e5c94891b7b81afa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 24 20:09:12 2011 +0200 msxml3/tests: Tests more XMLSAXReader versions. --- dlls/msxml3/tests/saxreader.c | 166 +++++++++++++++++++++++++++-------------- 1 files changed, 109 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6238926a2e5c94891b7b8…

1 0

Henri Verbeet : wined3d: Upload directly from the source surface in wined3d_surface_blt(), if possible.
by Alexandre Julliard 25 Oct '11

25 Oct '11

Module: wine Branch: master Commit: 2da4f87a7e7551f17cd650ef6d8596f595efc13b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2da4f87a7e7551f17cd650ef6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 24 20:45:42 2011 +0200 wined3d: Upload directly from the source surface in wined3d_surface_blt(), if possible. This avoids either loading sysmem surfaces into video memory (wasting GPU memory) and then doing a blit on the GPU, or downloading GPU surfaces to sysmem, doing a blit on the CPU, and likely uploading it again. This mostly matters for ddraw and d3d8 applications, d3d9 already has to go through wined3d_device_update_surface() to transfer data from sysmem surfaces to GPU surfaces. --- dlls/wined3d/device.c | 116 +--------------------------------- dlls/wined3d/surface.c | 136 +++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 12 +++- 3 files changed, 145 insertions(+), 119 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2da4f87a7e7551f17cd65…

1 0