August 2016 - Wine-Commits - list.winehq.org

Michael Stefaniuc : ole32/tests: Use todo_wine_if().
by Alexandre Julliard Aug. 10, 2016

Aug. 10, 2016

Module: wine Branch: master Commit: b6a505f9a57c5077bd1805746e9e5800b4c0bb56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6a505f9a57c5077bd1805746… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 9 22:34:25 2016 +0200 ole32/tests: Use todo_wine_if(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/propvariant.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index 0786a8e..ade45fb 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -166,16 +166,7 @@ static void expect(HRESULT hr, VARTYPE vt, BOOL copy, int line) } else if(flags == PROP_V0) ok(hr == S_OK, "%s (%s): got %08x\n", wine_vtypes[idx], modifier, hr); - else if(flags & PROP_TODO) - { - todo_wine - { - if(hr != S_OK) - win_skip("%s (%s): unsupported\n", wine_vtypes[idx], modifier); - else ok(hr == S_OK, "%s (%s): got %08x\n", wine_vtypes[idx], modifier, hr); - } - } - else + else todo_wine_if(flags & PROP_TODO) { if(hr != S_OK) win_skip("%s (%s): unsupported\n", wine_vtypes[idx], modifier);

1 0

Michael Stefaniuc : kernel32/tests: Remove an identical if / else branch.
by Alexandre Julliard Aug. 10, 2016

Aug. 10, 2016

Module: wine Branch: master Commit: 85dea19312eef9c1c659d95b81e16d186ff56b01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85dea19312eef9c1c659d95b8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 9 22:30:22 2016 +0200 kernel32/tests: Remove an identical if / else branch. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 836d7ec..6520513 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -187,15 +187,8 @@ static void test_ValidPathA(const CHAR *curdir, const CHAR *subdir, const CHAR * len=pGetLongPathNameA(fullpath,tmpstr,MAX_PATH); if(passfail==NULL) { ok(len, "%s: GetLongPathNameA failed\n",errstr); - if(HAS_TRAIL_SLASH_A(fullpath)) { - ok(lstrcmpiA(fullpathlong,tmpstr)==0, - "%s: GetLongPathNameA returned '%s' instead of '%s'\n", - errstr,tmpstr,fullpathlong); - } else { - ok(lstrcmpiA(fullpathlong,tmpstr)==0, - "%s: GetLongPathNameA returned '%s' instead of '%s'\n", - errstr,tmpstr,fullpathlong); - } + ok(!lstrcmpiA(fullpathlong, tmpstr), "%s: GetLongPathNameA returned '%s' instead of '%s'\n", + errstr, tmpstr, fullpathlong); } else { passfail->longlen=len; passfail->longerror=GetLastError();

1 0

Nikolay Sivov : wshom.ocx/tests: Fix indentation warning on GCC 6.
by Alexandre Julliard Aug. 10, 2016

Aug. 10, 2016

Module: wine Branch: master Commit: b00d68a1946d41b7d276d8ba917183d90b0d47a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b00d68a1946d41b7d276d8ba9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 9 20:07:42 2016 +0300 wshom.ocx/tests: Fix indentation warning on GCC 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wshom.ocx/tests/wshom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index a3d398e..61df0c1 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -213,8 +213,8 @@ static void test_wshshell(void) SysFreeString(str); /* current directory */ -if (0) /* crashes on native */ - hr = IWshShell3_get_CurrentDirectory(sh3, NULL); + if (0) /* crashes on native */ + hr = IWshShell3_get_CurrentDirectory(sh3, NULL); str = NULL; hr = IWshShell3_get_CurrentDirectory(sh3, &str);

1 0

Michael Stefaniuc : kernel32/tests: Use todo_wine_if().
by Alexandre Julliard Aug. 10, 2016

Aug. 10, 2016

Module: wine Branch: master Commit: 3e6b503adb51ff854bfe942caf5297c4cb730612 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e6b503adb51ff854bfe942ca… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 9 22:27:03 2016 +0200 kernel32/tests: Use todo_wine_if(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index ab94c01..5327865 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4358,17 +4358,10 @@ static void test_file_access(void) else { /* FIXME: Remove once Wine is fixed */ - if ((td[j].access & (GENERIC_READ | GENERIC_WRITE)) || - (!(td[i].access & (GENERIC_WRITE | FILE_WRITE_DATA)) && (td[j].access & FILE_WRITE_DATA)) || - (!(td[i].access & (GENERIC_READ | FILE_READ_DATA)) && (td[j].access & FILE_READ_DATA)) || - (!(td[i].access & (GENERIC_WRITE)) && (td[j].access & FILE_APPEND_DATA))) - { -todo_wine - ok(!ret, "DuplicateHandle(%#x => %#x) should fail\n", td[i].access, td[j].access); -todo_wine - ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); - } - else + todo_wine_if((td[j].access & (GENERIC_READ | GENERIC_WRITE) || + (!(td[i].access & (GENERIC_WRITE | FILE_WRITE_DATA)) && (td[j].access & FILE_WRITE_DATA)) || + (!(td[i].access & (GENERIC_READ | FILE_READ_DATA)) && (td[j].access & FILE_READ_DATA)) || + (!(td[i].access & (GENERIC_WRITE)) && (td[j].access & FILE_APPEND_DATA)))) { ok(!ret, "DuplicateHandle(%#x => %#x) should fail\n", td[i].access, td[j].access); ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError());

1 0

Nikolay Sivov : shell32/tests: Fix indentation warnings on GCC 6.
by Alexandre Julliard Aug. 10, 2016

Aug. 10, 2016

Module: wine Branch: master Commit: 27f91d71a2401781d38576d90183c26b519366e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27f91d71a2401781d38576d90… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 9 20:02:20 2016 +0300 shell32/tests: Fix indentation warnings on GCC 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/appbar.c | 4 ++-- dlls/shell32/tests/shelldispatch.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/appbar.c b/dlls/shell32/tests/appbar.c index dbac4e6..1505a40 100644 --- a/dlls/shell32/tests/appbar.c +++ b/dlls/shell32/tests/appbar.c @@ -423,8 +423,8 @@ static void test_GetCurrentProcessExplicitAppUserModelID(void) return; } -if (0) /* crashes on native */ - hr = pGetCurrentProcessExplicitAppUserModelID(NULL); + if (0) /* crashes on native */ + hr = pGetCurrentProcessExplicitAppUserModelID(NULL); appid = (void*)0xdeadbeef; hr = pGetCurrentProcessExplicitAppUserModelID(&appid); diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 70b6c36..9a47c67 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -728,9 +728,9 @@ todo_wine hr = IWebBrowser2_get_Document(wb, &doc); todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -if (hr == S_OK) +if (hr == S_OK) { test_dispatch_typeinfo(doc, viewdual_riids); - +} IWebBrowser2_Release(wb); /* IServiceProvider */

1 0

Nikolay Sivov : user32/tests: Fix indentation warnings on GCC 6.
by Alexandre Julliard Aug. 10, 2016

Aug. 10, 2016

Module: wine Branch: master Commit: 6c8887b830358dc109ea7781b2bb182c8104ce47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c8887b830358dc109ea7781b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 9 20:06:22 2016 +0300 user32/tests: Fix indentation warnings on GCC 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 6 +++--- dlls/user32/tests/menu.c | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 0d7c6d6..1813367 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -184,7 +184,7 @@ static int KbdMessage( KEV kev, WPARAM *pwParam, LPARAM *plParam ) if( TrackSysKey == VK_MENU || /* <ALT>-down/<ALT>-up sequence */ (VKey != VK_MENU)) /* <ALT>-down...<something else>-up */ message = WM_SYSKEYUP; - TrackSysKey = 0; + TrackSysKey = 0; } InputKeyStateTable[VKey] &= ~0x80; flags |= KF_REPEAT | KF_UP; @@ -1767,8 +1767,8 @@ static void test_keyboard_layout_name(void) BOOL ret; char klid[KL_NAMELENGTH]; -if (0) /* crashes on native system */ - ret = GetKeyboardLayoutNameA(NULL); + if (0) /* crashes on native system */ + ret = GetKeyboardLayoutNameA(NULL); SetLastError(0xdeadbeef); ret = GetKeyboardLayoutNameW(NULL); diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index ae7b957..a42bc1c 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -3972,13 +3972,15 @@ static void test_AppendMenu(void) mii.wID = 206; ret = InsertMenuItemA(hmenu, 0, TRUE, &mii); ok(ret, "InsertMenuItem failed\n"); -if (0) /* FIXME: uncomment once Wine is fixed */ +if (0) /* FIXME: uncomment once Wine is fixed */ { check_menu_items(hmenu, 206, MF_SEPARATOR, MFS_GRAYED); +} mii.wID = 207; ret = SetMenuItemInfoA(hmenu, 0, TRUE, &mii); ok(ret, "SetMenuItemInfo failed\n"); -if (0) /* FIXME: uncomment once Wine is fixed */ +if (0) /* FIXME: uncomment once Wine is fixed */ { check_menu_items(hmenu, 207, MF_SEPARATOR, MFS_GRAYED); +} DestroyMenu(hmenu); hbmp = CreateBitmap(1, 1, 1, 1, NULL);

1 0

Nikolay Sivov : scrrun/tests: Fix a warning on GCC 6.
by Alexandre Julliard Aug. 10, 2016

Aug. 10, 2016

Module: wine Branch: master Commit: bbb1602442c1b3789d8085c9f9853d8f7800d686 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbb1602442c1b3789d8085c9f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 9 19:59:50 2016 +0300 scrrun/tests: Fix a warning on GCC 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/tests/dictionary.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index a1b7d06..a94782f 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -101,8 +101,8 @@ static void test_comparemode(void) &IID_IDictionary, (void**)&dict); ok(hr == S_OK, "got 0x%08x\n", hr); -if (0) /* crashes on native */ - hr = IDictionary_get_CompareMode(dict, NULL); + if (0) /* crashes on native */ + hr = IDictionary_get_CompareMode(dict, NULL); method = 10; hr = IDictionary_get_CompareMode(dict, &method); @@ -933,8 +933,8 @@ static void test_IEnumVARIANT(void) &IID_IDictionary, (void**)&dict); ok(hr == S_OK, "got 0x%08x\n", hr); -if (0) /* crashes on native */ - hr = IDictionary__NewEnum(dict, NULL); + if (0) /* crashes on native */ + hr = IDictionary__NewEnum(dict, NULL); hr = IDictionary__NewEnum(dict, &enum1); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Andrew Eikum : mmdevapi: Fix some DEVPKEY definitions.
by Alexandre Julliard Aug. 9, 2016

Aug. 9, 2016

Module: wine Branch: master Commit: ba858c28fd489a812ea0f55a11680a8edaf99ce5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba858c28fd489a812ea0f55a1… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Aug 9 10:17:04 2016 -0500 mmdevapi: Fix some DEVPKEY definitions. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/devenum.c | 1 + dlls/mmdevapi/tests/propstore.c | 6 +++--- include/devpkey.h | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index b8b714c..221fb39 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -356,6 +356,7 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st pv.vt = VT_LPWSTR; pv.u.pwszVal = name; MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &pv); + MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_FriendlyName, &pv); MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_Device_DeviceDesc, &pv); pv.u.pwszVal = guidstr; diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c index 665136f..6447113 100644 --- a/dlls/mmdevapi/tests/propstore.c +++ b/dlls/mmdevapi/tests/propstore.c @@ -64,7 +64,7 @@ static void test_propertystore(IPropertyStore *store) pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_FriendlyName, &pv); ok(hr == S_OK, "Failed with %08x\n", hr); - ok(pv.vt == VT_EMPTY, "Key should not be found\n"); + ok(pv.vt == VT_LPWSTR && pv.u.pwszVal, "FriendlyName value had wrong type: 0x%x or was NULL\n", pv.vt); pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_Enabled, &pv); @@ -118,8 +118,8 @@ static void test_getat(IPropertyStore *store) if (IsEqualPropertyKey(pkey, DEVPKEY_Device_DeviceDesc)) found_desc = TRUE; } - ok(found_name || broken(!found_name), "DEVPKEY_Device_FriendlyName not found\n"); - ok(found_desc == TRUE, "DEVPKEY_Device_DeviceDesc not found\n"); + ok(found_name, "DEVPKEY_Device_FriendlyName not found\n"); + ok(found_desc, "DEVPKEY_Device_DeviceDesc not found\n"); } static void test_setvalue_on_wow64(IPropertyStore *store) diff --git a/include/devpkey.h b/include/devpkey.h index ebaabc1..648ef42 100644 --- a/include/devpkey.h +++ b/include/devpkey.h @@ -57,6 +57,6 @@ DEFINE_DEVPROPKEY(DEVPKEY_Device_InstallState, 0xa45c254e,0xdf1c,0x4efd,0x80,0x2 DEFINE_DEVPROPKEY(DEVPKEY_Device_LocationPaths, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 37); DEFINE_DEVPROPKEY(DEVPKEY_Device_BaseContainerId, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 38); -DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_FriendlyName, 0x026e516e,0x8b14,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 2); -DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_Enabled, 0x026e516e,0x8b14,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 3); -DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_ClassGuid, 0x026e516e,0x8b14,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 4); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_FriendlyName, 0x026e516e,0xb814,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 2); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_Enabled, 0x026e516e,0xb814,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 3); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_ClassGuid, 0x026e516e,0xb814,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 4);

1 0

Huw Davies : usp10: Free the final page.
by Alexandre Julliard Aug. 9, 2016

Aug. 9, 2016

Module: wine Branch: master Commit: 0dbd2e37f916d6b52eac8bad7fa529aa952a0b1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dbd2e37f916d6b52eac8bad7… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 9 15:45:24 2016 +0100 usp10: Free the final page. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 2 +- dlls/usp10/usp10_internal.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index dc1cc06..0471fc6 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1019,7 +1019,7 @@ HRESULT WINAPI ScriptFreeCache(SCRIPT_CACHE *psc) { heap_free(((ScriptCache *)*psc)->widths[i]); } - for (i = 0; i < 0x10; i++) + for (i = 0; i < NUM_PAGES; i++) { unsigned int j; if (((ScriptCache *)*psc)->page[i]) diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index c1a5ccf..1c0d1c5 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -125,6 +125,8 @@ #define GLYPH_BLOCK_MASK (GLYPH_BLOCK_SIZE - 1) #define GLYPH_MAX 65536 +#define NUM_PAGES 17 + #define GSUB_E_NOFEATURE -2 #define GSUB_E_NOGLYPH -1 @@ -169,7 +171,7 @@ typedef struct { OUTLINETEXTMETRICW *otm; SCRIPT_FONTPROPERTIES sfp; BOOL sfnt; - CacheGlyphPage *page[0x11]; + CacheGlyphPage *page[NUM_PAGES]; ABC *widths[GLYPH_MAX / GLYPH_BLOCK_SIZE]; LPVOID GSUB_Table; LPVOID GDEF_Table;

1 0

Józef Kucia : wined3d: Introduce gl_blend_from_d3d() helper function.
by Alexandre Julliard Aug. 9, 2016

Aug. 9, 2016

Module: wine Branch: master Commit: db5211d36fd4a8807ece523deb666e6bd2a0c2b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db5211d36fd4a8807ece523de… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 8 16:52:28 2016 +0200 wined3d: Introduce gl_blend_from_d3d() helper function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 83 +++++++++++++++++++++++----------------------------- 1 file changed, 37 insertions(+), 46 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 54ce2ee..630a745 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -412,12 +412,35 @@ static GLenum gl_blend_factor(enum wined3d_blend factor, const struct wined3d_fo } } +static void gl_blend_from_d3d(GLenum *src_blend, GLenum *dst_blend, + enum wined3d_blend d3d_src_blend, enum wined3d_blend d3d_dst_blend, + const struct wined3d_format *rt_format) +{ + /* WINED3D_BLEND_BOTHSRCALPHA and WINED3D_BLEND_BOTHINVSRCALPHA are legacy + * source blending values which are still valid up to d3d9. They should + * not occur as dest blend values. */ + if (d3d_src_blend == WINED3D_BLEND_BOTHSRCALPHA) + { + *src_blend = GL_SRC_ALPHA; + *dst_blend = GL_ONE_MINUS_SRC_ALPHA; + } + else if (d3d_src_blend == WINED3D_BLEND_BOTHINVSRCALPHA) + { + *src_blend = GL_ONE_MINUS_SRC_ALPHA; + *dst_blend = GL_SRC_ALPHA; + } + else + { + *src_blend = gl_blend_factor(d3d_src_blend, rt_format); + *dst_blend = gl_blend_factor(d3d_dst_blend, rt_format); + } +} + static void state_blend(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_format *rt_format; - enum wined3d_blend d3d_blend; - GLenum srcBlend, dstBlend; + GLenum src_blend, dst_blend; unsigned int rt_fmt_flags; if (!state->fb->render_targets[0]) @@ -458,34 +481,18 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st return; }; - /* WINED3D_BLEND_BOTHSRCALPHA and WINED3D_BLEND_BOTHINVSRCALPHA are legacy - * source blending values which are still valid up to d3d9. They should - * not occur as dest blend values. */ - d3d_blend = state->render_states[WINED3D_RS_SRCBLEND]; - if (d3d_blend == WINED3D_BLEND_BOTHSRCALPHA) - { - srcBlend = GL_SRC_ALPHA; - dstBlend = GL_ONE_MINUS_SRC_ALPHA; - } - else if (d3d_blend == WINED3D_BLEND_BOTHINVSRCALPHA) - { - srcBlend = GL_ONE_MINUS_SRC_ALPHA; - dstBlend = GL_SRC_ALPHA; - } - else - { - srcBlend = gl_blend_factor(d3d_blend, rt_format); - dstBlend = gl_blend_factor(state->render_states[WINED3D_RS_DESTBLEND], rt_format); - } + gl_blend_from_d3d(&src_blend, &dst_blend, + state->render_states[WINED3D_RS_SRCBLEND], + state->render_states[WINED3D_RS_DESTBLEND], rt_format); if (state->render_states[WINED3D_RS_EDGEANTIALIAS] || state->render_states[WINED3D_RS_ANTIALIASEDLINEENABLE]) { gl_info->gl_ops.gl.p_glEnable(GL_LINE_SMOOTH); checkGLcall("glEnable(GL_LINE_SMOOTH)"); - if (srcBlend != GL_SRC_ALPHA) + if (src_blend != GL_SRC_ALPHA) WARN("WINED3D_RS_EDGEANTIALIAS enabled, but unexpected src blending param.\n"); - if (dstBlend != GL_ONE_MINUS_SRC_ALPHA && dstBlend != GL_ONE) + if (dst_blend != GL_ONE_MINUS_SRC_ALPHA && dst_blend != GL_ONE) WARN("WINED3D_RS_EDGEANTIALIAS enabled, but unexpected dst blending param.\n"); } else @@ -500,7 +507,7 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st if (state->render_states[WINED3D_RS_SEPARATEALPHABLENDENABLE]) { - GLenum srcBlendAlpha, dstBlendAlpha; + GLenum src_blend_alpha, dst_blend_alpha; /* Separate alpha blending requires GL_EXT_blend_function_separate, so make sure it is around */ if (!context->gl_info->supported[EXT_BLEND_FUNC_SEPARATE]) @@ -509,33 +516,17 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st return; } - /* WINED3D_BLEND_BOTHSRCALPHA and WINED3D_BLEND_BOTHINVSRCALPHA are legacy - * source blending values which are still valid up to d3d9. They should - * not occur as dest blend values. */ - d3d_blend = state->render_states[WINED3D_RS_SRCBLENDALPHA]; - if (d3d_blend == WINED3D_BLEND_BOTHSRCALPHA) - { - srcBlendAlpha = GL_SRC_ALPHA; - dstBlendAlpha = GL_ONE_MINUS_SRC_ALPHA; - } - else if (d3d_blend == WINED3D_BLEND_BOTHINVSRCALPHA) - { - srcBlendAlpha = GL_ONE_MINUS_SRC_ALPHA; - dstBlendAlpha = GL_SRC_ALPHA; - } - else - { - srcBlendAlpha = gl_blend_factor(d3d_blend, rt_format); - dstBlendAlpha = gl_blend_factor(state->render_states[WINED3D_RS_DESTBLENDALPHA], rt_format); - } + gl_blend_from_d3d(&src_blend_alpha, &dst_blend_alpha, + state->render_states[WINED3D_RS_SRCBLENDALPHA], + state->render_states[WINED3D_RS_DESTBLENDALPHA], rt_format); - GL_EXTCALL(glBlendFuncSeparate(srcBlend, dstBlend, srcBlendAlpha, dstBlendAlpha)); + GL_EXTCALL(glBlendFuncSeparate(src_blend, dst_blend, src_blend_alpha, dst_blend_alpha)); checkGLcall("glBlendFuncSeparate"); } else { - TRACE("glBlendFunc src=%x, dst=%x\n", srcBlend, dstBlend); - gl_info->gl_ops.gl.p_glBlendFunc(srcBlend, dstBlend); + TRACE("glBlendFunc src=%x, dst=%x.\n", src_blend, dst_blend); + gl_info->gl_ops.gl.p_glBlendFunc(src_blend, dst_blend); checkGLcall("glBlendFunc"); }

1 0