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

Stefan Dösinger : wined3d: Use CMP instead of SLT and SGE in sRGB correction.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: ba35760f9fd5fd90a0fa34077862f04513d1ab16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba35760f9fd5fd90a0fa34077… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 19:06:21 2009 +0200 wined3d: Use CMP instead of SLT and SGE in sRGB correction. This shortens the code and reduces the amount of temp regs used by 1. --- dlls/wined3d/arb_program_shader.c | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 229c323..b52f173 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1878,7 +1878,7 @@ static BOOL shader_arb_dirty_const(IWineD3DDevice *iface) { } static void arbfp_add_sRGB_correction(SHADER_BUFFER *buffer, const char *fragcolor, const char *tmp1, - const char *tmp2, const char *tmp3, const char *tmp4) { + const char *tmp2, const char *tmp3) { /* Perform sRGB write correction. See GLX_EXT_framebuffer_sRGB */ /* Calculate the > 0.0031308 case */ @@ -1889,14 +1889,9 @@ static void arbfp_add_sRGB_correction(SHADER_BUFFER *buffer, const char *fragcol shader_addline(buffer, "SUB %s, %s, srgb_consts2.x;\n", tmp1, tmp1); /* Calculate the < case */ shader_addline(buffer, "MUL %s, srgb_consts1.x, %s;\n", tmp2, fragcolor); - /* Get 1.0 / 0.0 masks for > 0.0031308 and < 0.0031308 */ - shader_addline(buffer, "SLT %s, srgb_consts1.y, %s;\n", tmp3, fragcolor); - shader_addline(buffer, "SGE %s, srgb_consts1.y, %s;\n", tmp4, fragcolor); - /* Store the components > 0.0031308 in the destination */ - shader_addline(buffer, "MUL %s, %s, %s;\n", fragcolor, tmp1, tmp3); - /* Add the components that are < 0.0031308 */ - shader_addline(buffer, "MAD result.color.xyz, %s, %s, %s;\n", tmp2, tmp4, fragcolor); - /* [0.0;1.0] clamping. Not needed, this is done implicitly */ + /* Subtract the comparison value from the fragcolor and use CMP to pick either the > case * or the < case */ + shader_addline(buffer, "SUB %s, %s, srgb_consts1.y;\n", tmp3, fragcolor); + shader_addline(buffer, "CMP result.color.xyz, %s, %s, %s;\n", tmp3, tmp2, tmp1); } /* GL locking is done by the caller */ @@ -1959,7 +1954,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShader *iface, shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function); if(args->srgb_correction) { - arbfp_add_sRGB_correction(buffer, fragcolor, "TMP", "TA", "TB", "TC"); + arbfp_add_sRGB_correction(buffer, fragcolor, "TMP", "TA", "TB"); shader_addline(buffer, "MOV result.color, %s;\n", fragcolor); } else if(reg_maps->shader_version.major < 2) { shader_addline(buffer, "MOV result.color, %s;\n", fragcolor); @@ -2964,7 +2959,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, IWi if(settings->sRGB_write) { shader_addline(&buffer, "MAD ret, fragment.color.secondary, specular_enable, %s;\n", final_combiner_src); - arbfp_add_sRGB_correction(&buffer, "ret", "arg0", "arg1", "arg2", "tempreg"); + arbfp_add_sRGB_correction(&buffer, "ret", "arg0", "arg1", "arg2"); shader_addline(&buffer, "MOV result.color.w, ret.w;\n"); } else { shader_addline(&buffer, "MAD result.color, fragment.color.secondary, specular_enable, %s;\n", final_combiner_src);

1 0

Jacek Caban : urlmon: Added MIME filter handling in BindProtocol tests.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: 69365793b1f6144cb2a93aff08790c38903188e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69365793b1f6144cb2a93aff0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 18 18:36:24 2009 +0200 urlmon: Added MIME filter handling in BindProtocol tests. --- dlls/urlmon/tests/protocol.c | 723 +++++++++++++++++++++++++++++++++++------- 1 files changed, 608 insertions(+), 115 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69365793b1f6144cb2a93…

1 0

Michael Stefaniuc : notepad: Use the more specific MAKEINTRESOURCEW macro.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: f706c68cf91133330fa705c7ed5fc24c83b74dd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f706c68cf91133330fa705c7e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 18 21:07:49 2009 +0200 notepad: Use the more specific MAKEINTRESOURCEW macro. --- programs/notepad/dialog.c | 8 ++++---- programs/notepad/main.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index b028c38..6d8d04c 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -798,8 +798,8 @@ VOID DIALOG_HelpAboutNotepad(VOID) { static const WCHAR notepadW[] = { 'W','i','n','e',' ','N','o','t','e','p','a','d',0 }; WCHAR szNotepad[MAX_STRING_LEN]; - HICON icon = LoadImageW( Globals.hInstance, MAKEINTRESOURCE(IDI_NOTEPAD), - IMAGE_ICON, 48, 48, LR_SHARED ); + HICON icon = LoadImageW(Globals.hInstance, MAKEINTRESOURCEW(IDI_NOTEPAD), + IMAGE_ICON, 48, 48, LR_SHARED); LoadString(Globals.hInstance, STRING_NOTEPAD, szNotepad, SIZEOF(szNotepad)); ShellAbout(Globals.hMainWnd, szNotepad, notepadW, icon); @@ -812,8 +812,8 @@ VOID DIALOG_HelpAboutNotepad(VOID) */ VOID DIALOG_FilePageSetup(void) { - DialogBox(Globals.hInstance, MAKEINTRESOURCE(DIALOG_PAGESETUP), - Globals.hMainWnd, DIALOG_PAGESETUP_DlgProc); + DialogBoxW(Globals.hInstance, MAKEINTRESOURCEW(DIALOG_PAGESETUP), + Globals.hMainWnd, DIALOG_PAGESETUP_DlgProc); } diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 8f7520e..7f987ae 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -736,10 +736,10 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) class.cbSize = sizeof(class); class.lpfnWndProc = NOTEPAD_WndProc; class.hInstance = Globals.hInstance; - class.hIcon = LoadIcon(Globals.hInstance, MAKEINTRESOURCE(IDI_NOTEPAD)); - class.hCursor = LoadCursor(0, IDC_ARROW); + class.hIcon = LoadIconW(Globals.hInstance, MAKEINTRESOURCEW(IDI_NOTEPAD)); + class.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); class.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); - class.lpszMenuName = MAKEINTRESOURCE(MAIN_MENU); + class.lpszMenuName = MAKEINTRESOURCEW(MAIN_MENU); class.lpszClassName = className; if (!RegisterClassEx(&class)) return FALSE; @@ -777,7 +777,7 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) HandleCommandLine(GetCommandLine()); - hAccel = LoadAccelerators( hInstance, MAKEINTRESOURCE(ID_ACCEL) ); + hAccel = LoadAcceleratorsW(hInstance, MAKEINTRESOURCEW(ID_ACCEL)); while (GetMessage(&msg, 0, 0, 0)) {

1 0

Michael Stefaniuc : notepad: Use the explicit W-form of the functions.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: 27c8839f66ef7b63a0a816d9bc0b6a2a34b5d616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27c8839f66ef7b63a0a816d9b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 18 21:08:20 2009 +0200 notepad: Use the explicit W-form of the functions. --- programs/notepad/dialog.c | 106 ++++++++++++++++++++++---------------------- programs/notepad/main.c | 67 ++++++++++++++-------------- 2 files changed, 86 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=27c8839f66ef7b63a0a81…

1 0

Michael Stefaniuc : notepad: The UNICODE define isn't needed anymore; remove it.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: f66b600449beb774d915bb927ec482044956be40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f66b600449beb774d915bb927… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 18 21:09:25 2009 +0200 notepad: The UNICODE define isn't needed anymore; remove it. Add the WINE_NO_UNICODE_MACROS define to prevent the AW form of functions and types from creeping back in. --- programs/notepad/Makefile.in | 2 +- programs/notepad/dialog.c | 2 -- programs/notepad/main.c | 2 -- 3 files changed, 1 insertions(+), 5 deletions(-) diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in index a44fe71..fcdc872 100644 --- a/programs/notepad/Makefile.in +++ b/programs/notepad/Makefile.in @@ -7,7 +7,7 @@ APPMODE = -mwindows -mno-cygwin IMPORTS = comdlg32 shell32 shlwapi user32 gdi32 advapi32 kernel32 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt MODCFLAGS = @BUILTINFLAG@ -EXTRADEFS = -DNO_LIBWINE_PORT +EXTRADEFS = -DNO_LIBWINE_PORT -DWINE_NO_UNICODE_MACROS C_SRCS = \ dialog.c \ diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index e2328f4..4e56d8e 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -21,8 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define UNICODE - #include <assert.h> #include <stdio.h> #include <windows.h> diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 9f4d6f9..b3c5411 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -22,8 +22,6 @@ * */ -#define UNICODE - #include <windows.h> #include <shlwapi.h> #include <stdio.h>

1 0

Michael Stefaniuc : notepad: Fix the Romanian translation.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: f6b24b5cadef9a3fea9804bdfcbd24c6ddd2dad9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6b24b5cadef9a3fea9804bdf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 19 00:00:20 2009 +0200 notepad: Fix the Romanian translation. --- programs/notepad/Ro.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Ro.rc b/programs/notepad/Ro.rc index 1a288f7..9685de9 100644 --- a/programs/notepad/Ro.rc +++ b/programs/notepad/Ro.rc @@ -53,6 +53,7 @@ POPUP "&Editează" { POPUP "&Caută" { MENUITEM "&Caută...\tCtrl+F", CMD_SEARCH MENUITEM "Caută &următorul\tF3", CMD_SEARCH_NEXT + MENUITEM "&Înlocuiește...\tCtrl+H", CMD_REPLACE } POPUP "&Ajutor" { MENUITEM "C&onținut", CMD_HELP_CONTENTS

1 0

Michael Stefaniuc : Fix typo in Romanian translation basă => bază.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: 4fd3d633cb873f2f4d5f33be0438e2a300e213f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fd3d633cb873f2f4d5f33be0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 19 00:13:06 2009 +0200 Fix typo in Romanian translation basă => bază. Thanks to Dimitriu Petru for spotting this. --- dlls/comdlg32/cdlg_Ro.rc | 2 +- programs/winecfg/Ro.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/cdlg_Ro.rc b/dlls/comdlg32/cdlg_Ro.rc index 0c58bfc..45a6889 100644 --- a/dlls/comdlg32/cdlg_Ro.rc +++ b/dlls/comdlg32/cdlg_Ro.rc @@ -155,7 +155,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Culoare" FONT 8, "MS Shell Dlg" { - LTEXT "Culori de &basă:", 1088, 4, 4, 140, 10 + LTEXT "Culori de &bază:", 1088, 4, 4, 140, 10 LTEXT "&Culori personalizate:", 1089, 4, 106, 140, 10 LTEXT "Culoare | Sol&id", 1090, 150, 151, 48, 10 LTEXT "&Roșu:", 726 /*1094*/,249,126,24,10 diff --git a/programs/winecfg/Ro.rc b/programs/winecfg/Ro.rc index a4b0cad..45e2274 100644 --- a/programs/winecfg/Ro.rc +++ b/programs/winecfg/Ro.rc @@ -268,7 +268,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_ACCEL_FULL "Complet" IDS_ACCEL_STANDARD "Standard" - IDS_ACCEL_BASIC "De basă" + IDS_ACCEL_BASIC "De bază" IDS_ACCEL_EMULATION "Emulare" IDS_DRIVER_ALSA "Driver ALSA" IDS_DRIVER_ESOUND "Driver Esound"

1 0

Roderick Colenbrander : wgl: Use local pixel format data for WGL_ACCELERATION_ARB.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: f83b299bd28f59e5157b484b4adb05e61bada69a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f83b299bd28f59e5157b484b4… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue May 19 00:23:05 2009 +0200 wgl: Use local pixel format data for WGL_ACCELERATION_ARB. --- dlls/winex11.drv/opengl.c | 35 +++++++++++++++++++++++++---------- 1 files changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 3696072..3d7c456 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -717,6 +717,11 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf break; case WGL_ACCELERATION_ARB: + /* This flag is set in a WineGLPixelFormat */ + pop = iWGLAttr[++cur]; + TRACE("pAttr[%d] = WGL_ACCELERATION_ARB: %d\n", cur, pop); + break; + case WGL_SUPPORT_OPENGL_ARB: pop = iWGLAttr[++cur]; /** nothing to do, if we are here, supposing support Accelerated OpenGL */ @@ -2694,6 +2699,20 @@ static GLboolean WINAPI X11DRV_wglChoosePixelFormatARB(HDC hdc, const int *piAtt if(piAttribIList[i+1]) dwFlags |= PFD_DRAW_TO_BITMAP; break; + case WGL_ACCELERATION_ARB: + switch(piAttribIList[i+1]) + { + case WGL_NO_ACCELERATION_ARB: + dwFlags |= PFD_GENERIC_FORMAT; + break; + case WGL_GENERIC_ACCELERATION_ARB: + dwFlags |= PFD_GENERIC_ACCELERATED; + break; + case WGL_FULL_ACCELERATION_ARB: + /* Nothing to do */ + break; + } + break; case WGL_SUPPORT_GDI_ARB: if(piAttribIList[i+1]) dwFlags |= PFD_SUPPORT_GDI; @@ -2791,16 +2810,12 @@ static GLboolean WINAPI X11DRV_wglGetPixelFormatAttribivARB(HDC hdc, int iPixelF case WGL_ACCELERATION_ARB: curGLXAttr = GLX_CONFIG_CAVEAT; if (!fmt) goto pix_error; - hTest = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, curGLXAttr, &tmp); - if (hTest) goto get_error; - switch (tmp) { - case GLX_NONE: piValues[i] = WGL_FULL_ACCELERATION_ARB; break; - case GLX_SLOW_CONFIG: piValues[i] = WGL_GENERIC_ACCELERATION_ARB; break; - case GLX_NON_CONFORMANT_CONFIG: piValues[i] = WGL_FULL_ACCELERATION_ARB; break; - default: - ERR("unexpected Config Caveat(%x)\n", tmp); - piValues[i] = WGL_NO_ACCELERATION_ARB; - } + if(fmt->dwFlags & PFD_GENERIC_FORMAT) + piValues[i] = WGL_NO_ACCELERATION_ARB; + else if(fmt->dwFlags & PFD_GENERIC_ACCELERATED) + piValues[i] = WGL_GENERIC_ACCELERATION_ARB; + else + piValues[i] = WGL_FULL_ACCELERATION_ARB; continue; case WGL_TRANSPARENT_ARB:

1 0

Dmitry Timoshkov : user32: Invalidate a being removed listbox item before deleting it as it' s been done before d2ecb1194102b6d7e6078556f80e58c70ca39c23.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: c293a535c05d5963a9095929e55a0658d342b1ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=c293a535c05d5963a9095929e… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue May 19 15:00:21 2009 +0900 user32: Invalidate a being removed listbox item before deleting it as it's been done before d2ecb1194102b6d7e6078556f80e58c70ca39c23. --- dlls/user32/listbox.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index eaa805b..15aadcb 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -1725,14 +1725,14 @@ static LRESULT LISTBOX_RemoveItem( LB_DESCR *descr, INT index ) if ((index < 0) || (index >= descr->nb_items)) return LB_ERR; + /* We need to invalidate the original rect instead of the updated one. */ + LISTBOX_InvalidateItems( descr, index ); + descr->nb_items--; LISTBOX_DeleteItem( descr, index ); if (!descr->nb_items) return LB_OKAY; - /* We need to invalidate the original rect instead of the updated one. */ - LISTBOX_InvalidateItems( descr, index ); - /* Remove the item */ item = &descr->items[index];

1 0

Andrew Nguyen : kernel32/tests: Correctly skip when the Unicode communications functions are not available .
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: 786158796b14bdd752734bf50cd85f00f3beab0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=786158796b14bdd752734bf50… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Tue May 19 02:11:34 2009 -0500 kernel32/tests: Correctly skip when the Unicode communications functions are not available. --- dlls/kernel32/tests/comm.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 99fe505..8cd07ad 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -571,7 +571,10 @@ static void test_BuildCommDCBW(TEST *ptest, int initial_value, DCB *pexpected_dc result = BuildCommDCBW(wide_string, &dcb); if(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("BuildCommDCBW is not available\n"); return; + } /* check results */ check_result("BuildCommDCBW", ptest, initial_value, result); @@ -595,7 +598,10 @@ static void test_BuildCommDCBAndTimeoutsW(TEST *ptest, int initial_value, DCB *p result = BuildCommDCBAndTimeoutsW(wide_string, &dcb, &timeouts); if(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("BuildCommDCBAndTimeoutsW is not available\n"); return; + } /* check results */ check_result("BuildCommDCBAndTimeoutsA", ptest, initial_value, result);

1 0