January 2009 - Wine-commits

Alexandre Julliard : user32/tests: Fix some more message test failures on Windows.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: d8375e2137080a21ee990f4c9c06ab515facc31b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8375e2137080a21ee990f4c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 20 14:02:02 2009 +0100 user32/tests: Fix some more message test failures on Windows. --- dlls/user32/tests/msg.c | 42 +++++++++++++++++++++++++++++++----------- 1 files changed, 31 insertions(+), 11 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 38cfeef..e8d5301 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -654,6 +654,8 @@ static const struct message WmCreateMaxPopupSeq[] = { { WM_SYNCPAINT, sent|wparam|optional, 4 }, { WM_NCPAINT, sent|wparam|optional, 1 }, { WM_ERASEBKGND, sent|optional }, + { WM_NCPAINT, sent|wparam|defwinproc|optional, 1 }, + { WM_ERASEBKGND, sent|defwinproc|optional }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOCLIENTMOVE|SWP_NOCLIENTSIZE|SWP_SHOWWINDOW|SWP_NOMOVE|SWP_NOSIZE }, { 0 } }; @@ -728,6 +730,8 @@ static const struct message WmShowMaxPopupSeq[] = { { WM_SYNCPAINT, sent|wparam|optional, 4 }, { WM_NCPAINT, sent|wparam|optional, 1 }, { WM_ERASEBKGND, sent|optional }, + { WM_NCPAINT, sent|wparam|defwinproc|optional, 1 }, + { WM_ERASEBKGND, sent|defwinproc|optional }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOMOVE|SWP_NOSIZE }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { 0 } @@ -914,7 +918,7 @@ static const struct message WmHideChildSeq2[] = { { WM_SHOWWINDOW, sent|wparam, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam, 0, 0 }, - { WM_ERASEBKGND, sent|parent }, + { WM_ERASEBKGND, sent|parent|optional }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { 0 } }; @@ -1868,8 +1872,17 @@ static void dump_sequence(const struct message *expected, const char *context, c if (expected->message == actual->message) { - expected++; - actual++; + if ((expected->flags & defwinproc) != (actual->flags & defwinproc) && + (expected->flags & optional)) + { + /* don't match messages if their defwinproc status differs */ + expected++; + } + else + { + expected++; + actual++; + } } /* silently drop winevent messages if there is no support for them */ else if ((expected->flags & optional) || ((expected->flags & winevent_hook) && !hEvent_hook)) @@ -5658,7 +5671,7 @@ static const struct message WmParentErasePaint[] = { { WM_PAINT, sent }, { WM_NCPAINT, sent|beginpaint }, { WM_GETTEXT, sent|beginpaint|defwinproc|optional }, - { WM_ERASEBKGND, sent|beginpaint }, + { WM_ERASEBKGND, sent|beginpaint|optional }, { 0 } }; @@ -5743,13 +5756,15 @@ static void test_paint_messages(void) */ trace("testing ValidateRect(0, NULL)\n"); SetRectEmpty( &rect ); - ok(ValidateRect(0, &rect), "ValidateRect(0, &rc) should not fail\n"); - check_update_rgn( hwnd, hrgn ); - ok_sequence( WmInvalidateErase, "InvalidateErase", FALSE ); - flush_events(); - ok_sequence( WmPaint, "Paint", FALSE ); - RedrawWindow( hwnd, NULL, NULL, RDW_VALIDATE ); - check_update_rgn( hwnd, 0 ); + if (ValidateRect(0, &rect)) /* not supported on Win9x */ + { + check_update_rgn( hwnd, hrgn ); + ok_sequence( WmInvalidateErase, "InvalidateErase", FALSE ); + flush_events(); + ok_sequence( WmPaint, "Paint", FALSE ); + RedrawWindow( hwnd, NULL, NULL, RDW_VALIDATE ); + check_update_rgn( hwnd, 0 ); + } trace("testing InvalidateRgn(0, NULL, FALSE)\n"); SetLastError(0xdeadbeef); @@ -8882,6 +8897,11 @@ static void test_PeekMessage(void) qs_all_input &= ~QS_RAWINPUT; qs_input &= ~QS_RAWINPUT; } + if (qstatus & QS_POSTMESSAGE) + { + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) /* nothing */ ; + qstatus = GetQueueStatus(qs_all_input); + } ok(qstatus == 0, "wrong qstatus %08x\n", qstatus); trace("signalling to send message\n");

1 0

Alexandre Julliard : winmm/tests: Increase the timing tolerances some more.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: 023df8518303f55bda27316e320e53e6357a72b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=023df8518303f55bda27316e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 20 14:02:12 2009 +0100 winmm/tests: Increase the timing tolerances some more. --- dlls/winmm/tests/wave.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index b2b3d7c..22ada89 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -789,13 +789,13 @@ static void wave_out_test_deviceOut(int device, double duration, } } - /* Check the sound duration was between -10% and +25% of the expected value */ + /* Check the sound duration was between -10% and +35% of the expected value */ end=GetTickCount(); actual = (end - start) / 1000.0; if (winetest_debug > 1) trace("sound duration=%g ms\n",1000*actual); ok((actual > (0.9 * (duration+paused))) && - (actual < (1.25 * (duration+paused))), + (actual < (1.35 * (duration+paused))), "The sound played for %g ms instead of %g ms\n", 1000*actual,1000*(duration+paused)); for (i = 0; i < headers; i++) {

1 0

Vincent Pelletier : winejoystick.drv: Implement POV support.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: a4b201a287b871b2bd5d4642cf540b9b39d9d580 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4b201a287b871b2bd5d4642c… Author: Vincent Pelletier <plr.vincent(a)gmail.com> Date: Sat Jan 17 12:54:07 2009 +0100 winejoystick.drv: Implement POV support. --- dlls/winejoystick.drv/joystick.c | 37 +++++++++++++++++++++++++++++++++++-- 1 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/winejoystick.drv/joystick.c b/dlls/winejoystick.drv/joystick.c index fff81e2..2967a50 100644 --- a/dlls/winejoystick.drv/joystick.c +++ b/dlls/winejoystick.drv/joystick.c @@ -100,6 +100,8 @@ typedef struct tagWINE_JSTCK { int r; int u; int v; + int pov_x; + int pov_y; int buttons; char axesMap[ABS_MAX + 1]; } WINE_JSTCK; @@ -278,11 +280,14 @@ static const WCHAR ini[] = {'W','i','n','e',' ','J','o','y','s','t','i','c','k', lpCaps->wNumAxes++; lpCaps->wCaps |= JOYCAPS_HASV; break; + case 16: /* Hat 0 X */ + case 17: /* Hat 0 Y */ + lpCaps->wCaps |= JOYCAPS_HASPOV | JOYCAPS_POV4DIR; + /* TODO: JOYCAPS_POVCTS handling */ + break; default: WARN("Unknown axis %hhu(%hhu). Skipped.\n", jstck->axesMap[i], i); } - /* FIXME: don't know how to detect for - JOYCAPS_HASPOV, JOYCAPS_POV4DIR, JOYCAPS_POVCTS */ } } #else @@ -359,6 +364,12 @@ static LRESULT JSTCK_GetPosEx(DWORD_PTR dwDevID, LPJOYINFOEX lpInfo) case 4: /* Ry */ jstck->v = ev.value; break; + case 16: /* Hat 0 X */ + jstck->pov_x = ev.value; + break; + case 17: /* Hat 0 Y */ + jstck->pov_y = ev.value; + break; default: FIXME("Unknown joystick event '%d'\n", ev.number); } @@ -413,6 +424,28 @@ static LRESULT JSTCK_GetPosEx(DWORD_PTR dwDevID, LPJOYINFOEX lpInfo) # endif if (lpInfo->dwFlags & JOY_RETURNV) lpInfo->dwVpos = jstck->v + 32767; + if (lpInfo->dwFlags & JOY_RETURNPOV) { + if (jstck->pov_y > 0) { + if (jstck->pov_x < 0) + lpInfo->dwPOV = 22500; /* SW */ + else if (jstck->pov_x > 0) + lpInfo->dwPOV = 13500; /* SE */ + else + lpInfo->dwPOV = 18000; /* S, JOY_POVBACKWARD */ + } else if (jstck->pov_y < 0) { + if (jstck->pov_x < 0) + lpInfo->dwPOV = 31500; /* NW */ + else if (jstck->pov_x > 0) + lpInfo->dwPOV = 4500; /* NE */ + else + lpInfo->dwPOV = 0; /* N, JOY_POVFORWARD */ + } else if (jstck->pov_x < 0) + lpInfo->dwPOV = 27000; /* W, JOY_POVLEFT */ + else if (jstck->pov_x > 0) + lpInfo->dwPOV = 9000; /* E, JOY_POVRIGHT */ + else + lpInfo->dwPOV = JOY_POVCENTERED; /* Center */ + } #else dev_stat = read(dev, &js, sizeof(js));

1 0

Vincent Pelletier : dinput: Add effect gain support.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: d2969fef920cd2d3660db8b912893ddd82c26527 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2969fef920cd2d3660db8b91… Author: Vincent Pelletier <plr.vincent(a)gmail.com> Date: Sun Jan 18 19:02:14 2009 +0100 dinput: Add effect gain support. --- dlls/dinput/effect_linuxinput.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index eb6a2b5..f225a65 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -54,6 +54,7 @@ struct LinuxInputEffectImpl GUID guid; struct ff_effect effect; /* Effect data */ + int gain; /* Effect gain */ int* fd; /* Parent device */ struct list *entry; /* Entry into the parent's list of effects */ }; @@ -379,9 +380,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_GetParameters( } if (dwFlags & DIEP_GAIN) { - /* the linux input ff driver apparently has no support - * for setting the device's gain. */ - peff->dwGain = DI_FFNOMINALMAX; + peff->dwGain = This->gain; } if (dwFlags & DIEP_SAMPLEPERIOD) { @@ -513,6 +512,12 @@ static HRESULT WINAPI LinuxInputEffectImpl_Start( } event.type = EV_FF; + + event.code = FF_GAIN; + event.value = This->gain; + if (write(*(This->fd), &event, sizeof(event)) == -1) + FIXME("Failed setting gain. Error: %d \"%s\".\n", errno, strerror(errno)); + event.code = This->effect.id; event.value = dwIterations; if (write(*(This->fd), &event, sizeof(event)) == -1) { @@ -623,7 +628,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( /* Gain and Sample Period settings are not supported by the linux * event system */ if (dwFlags & DIEP_GAIN) - TRACE("Gain requested but no gain functionality present.\n"); + This->gain = 0xFFFF * peff->dwGain / 1000; if (dwFlags & DIEP_SAMPLEPERIOD) TRACE("Sample period requested but no sample period functionality present.\n");

1 0

Vincent Pelletier : winejoystick.drv: Use JSIOCGAXMAP ioctl to correct axes mapping.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: b04e8226e557b28214e39c8697235573f1d48ec6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b04e8226e557b28214e39c869… Author: Vincent Pelletier <plr.vincent(a)gmail.com> Date: Sat Jan 17 12:35:05 2009 +0100 winejoystick.drv: Use JSIOCGAXMAP ioctl to correct axes mapping. --- dlls/winejoystick.drv/joystick.c | 66 +++++++++++++++++++++++++++----------- 1 files changed, 47 insertions(+), 19 deletions(-) diff --git a/dlls/winejoystick.drv/joystick.c b/dlls/winejoystick.drv/joystick.c index 38fb0cf..fff81e2 100644 --- a/dlls/winejoystick.drv/joystick.c +++ b/dlls/winejoystick.drv/joystick.c @@ -101,6 +101,7 @@ typedef struct tagWINE_JSTCK { int u; int v; int buttons; + char axesMap[ABS_MAX + 1]; } WINE_JSTCK; static WINE_JSTCK JSTCK_Data[MAXJOYSTICK]; @@ -178,8 +179,12 @@ static int JSTCK_OpenDevice(WINE_JSTCK* jstick) #endif if ((jstick->dev = open(buf, flags)) < 0) { sprintf(buf, JOYDEV_OLD, jstick->joyIntf); - jstick->dev = open(buf, flags); + if ((jstick->dev = open(buf, flags)) < 0) + return jstick->dev; } +#ifdef HAVE_LINUX_22_JOYSTICK_API + ioctl(jstick->dev, JSIOCGAXMAP, jstick->axesMap); +#endif return jstick->dev; } @@ -195,6 +200,7 @@ static LRESULT JSTCK_GetDevCaps(DWORD_PTR dwDevID, LPJOYCAPSW lpCaps, DWORD dwSi char nrOfAxes; char nrOfButtons; char identString[MAXPNAMELEN]; + int i; int driverVersion; #else static const WCHAR ini[] = {'W','i','n','e',' ','J','o','y','s','t','i','c','k',' ','D','r','i','v','e','r',0}; @@ -235,26 +241,46 @@ static const WCHAR ini[] = {'W','i','n','e',' ','J','o','y','s','t','i','c','k', lpCaps->wNumButtons = nrOfButtons; #endif if (dwSize == sizeof(JOYCAPSW)) { - /* since we suppose ntOfAxes <= 6 in the following code, do it explicitly */ - if (nrOfAxes > 6) nrOfAxes = 6; /* complete 95 structure */ lpCaps->wRmin = 0; - lpCaps->wRmax = nrOfAxes >= 4 ? 0xFFFF : 0; + lpCaps->wRmax = 0xFFFF; lpCaps->wUmin = 0; - lpCaps->wUmax = nrOfAxes >= 5 ? 0xFFFF : 0; + lpCaps->wUmax = 0xFFFF; lpCaps->wVmin = 0; - lpCaps->wVmax = nrOfAxes >= 6 ? 0xFFFF : 0; + lpCaps->wVmax = 0xFFFF; lpCaps->wMaxAxes = 6; /* same as MS Joystick Driver */ - lpCaps->wNumAxes = nrOfAxes; /* nr of axes in use */ + lpCaps->wNumAxes = 0; /* nr of axes in use */ lpCaps->wMaxButtons = 32; /* same as MS Joystick Driver */ lpCaps->szRegKey[0] = 0; lpCaps->szOEMVxD[0] = 0; lpCaps->wCaps = 0; - switch(nrOfAxes) { - case 6: lpCaps->wCaps |= JOYCAPS_HASV; - case 5: lpCaps->wCaps |= JOYCAPS_HASU; - case 4: lpCaps->wCaps |= JOYCAPS_HASR; - case 3: lpCaps->wCaps |= JOYCAPS_HASZ; + for (i = 0; i < nrOfAxes; i++) { + switch (jstck->axesMap[i]) { + case 0: /* X */ + case 1: /* Y */ + lpCaps->wNumAxes++; + break; + case 2: /* Z */ + case 6: /* Throttle */ + lpCaps->wNumAxes++; + lpCaps->wCaps |= JOYCAPS_HASZ; + break; + case 5: /* Rz */ + case 7: /* Rudder */ + lpCaps->wNumAxes++; + lpCaps->wCaps |= JOYCAPS_HASR; + break; + case 3: /* Rx */ + lpCaps->wNumAxes++; + lpCaps->wCaps |= JOYCAPS_HASU; + break; + case 4: /* Ry */ + lpCaps->wNumAxes++; + lpCaps->wCaps |= JOYCAPS_HASV; + break; + default: + WARN("Unknown axis %hhu(%hhu). Skipped.\n", jstck->axesMap[i], i); + } /* FIXME: don't know how to detect for JOYCAPS_HASPOV, JOYCAPS_POV4DIR, JOYCAPS_POVCTS */ } @@ -312,23 +338,25 @@ static LRESULT JSTCK_GetPosEx(DWORD_PTR dwDevID, LPJOYINFOEX lpInfo) #ifdef HAVE_LINUX_22_JOYSTICK_API while ((read(dev, &ev, sizeof(struct js_event))) > 0) { if (ev.type == (JS_EVENT_AXIS)) { - switch (ev.number) { - case 0: + switch (jstck->axesMap[ev.number]) { + case 0: /* X */ jstck->x = ev.value; break; - case 1: + case 1: /* Y */ jstck->y = ev.value; break; - case 2: + case 2: /* Z */ + case 6: /* Throttle */ jstck->z = ev.value; break; - case 3: + case 5: /* Rz */ + case 7: /* Rudder */ jstck->r = ev.value; break; - case 4: + case 3: /* Rx */ jstck->u = ev.value; break; - case 5: + case 4: /* Ry */ jstck->v = ev.value; break; default:

1 0

Stefan Dösinger : wined3d: Get rid of is_compiled in the pixel shader.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: 3d97055be74c7720513fc6ae8672a7271f74e9b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d97055be74c7720513fc6ae8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 16 15:09:50 2009 +0100 wined3d: Get rid of is_compiled in the pixel shader. --- dlls/wined3d/pixelshader.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 9dcf37f..daea9df 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -439,8 +439,6 @@ static GLuint pixelshader_compile(IWineD3DPixelShaderImpl *This, const struct ps retval = device->shader_backend->shader_generate_pshader((IWineD3DPixelShader *)This, &buffer, args); shader_buffer_free(&buffer); - This->baseShader.is_compiled = TRUE; - return retval; }

1 0

Vincent Pelletier : winejoystick.drv: Fix file descriptor leak.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: 279690e3e78e5eecac95bb566fed8f5e67f5af12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=279690e3e78e5eecac95bb566… Author: Vincent Pelletier <plr.vincent(a)gmail.com> Date: Sat Jan 17 12:31:39 2009 +0100 winejoystick.drv: Fix file descriptor leak. --- dlls/winejoystick.drv/joystick.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winejoystick.drv/joystick.c b/dlls/winejoystick.drv/joystick.c index 41d6eb8..38fb0cf 100644 --- a/dlls/winejoystick.drv/joystick.c +++ b/dlls/winejoystick.drv/joystick.c @@ -178,8 +178,9 @@ static int JSTCK_OpenDevice(WINE_JSTCK* jstick) #endif if ((jstick->dev = open(buf, flags)) < 0) { sprintf(buf, JOYDEV_OLD, jstick->joyIntf); + jstick->dev = open(buf, flags); } - return (jstick->dev = open(buf, flags)); + return jstick->dev; }

1 0

Huw Davies : comdlg32: Add a function to update the orientation buttons.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: 3a35271960bb9f2abf60d410ee1a76df91b30b69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a35271960bb9f2abf60d410e… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 19 17:12:43 2009 +0000 comdlg32: Add a function to update the orientation buttons. --- dlls/comdlg32/printdlg.c | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 3e5eac3..ce8a071 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2567,7 +2567,7 @@ static void pagesetup_set_orientation(PageSetupDataA *pda, WORD orient) GlobalUnlock(pda->dlga->hDevMode); } -static WORD pagesetup_get_orientation(PageSetupDataA *pda) +static WORD pagesetup_get_orientation(const PageSetupDataA *pda) { DEVMODEA *dm = GlobalLock(pda->dlga->hDevMode); WORD orient = dm->u1.s1.dmOrientation; @@ -2582,7 +2582,7 @@ static void pagesetup_set_papersize(PageSetupDataA *pda, WORD paper) GlobalUnlock(pda->dlga->hDevMode); } -static WORD pagesetup_get_papersize(PageSetupDataA *pda) +static WORD pagesetup_get_papersize(const PageSetupDataA *pda) { DEVMODEA *dm = GlobalLock(pda->dlga->hDevMode); WORD paper = dm->u1.s1.dmPaperSize; @@ -2998,6 +2998,14 @@ static void set_margin_groupbox_title(HWND hDlg, const PageSetupDataA *pda) SetDlgItemTextW(hDlg, grp4, title); } +static void pagesetup_update_orientation_buttons(HWND hDlg, const PageSetupDataA *pda) +{ + if (pagesetup_get_orientation(pda) == DMORIENT_LANDSCAPE) + CheckRadioButton(hDlg, rad1, rad2, rad2); + else + CheckRadioButton(hDlg, rad1, rad2, rad1); +} + /******************************************************************************** * PRINTDLG_PS_WMCommandA * process WM_COMMAND message for PageSetupDlgA @@ -3104,10 +3112,8 @@ PRINTDLG_PS_WMCommandA( ClosePrinter(hPrinter); /* Changing paper */ pagesetup_update_papersize(pda); - if (pagesetup_get_orientation(pda) == DMORIENT_LANDSCAPE) - CheckRadioButton(hDlg, rad1, rad2, rad2); - else - CheckRadioButton(hDlg, rad1, rad2, rad1); + pagesetup_update_orientation_buttons(hDlg, pda); + /* Changing paper preview */ PRINTDLG_PS_ChangePaperPrev(pda); /* Selecting paper in combo */ @@ -3464,11 +3470,8 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) EnableWindow(GetDlgItem(hDlg, edt7), FALSE); } - /* Set orientation radiobutton properly */ - if (pagesetup_get_orientation(pda) == DMORIENT_LANDSCAPE) - CheckRadioButton(hDlg, rad1, rad2, rad2); - else - CheckRadioButton(hDlg, rad1, rad2, rad1); + /* Set orientation radiobuttons properly */ + pagesetup_update_orientation_buttons(hDlg, pda); /* if orientation disabled */ if (pda->dlga->Flags & PSD_DISABLEORIENTATION) {

1 0

Stefan Dösinger : wined3d: Don' t single-allocate new gl shaders.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: 3c3272dc413d6ffb78c4a91ae7c2e69de6521c17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c3272dc413d6ffb78c4a91ae… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 19 18:39:36 2009 +0100 wined3d: Don't single-allocate new gl shaders. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/pixelshader.c | 31 +++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 22 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7ff3cd4..c5f7718 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1857,6 +1857,7 @@ static void shader_arb_destroy(IWineD3DBaseShader *iface) { HeapFree(GetProcessHeap(), 0, This->gl_shaders); This->gl_shaders = NULL; This->num_gl_shaders = 0; + This->shader_array_size = 0; } else { IWineD3DVertexShaderImpl *This = (IWineD3DVertexShaderImpl *) iface; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d1e1bae..4024269 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3652,6 +3652,7 @@ static void shader_glsl_destroy(IWineD3DBaseShader *iface) { HeapFree(GetProcessHeap(), 0, ps->gl_shaders); ps->gl_shaders = NULL; ps->num_gl_shaders = 0; + ps->shader_array_size = 0; } else { TRACE("Deleting shader object %u\n", vs->prgId); ENTER_GL(); diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 9f96c59..9dcf37f 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -520,10 +520,12 @@ void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWineD3DStateBlockImp GLuint find_gl_pshader(IWineD3DPixelShaderImpl *shader, const struct ps_compile_args *args) { UINT i; - struct ps_compiled_shader *old_array; + DWORD new_size; + struct ps_compiled_shader *new_array; /* Usually we have very few GL shaders for each d3d shader(just 1 or maybe 2), - * so a linear search is more performant than a hashmap + * so a linear search is more performant than a hashmap or a binary search + * (cache coherency etc) */ for(i = 0; i < shader->num_gl_shaders; i++) { if(memcmp(&shader->gl_shaders[i].args, args, sizeof(*args)) == 0) { @@ -532,17 +534,22 @@ GLuint find_gl_pshader(IWineD3DPixelShaderImpl *shader, const struct ps_compile_ } TRACE("No matching GL shader found, compiling a new shader\n"); - old_array = shader->gl_shaders; - if(old_array) { - shader->gl_shaders = HeapReAlloc(GetProcessHeap(), 0, old_array, - (shader->num_gl_shaders + 1) * sizeof(*shader->gl_shaders)); - } else { - shader->gl_shaders = HeapAlloc(GetProcessHeap(), 0, sizeof(*shader->gl_shaders)); - } + if(shader->shader_array_size == shader->num_gl_shaders) { + if(shader->gl_shaders) { + new_size = shader->shader_array_size + max(1, shader->shader_array_size / 2); + new_array = HeapReAlloc(GetProcessHeap(), 0, shader->gl_shaders, + new_size * sizeof(*shader->gl_shaders)); + } else { + new_array = HeapAlloc(GetProcessHeap(), 0, sizeof(*shader->gl_shaders)); + new_size = 1; + } - if(!shader->gl_shaders) { - ERR("Out of memory\n"); - return 0; + if(!new_array) { + ERR("Out of memory\n"); + return 0; + } + shader->gl_shaders = new_array; + shader->shader_array_size = new_size; } shader->gl_shaders[shader->num_gl_shaders].args = *args; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 80f6c72..f7f724b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2382,7 +2382,7 @@ typedef struct IWineD3DPixelShaderImpl { /* The GL shader */ struct ps_compiled_shader *gl_shaders; - UINT num_gl_shaders; + UINT num_gl_shaders, shader_array_size; /* Some information about the shader behavior */ struct stb_const_desc bumpenvmatconst[MAX_TEXTURES];

1 0

Stefan Dösinger : wined3d: Get rid of last_was_foggy_shader & friends.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: 50109aa969ccdc09acd0c4773c7c62a96fd78706 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50109aa969ccdc09acd0c4773… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 16 15:09:18 2009 +0100 wined3d: Get rid of last_was_foggy_shader & friends. The fog settings do not depend on wether the shader writes to oFog or not, instead they depend on the FOGVERTEXMODE and FOGTABLEMODE settings, and if a vertex shader is bound at all. It works the same way as with the fixed function, and having a vertex shader is the same as using pretransformed vertices, just that the fog coord comes from the shader instead of the specular color: FOGTABLEMODE != NONE: The Z coord is used, oFog is ignored FOGTABLEMODE == NONE, with VS: oFog is used FOGTABLEMODE == NONE, no VS, XYZ: Z is used FOGTABLEMODE == NONE, no VS, XYZRHW: diffuse color is used --- dlls/d3d9/tests/visual.c | 12 +++- dlls/wined3d/arb_program_shader.c | 21 +++---- dlls/wined3d/state.c | 122 +++++++++++++++++-------------------- dlls/wined3d/utils.c | 26 +++++--- dlls/wined3d/wined3d_private.h | 3 +- 5 files changed, 90 insertions(+), 94 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=50109aa969ccdc09acd0c…

1 0