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

Andrew Nguyen : dxdiagn: Add some machine name properties to the DxDiag_SystemInfo container.
by Alexandre Julliard April 4, 2011

April 4, 2011

Module: wine Branch: master Commit: ff1285aca7b5d09d727316c85c35cfa38a63466f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff1285aca7b5d09d727316c85… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Apr 3 20:55:17 2011 -0500 dxdiagn: Add some machine name properties to the DxDiag_SystemInfo container. --- dlls/dxdiagn/provider.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 9a6ba6b..9dcb99f 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -366,11 +366,14 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) static const WCHAR dwOSBuildNumber[] = {'d','w','O','S','B','u','i','l','d','N','u','m','b','e','r',0}; static const WCHAR dwOSPlatformID[] = {'d','w','O','S','P','l','a','t','f','o','r','m','I','D',0}; static const WCHAR szCSDVersion[] = {'s','z','C','S','D','V','e','r','s','i','o','n',0}; + static const WCHAR szMachineNameLocalized[] = {'s','z','M','a','c','h','i','n','e','N','a','m','e','L','o','c','a','l','i','z','e','d',0}; + static const WCHAR szMachineNameEnglish[] = {'s','z','M','a','c','h','i','n','e','N','a','m','e','E','n','g','l','i','s','h',0}; HRESULT hr; MEMORYSTATUSEX msex; OSVERSIONINFOW info; - WCHAR buffer[MAX_PATH]; + DWORD count; + WCHAR buffer[MAX_PATH], computer_name[MAX_COMPUTERNAME_LENGTH + 1]; hr = add_ui4_property(node, dwDirectXVersionMajor, 9); if (FAILED(hr)) @@ -440,6 +443,18 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) if (FAILED(hr)) return hr; + count = sizeof(computer_name)/sizeof(WCHAR); + if (!GetComputerNameW(computer_name, &count)) + return E_FAIL; + + hr = add_bstr_property(node, szMachineNameLocalized, computer_name); + if (FAILED(hr)) + return hr; + + hr = add_bstr_property(node, szMachineNameEnglish, computer_name); + if (FAILED(hr)) + return hr; + return S_OK; }

1 0

Alexandre Julliard : gdi32: Use the hdc from the generic physdev structure in metafiles.
by Alexandre Julliard April 4, 2011

April 4, 2011

Module: wine Branch: master Commit: edb68487f417281866519587635f06bd9dac67b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edb68487f4172818665195876… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 4 12:27:02 2011 +0200 gdi32: Use the hdc from the generic physdev structure in metafiles. --- dlls/gdi32/mfdrv/init.c | 11 +++++------ dlls/gdi32/mfdrv/metafiledrv.h | 1 - dlls/gdi32/mfdrv/objects.c | 14 +++++--------- dlls/gdi32/mfdrv/text.c | 3 +-- 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index cee4534..cba26eb 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -181,7 +181,6 @@ static DC *MFDRV_AllocMetaFile(void) } push_dc_driver( dc, &physDev->dev, &MFDRV_Funcs ); - physDev->hdc = dc->hSelf; physDev->handles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, HANDLE_LIST_INC * sizeof(physDev->handles[0])); physDev->handles_size = HANDLE_LIST_INC; @@ -196,7 +195,7 @@ static DC *MFDRV_AllocMetaFile(void) physDev->mh->mtMaxRecord = 0; physDev->mh->mtNoParameters = 0; - SetVirtualResolution(dc->hSelf, 0, 0, 0, 0); + SetVirtualResolution( physDev->dev.hdc, 0, 0, 0, 0); return dc; } @@ -213,7 +212,7 @@ static BOOL CDECL MFDRV_DeleteDC( PHYSDEV dev ) HeapFree( GetProcessHeap(), 0, physDev->mh ); for(index = 0; index < physDev->handles_size; index++) if(physDev->handles[index]) - GDI_hdc_not_using_object(physDev->handles[index], physDev->hdc); + GDI_hdc_not_using_object(physDev->handles[index], dev->hdc); HeapFree( GetProcessHeap(), 0, physDev->handles ); HeapFree( GetProcessHeap(), 0, physDev ); return TRUE; @@ -265,8 +264,8 @@ HDC WINAPI CreateMetaFileW( LPCWSTR filename ) else /* memory based metafile */ physDev->mh->mtType = METAFILE_MEMORY; - TRACE("returning %p\n", dc->hSelf); - ret = dc->hSelf; + TRACE("returning %p\n", physDev->dev.hdc); + ret = physDev->dev.hdc; release_dc_ptr( dc ); return ret; } @@ -314,7 +313,7 @@ static DC *MFDRV_CloseMetaFile( HDC hdc ) } if (dc->refcount != 1) { - FIXME( "not deleting busy DC %p refcount %u\n", dc->hSelf, dc->refcount ); + FIXME( "not deleting busy DC %p refcount %u\n", hdc, dc->refcount ); release_dc_ptr( dc ); return NULL; } diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 7c15813..296cb47 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -33,7 +33,6 @@ typedef struct { struct gdi_physdev dev; - HDC hdc; METAHEADER *mh; /* Pointer to metafile header */ UINT handles_size, cur_handles; HGDIOBJ *handles; diff --git a/dlls/gdi32/mfdrv/objects.c b/dlls/gdi32/mfdrv/objects.c index c4b1602..eea4689 100644 --- a/dlls/gdi32/mfdrv/objects.c +++ b/dlls/gdi32/mfdrv/objects.c @@ -214,7 +214,6 @@ INT16 MFDRV_CreateBrushIndirect(PHYSDEV dev, HBRUSH hBrush ) DWORD size; METARECORD *mr; LOGBRUSH logbrush; - METAFILEDRV_PDEVICE *physDev = (METAFILEDRV_PDEVICE *)dev; BOOL r; if (!GetObjectA( hBrush, sizeof(logbrush), &logbrush )) return -1; @@ -282,12 +281,12 @@ INT16 MFDRV_CreateBrushIndirect(PHYSDEV dev, HBRUSH hBrush ) MFDRV_Reverse((LPBYTE)info + sizeof(BITMAPINFO) + sizeof(RGBQUAD), bm.bmWidth, bm.bmHeight); - cref = GetTextColor(physDev->hdc); + cref = GetTextColor( dev->hdc ); info->bmiColors[0].rgbRed = GetRValue(cref); info->bmiColors[0].rgbGreen = GetGValue(cref); info->bmiColors[0].rgbBlue = GetBValue(cref); info->bmiColors[0].rgbReserved = 0; - cref = GetBkColor(physDev->hdc); + cref = GetBkColor( dev->hdc ); info->bmiColors[1].rgbRed = GetRValue(cref); info->bmiColors[1].rgbGreen = GetGValue(cref); info->bmiColors[1].rgbBlue = GetBValue(cref); @@ -341,7 +340,6 @@ done: */ HBRUSH CDECL MFDRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) { - METAFILEDRV_PDEVICE *physDev = (METAFILEDRV_PDEVICE *)dev; INT16 index; index = MFDRV_FindObject(dev, hbrush); @@ -350,7 +348,7 @@ HBRUSH CDECL MFDRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) index = MFDRV_CreateBrushIndirect( dev, hbrush ); if( index < 0 ) return 0; - GDI_hdc_using_object(hbrush, physDev->hdc); + GDI_hdc_using_object(hbrush, dev->hdc); } return MFDRV_SelectObject( dev, index ) ? hbrush : HGDI_ERROR; } @@ -398,7 +396,6 @@ static UINT16 MFDRV_CreateFontIndirect(PHYSDEV dev, HFONT hFont, LOGFONTW *logfo */ HFONT CDECL MFDRV_SelectFont( PHYSDEV dev, HFONT hfont, HANDLE gdiFont ) { - METAFILEDRV_PDEVICE *physDev = (METAFILEDRV_PDEVICE *)dev; LOGFONTW font; INT16 index; @@ -410,7 +407,7 @@ HFONT CDECL MFDRV_SelectFont( PHYSDEV dev, HFONT hfont, HANDLE gdiFont ) index = MFDRV_CreateFontIndirect(dev, hfont, &font); if( index < 0 ) return HGDI_ERROR; - GDI_hdc_using_object(hfont, physDev->hdc); + GDI_hdc_using_object(hfont, dev->hdc); } return MFDRV_SelectObject( dev, index ) ? hfont : HGDI_ERROR; } @@ -437,7 +434,6 @@ static UINT16 MFDRV_CreatePenIndirect(PHYSDEV dev, HPEN hPen, LOGPEN16 *logpen) */ HPEN CDECL MFDRV_SelectPen( PHYSDEV dev, HPEN hpen ) { - METAFILEDRV_PDEVICE *physDev = (METAFILEDRV_PDEVICE *)dev; LOGPEN16 logpen; INT16 index; @@ -476,7 +472,7 @@ HPEN CDECL MFDRV_SelectPen( PHYSDEV dev, HPEN hpen ) index = MFDRV_CreatePenIndirect( dev, hpen, &logpen ); if( index < 0 ) return 0; - GDI_hdc_using_object(hpen, physDev->hdc); + GDI_hdc_using_object(hpen, dev->hdc); } return MFDRV_SelectObject( dev, index ) ? hpen : HGDI_ERROR; } diff --git a/dlls/gdi32/mfdrv/text.c b/dlls/gdi32/mfdrv/text.c index 3ec3703..5722211 100644 --- a/dlls/gdi32/mfdrv/text.c +++ b/dlls/gdi32/mfdrv/text.c @@ -84,8 +84,7 @@ MFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, LPSTR ascii; DWORD len; CHARSETINFO csi; - METAFILEDRV_PDEVICE *physDev = (METAFILEDRV_PDEVICE *)dev; - int charset = GetTextCharset(physDev->hdc); + int charset = GetTextCharset( dev->hdc ); UINT cp = CP_ACP; if(TranslateCharsetInfo(ULongToPtr(charset), &csi, TCI_SRCCHARSET))

1 0

Owen Rudge : advapi32: Add basic SaferSetLevelInformation stub.
by Alexandre Julliard April 4, 2011

April 4, 2011

Module: wine Branch: master Commit: 65ba77bd5c16c5d8a02e7c70ccf5ed1d7918a41a URL: http://source.winehq.org/git/wine.git/?a=commit;h=65ba77bd5c16c5d8a02e7c70c… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Fri Apr 1 17:29:24 2011 +0100 advapi32: Add basic SaferSetLevelInformation stub. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 10 ++++++++++ include/winsafer.h | 20 ++++++++++++++++++++ 3 files changed, 31 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 683e7ab..9bb202d 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -550,7 +550,7 @@ @ stdcall SaferGetPolicyInformation(long long long ptr ptr ptr) # @ stub SaferIdentifyLevel # @ stub SaferRecordEventLogEntry -# @ stub SaferSetLevelInformation +@ stdcall SaferSetLevelInformation(ptr long ptr long) # @ stub SaferSetPolicyInformation # @ stub SaferiChangeRegistryScope # @ stub SaferiCompareTokenLevels diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index cd76fb5..2dcb8fa 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -5619,3 +5619,13 @@ BOOL WINAPI SaferGetPolicyInformation(DWORD scope, SAFER_POLICY_INFO_CLASS class FIXME("(%u %u %u %p %p %p) stub\n", scope, class, size, buffer, required, lpReserved); return FALSE; } + +/****************************************************************************** + * SaferSetLevelInformation [ADVAPI32.@] + */ +BOOL WINAPI SaferSetLevelInformation(SAFER_LEVEL_HANDLE handle, SAFER_OBJECT_INFO_CLASS infotype, + LPVOID buffer, DWORD size) +{ + FIXME("(%p %u %p %u) stub\n", handle, infotype, buffer, size); + return FALSE; +} diff --git a/include/winsafer.h b/include/winsafer.h index 837a551..4855f53 100644 --- a/include/winsafer.h +++ b/include/winsafer.h @@ -51,7 +51,27 @@ typedef enum _SAFER_POLICY_INFO_CLASS { SaferPolicyScopeFlags } SAFER_POLICY_INFO_CLASS; +typedef enum _SAFER_OBJECT_INFO_CLASS { + SaferObjectLevelId = 1, + SaferObjectScopeId, + SaferObjectFriendlyName, + SaferObjectDescription, + SaferObjectBuiltin, + SaferObjectDisallowed, + SaferObjectDisableMaxPrivilege, + SaferObjectInvertDeletedPrivileges, + SaferObjectDeletedPrivileges, + SaferObjectDefaultOwner, + SaferObjectSidsToDisable, + SaferObjectRestrictedSidsInverted, + SaferObjectRestrictedSidsAdded, + SaferObjectAllIdentificationGuids, + SaferObjectSingleIdentification, + SaferObjectExtendedError +} SAFER_OBJECT_INFO_CLASS; + WINADVAPI BOOL WINAPI SaferGetPolicyInformation(DWORD,SAFER_POLICY_INFO_CLASS,DWORD,PVOID,PDWORD,LPVOID); +WINADVAPI BOOL WINAPI SaferSetLevelInformation(SAFER_LEVEL_HANDLE,SAFER_OBJECT_INFO_CLASS,LPVOID,DWORD); #ifdef __cplusplus }

1 0

Alexandre Julliard : gdi32: Use the hdc from the generic physdev structure in enhanced metafiles.
by Alexandre Julliard April 4, 2011

April 4, 2011

Module: wine Branch: master Commit: 71c6f4826990f6887d3b246fb3d991d20b243b49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71c6f4826990f6887d3b246fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 4 12:27:09 2011 +0200 gdi32: Use the hdc from the generic physdev structure in enhanced metafiles. --- dlls/gdi32/enhmfdrv/dc.c | 8 ++---- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/graphics.c | 38 ++++++++++++++------------------- dlls/gdi32/enhmfdrv/init.c | 15 ++++++------- dlls/gdi32/enhmfdrv/objects.c | 16 +++++++------- 5 files changed, 34 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71c6f4826990f6887d3b2…

1 0

Matteo Bruni : wined3d: Get rid of context_validate.
by Alexandre Julliard April 4, 2011

April 4, 2011

Module: wine Branch: master Commit: 77face22d5365d94b9bfe614ed202692e1523593 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77face22d5365d94b9bfe614e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 18 19:18:40 2011 +0100 wined3d: Get rid of context_validate. It should not be needed anymore, now the wined3d context is implicitly validated on GL context activation. The check itself wasn't reliable because of some threading issues and it also brought a small performance hit. --- dlls/wined3d/context.c | 28 ++++++++-------------------- dlls/wined3d/device.c | 3 +++ 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c3a6a5f..7d029db 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -800,6 +800,9 @@ static BOOL context_set_pixel_format(const struct wined3d_gl_info *gl_info, HDC static void context_update_window(struct wined3d_context *context) { + if (context->win_handle == context->swapchain->win_handle) + return; + TRACE("Updating context %p window from %p to %p.\n", context, context->win_handle, context->swapchain->win_handle); @@ -842,22 +845,6 @@ err: } /* Do not call while under the GL lock. */ -static void context_validate(struct wined3d_context *context) -{ - HWND wnd = WindowFromDC(context->hdc); - - if (wnd != context->win_handle) - { - WARN("DC %p belongs to window %p instead of %p.\n", - context->hdc, wnd, context->win_handle); - context->valid = 0; - } - - if (context->win_handle != context->swapchain->win_handle) - context_update_window(context); -} - -/* Do not call while under the GL lock. */ static void context_destroy_gl_resources(struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; @@ -871,8 +858,9 @@ static void context_destroy_gl_resources(struct wined3d_context *context) restore_ctx = pwglGetCurrentContext(); restore_dc = pwglGetCurrentDC(); - context_validate(context); - if (context->valid && restore_ctx != context->glCtx) pwglMakeCurrent(context->hdc, context->glCtx); + context_update_window(context); + if (context->valid && restore_ctx != context->glCtx) + context->valid = !!pwglMakeCurrent(context->hdc, context->glCtx); else restore_ctx = NULL; ENTER_GL(); @@ -1900,7 +1888,7 @@ static struct wined3d_context *FindContext(IWineD3DDeviceImpl *This, IWineD3DSur if (current_context && current_context->current_rt == target) { - context_validate(current_context); + context_update_window(current_context); return current_context; } @@ -1922,7 +1910,7 @@ static struct wined3d_context *FindContext(IWineD3DDeviceImpl *This, IWineD3DSur context = swapchain_get_context(This->swapchains[0]); } - context_validate(context); + context_update_window(context); return context; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1ef9c62..2d50caa 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2123,6 +2123,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, if(!This->d3d_initialized) return WINED3DERR_INVALIDCALL; + /* Force making the context current again, to verify it is still valid + * (workaround for broken drivers) */ + context_set_current(NULL); /* I don't think that the interface guarantees that the device is destroyed from the same thread * it was created. Thus make sure a context is active for the glDelete* calls */

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard April 4, 2011

April 4, 2011

Module: wine Branch: master Commit: c6b810947a584d079a52c8ad5c2def1bde8e4ea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6b810947a584d079a52c8ad5… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Fri Apr 1 18:46:37 2011 +0300 po: Update Lithuanian translation. --- po/lt.po | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/po/lt.po b/po/lt.po index 79ca7f0..04e5265 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-03-18 12:34+0300\n" +"PO-Revision-Date: 2011-04-01 18:46+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -9208,9 +9208,8 @@ msgid "&Multi String Value" msgstr "&Kelių eilučių reikšmė" #: regedit.rc:52 regedit.rc:104 -#, fuzzy msgid "&Expandable String Value" -msgstr "&Eilutės reikšmė" +msgstr "&Išskleidžiama eilutės reikšmė" #: regedit.rc:56 regedit.rc:108 msgid "&Rename\tF2"

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard April 4, 2011

April 4, 2011

Module: wine Branch: master Commit: 1beb6e163654649cb0a62bd33c0df47570f301c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1beb6e163654649cb0a62bd33… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sat Apr 2 17:25:34 2011 +0900 po: Update Korean translation. --- po/ko.po | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/po/ko.po b/po/ko.po index 591f8d6..ec23a19 100644 --- a/po/ko.po +++ b/po/ko.po @@ -9155,9 +9155,8 @@ msgid "&Multi String Value" msgstr "다중 문자열 값(&M)" #: regedit.rc:52 regedit.rc:104 -#, fuzzy msgid "&Expandable String Value" -msgstr "문자열 값(&S)" +msgstr "확장가능한 문자열 값(&E)" #: regedit.rc:56 regedit.rc:108 msgid "&Rename\tF2"

1 0

Henri Verbeet : wined3d: Introduce a helper function for translating blend operations.
by Alexandre Julliard April 4, 2011

April 4, 2011

Module: wine Branch: master Commit: ae58e47ca09ee2e38986731762d1917910d9a350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae58e47ca09ee2e3898673176… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 3 23:35:33 2011 +0200 wined3d: Introduce a helper function for translating blend operations. --- dlls/wined3d/state.c | 47 +++++++++++++++++++++++------------------------ 1 files changed, 23 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 85e61de..6ef28c7 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -8,7 +8,7 @@ * Copyright 2005 Oliver Stieber * Copyright 2006 Henri Verbeet * Copyright 2006-2008 Stefan Dösinger for CodeWeavers - * Copyright 2009-2010 Henri Verbeet for CodeWeavers + * Copyright 2009-2011 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -634,6 +634,26 @@ static void state_blendop_w(DWORD state, struct wined3d_stateblock *stateblock, WARN("Unsupported in local OpenGL implementation: glBlendEquation\n"); } +static GLenum gl_blend_op(WINED3DBLENDOP op) +{ + switch (op) + { + case WINED3DBLENDOP_ADD: + return GL_FUNC_ADD_EXT; + case WINED3DBLENDOP_SUBTRACT: + return GL_FUNC_SUBTRACT_EXT; + case WINED3DBLENDOP_REVSUBTRACT: + return GL_FUNC_REVERSE_SUBTRACT_EXT; + case WINED3DBLENDOP_MIN: + return GL_MIN_EXT; + case WINED3DBLENDOP_MAX: + return GL_MAX_EXT; + default: + FIXME("Unhandled blend op %#x.\n", op); + return GL_NONE; + } +} + static void state_blendop(DWORD state, struct wined3d_stateblock *stateblock, struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; @@ -648,29 +668,8 @@ static void state_blendop(DWORD state, struct wined3d_stateblock *stateblock, st return; } - switch (stateblock->state.render_states[WINED3DRS_BLENDOP]) - { - case WINED3DBLENDOP_ADD: blendEquation = GL_FUNC_ADD_EXT; break; - case WINED3DBLENDOP_SUBTRACT: blendEquation = GL_FUNC_SUBTRACT_EXT; break; - case WINED3DBLENDOP_REVSUBTRACT: blendEquation = GL_FUNC_REVERSE_SUBTRACT_EXT; break; - case WINED3DBLENDOP_MIN: blendEquation = GL_MIN_EXT; break; - case WINED3DBLENDOP_MAX: blendEquation = GL_MAX_EXT; break; - default: - FIXME("Unrecognized/Unhandled D3DBLENDOP value %#x.\n", - stateblock->state.render_states[WINED3DRS_BLENDOP]); - } - - switch (stateblock->state.render_states[WINED3DRS_BLENDOPALPHA]) - { - case WINED3DBLENDOP_ADD: blendEquationAlpha = GL_FUNC_ADD_EXT; break; - case WINED3DBLENDOP_SUBTRACT: blendEquationAlpha = GL_FUNC_SUBTRACT_EXT; break; - case WINED3DBLENDOP_REVSUBTRACT: blendEquationAlpha = GL_FUNC_REVERSE_SUBTRACT_EXT; break; - case WINED3DBLENDOP_MIN: blendEquationAlpha = GL_MIN_EXT; break; - case WINED3DBLENDOP_MAX: blendEquationAlpha = GL_MAX_EXT; break; - default: - FIXME("Unrecognized/Unhandled D3DBLENDOP value %#x\n", - stateblock->state.render_states[WINED3DRS_BLENDOPALPHA]); - } + blendEquation = gl_blend_op(stateblock->state.render_states[WINED3DRS_BLENDOP]); + blendEquationAlpha = gl_blend_op(stateblock->state.render_states[WINED3DRS_BLENDOPALPHA]); if (stateblock->state.render_states[WINED3DRS_SEPARATEALPHABLENDENABLE]) {

1 0

Henri Verbeet : wined3d: Fix ARB_0001 with pixel shaders in arb_get_helper_value().
by Alexandre Julliard April 4, 2011

April 4, 2011

Module: wine Branch: master Commit: 6aa02f11ea8651f5593fd237859deeccad1c99ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aa02f11ea8651f5593fd2378… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 3 23:35:32 2011 +0200 wined3d: Fix ARB_0001 with pixel shaders in arb_get_helper_value(). --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a8c3e2e..45e5ab1 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -104,7 +104,7 @@ static const char *arb_get_helper_value(enum wined3d_shader_type shader, enum ar case ARB_ZERO: return "ps_helper_const.x"; case ARB_ONE: return "ps_helper_const.y"; case ARB_TWO: return "coefmul.x"; - case ARB_0001: return "helper_const.xxxy"; + case ARB_0001: return "ps_helper_const.xxxy"; case ARB_EPS: return "ps_helper_const.z"; default: break; }

1 0

Jacek Caban : wininet: Added more tests.
by Alexandre Julliard April 4, 2011

April 4, 2011

Module: wine Branch: master Commit: 7611d1073233d2e529d5558ce7b2dc2877bd82ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=7611d1073233d2e529d5558ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Apr 2 15:20:53 2011 +0200 wininet: Added more tests. --- dlls/wininet/tests/http.c | 42 +++++++++++++++++++++++++++++++----------- 1 files changed, 31 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 477ae56..c8ac617 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -107,6 +107,7 @@ static HANDLE hCompleteEvent; #define TESTF_REDIRECT 0x01 #define TESTF_COMPRESSED 0x02 #define TESTF_ALLOW_COOKIE 0x04 +#define TESTF_CHUNKED 0x08 typedef struct { const char *url; @@ -121,6 +122,14 @@ typedef struct { static const test_data_t test_data[] = { { + "http://test.winehq.org/tests/data.php", + "http://test.winehq.org/tests/data.php", + "test.winehq.org", + "/tests/data.php", + "", + TESTF_CHUNKED + }, + { "http://test.winehq.org/tests/redirect", "http://test.winehq.org/tests/hello.html", "test.winehq.org", @@ -303,7 +312,7 @@ static VOID WINAPI callback( static void InternetReadFile_test(int flags, const test_data_t *test) { char *post_data = NULL; - BOOL res; + BOOL res, on_async = TRUE; CHAR buffer[4000]; DWORD length, post_len = 0; DWORD out; @@ -521,9 +530,6 @@ static void InternetReadFile_test(int flags, const test_data_t *test) if (flags & INTERNET_FLAG_ASYNC) SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); res = InternetQueryDataAvailable(hor,&length,0x0,0x0); - ok(!(!res && length != 0),"InternetQueryDataAvailable failed with non-zero length\n"); - ok(res || ((flags & INTERNET_FLAG_ASYNC) && GetLastError() == ERROR_IO_PENDING), - "InternetQueryDataAvailable failed, error %d\n", GetLastError()); if (flags & INTERNET_FLAG_ASYNC) { if (res) @@ -532,11 +538,22 @@ static void InternetReadFile_test(int flags, const test_data_t *test) } else if (GetLastError() == ERROR_IO_PENDING) { + trace("PENDING\n"); + /* on some tests, InternetQueryDataAvailable returns non-zero length and ERROR_IO_PENDING */ + if(!(test->flags & TESTF_CHUNKED)) + ok(!length, "InternetQueryDataAvailable returned ERROR_IO_PENDING and %u length\n", length); WaitForSingleObject(hCompleteEvent, INFINITE); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); continue; + }else { + ok(0, "InternetQueryDataAvailable failed: %u\n", GetLastError()); } + }else { + ok(res, "InternetQueryDataAvailable failed: %u\n", GetLastError()); } + trace("LENGTH %d\n", length); + if(test->flags & TESTF_CHUNKED) + ok(length <= 8192, "length = %d, expected <= 8192\n", length); if (length) { char *buffer; @@ -551,9 +568,11 @@ static void InternetReadFile_test(int flags, const test_data_t *test) if(test->content) ok(!strcmp(buffer, test->content), "buffer = '%s', expected '%s'\n", buffer, test->content); HeapFree(GetProcessHeap(),0,buffer); - } - if (length == 0) + }else { + ok(!on_async, "Returned zero size in response to request complete\n"); break; + } + on_async = FALSE; } if(test->flags & TESTF_REDIRECT) { CHECK_NOTIFIED2(INTERNET_STATUS_CLOSING_CONNECTION, 2); @@ -1851,7 +1870,7 @@ static void test_basic_request(int port, const char *verb, const char *url) r = InternetReadFile(hr, buffer, sizeof buffer, &count); ok(r, "InternetReadFile failed %u\n", GetLastError()); ok(count == sizeof page1 - 1, "count was wrong\n"); - ok(!memcmp(buffer, page1, sizeof page1), "http data wrong\n"); + ok(!memcmp(buffer, page1, sizeof page1), "http data wrong, got: %s\n", buffer); InternetCloseHandle(hr); InternetCloseHandle(hc); @@ -3387,12 +3406,13 @@ START_TEST(http) pInternetSetStatusCallbackA = (void*)GetProcAddress(hdll, "InternetSetStatusCallbackA"); init_status_tests(); - test_InternetCloseHandle(); + if(0)test_InternetCloseHandle(); InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[0]); - InternetReadFile_test(0, &test_data[0]); - first_connection_to_test_url = TRUE; InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[1]); InternetReadFile_test(0, &test_data[1]); + first_connection_to_test_url = TRUE; + InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[2]); + InternetReadFile_test(0, &test_data[2]); InternetReadFileExA_test(INTERNET_FLAG_ASYNC); test_open_url_async(); test_async_HttpSendRequestEx(); @@ -3406,5 +3426,5 @@ START_TEST(http) test_bogus_accept_types_array(); InternetReadFile_chunked_test(); HttpSendRequestEx_test(); - InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[2]); + InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[3]); }

1 0