May 2006 - Wine-commits - list.winehq.org

Detlef Riekenberg : Makefile.in: find needs a slash when the source dir is a symlink.
by Alexandre Julliard 24 May '06

24 May '06

Module: wine Branch: refs/heads/master Commit: 0076e33d363877679c19923ca1c0dbdc9aa5192c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0076e33d363877679c19923… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun May 21 21:54:48 2006 +0200 Makefile.in: find needs a slash when the source dir is a symlink. --- Makefile.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 2bcd50d..c1348e6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -120,10 +120,10 @@ crosstest:: $(TESTSUBDIRS:%=%/__crosstes # Misc rules TAGS etags: - find $(TOPSRCDIR) -name '*.[ch]' -print | etags - + find $(TOPSRCDIR)/ -name '*.[ch]' -print | etags - tags ctags: - find $(TOPSRCDIR) -name '*.[ch]' -print | ctags --c-types=+px -L - + find $(TOPSRCDIR)/ -name '*.[ch]' -print | ctags --c-types=+px -L - manpages htmlpages sgmlpages: cd documentation && $(MAKE) $@

1 0

Alexandre Julliard : libwine_unicode: Define all functions in the library even if they can be inlined.
by Alexandre Julliard 24 May '06

24 May '06

Module: wine Branch: refs/heads/master Commit: a92db320de2a030b055ef88a589ce5368a34e67d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a92db320de2a030b055ef88… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 24 14:00:47 2006 +0200 libwine_unicode: Define all functions in the library even if they can be inlined. --- include/wine/unicode.h | 62 +++++++------- libs/unicode/string.c | 185 +++++++++++++++++++++++++++++++++++++++++ libs/unicode/wine_unicode.def | 31 +++++++ libs/unicode/wine_unicode.map | 31 +++++++ 4 files changed, 278 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=a92db320de2a030b055…

1 0

Alexandre Julliard : libwine_unicode: Renamed is_dbcs_leadbyte to wine_is_dbcs_leadbyte.
by Alexandre Julliard 24 May '06

24 May '06

Module: wine Branch: refs/heads/master Commit: f01d9879c64f7dedf2d25badfef407a280946643 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f01d9879c64f7dedf2d25ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 24 14:14:09 2006 +0200 libwine_unicode: Renamed is_dbcs_leadbyte to wine_is_dbcs_leadbyte. --- dlls/kernel/locale.c | 4 ++-- dlls/ntdll/rtlstr.c | 2 +- include/wine/unicode.h | 2 +- libs/unicode/string.c | 2 +- libs/unicode/wine_unicode.def | 2 +- libs/unicode/wine_unicode.map | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/kernel/locale.c b/dlls/kernel/locale.c index ebeeee2..29064b7 100644 --- a/dlls/kernel/locale.c +++ b/dlls/kernel/locale.c @@ -1279,7 +1279,7 @@ BOOL WINAPI IsValidCodePage( UINT codepa BOOL WINAPI IsDBCSLeadByteEx( UINT codepage, BYTE testchar ) { const union cptable *table = get_codepage_table( codepage ); - return table && is_dbcs_leadbyte( table, testchar ); + return table && wine_is_dbcs_leadbyte( table, testchar ); } @@ -1299,7 +1299,7 @@ BOOL WINAPI IsDBCSLeadByteEx( UINT codep BOOL WINAPI IsDBCSLeadByte( BYTE testchar ) { if (!ansi_cptable) return FALSE; - return is_dbcs_leadbyte( ansi_cptable, testchar ); + return wine_is_dbcs_leadbyte( ansi_cptable, testchar ); } diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index 468ac31..8e997e7 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -638,7 +638,7 @@ WCHAR WINAPI RtlAnsiCharToUnicodeChar(LP WCHAR str; DWORD charSize = sizeof(CHAR); - if (is_dbcs_leadbyte(ansi_table, **ansi)) + if (wine_is_dbcs_leadbyte(ansi_table, **ansi)) charSize++; RtlMultiByteToUnicodeN(&str, sizeof(WCHAR), NULL, *ansi, charSize); diff --git a/include/wine/unicode.h b/include/wine/unicode.h index 88e93b2..34ae52b 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -95,7 +95,7 @@ extern int snprintfW( WCHAR *str, size_t extern int vsprintfW( WCHAR *str, const WCHAR *format, va_list valist ); extern int vsnprintfW( WCHAR *str, size_t len, const WCHAR *format, va_list valist ); -extern inline int is_dbcs_leadbyte( const union cptable *table, unsigned char ch ) +extern inline int wine_is_dbcs_leadbyte( const union cptable *table, unsigned char ch ) { return (table->info.char_size == 2) && (table->dbcs.cp2uni_leadbytes[ch]); } diff --git a/libs/unicode/string.c b/libs/unicode/string.c index 7d88586..860e09d 100644 --- a/libs/unicode/string.c +++ b/libs/unicode/string.c @@ -27,7 +27,7 @@ extern const WCHAR wine_casemap_lower[]; extern const WCHAR wine_casemap_upper[]; extern const unsigned short wine_wctype_table[]; -int is_dbcs_leadbyte( const union cptable *table, unsigned char ch ) +int wine_is_dbcs_leadbyte( const union cptable *table, unsigned char ch ) { return (table->info.char_size == 2) && (table->dbcs.cp2uni_leadbytes[ch]); } diff --git a/libs/unicode/wine_unicode.def b/libs/unicode/wine_unicode.def index d892629..e582d88 100644 --- a/libs/unicode/wine_unicode.def +++ b/libs/unicode/wine_unicode.def @@ -4,7 +4,6 @@ EXPORTS atoiW atolW get_char_typeW - is_dbcs_leadbyte isalnumW isalphaW iscntrlW @@ -53,6 +52,7 @@ EXPORTS wine_cpsymbol_wcstombs wine_fold_string wine_get_sortkey + wine_is_dbcs_leadbyte wine_utf8_mbstowcs wine_utf8_wcstombs wine_wctype_table diff --git a/libs/unicode/wine_unicode.map b/libs/unicode/wine_unicode.map index 30e3086..7d98e64 100644 --- a/libs/unicode/wine_unicode.map +++ b/libs/unicode/wine_unicode.map @@ -4,7 +4,6 @@ WINE_1.0 atoiW; atolW; get_char_typeW; - is_dbcs_leadbyte; isalnumW; isalphaW; iscntrlW; @@ -53,6 +52,7 @@ WINE_1.0 wine_cpsymbol_wcstombs; wine_fold_string; wine_get_sortkey; + wine_is_dbcs_leadbyte; wine_utf8_mbstowcs; wine_utf8_wcstombs; wine_wctype_table;

1 0

Hwang YunSong : gphoto2.ds: Added Korean resources.
by Alexandre Julliard 24 May '06

24 May '06

Module: wine Branch: refs/heads/master Commit: 65d43a6770093c94e0e975a0d64b8ce5ac7bba3a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=65d43a6770093c94e0e975a… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon May 22 10:45:49 2006 +0900 gphoto2.ds: Added Korean resources. --- dlls/gphoto2.ds/gphoto2_Ko.rc | 54 +++++++++++++++++++++++++++++++++++++++++ dlls/gphoto2.ds/rsrc.rc | 1 + 2 files changed, 55 insertions(+), 0 deletions(-) create mode 100644 dlls/gphoto2.ds/gphoto2_Ko.rc diff --git a/dlls/gphoto2.ds/gphoto2_Ko.rc b/dlls/gphoto2.ds/gphoto2_Ko.rc new file mode 100644 index 0000000..5262662 --- /dev/null +++ b/dlls/gphoto2.ds/gphoto2_Ko.rc @@ -0,0 +1,54 @@ +/* + * Korean resources for Twain + * + * Copyright 2006 CodeWeavers, Aric Stewart + * Copyright 2006 YunSong Hwang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 +STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | + WS_CAPTION | WS_SYSMENU +CAPTION "ī�޶�� ʸ�" +MENU 20545 +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | +WS_TABSTOP,7,7,358,229 + DEFPUSHBUTTON "��õ� �� ҷ��",IDC_IMPORT,225,252,56,14 + PUSHBUTTON "�� ҷ��",IDC_IMPORTALL,7,252,52,14 + PUSHBUTTON "��",IDC_EXIT,295,252,50,14 +END + +IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "�ű�� " +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "�ű�� ....��ø� ��ٸ��ʽÿ�",IDC_STATIC,53,19,85,8 +END + +IDD_CONNECTING DIALOG DISCARDABLE 0, 0, 280, 116 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU| WS_VISIBLE | DS_CENTER +CAPTION "ī�޶��ϰ� ��" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "",IDC_BITMAP,"Static",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110 + LTEXT "ī�޶��ϰ� ��... ��ø� ��ٸ��ʽÿ�",IDC_STATIC,128,58, + 116,8 +END diff --git a/dlls/gphoto2.ds/rsrc.rc b/dlls/gphoto2.ds/rsrc.rc index d9ad0ec..0c06494 100644 --- a/dlls/gphoto2.ds/rsrc.rc +++ b/dlls/gphoto2.ds/rsrc.rc @@ -29,3 +29,4 @@ #include "resource.h" #include "gphoto2_En.rc" #include "gphoto2_Fr.rc" #include "gphoto2_Nl.rc" +#include "gphoto2_Ko.rc"

1 0

Stefan Dösinger : wined3d: Swapchain and back buffer corrections + tests.
by Alexandre Julliard 24 May '06

24 May '06

Module: wine Branch: refs/heads/master Commit: e902cd119f7b5c60f57cd1e232c2c0c37e36fe15 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e902cd119f7b5c60f57cd1e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 24 11:34:30 2006 +0200 wined3d: Swapchain and back buffer corrections + tests. --- dlls/d3d9/swapchain.c | 8 ++ dlls/d3d9/tests/device.c | 146 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 145 +++++++++----------------------------- dlls/wined3d/swapchain.c | 9 +- dlls/wined3d/wined3d_private.h | 8 +- include/wine/wined3d_interface.h | 2 - 6 files changed, 196 insertions(+), 122 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=e902cd119f7b5c60f57…

1 0

Dmitry Timoshkov : user: Add a test to check the queue status if there is a pending
by Alexandre Julliard 24 May '06

24 May '06

Module: wine Branch: refs/heads/master Commit: 0170bc3e84ba0d2881f374947e69943a746ea496 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0170bc3e84ba0d2881f3749… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed May 24 15:53:24 2006 +0900 user: Add a test to check the queue status if there is a pending posted message and the quit flag is set. --- dlls/user/tests/msg.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 57 insertions(+), 1 deletions(-) diff --git a/dlls/user/tests/msg.c b/dlls/user/tests/msg.c index 5551d62..2a3e8aa 100644 --- a/dlls/user/tests/msg.c +++ b/dlls/user/tests/msg.c @@ -6363,7 +6363,12 @@ #endif /****** start of MOUSE_LL hook test *************/ hCBT_global_hook = SetWindowsHookExA(WH_MOUSE_LL, cbt_global_hook_proc, GetModuleHandleA(0), 0); - assert(hCBT_global_hook); + /* WH_MOUSE_LL is not supported on Win9x platforms */ + if (!hCBT_global_hook) + { + trace("Skipping WH_MOUSE_LL test on this platform\n"); + goto skip_mouse_ll_hook_test; + } hevent = CreateEventA(NULL, 0, 0, NULL); assert(hevent); @@ -6393,6 +6398,7 @@ #endif CloseHandle(hevent); ok(!IsWindow(hwnd2), "window should be destroyed on thread exit\n"); /****** end of MOUSE_LL hook test *************/ +skip_mouse_ll_hook_test: ok(DestroyWindow(hwnd), "failed to destroy window\n"); } @@ -7183,18 +7189,22 @@ static void test_PeekMessage(void) DWORD tid, qstatus; UINT qs_all_input = QS_ALLINPUT; UINT qs_input = QS_INPUT; + BOOL ret; struct peekmsg_info info; info.hwnd = CreateWindowA("TestWindowClass", NULL, WS_OVERLAPPEDWINDOW, 100, 100, 200, 200, 0, 0, 0, NULL); + assert(info.hwnd); ShowWindow(info.hwnd, SW_SHOW); UpdateWindow(info.hwnd); + SetFocus(info.hwnd); info.hevent[EV_START_STOP] = CreateEventA(NULL, 0, 0, NULL); info.hevent[EV_SENDMSG] = CreateEventA(NULL, 0, 0, NULL); info.hevent[EV_ACK] = CreateEventA(NULL, 0, 0, NULL); hthread = CreateThread(NULL, 0, send_msg_thread_2, &info, 0, &tid); + Sleep(100); trace("signalling to start looping\n"); SetEvent(info.hevent[EV_START_STOP]); @@ -7379,6 +7389,52 @@ todo_wine { ok(qstatus == 0, "wrong qstatus %08lx\n", qstatus); + /* test whether presence of the quit flag in the queue affects + * the queue state + */ + PostQuitMessage(0x1234abcd); + + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == MAKELONG(QS_POSTMESSAGE, QS_POSTMESSAGE), + "wrong qstatus %08lx\n", qstatus); + + PostMessageA(info.hwnd, WM_USER, 0, 0); + + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == MAKELONG(QS_POSTMESSAGE, QS_POSTMESSAGE), + "wrong qstatus %08lx\n", qstatus); + + msg.message = 0; + ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); + ok(ret && msg.message == WM_USER, + "got %d and %x instead of TRUE and WM_USER\n", ret, msg.message); + + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == MAKELONG(0, QS_POSTMESSAGE), + "wrong qstatus %08lx\n", qstatus); + + msg.message = 0; + ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); + ok(ret && msg.message == WM_QUIT, + "got %d and %x instead of TRUE and WM_QUIT\n", ret, msg.message); + ok(msg.wParam == 0x1234abcd, "got wParam %x instead of 0x1234abcd\n", msg.wParam); + ok(msg.lParam == 0, "got lParam %lx instead of 0\n", msg.lParam); + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(0, QS_POSTMESSAGE), + "wrong qstatus %08lx\n", qstatus); +} + + ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); + ok(!ret, + "PeekMessageA should have returned FALSE instead of msg %x\n", + msg.message); + + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == 0, + "wrong qstatus %08lx\n", qstatus); + trace("signalling to exit\n"); SetEvent(info.hevent[EV_START_STOP]);

1 0

Mike McCormack : msi: Set a default radio button.
by Alexandre Julliard 24 May '06

24 May '06

Module: wine Branch: refs/heads/master Commit: 6df2c04f203b04e211ed734f42a2d5c5c672b6f6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6df2c04f203b04e211ed734… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed May 24 17:41:17 2006 +0900 msi: Set a default radio button. --- dlls/msi/dialog.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index a48ab1e..7949ecd 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -101,6 +101,7 @@ typedef struct msi_dialog* dialog; msi_control *parent; DWORD attributes; + LPWSTR propval; } radio_button_group_descr; const WCHAR szMsiDialogClass[] = { @@ -1344,6 +1345,9 @@ static UINT msi_dialog_create_radiobutto return ERROR_FUNCTION_FAILED; control->handler = msi_dialog_radiogroup_handler; + if (!lstrcmpW(control->name, group->propval)) + SendMessageW(control->hwnd, BM_SETCHECK, BST_CHECKED, 0); + prop = MSI_RecordGetString( rec, 1 ); if( prop ) control->property = strdupW( prop ); @@ -1395,9 +1399,11 @@ static UINT msi_dialog_radiogroup_contro group.dialog = dialog; group.parent = control; group.attributes = MSI_RecordGetInteger( rec, 8 ); + group.propval = msi_dup_property( dialog->package, control->property ); r = MSI_IterateRecords( view, 0, msi_dialog_create_radiobutton, &group ); msiobj_release( &view->hdr ); + msi_free( group.propval ); return r; }

1 0

Mike McCormack : msi: Fix a possible memory leak.
by Alexandre Julliard 24 May '06

24 May '06

Module: wine Branch: refs/heads/master Commit: 20c5746649f2d4051d05ea5ecd33d1c2b6fe504e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=20c5746649f2d4051d05ea5… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed May 24 17:41:04 2006 +0900 msi: Fix a possible memory leak. --- dlls/msi/action.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 54a5b47..aaa5886 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2816,8 +2816,8 @@ static UINT ITERATE_CreateShortcuts(MSIR LPCWSTR buffer, extension; MSICOMPONENT *comp; static const WCHAR szlnk[]={'.','l','n','k',0}; - IShellLinkW *sl; - IPersistFile *pf; + IShellLinkW *sl = NULL; + IPersistFile *pf = NULL; HRESULT res; buffer = MSI_RecordGetString(row,4); @@ -2841,17 +2841,17 @@ static UINT ITERATE_CreateShortcuts(MSIR res = CoCreateInstance( &CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLinkW, (LPVOID *) &sl ); - if (FAILED(res)) + if (FAILED( res )) { - ERR("Is IID_IShellLink\n"); - return ERROR_SUCCESS; + ERR("CLSID_ShellLink not available\n"); + goto err; } res = IShellLinkW_QueryInterface( sl, &IID_IPersistFile,(LPVOID*) &pf ); - if( FAILED( res ) ) + if (FAILED( res )) { - ERR("Is IID_IPersistFile\n"); - return ERROR_SUCCESS; + ERR("QueryInterface(IID_IPersistFile) failed\n"); + goto err; } buffer = MSI_RecordGetString(row,2); @@ -2937,8 +2937,11 @@ static UINT ITERATE_CreateShortcuts(MSIR msi_free(target_file); - IPersistFile_Release( pf ); - IShellLinkW_Release( sl ); +err: + if (pf) + IPersistFile_Release( pf ); + if (sl) + IShellLinkW_Release( sl ); return ERROR_SUCCESS; }

1 0

Roderick Colenbrander : wined3d: Fix ARB_imaging abuse.
by Alexandre Julliard 24 May '06

24 May '06

Module: wine Branch: refs/heads/master Commit: 9c018fd877a0bc28810c598d47b010dc0a728fe2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9c018fd877a0bc28810c598… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun May 21 15:05:41 2006 +0200 wined3d: Fix ARB_imaging abuse. --- dlls/wined3d/device.c | 27 +++++++++++--- dlls/wined3d/directx.c | 3 ++ include/wine/wined3d_gl.h | 84 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 107 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cfc9435..4d5b6b6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -294,8 +294,12 @@ #undef APPLY_STATE */ D3DCOLORTOGLFLOAT4(This->stateBlock->renderState[WINED3DRS_TEXTUREFACTOR], col); /* Set the default alpha blend color */ - glBlendColor(col[0], col[1], col[2], col[3]); - checkGLcall("glBlendColor"); + if (GL_SUPPORT(ARB_IMAGING)) { + GL_EXTCALL(glBlendColor(col[0], col[1], col[2], col[3])); + checkGLcall("glBlendColor"); + } else { + WARN("Unsupported in local OpenGL implementation: glBlendColor\n"); + } D3DCOLORTOGLFLOAT4(This->stateBlock->renderState[WINED3DRS_TEXTUREFACTOR], col); glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, &col[0]); @@ -3347,9 +3351,14 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen default: FIXME("Unrecognized/Unhandled D3DBLENDOP value %ld\n", Value); } - TRACE("glBlendEquation(%x)\n", glParm); - glBlendEquation(glParm); - checkGLcall("glBlendEquation"); + + if(GL_SUPPORT(ARB_IMAGING)) { + TRACE("glBlendEquation(%x)\n", glParm); + GL_EXTCALL(glBlendEquation(glParm)); + checkGLcall("glBlendEquation"); + } else { + WARN("Unsupported in local OpenGL implementation: glBlendEquation\n"); + } } break; @@ -3362,8 +3371,12 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen float col[4]; D3DCOLORTOGLFLOAT4(Value, col); /* Set the default alpha blend color */ - glBlendColor(col[0], col[1], col[2], col[3]); - checkGLcall("glBlendColor"); + if (GL_SUPPORT(ARB_IMAGING)) { + GL_EXTCALL(glBlendColor(col[0], col[1], col[2], col[3])); + checkGLcall("glBlendColor"); + } else { + WARN("Unsupported in local OpenGL implementation: glBlendColor\n"); + } /* And now the default texture color as well */ for (i = 0; i < GL_LIMITS(textures); i++) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 62af4a6..c27e75c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -489,6 +489,9 @@ #undef USE_GL_FUNC glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS_ARB, &gl_max); TRACE_(d3d_caps)(" FOUND: ARB Pixel Shader support - GL_MAX_TEXTURE_IMAGE_UNITS_ARB=%u\n", gl_max); gl_info->max_samplers = min(MAX_SAMPLERS, gl_max); + } else if (strcmp(ThisExtn, "GL_ARB_imaging") == 0) { + TRACE_(d3d_caps)(" FOUND: ARB imaging support\n"); + gl_info->supported[ARB_IMAGING] = TRUE; } else if (strcmp(ThisExtn, "GL_ARB_shading_language_100") == 0) { TRACE_(d3d_caps)(" FOUND: GL Shading Language v100 support\n"); gl_info->supported[ARB_SHADING_LANGUAGE_100] = TRUE; diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 48e540c..c054f1a 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -51,6 +51,86 @@ #define APIENTRY * #defines and functions pointer ****************************************************/ +/* GL_ARB_imaging */ +#ifndef GL_ARB_imaging +#define GL_CONSTANT_COLOR 0x8001 +#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002 +#define GL_CONSTANT_ALPHA 0x8003 +#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004 +#define GL_BLEND_COLOR 0x8005 +#define GL_FUNC_ADD 0x8006 +#define GL_MIN 0x8007 +#define GL_MAX 0x8008 +#define GL_BLEND_EQUATION 0x8009 +#define GL_FUNC_SUBTRACT 0x800A +#define GL_FUNC_REVERSE_SUBTRACT 0x800B +#define GL_CONVOLUTION_1D 0x8010 +#define GL_CONVOLUTION_2D 0x8011 +#define GL_SEPARABLE_2D 0x8012 +#define GL_CONVOLUTION_BORDER_MODE 0x8013 +#define GL_CONVOLUTION_FILTER_SCALE 0x8014 +#define GL_CONVOLUTION_FILTER_BIAS 0x8015 +#define GL_REDUCE 0x8016 +#define GL_CONVOLUTION_FORMAT 0x8017 +#define GL_CONVOLUTION_WIDTH 0x8018 +#define GL_CONVOLUTION_HEIGHT 0x8019 +#define GL_MAX_CONVOLUTION_WIDTH 0x801A +#define GL_MAX_CONVOLUTION_HEIGHT 0x801B +#define GL_POST_CONVOLUTION_RED_SCALE 0x801C +#define GL_POST_CONVOLUTION_GREEN_SCALE 0x801D +#define GL_POST_CONVOLUTION_BLUE_SCALE 0x801E +#define GL_POST_CONVOLUTION_ALPHA_SCALE 0x801F +#define GL_POST_CONVOLUTION_RED_BIAS 0x8020 +#define GL_POST_CONVOLUTION_GREEN_BIAS 0x8021 +#define GL_POST_CONVOLUTION_BLUE_BIAS 0x8022 +#define GL_POST_CONVOLUTION_ALPHA_BIAS 0x8023 +#define GL_HISTOGRAM 0x8024 +#define GL_PROXY_HISTOGRAM 0x8025 +#define GL_HISTOGRAM_WIDTH 0x8026 +#define GL_HISTOGRAM_FORMAT 0x8027 +#define GL_HISTOGRAM_RED_SIZE 0x8028 +#define GL_HISTOGRAM_GREEN_SIZE 0x8029 +#define GL_HISTOGRAM_BLUE_SIZE 0x802A +#define GL_HISTOGRAM_ALPHA_SIZE 0x802B +#define GL_HISTOGRAM_LUMINANCE_SIZE 0x802C +#define GL_HISTOGRAM_SINK 0x802D +#define GL_MINMAX 0x802E +#define GL_MINMAX_FORMAT 0x802F +#define GL_MINMAX_SINK 0x8030 +#define GL_TABLE_TOO_LARGE 0x8031 +#define GL_COLOR_MATRIX 0x80B1 +#define GL_COLOR_MATRIX_STACK_DEPTH 0x80B2 +#define GL_MAX_COLOR_MATRIX_STACK_DEPTH 0x80B3 +#define GL_POST_COLOR_MATRIX_RED_SCALE 0x80B4 +#define GL_POST_COLOR_MATRIX_GREEN_SCALE 0x80B5 +#define GL_POST_COLOR_MATRIX_BLUE_SCALE 0x80B6 +#define GL_POST_COLOR_MATRIX_ALPHA_SCALE 0x80B7 +#define GL_POST_COLOR_MATRIX_RED_BIAS 0x80B8 +#define GL_POST_COLOR_MATRIX_GREEN_BIAS 0x80B9 +#define GL_POST_COLOR_MATRIX_BLUE_BIAS 0x80BA +#define GL_POST_COLOR_MATRIX_ALPHA_BIAS 0x80BB +#define GL_COLOR_TABLE 0x80D0 +#define GL_POST_CONVOLUTION_COLOR_TABLE 0x80D1 +#define GL_POST_COLOR_MATRIX_COLOR_TABLE 0x80D2 +#define GL_PROXY_COLOR_TABLE 0x80D3 +#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4 +#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5 +#define GL_COLOR_TABLE_SCALE 0x80D6 +#define GL_COLOR_TABLE_BIAS 0x80D7 +#define GL_COLOR_TABLE_FORMAT 0x80D8 +#define GL_COLOR_TABLE_WIDTH 0x80D9 +#define GL_COLOR_TABLE_RED_SIZE 0x80DA +#define GL_COLOR_TABLE_GREEN_SIZE 0x80DB +#define GL_COLOR_TABLE_BLUE_SIZE 0x80DC +#define GL_COLOR_TABLE_ALPHA_SIZE 0x80DD +#define GL_COLOR_TABLE_LUMINANCE_SIZE 0x80DE +#define GL_COLOR_TABLE_INTENSITY_SIZE 0x80DF +#define GL_CONSTANT_BORDER 0x8151 +#define GL_REPLICATE_BORDER 0x8153 +#define GL_CONVOLUTION_BORDER_COLOR 0x8154 +#endif +typedef void (APIENTRY *PGLFNBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); +typedef void (APIENTRY *PGLFNBLENDEQUATIONPROC) (GLenum mode); /* GL_ARB_point_parameters */ #ifndef GL_ARB_point_parameters #define GL_ARB_point_parameters 1 @@ -1186,6 +1266,7 @@ #define MAKEDWORD_VERSION(maj, min) ((m typedef enum _GL_SupportedExt { /* ARB */ ARB_FRAGMENT_PROGRAM, + ARB_IMAGING, ARB_MULTISAMPLE, ARB_MULTITEXTURE, ARB_OCCLUSION_QUERY, @@ -1247,6 +1328,9 @@ typedef enum _GL_SupportedExt { ****************************************************/ #define GL_EXT_FUNCS_GEN \ /** ARB Extensions **/ \ + /* GL_ARB_imaging */ \ + USE_GL_FUNC(PGLFNBLENDCOLORPROC, glBlendColor); \ + USE_GL_FUNC(PGLFNBLENDEQUATIONPROC, glBlendEquation); \ /* GL_ARB_point_parameters */ \ USE_GL_FUNC(PGLFNGLPOINTPARAMETERFARBPROC, glPointParameterfARB); \ USE_GL_FUNC(PGLFNGLPOINTPARAMETERFVARBPROC, glPointParameterfvARB); \

1 0

Alexandre Julliard : wined3d: Fixed a couple of boolean comparisons against TRUE.
by Alexandre Julliard 24 May '06

24 May '06

Module: wine Branch: refs/heads/master Commit: 63199ca02287408feb85053cb73a66db5f70772b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=63199ca02287408feb85053… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 24 10:46:06 2006 +0200 wined3d: Fixed a couple of boolean comparisons against TRUE. --- dlls/wined3d/device.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b205c5c..cfc9435 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -731,7 +731,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_Creat break; case WINED3DPOOL_DEFAULT: /*TODO: Create offscreen plain can cause this check to fail..., find out if it should */ if(!(Usage & WINED3DUSAGE_DYNAMIC) && !(Usage & WINED3DUSAGE_RENDERTARGET) - && !(Usage && WINED3DUSAGE_DEPTHSTENCIL ) && Lockable == TRUE) + && !(Usage && WINED3DUSAGE_DEPTHSTENCIL ) && Lockable) FIXME("Creating a surface with a POOL of DEFAULT with Locable true, that doesn't specify DYNAMIC usage.\n"); break; default: @@ -4701,7 +4701,7 @@ process_vertices_strided(IWineD3DDeviceI * a) D3DRS_CLIPPING is enabled * b) WINED3DVOP_CLIP is passed */ - if(This->stateBlock->renderState[WINED3DRS_CLIPPING] == TRUE) { + if(This->stateBlock->renderState[WINED3DRS_CLIPPING]) { static BOOL warned = FALSE; /* * The clipping code is not quite correct. Some things need @@ -6938,7 +6938,7 @@ #endif IWineD3DSwapChain_Release((IWineD3DSwapChain *)swapchain); } - else if (pbuffer_support == TRUE && cfgs != NULL /* && some test to make sure that opengl supports pbuffers */) { + else if (pbuffer_support && cfgs != NULL /* && some test to make sure that opengl supports pbuffers */) { /** ******************************************************************** * This is a quickly hacked out implementation of offscreen textures.

1 0