April 2010 - Wine-Commits - list.winehq.org

Damjan Jovanovic : ntoskrnl.exe: Stub out IoGetDeviceProperty.
by Alexandre Julliard April 15, 2010

April 15, 2010

Module: wine Branch: master Commit: 6aeffb53eeed0573a4c971097ffe39c6c1b537c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aeffb53eeed0573a4c971097… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Apr 14 21:28:59 2010 +0200 ntoskrnl.exe: Stub out IoGetDeviceProperty. --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 24 ++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 793a699..c22b81a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -632,6 +632,18 @@ NTSTATUS WINAPI IoGetDeviceObjectPointer( UNICODE_STRING *name, ACCESS_MASK acc /*********************************************************************** + * IoGetDeviceProperty (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoGetDeviceProperty( DEVICE_OBJECT *device, DEVICE_REGISTRY_PROPERTY device_property, + ULONG buffer_length, PVOID property_buffer, PULONG result_length ) +{ + FIXME( "%p %d %u %p %p: stub\n", device, device_property, buffer_length, + property_buffer, result_length ); + return STATUS_NOT_IMPLEMENTED; +} + + +/*********************************************************************** * IoCallDriver (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI IoCallDriver( DEVICE_OBJECT *device, IRP *irp ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index bb98dc2..e6db4f7 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -383,7 +383,7 @@ @ stub IoGetDeviceInterfaceAlias @ stub IoGetDeviceInterfaces @ stdcall IoGetDeviceObjectPointer(ptr long ptr ptr) -@ stub IoGetDeviceProperty +@ stdcall IoGetDeviceProperty(ptr long long ptr ptr) @ stub IoGetDeviceToVerify @ stub IoGetDiskDeviceObject @ stub IoGetDmaAdapter diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index da673a5..baede35 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -689,6 +689,29 @@ typedef enum _BUS_QUERY_ID_TYPE { BusQueryDeviceSerialNumber } BUS_QUERY_ID_TYPE, *PBUS_QUERY_ID_TYPE; +typedef enum { + DevicePropertyDeviceDescription, + DevicePropertyHardwareID, + DevicePropertyCompatibleIDs, + DevicePropertyBootConfiguration, + DevicePropertyBootConfigurationTranslated, + DevicePropertyClassName, + DevicePropertyClassGuid, + DevicePropertyDriverKeyName, + DevicePropertyManufacturer, + DevicePropertyFriendlyName, + DevicePropertyLocationInformation, + DevicePropertyPhysicalDeviceObjectName, + DevicePropertyBusTypeGuid, + DevicePropertyLegacyBusType, + DevicePropertyBusNumber, + DevicePropertyEnumeratorName, + DevicePropertyAddress, + DevicePropertyUINumber, + DevicePropertyInstallState, + DevicePropertyRemovalPolicy +} DEVICE_REGISTRY_PROPERTY; + typedef enum _DEVICE_TEXT_TYPE { DeviceTextDescription, DeviceTextLocationInformation @@ -1074,6 +1097,7 @@ NTSTATUS WINAPI IoDeleteSymbolicLink(UNICODE_STRING*); void WINAPI IoFreeIrp(IRP*); PEPROCESS WINAPI IoGetCurrentProcess(void); NTSTATUS WINAPI IoGetDeviceObjectPointer(UNICODE_STRING*,ACCESS_MASK,PFILE_OBJECT*,PDEVICE_OBJECT*); +NTSTATUS WINAPI IoGetDeviceProperty(PDEVICE_OBJECT,DEVICE_REGISTRY_PROPERTY,ULONG,PVOID,PULONG); PVOID WINAPI IoGetDriverObjectExtension(PDRIVER_OBJECT,PVOID); PDEVICE_OBJECT WINAPI IoGetRelatedDeviceObject(PFILE_OBJECT); void WINAPI IoInitializeIrp(IRP*,USHORT,CCHAR);

1 0

Vincent Povirk : windowscodecs: Add locking to the PNG encoder.
by Alexandre Julliard April 15, 2010

April 15, 2010

Module: wine Branch: master Commit: fd3ea78702e3c5ae7e1f66edf8b96254df5ae425 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd3ea78702e3c5ae7e1f66edf… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Apr 9 15:27:37 2010 -0500 windowscodecs: Add locking to the PNG encoder. --- dlls/windowscodecs/pngformat.c | 102 ++++++++++++++++++++++++++++++++++++++-- dlls/windowscodecs/regsvr.c | 2 +- 2 files changed, 98 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 8f2b74c..3dcbd9a 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -802,6 +802,7 @@ typedef struct PngEncoder { UINT lines_written; BOOL frame_committed; BOOL committed; + CRITICAL_SECTION lock; } PngEncoder; static inline PngEncoder *encoder_from_frame(IWICBitmapFrameEncode *iface) @@ -850,10 +851,18 @@ static HRESULT WINAPI PngFrameEncode_Initialize(IWICBitmapFrameEncode *iface, PngEncoder *This = encoder_from_frame(iface); TRACE("(%p,%p)\n", iface, pIEncoderOptions); - if (This->frame_initialized) return WINCODEC_ERR_WRONGSTATE; + EnterCriticalSection(&This->lock); + + if (This->frame_initialized) + { + LeaveCriticalSection(&This->lock); + return WINCODEC_ERR_WRONGSTATE; + } This->frame_initialized = TRUE; + LeaveCriticalSection(&This->lock); + return S_OK; } @@ -863,11 +872,19 @@ static HRESULT WINAPI PngFrameEncode_SetSize(IWICBitmapFrameEncode *iface, PngEncoder *This = encoder_from_frame(iface); TRACE("(%p,%u,%u)\n", iface, uiWidth, uiHeight); - if (!This->frame_initialized || This->info_written) return WINCODEC_ERR_WRONGSTATE; + EnterCriticalSection(&This->lock); + + if (!This->frame_initialized || This->info_written) + { + LeaveCriticalSection(&This->lock); + return WINCODEC_ERR_WRONGSTATE; + } This->width = uiWidth; This->height = uiHeight; + LeaveCriticalSection(&This->lock); + return S_OK; } @@ -877,11 +894,19 @@ static HRESULT WINAPI PngFrameEncode_SetResolution(IWICBitmapFrameEncode *iface, PngEncoder *This = encoder_from_frame(iface); TRACE("(%p,%0.2f,%0.2f)\n", iface, dpiX, dpiY); - if (!This->frame_initialized || This->info_written) return WINCODEC_ERR_WRONGSTATE; + EnterCriticalSection(&This->lock); + + if (!This->frame_initialized || This->info_written) + { + LeaveCriticalSection(&This->lock); + return WINCODEC_ERR_WRONGSTATE; + } This->xres = dpiX; This->yres = dpiY; + LeaveCriticalSection(&This->lock); + return S_OK; } @@ -892,7 +917,13 @@ static HRESULT WINAPI PngFrameEncode_SetPixelFormat(IWICBitmapFrameEncode *iface int i; TRACE("(%p,%s)\n", iface, debugstr_guid(pPixelFormat)); - if (!This->frame_initialized || This->info_written) return WINCODEC_ERR_WRONGSTATE; + EnterCriticalSection(&This->lock); + + if (!This->frame_initialized || This->info_written) + { + LeaveCriticalSection(&This->lock); + return WINCODEC_ERR_WRONGSTATE; + } for (i=0; formats[i].guid; i++) { @@ -905,6 +936,8 @@ static HRESULT WINAPI PngFrameEncode_SetPixelFormat(IWICBitmapFrameEncode *iface This->format = &formats[i]; memcpy(pPixelFormat, This->format->guid, sizeof(GUID)); + LeaveCriticalSection(&This->lock); + return S_OK; } @@ -938,15 +971,24 @@ static HRESULT WINAPI PngFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, jmp_buf jmpbuf; TRACE("(%p,%u,%u,%u,%p)\n", iface, lineCount, cbStride, cbBufferSize, pbPixels); + EnterCriticalSection(&This->lock); + if (!This->frame_initialized || !This->width || !This->height || !This->format) + { + LeaveCriticalSection(&This->lock); return WINCODEC_ERR_WRONGSTATE; + } if (lineCount == 0 || lineCount + This->lines_written > This->height) + { + LeaveCriticalSection(&This->lock); return E_INVALIDARG; + } /* set up setjmp/longjmp error handling */ if (setjmp(jmpbuf)) { + LeaveCriticalSection(&This->lock); HeapFree(GetProcessHeap(), 0, row_pointers); return E_FAIL; } @@ -977,7 +1019,10 @@ static HRESULT WINAPI PngFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, row_pointers = HeapAlloc(GetProcessHeap(), 0, lineCount * sizeof(png_byte*)); if (!row_pointers) + { + LeaveCriticalSection(&This->lock); return E_OUTOFMEMORY; + } for (i=0; i<lineCount; i++) row_pointers[i] = pbPixels + cbStride * i; @@ -985,6 +1030,8 @@ static HRESULT WINAPI PngFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, ppng_write_rows(This->png_ptr, row_pointers, lineCount); This->lines_written += lineCount; + LeaveCriticalSection(&This->lock); + HeapFree(GetProcessHeap(), 0, row_pointers); return S_OK; @@ -1069,12 +1116,18 @@ static HRESULT WINAPI PngFrameEncode_Commit(IWICBitmapFrameEncode *iface) jmp_buf jmpbuf; TRACE("(%p)\n", iface); + EnterCriticalSection(&This->lock); + if (!This->info_written || This->lines_written != This->height || This->frame_committed) + { + LeaveCriticalSection(&This->lock); return WINCODEC_ERR_WRONGSTATE; + } /* set up setjmp/longjmp error handling */ if (setjmp(jmpbuf)) { + LeaveCriticalSection(&This->lock); return E_FAIL; } ppng_set_error_fn(This->png_ptr, &jmpbuf, user_error_fn, user_warning_fn); @@ -1083,6 +1136,8 @@ static HRESULT WINAPI PngFrameEncode_Commit(IWICBitmapFrameEncode *iface) This->frame_committed = TRUE; + LeaveCriticalSection(&This->lock); + return S_OK; } @@ -1152,6 +1207,8 @@ static ULONG WINAPI PngEncoder_Release(IWICBitmapEncoder *iface) if (ref == 0) { + This->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->lock); if (This->png_ptr) ppng_destroy_write_struct(&This->png_ptr, &This->info_ptr); if (This->stream) @@ -1187,19 +1244,28 @@ static HRESULT WINAPI PngEncoder_Initialize(IWICBitmapEncoder *iface, TRACE("(%p,%p,%u)\n", iface, pIStream, cacheOption); + EnterCriticalSection(&This->lock); + if (This->png_ptr) + { + LeaveCriticalSection(&This->lock); return WINCODEC_ERR_WRONGSTATE; + } /* initialize libpng */ This->png_ptr = ppng_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); if (!This->png_ptr) + { + LeaveCriticalSection(&This->lock); return E_FAIL; + } This->info_ptr = ppng_create_info_struct(This->png_ptr); if (!This->info_ptr) { ppng_destroy_write_struct(&This->png_ptr, NULL); This->png_ptr = NULL; + LeaveCriticalSection(&This->lock); return E_FAIL; } @@ -1213,6 +1279,7 @@ static HRESULT WINAPI PngEncoder_Initialize(IWICBitmapEncoder *iface, This->png_ptr = NULL; IStream_Release(This->stream); This->stream = NULL; + LeaveCriticalSection(&This->lock); return E_FAIL; } ppng_set_error_fn(This->png_ptr, &jmpbuf, user_error_fn, user_warning_fn); @@ -1220,6 +1287,8 @@ static HRESULT WINAPI PngEncoder_Initialize(IWICBitmapEncoder *iface, /* set up custom i/o handling */ ppng_set_write_fn(This->png_ptr, This, user_write_data, user_flush); + LeaveCriticalSection(&This->lock); + return S_OK; } @@ -1269,17 +1338,31 @@ static HRESULT WINAPI PngEncoder_CreateNewFrame(IWICBitmapEncoder *iface, HRESULT hr; TRACE("(%p,%p,%p)\n", iface, ppIFrameEncode, ppIEncoderOptions); + EnterCriticalSection(&This->lock); + if (This->frame_count != 0) + { + LeaveCriticalSection(&This->lock); return WINCODEC_ERR_UNSUPPORTEDOPERATION; + } if (!This->stream) + { + LeaveCriticalSection(&This->lock); return WINCODEC_ERR_NOTINITIALIZED; + } hr = CreatePropertyBag2(ppIEncoderOptions); - if (FAILED(hr)) return hr; + if (FAILED(hr)) + { + LeaveCriticalSection(&This->lock); + return hr; + } This->frame_count = 1; + LeaveCriticalSection(&This->lock); + IWICBitmapEncoder_AddRef(iface); *ppIFrameEncode = (IWICBitmapFrameEncode*)&This->lpFrameVtbl; @@ -1291,11 +1374,18 @@ static HRESULT WINAPI PngEncoder_Commit(IWICBitmapEncoder *iface) PngEncoder *This = (PngEncoder*)iface; TRACE("(%p)\n", iface); + EnterCriticalSection(&This->lock); + if (!This->frame_committed || This->committed) + { + LeaveCriticalSection(&This->lock); return WINCODEC_ERR_WRONGSTATE; + } This->committed = TRUE; + EnterCriticalSection(&This->lock); + return S_OK; } @@ -1359,6 +1449,8 @@ HRESULT PngEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->lines_written = 0; This->frame_committed = FALSE; This->committed = FALSE; + InitializeCriticalSection(&This->lock); + This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PngEncoder.lock"); ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); IUnknown_Release((IUnknown*)This); diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index a71ef0a..c5828a6 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -745,7 +745,7 @@ static struct regsvr_coclass const coclass_list[] = { "WIC PNG Encoder", NULL, "windowscodecs.dll", - "Apartment" + "Both" }, { &CLSID_WICBmpEncoder, "WIC BMP Encoder",

1 0

Aric Stewart : usp10: Have ScriptShape respect fLogicalOrder and fRTL when ordering glyphs.
by Alexandre Julliard April 15, 2010

April 15, 2010

Module: wine Branch: master Commit: 51bbd9299f13ebb242ec92df900933f985efb14c URL: http://source.winehq.org/git/wine.git/?a=commit;h=51bbd9299f13ebb242ec92df9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 14 10:00:37 2010 -0500 usp10: Have ScriptShape respect fLogicalOrder and fRTL when ordering glyphs. --- dlls/usp10/usp10.c | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 4f8a08b..8595714 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1332,6 +1332,7 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, { HRESULT hr; unsigned int i; + BOOL rtl; TRACE("(%p, %p, %s, %d, %d, %p, %p, %p, %p, %p)\n", hdc, psc, debugstr_wn(pwcChars, cChars), cChars, cMaxGlyphs, psa, pwOutGlyphs, pwLogClust, psva, pcGlyphs); @@ -1341,6 +1342,7 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, if (!psva || !pcGlyphs) return E_INVALIDARG; if (cChars > cMaxGlyphs) return E_OUTOFMEMORY; + rtl = (!psa->fLogicalOrder && psa->fRTL); *pcGlyphs = cChars; if ((hr = init_script_cache(hdc, psc)) != S_OK) return hr; @@ -1350,33 +1352,42 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, { for (i = 0; i < cChars; i++) { - if (!(pwOutGlyphs[i] = get_cache_glyph(psc, pwcChars[i]))) + int idx = i; + if (rtl) idx = cChars - 1 - i; + if (!(pwOutGlyphs[i] = get_cache_glyph(psc, pwcChars[idx]))) { WORD glyph; if (!hdc) return E_PENDING; - if (GetGlyphIndicesW(hdc, &pwcChars[i], 1, &glyph, 0) == GDI_ERROR) return S_FALSE; - pwOutGlyphs[i] = set_cache_glyph(psc, pwcChars[i], glyph); + if (GetGlyphIndicesW(hdc, &pwcChars[idx], 1, &glyph, 0) == GDI_ERROR) return S_FALSE; + pwOutGlyphs[i] = set_cache_glyph(psc, pwcChars[idx], glyph); } } } else { TRACE("no glyph translation\n"); - for (i = 0; i < cChars; i++) pwOutGlyphs[i] = pwcChars[i]; + for (i = 0; i < cChars; i++) + { + int idx = i; + if (rtl) idx = cChars - 1 - i; + pwOutGlyphs[i] = pwcChars[idx]; + } } /* set up a valid SCRIPT_VISATTR and LogClust for each char in this run */ for (i = 0; i < cChars; i++) { + int idx = i; + if (rtl) idx = cChars - 1 - i; /* FIXME: set to better values */ - psva[i].uJustification = (pwcChars[i] == ' ') ? SCRIPT_JUSTIFY_BLANK : SCRIPT_JUSTIFY_CHARACTER; + psva[i].uJustification = (pwcChars[idx] == ' ') ? SCRIPT_JUSTIFY_BLANK : SCRIPT_JUSTIFY_CHARACTER; psva[i].fClusterStart = 1; psva[i].fDiacritic = 0; psva[i].fZeroWidth = 0; psva[i].fReserved = 0; psva[i].fShapeReserved = 0; - pwLogClust[i] = i; + pwLogClust[i] = idx; } return S_OK; }

1 0

Christian Costa : d3dx9_36/tests: Move surface tests into surface.c.
by Alexandre Julliard April 14, 2010

April 14, 2010

Module: wine Branch: master Commit: 79b8de1263b02eb2a3319885b172473fa7021b37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79b8de1263b02eb2a3319885b… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Apr 12 21:36:26 2010 +0200 d3dx9_36/tests: Move surface tests into surface.c. --- dlls/d3dx9_36/tests/Makefile.in | 2 +- dlls/d3dx9_36/tests/{texture.c => surface.c} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/Makefile.in b/dlls/d3dx9_36/tests/Makefile.in index 59ac277..b9ad40d 100644 --- a/dlls/d3dx9_36/tests/Makefile.in +++ b/dlls/d3dx9_36/tests/Makefile.in @@ -13,7 +13,7 @@ C_SRCS = \ math.c \ mesh.c \ shader.c \ - texture.c + surface.c RC_SRCS = rsrc.rc diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/surface.c similarity index 99% rename from dlls/d3dx9_36/tests/texture.c rename to dlls/d3dx9_36/tests/surface.c index 2d6f768..ef04afc 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -1,5 +1,5 @@ /* - * Tests for the D3DX9 texture functions + * Tests for the D3DX9 surface functions * * Copyright 2009 Tony Wasserka * @@ -489,7 +489,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) if(testbitmap_ok) DeleteFileA("testbitmap.bmp"); } -START_TEST(texture) +START_TEST(surface) { HWND wnd; IDirect3D9 *d3d;

1 0

Jörg Höhle : winmm: Prepare transition of MCI parser to 64bit.
by Alexandre Julliard April 14, 2010

April 14, 2010

Module: wine Branch: master Commit: 0bc218b9db25bea09f82d0cef306fa152230dfce URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bc218b9db25bea09f82d0cef… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Apr 13 23:26:37 2010 +0200 winmm: Prepare transition of MCI parser to 64bit. --- dlls/winmm/mci.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index e70a396..f9c65eb 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1036,7 +1036,7 @@ static DWORD MCI_ParseOptArgs(DWORD_PTR* data, int _offset, LPCWSTR lpCmd, /* skip any leading white space(s) */ while (*args == ' ') args++; - TRACE("args=%s offset=%d\n", debugstr_w(args), offset); + TRACE("args=%s\n", debugstr_w(args)); do { /* loop on options for command table for the requested verb */ str = (LPCWSTR)lmem; @@ -1056,6 +1056,11 @@ static DWORD MCI_ParseOptArgs(DWORD_PTR* data, int _offset, LPCWSTR lpCmd, } inCst = FALSE; cflg = 0; break; + case MCI_RETURN: + if (offset != _offset) { + ERR("MCI_RETURN not in first position\n"); + return MCIERR_PARSER_INTERNAL; + } } if (strncmpiW(args, str, len) == 0 && @@ -1075,17 +1080,20 @@ static DWORD MCI_ParseOptArgs(DWORD_PTR* data, int _offset, LPCWSTR lpCmd, break; case MCI_FLAG: *dwFlags |= flg; + TRACE("flag=%08x\n", flg); break; case MCI_INTEGER: if (inCst) { data[offset] |= flg; *dwFlags |= cflg; inCst = FALSE; + TRACE("flag=%08x constant=%08x\n", cflg, flg); } else { *dwFlags |= flg; if (!MCI_GetDWord(&(data[offset]), &args)) { return MCIERR_BAD_INTEGER; } + TRACE("flag=%08x int=%ld\n", flg, data[offset]); } break; case MCI_RECT: @@ -1098,11 +1106,13 @@ static DWORD MCI_ParseOptArgs(DWORD_PTR* data, int _offset, LPCWSTR lpCmd, ERR("Bad rect %s\n", debugstr_w(args)); return MCIERR_BAD_INTEGER; } + TRACE("flag=%08x for rectangle\n", flg); break; case MCI_STRING: *dwFlags |= flg; if ((dwRet = MCI_GetString((LPWSTR*)&data[offset], &args))) return dwRet; + TRACE("flag=%08x string=%s\n", flg, debugstr_w((LPWSTR)data[offset])); break; default: ERR("oops\n"); } @@ -1401,11 +1411,10 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, */ if (lpstrRet && uRetLen) *lpstrRet = '\0'; - TRACE("[%d, %s, %08x, %08lx/%s %08lx/%s %08lx/%s %08lx/%s %08lx/%s %08lx/%s]\n", + TRACE("[%d, %s, %08x, %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx]\n", wmd ? wmd->wDeviceID : uDevID, MCI_MessageToString(MCI_GetMessage(lpCmd)), dwFlags, - data[0], debugstr_w((WCHAR *)data[0]), data[1], debugstr_w((WCHAR *)data[1]), - data[2], debugstr_w((WCHAR *)data[2]), data[3], debugstr_w((WCHAR *)data[3]), - data[4], debugstr_w((WCHAR *)data[4]), data[5], debugstr_w((WCHAR *)data[5])); + data[0], data[1], data[2], data[3], data[4], + data[5], data[6], data[7], data[8], data[9]); if (strcmpW(verb, wszOpen) == 0) { if ((dwRet = MCI_FinishOpen(wmd, (LPMCI_OPEN_PARMSW)data, dwFlags)))

1 0

Roderick Colenbrander : d3d9: Add an initial ColorFill regression test.
by Alexandre Julliard April 14, 2010

April 14, 2010

Module: wine Branch: master Commit: 67f43418d051059046f0bf306bdc094df8e6e98c URL: http://source.winehq.org/git/wine.git/?a=commit;h=67f43418d051059046f0bf306… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Apr 14 14:19:20 2010 +0200 d3d9: Add an initial ColorFill regression test. --- dlls/d3d9/tests/visual.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 66 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 173de96..4e5e838 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -638,6 +638,71 @@ static void clear_test(IDirect3DDevice9 *device) IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); } +static void color_fill_test(IDirect3DDevice9 *device) +{ + HRESULT hr; + IDirect3DSurface9 *backbuffer = NULL; + IDirect3DSurface9 *rt_surface = NULL; + IDirect3DSurface9 *offscreen_surface = NULL; + DWORD fill_color, color; + + /* Test ColorFill on a the backbuffer (should pass) */ + hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(hr == D3D_OK, "Can't get back buffer, hr = %08x\n", hr); + if(backbuffer) + { + fill_color = 0x112233; + hr = IDirect3DDevice9_ColorFill(device, backbuffer, NULL, fill_color); + + color = getPixelColor(device, 0, 0); + ok(color == fill_color, "Expected color %08x, got %08x\n", fill_color, color); + + IDirect3DSurface9_Release(backbuffer); + } + + /* Test ColorFill on a render target surface (should pass) */ + hr = IDirect3DDevice9_CreateRenderTarget(device, 32, 32, D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, TRUE, &rt_surface, NULL ); + ok(hr == D3D_OK, "Unable to create render target surface, hr = %08x\n", hr); + if(rt_surface) + { + fill_color = 0x445566; + hr = IDirect3DDevice9_ColorFill(device, rt_surface, NULL, fill_color); + + color = getPixelColorFromSurface(rt_surface, 0, 0); + ok(color == fill_color, "Expected color %08x, got %08x\n", fill_color, color); + + IDirect3DSurface9_Release(rt_surface); + } + + /* Test ColorFill on a offscreen plain surface in D3DPOOL_DEFAULT (should pass) */ + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 32, 32, + D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &offscreen_surface, NULL); + ok(hr == D3D_OK, "Unable to create offscreen plain surface, hr = %08x\n", hr); + if(offscreen_surface) + { + fill_color = 0x778899; + hr = IDirect3DDevice9_ColorFill(device, offscreen_surface, NULL, fill_color); + + color = getPixelColorFromSurface(offscreen_surface, 0, 0); + ok(color == fill_color, "Expected color %08x, got %08x\n", fill_color, color); + + IDirect3DSurface9_Release(offscreen_surface); + } + + /* Try ColorFill on a offscreen surface in sysmem (should fail) */ + offscreen_surface = NULL; + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 32, 32, + D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &offscreen_surface, NULL); + ok(hr == D3D_OK, "Unable to create offscreen plain surface, hr = %08x\n", hr); + if(offscreen_surface) + { + hr = IDirect3DDevice9_ColorFill(device, offscreen_surface, NULL, 0); + ok(hr == D3DERR_INVALIDCALL, "ColorFill on offscreen sysmem surface failed with hr = %08x\n", hr); + + IDirect3DSurface9_Release(offscreen_surface); + } +} + typedef struct { float in[4]; DWORD out; @@ -11041,6 +11106,7 @@ START_TEST(visual) stretchrect_test(device_ptr); lighting_test(device_ptr); clear_test(device_ptr); + color_fill_test(device_ptr); fog_test(device_ptr); if(caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP) {

1 0

Roderick Colenbrander : wined3d: Separate detection of D3D10+ and D3D9 Nvidia GPUs.
by Alexandre Julliard April 14, 2010

April 14, 2010

Module: wine Branch: master Commit: bf73d23d950ab5f185f4a875f48809b2b857e74e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf73d23d950ab5f185f4a875f… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Apr 14 14:19:19 2010 +0200 wined3d: Separate detection of D3D10+ and D3D9 Nvidia GPUs. --- dlls/wined3d/directx.c | 15 +++++++++++---- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 67b2bd2..6498859 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1251,10 +1251,7 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl_info *gl_info, const char *gl_renderer, unsigned int *vidmem) { - /* Both the GeforceFX, 6xxx and 7xxx series support D3D9. The last two types have more - * shader capabilities, so we use the shader capabilities to distinguish between FX and 6xxx/7xxx. - */ - if (WINE_D3D9_CAPABLE(gl_info) && gl_info->supported[NV_VERTEX_PROGRAM3]) + if (WINE_D3D10_CAPABLE(gl_info)) { /* Geforce 200 - highend */ if (strstr(gl_renderer, "GTX 280") @@ -1360,6 +1357,16 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl return CARD_NVIDIA_GEFORCE_8300GS; } + /* Geforce8-compatible fall back if the GPU is not in the list yet */ + *vidmem = 128; + return CARD_NVIDIA_GEFORCE_8300GS; + } + + /* Both the GeforceFX, 6xxx and 7xxx series support D3D9. The last two types have more + * shader capabilities, so we use the shader capabilities to distinguish between FX and 6xxx/7xxx. + */ + if (WINE_D3D9_CAPABLE(gl_info) && gl_info->supported[NV_VERTEX_PROGRAM3]) + { /* Geforce7 - highend */ if (strstr(gl_renderer, "7800") || strstr(gl_renderer, "7900") diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 981f580..00d4c48 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1234,6 +1234,7 @@ void context_surface_update(struct wined3d_context *context, IWineD3DSurfaceImpl #define WINE_D3D7_CAPABLE(gl_info) (gl_info->supported[ARB_TEXTURE_COMPRESSION] && gl_info->supported[ARB_TEXTURE_CUBE_MAP] && gl_info->supported[ARB_TEXTURE_ENV_DOT3]) #define WINE_D3D8_CAPABLE(gl_info) WINE_D3D7_CAPABLE(gl_info) && (gl_info->supported[ARB_MULTISAMPLE] && gl_info->supported[ARB_TEXTURE_BORDER_CLAMP]) #define WINE_D3D9_CAPABLE(gl_info) WINE_D3D8_CAPABLE(gl_info) && (gl_info->supported[ARB_FRAGMENT_PROGRAM] && gl_info->supported[ARB_VERTEX_SHADER]) +#define WINE_D3D10_CAPABLE(gl_info) WINE_D3D9_CAPABLE(gl_info) && (gl_info->supported[EXT_GPU_SHADER4]) /***************************************************************************** * Internal representation of a light

1 0

Roderick Colenbrander : wined3d: Move G16R16/ R16G16F conversion to the formats table.
by Alexandre Julliard April 14, 2010

April 14, 2010

Module: wine Branch: master Commit: cda78c01e62bea533bcfdedee8a68663c67f2050 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cda78c01e62bea533bcfdedee… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Apr 14 14:19:17 2010 +0200 wined3d: Move G16R16/R16G16F conversion to the formats table. --- dlls/wined3d/surface.c | 37 ------------------------------------- dlls/wined3d/utils.c | 34 ++++++++++++++++++++++++++++++---- 2 files changed, 30 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1dbbeeb..40921d6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2134,7 +2134,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ { BOOL colorkey_active = need_alpha_ck && (This->CKeyFlags & WINEDDSD_CKSRCBLT); IWineD3DDeviceImpl *device = This->resource.device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; BOOL blit_supported = FALSE; RECT rect = {0, 0, This->pow2Width, This->pow2Height}; @@ -2233,17 +2232,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ desc->conv_byte_count = 2; break; - case WINED3DFMT_R16G16_UNORM: - *convert = CONVERT_G16R16; - desc->conv_byte_count = 6; - break; - - case WINED3DFMT_R16G16_FLOAT: - if (gl_info->supported[ARB_TEXTURE_RG]) break; - *convert = CONVERT_R16G16F; - desc->conv_byte_count = 6; - break; - default: break; } @@ -2505,31 +2493,6 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; } - case CONVERT_G16R16: - case CONVERT_R16G16F: - { - unsigned int x, y; - const WORD *Source; - WORD *Dest; - - for(y = 0; y < height; y++) { - Source = (const WORD *)(src + y * pitch); - Dest = (WORD *) (dst + y * outpitch); - for (x = 0; x < width; x++ ) { - WORD green = (*Source++); - WORD red = (*Source++); - Dest[0] = green; - Dest[1] = red; - /* Strictly speaking not correct for R16G16F, but it doesn't matter because the - * shader overwrites it anyway - */ - Dest[2] = 0xffff; - Dest += 3; - } - } - break; - } - default: ERR("Unsupported conversion type %#x.\n", convert); } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b2a35c6..abe3770 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -417,6 +417,32 @@ static void convert_r16g16_snorm(const BYTE *src, BYTE *dst, UINT pitch, UINT wi } } +static void convert_r16g16(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) +{ + unsigned int x, y; + const WORD *Source; + WORD *Dest; + UINT outpitch = (pitch * 3)/2; + + for(y = 0; y < height; y++) + { + Source = (const WORD *)(src + y * pitch); + Dest = (WORD *) (dst + y * outpitch); + for (x = 0; x < width; x++ ) + { + WORD green = (*Source++); + WORD red = (*Source++); + Dest[0] = green; + Dest[1] = red; + /* Strictly speaking not correct for R16G16F, but it doesn't matter because the + * shader overwrites it anyway + */ + Dest[2] = 0xffff; + Dest += 3; + } + } +} + static void convert_r32g32_float(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) { unsigned int x, y; @@ -582,9 +608,9 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_RENDERTARGET, ARB_TEXTURE_RG, NULL}, {WINED3DFMT_R16G16_FLOAT, GL_RGB16F_ARB, GL_RGB16F_ARB, 0, - GL_RGB, GL_HALF_FLOAT_ARB, 0, + GL_RGB, GL_HALF_FLOAT_ARB, 6, WINED3DFMT_FLAG_RENDERTARGET, - ARB_TEXTURE_FLOAT, NULL}, + ARB_TEXTURE_FLOAT, &convert_r16g16}, {WINED3DFMT_R16G16_FLOAT, GL_RG16F, GL_RG16F, 0, GL_RG, GL_HALF_FLOAT_ARB, 0, WINED3DFMT_FLAG_RENDERTARGET, @@ -656,9 +682,9 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_R16G16_UNORM, GL_RGB16, GL_RGB16, GL_RGBA16, - GL_RGB, GL_UNSIGNED_SHORT, 0, + GL_RGB, GL_UNSIGNED_SHORT, 6, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, - WINED3D_GL_EXT_NONE, NULL}, + WINED3D_GL_EXT_NONE, &convert_r16g16}, {WINED3DFMT_B10G10R10A2_UNORM, GL_RGB10_A2, GL_RGB10_A2, 0, GL_BGRA, GL_UNSIGNED_INT_2_10_10_10_REV, 0, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING,

1 0

Alexandre Julliard : gdi32: Use the more detailed libwine information to classify bidi chars.
by Alexandre Julliard April 14, 2010

April 14, 2010

Module: wine Branch: master Commit: b0beb46aa847dca0b25294e231059ee12fecc3eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0beb46aa847dca0b25294e23… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 14 12:35:29 2010 +0200 gdi32: Use the more detailed libwine information to classify bidi chars. --- dlls/gdi32/bidi.c | 116 ++++++++++++++++------------------------------------ 1 files changed, 36 insertions(+), 80 deletions(-) diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index 60fff3e..d488153 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -49,6 +49,7 @@ #include "wingdi.h" #include "winnls.h" #include "usp10.h" +#include "wine/unicode.h" #include "wine/debug.h" #include "gdi_private.h" @@ -105,91 +106,46 @@ enum directions /* HELPER FUNCTIONS */ -/* grep -r ';BN;' data.txt | grep -v [0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F] | sed -e s@\;.*@@ -e s/^..../0x\&,\ / | xargs echo */ -static const WCHAR BNs[] = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, - 0x000E, 0x000F, 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, - 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x007F, 0x0080, 0x0081, 0x0082, - 0x0083, 0x0084, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, - 0x008D, 0x008E, 0x008F, 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, - 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, - 0x009F, 0x00AD, 0x070F, 0x200B, 0x200C, 0x200D, 0x2060, 0x2061, 0x2062, - 0x2063, 0x206A, 0x206B, 0x206C, 0x206D, 0x206E, 0x206F, 0xFEFF -}; - -/* Idem, but with ';R;' instead of ';BN;' */ -static const WCHAR Rs[] = { - 0x05BE, 0x05C0, 0x05C3, 0x05C6, 0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, - 0x05D5, 0x05D6, 0x05D7, 0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, - 0x05DE, 0x05DF, 0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, - 0x05E7, 0x05E8, 0x05E9, 0x05EA, 0x05F0, 0x05F1, 0x05F2, 0x05F3, 0x05F4, - 0x07C0, 0x07C1, 0x07C2, 0x07C3, 0x07C4, 0x07C5, 0x07C6, 0x07C7, 0x07C8, - 0x07C9, 0x07CA, 0x07CB, 0x07CC, 0x07CD, 0x07CE, 0x07CF, 0x07D0, 0x07D1, - 0x07D2, 0x07D3, 0x07D4, 0x07D5, 0x07D6, 0x07D7, 0x07D8, 0x07D9, 0x07DA, - 0x07DB, 0x07DC, 0x07DD, 0x07DE, 0x07DF, 0x07E0, 0x07E1, 0x07E2, 0x07E3, - 0x07E4, 0x07E5, 0x07E6, 0x07E7, 0x07E8, 0x07E9, 0x07EA, 0x07F4, 0x07F5, - 0x07FA, 0x200F, 0xFB1D, 0xFB1F, 0xFB20, 0xFB21, 0xFB22, 0xFB23, 0xFB24, - 0xFB25, 0xFB26, 0xFB27, 0xFB28, 0xFB2A, 0xFB2B, 0xFB2C, 0xFB2D, 0xFB2E, - 0xFB2F, 0xFB30, 0xFB31, 0xFB32, 0xFB33, 0xFB34, 0xFB35, 0xFB36, 0xFB38, - 0xFB39, 0xFB3A, 0xFB3B, 0xFB3C, 0xFB3E, 0xFB40, 0xFB41, 0xFB43, 0xFB44, - 0xFB46, 0xFB47, 0xFB48, 0xFB49, 0xFB4A, 0xFB4B, 0xFB4C, 0xFB4D, 0xFB4E, - 0xFB4F -}; - -/* Convert the incomplete win32 table to some slightly more useful data */ +/* Convert the libwine information to the direction enum */ static void classify(LPCWSTR lpString, WORD *chartype, DWORD uCount) { - unsigned i, j; - GetStringTypeW(CT_CTYPE2, lpString, uCount, chartype); + static const enum directions dir_map[16] = + { + L, /* unassigned defaults to L */ + L, + R, + EN, + ES, + ET, + AN, + CS, + B, + S, + WS, + ON, + AL, + NSM, + BN, + PDF /* also LRE, LRO, RLE, RLO */ + }; + + unsigned i; + for (i = 0; i < uCount; ++i) - switch (chartype[i]) + { + chartype[i] = dir_map[get_char_typeW(lpString[i]) >> 12]; + if (chartype[i] == PDF) { - case C2_LEFTTORIGHT: chartype[i] = L; break; - case C2_RIGHTTOLEFT: - chartype[i] = AL; - for (j = 0; j < sizeof(Rs)/sizeof(WCHAR); ++j) - if (Rs[j] == lpString[i]) - { - chartype[i] = R; - break; - } - break; - - case C2_EUROPENUMBER: chartype[i] = EN; break; - case C2_EUROPESEPARATOR: chartype[i] = ES; break; - case C2_EUROPETERMINATOR: chartype[i] = ET; break; - case C2_ARABICNUMBER: chartype[i] = AN; break; - case C2_COMMONSEPARATOR: chartype[i] = CS; break; - case C2_BLOCKSEPARATOR: chartype[i] = B; break; - case C2_SEGMENTSEPARATOR: chartype[i] = S; break; - case C2_WHITESPACE: chartype[i] = WS; break; - case C2_OTHERNEUTRAL: - switch (lpString[i]) - { - case 0x202A: chartype[i] = LRE; break; - case 0x202B: chartype[i] = RLE; break; - case 0x202C: chartype[i] = PDF; break; - case 0x202D: chartype[i] = LRO; break; - case 0x202E: chartype[i] = RLO; break; - default: chartype[i] = ON; break; - } - break; - case C2_NOTAPPLICABLE: - chartype[i] = NSM; - for (j = 0; j < sizeof(BNs)/sizeof(WCHAR); ++j) - if (BNs[j] == lpString[i]) - { - chartype[i] = BN; - break; - } - break; - - default: - /* According to BiDi spec, unassigned characters default to L */ - FIXME("Unhandled character type: %04x\n", chartype[i]); - chartype[i] = L; - break; + switch (lpString[i]) + { + case 0x202A: chartype[i] = LRE; break; + case 0x202B: chartype[i] = RLE; break; + case 0x202C: chartype[i] = PDF; break; + case 0x202D: chartype[i] = LRO; break; + case 0x202E: chartype[i] = RLO; break; + } } + } } /* Set a run of cval values at locations all prior to, but not including */

1 0

Alexandre Julliard : usp10: Use the more detailed libwine information to classify bidi chars.
by Alexandre Julliard April 14, 2010

April 14, 2010

Module: wine Branch: master Commit: 65ad39903268177a08ecf32767b4dfb8f1bc4f0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=65ad39903268177a08ecf3276… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 14 12:38:59 2010 +0200 usp10: Use the more detailed libwine information to classify bidi chars. --- dlls/usp10/bidi.c | 131 +++++++++++++++++++---------------------------------- 1 files changed, 46 insertions(+), 85 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index 2763453..8af28e7 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -49,6 +49,7 @@ #include "wingdi.h" #include "winnls.h" #include "usp10.h" +#include "wine/unicode.h" #include "wine/debug.h" #include "usp10_internal.h" @@ -107,97 +108,57 @@ enum directions /* HELPER FUNCTIONS */ -/* grep -r ';BN;' data.txt | grep -v [0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F] | sed -e s@\;.*@@ -e s/^..../0x\&,\ / | xargs echo */ -static const WCHAR BNs[] = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, - 0x000E, 0x000F, 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, - 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x007F, 0x0080, 0x0081, 0x0082, - 0x0083, 0x0084, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, - 0x008D, 0x008E, 0x008F, 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, - 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, - 0x009F, 0x00AD, 0x070F, 0x200B, 0x200C, 0x200D, 0x2060, 0x2061, 0x2062, - 0x2063, 0x206A, 0x206B, 0x206C, 0x206D, 0x206E, 0x206F, 0xFEFF -}; - -/* Idem, but with ';R;' instead of ';BN;' */ -static const WCHAR Rs[] = { - 0x05BE, 0x05C0, 0x05C3, 0x05C6, 0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, - 0x05D5, 0x05D6, 0x05D7, 0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, - 0x05DE, 0x05DF, 0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, - 0x05E7, 0x05E8, 0x05E9, 0x05EA, 0x05F0, 0x05F1, 0x05F2, 0x05F3, 0x05F4, - 0x07C0, 0x07C1, 0x07C2, 0x07C3, 0x07C4, 0x07C5, 0x07C6, 0x07C7, 0x07C8, - 0x07C9, 0x07CA, 0x07CB, 0x07CC, 0x07CD, 0x07CE, 0x07CF, 0x07D0, 0x07D1, - 0x07D2, 0x07D3, 0x07D4, 0x07D5, 0x07D6, 0x07D7, 0x07D8, 0x07D9, 0x07DA, - 0x07DB, 0x07DC, 0x07DD, 0x07DE, 0x07DF, 0x07E0, 0x07E1, 0x07E2, 0x07E3, - 0x07E4, 0x07E5, 0x07E6, 0x07E7, 0x07E8, 0x07E9, 0x07EA, 0x07F4, 0x07F5, - 0x07FA, 0x200F, 0xFB1D, 0xFB1F, 0xFB20, 0xFB21, 0xFB22, 0xFB23, 0xFB24, - 0xFB25, 0xFB26, 0xFB27, 0xFB28, 0xFB2A, 0xFB2B, 0xFB2C, 0xFB2D, 0xFB2E, - 0xFB2F, 0xFB30, 0xFB31, 0xFB32, 0xFB33, 0xFB34, 0xFB35, 0xFB36, 0xFB38, - 0xFB39, 0xFB3A, 0xFB3B, 0xFB3C, 0xFB3E, 0xFB40, 0xFB41, 0xFB43, 0xFB44, - 0xFB46, 0xFB47, 0xFB48, 0xFB49, 0xFB4A, 0xFB4B, 0xFB4C, 0xFB4D, 0xFB4E, - 0xFB4F -}; - -/* Convert the incomplete win32 table to some slightly more useful data */ +/* Convert the libwine information to the direction enum */ static void classify(LPCWSTR lpString, WORD *chartype, DWORD uCount, const SCRIPT_CONTROL *c) { - unsigned i, j; - GetStringTypeW(CT_CTYPE2, lpString, uCount, chartype); + static const enum directions dir_map[16] = + { + L, /* unassigned defaults to L */ + L, + R, + EN, + ES, + ET, + AN, + CS, + B, + S, + WS, + ON, + AL, + NSM, + BN, + PDF /* also LRE, LRO, RLE, RLO */ + }; + + unsigned i; + for (i = 0; i < uCount; ++i) + { + chartype[i] = dir_map[get_char_typeW(lpString[i]) >> 12]; switch (chartype[i]) { - case C2_LEFTTORIGHT: chartype[i] = L; break; - case C2_RIGHTTOLEFT: - chartype[i] = AL; - for (j = 0; j < sizeof(Rs)/sizeof(WCHAR); ++j) - if (Rs[j] == lpString[i]) - { - chartype[i] = R; - break; - } - break; - - case C2_EUROPENUMBER: chartype[i] = EN; break; - case C2_EUROPESEPARATOR: - if (c->fLegacyBidiClass && (lpString[i] == '-' || lpString[i] =='+')) - chartype[i] = N; - else if (c->fLegacyBidiClass && lpString[i] == '/') - chartype[i] = CS; - else - chartype[i] = ES; break; - case C2_EUROPETERMINATOR: chartype[i] = ET; break; - case C2_ARABICNUMBER: chartype[i] = AN; break; - case C2_COMMONSEPARATOR: chartype[i] = CS; break; - case C2_BLOCKSEPARATOR: chartype[i] = B; break; - case C2_SEGMENTSEPARATOR: chartype[i] = S; break; - case C2_WHITESPACE: chartype[i] = WS; break; - case C2_OTHERNEUTRAL: - switch (lpString[i]) - { - case 0x202A: chartype[i] = LRE; break; - case 0x202B: chartype[i] = RLE; break; - case 0x202C: chartype[i] = PDF; break; - case 0x202D: chartype[i] = LRO; break; - case 0x202E: chartype[i] = RLO; break; - default: chartype[i] = ON; break; - } - break; - case C2_NOTAPPLICABLE: - chartype[i] = NSM; - for (j = 0; j < sizeof(BNs)/sizeof(WCHAR); ++j) - if (BNs[j] == lpString[i]) - { - chartype[i] = BN; - break; - } - break; - - default: - /* According to BiDi spec, unassigned characters default to L */ - FIXME("Unhandled character type: %04x\n", chartype[i]); - chartype[i] = L; - break; + case ES: + if (!c->fLegacyBidiClass) break; + switch (lpString[i]) + { + case '-': + case '+': chartype[i] = N; break; + case '/': chartype[i] = CS; break; + } + break; + case PDF: + switch (lpString[i]) + { + case 0x202A: chartype[i] = LRE; break; + case 0x202B: chartype[i] = RLE; break; + case 0x202C: chartype[i] = PDF; break; + case 0x202D: chartype[i] = LRO; break; + case 0x202E: chartype[i] = RLO; break; + } + break; } + } } /* Set a run of cval values at locations all prior to, but not including */

1 0