wine-commits September 2008

wine-commits@winehq.org

3 participants
1215 discussions

Andrew Talbot : credui: Sign-compare warnings fix.
by Alexandre Julliard 23 Sep '08

23 Sep '08

Module: wine Branch: master Commit: 3a498da739c58918a5a689d865419dfc3f259a7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a498da739c58918a5a689d86… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Sep 22 19:38:42 2008 +0100 credui: Sign-compare warnings fix. --- dlls/credui/credui_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index 42316d6..7e3c8a0 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -441,7 +441,7 @@ static void CredDialogCommandOk(HWND hwndDlg, struct cred_dialog_params *params) if (!strchrW(user, '\\') && !strchrW(user, '@')) { - INT len_target = strlenW(params->pszTargetName); + ULONG len_target = strlenW(params->pszTargetName); memcpy(params->pszUsername, params->pszTargetName, min(len_target, params->ulUsernameMaxChars) * sizeof(WCHAR)); if (len_target + 1 < params->ulUsernameMaxChars)

1 0

Detlef Riekenberg : shdocvw: Set the default homepage.
by Alexandre Julliard 23 Sep '08

23 Sep '08

Module: wine Branch: master Commit: 40145952aee21806b403e73a5eeaafa3431be5da URL: http://source.winehq.org/git/wine.git/?a=commit;h=40145952aee21806b403e73a5… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Sep 21 22:43:51 2008 +0200 shdocvw: Set the default homepage. --- dlls/shdocvw/shdocvw.inf | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/shdocvw.inf b/dlls/shdocvw/shdocvw.inf index b765e24..cec06bc 100644 --- a/dlls/shdocvw/shdocvw.inf +++ b/dlls/shdocvw/shdocvw.inf @@ -137,8 +137,9 @@ HKLM,"Software\Microsoft\Windows\CurrentVersion\URL\Prefixes","www",,"http://" [Settings.Reg] -HKCU,"Software\Microsoft\Internet Explorer\Main","Start Page",,"http://www.winehq.org" -HKCU,"Software\Microsoft\Internet Explorer\Main","Search Page",,"http://www.google.com" +HKCU,"Software\Microsoft\Internet Explorer\Main","Start Page",2,"http://www.winehq.org" +HKCU,"Software\Microsoft\Internet Explorer\Main","Search Page",2,"http://www.google.com" +HKLM,"Software\Microsoft\Internet Explorer\Main","Default_Page_URL",2,"http://www.winehq.org" [IE.Reg]

1 0

Henri Verbeet : wined3d: Use shader_glsl_log() in some more places.
by Alexandre Julliard 23 Sep '08

23 Sep '08

Module: wine Branch: master Commit: e2bc8dfe3b6145b1ad930c7d27f3d405409e1e01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2bc8dfe3b6145b1ad930c7d2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 22 14:53:03 2008 +0200 wined3d: Use shader_glsl_log() in some more places. --- dlls/wined3d/glsl_shader.c | 2 -- dlls/wined3d/pixelshader.c | 2 +- dlls/wined3d/vertexshader.c | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3ce8188..287109f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1592,8 +1592,6 @@ void shader_glsl_map2gl(SHADER_OPCODE_ARG* arg) { case WINED3DSIO_ABS: instruction = "abs"; break; case WINED3DSIO_FRC: instruction = "fract"; break; case WINED3DSIO_NRM: instruction = "normalize"; break; - case WINED3DSIO_LOGP: - case WINED3DSIO_LOG: instruction = "log2"; break; case WINED3DSIO_EXP: instruction = "exp2"; break; case WINED3DSIO_SGN: instruction = "sign"; break; case WINED3DSIO_DSX: instruction = "dFdx"; break; diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 4b619d8..01e6d11 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -117,7 +117,7 @@ CONST SHADER_OPCODE IWineD3DPixelShaderImpl_shader_ins[] = { {WINED3DSIO_EXP, "exp", "EX2", 1, 2, shader_hw_map2gl, shader_glsl_map2gl, 0, 0}, {WINED3DSIO_LOG, "log", "LG2", 1, 2, shader_hw_map2gl, shader_glsl_log, 0, 0}, {WINED3DSIO_EXPP, "expp", "EXP", 1, 2, shader_hw_map2gl, shader_glsl_expp, 0, 0}, - {WINED3DSIO_LOGP, "logp", "LOG", 1, 2, shader_hw_map2gl, shader_glsl_map2gl, 0, 0}, + {WINED3DSIO_LOGP, "logp", "LOG", 1, 2, shader_hw_map2gl, shader_glsl_log, 0, 0}, {WINED3DSIO_DST, "dst", "DST", 1, 3, shader_hw_map2gl, shader_glsl_dst, 0, 0}, {WINED3DSIO_LRP, "lrp", "LRP", 1, 4, shader_hw_map2gl, shader_glsl_lrp, 0, 0}, {WINED3DSIO_FRC, "frc", "FRC", 1, 2, shader_hw_map2gl, shader_glsl_map2gl, 0, 0}, diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 68faa19..ae8130b 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -60,9 +60,9 @@ CONST SHADER_OPCODE IWineD3DVertexShaderImpl_shader_ins[] = { {WINED3DSIO_SGE, "sge", "SGE", 1, 3, shader_hw_map2gl, shader_glsl_compare, 0, 0}, {WINED3DSIO_ABS, "abs", "ABS", 1, 2, shader_hw_map2gl, shader_glsl_map2gl, 0, 0}, {WINED3DSIO_EXP, "exp", "EX2", 1, 2, shader_hw_map2gl, shader_glsl_map2gl, 0, 0}, - {WINED3DSIO_LOG, "log", "LG2", 1, 2, shader_hw_map2gl, shader_glsl_map2gl, 0, 0}, + {WINED3DSIO_LOG, "log", "LG2", 1, 2, shader_hw_map2gl, shader_glsl_log, 0, 0}, {WINED3DSIO_EXPP, "expp", "EXP", 1, 2, shader_hw_map2gl, shader_glsl_expp, 0, 0}, - {WINED3DSIO_LOGP, "logp", "LOG", 1, 2, shader_hw_map2gl, shader_glsl_map2gl, 0, 0}, + {WINED3DSIO_LOGP, "logp", "LOG", 1, 2, shader_hw_map2gl, shader_glsl_log, 0, 0}, {WINED3DSIO_LIT, "lit", "LIT", 1, 2, shader_hw_map2gl, shader_glsl_lit, 0, 0}, {WINED3DSIO_DST, "dst", "DST", 1, 3, shader_hw_map2gl, shader_glsl_dst, 0, 0}, {WINED3DSIO_LRP, "lrp", "LRP", 1, 4, NULL, shader_glsl_lrp, 0, 0},

1 0

Henri Verbeet : wined3d: Merge pshader_hw_map2gl() and vshader_hw_map2gl().
by Alexandre Julliard 23 Sep '08

23 Sep '08

Module: wine Branch: master Commit: ca28930113df9e573a8eb0a8c9fb579e84e5f166 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca28930113df9e573a8eb0a8c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 22 14:52:57 2008 +0200 wined3d: Merge pshader_hw_map2gl() and vshader_hw_map2gl(). This isn't the prettiest way to merge those functions, but it's a start. --- dlls/wined3d/arb_program_shader.c | 228 ++++++++++++++++++------------------- dlls/wined3d/pixelshader.c | 48 ++++---- dlls/wined3d/vertexshader.c | 46 ++++---- dlls/wined3d/wined3d_private.h | 3 +- 4 files changed, 160 insertions(+), 165 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca28930113df9e573a8eb…

1 0

Henri Verbeet : wined3d: Skip copying the depth stencil if it's discarded.
by Alexandre Julliard 23 Sep '08

23 Sep '08

Module: wine Branch: master Commit: 9d192c6251203fb75694190818ed1ae0971260aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d192c6251203fb7569419081… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 22 14:52:52 2008 +0200 wined3d: Skip copying the depth stencil if it's discarded. This gives a small performance improvement for applications that are smart enough to set the D3DPRESENTFLAG_DISCARD_DEPTHSTENCIL flag, or to create depth stencils with Discard set to TRUE. --- dlls/wined3d/device.c | 11 ++++++++--- dlls/wined3d/swapchain.c | 7 +++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d83fdcc..08ef2e1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6647,9 +6647,14 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetDepthStencilSurface(IWineD3DDevice * ******************************************************/ if (This->stencilBufferTarget) { - ActivateContext(This, This->render_targets[0], CTXUSAGE_RESOURCELOAD); - surface_load_ds_location(This->stencilBufferTarget, SFLAG_DS_OFFSCREEN); - surface_modify_ds_location(This->stencilBufferTarget, SFLAG_DS_OFFSCREEN); + if (((IWineD3DSwapChainImpl *)This->swapchains[0])->presentParms.Flags & WINED3DPRESENTFLAG_DISCARD_DEPTHSTENCIL + || ((IWineD3DSurfaceImpl *)This->stencilBufferTarget)->Flags & SFLAG_DISCARD) { + surface_modify_ds_location(This->stencilBufferTarget, SFLAG_DS_DISCARDED); + } else { + ActivateContext(This, This->render_targets[0], CTXUSAGE_RESOURCELOAD); + surface_load_ds_location(This->stencilBufferTarget, SFLAG_DS_OFFSCREEN); + surface_modify_ds_location(This->stencilBufferTarget, SFLAG_DS_OFFSCREEN); + } } tmp = This->stencilBufferTarget; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 1a82ab8..a9a5787 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -259,6 +259,13 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO } } + if (This->wineD3DDevice->stencilBufferTarget) { + if (This->presentParms.Flags & WINED3DPRESENTFLAG_DISCARD_DEPTHSTENCIL + || ((IWineD3DSurfaceImpl *)This->wineD3DDevice->stencilBufferTarget)->Flags & SFLAG_DISCARD) { + surface_modify_ds_location(This->wineD3DDevice->stencilBufferTarget, SFLAG_DS_DISCARDED); + } + } + if(This->presentParms.PresentationInterval != WINED3DPRESENT_INTERVAL_IMMEDIATE && GL_SUPPORT(SGI_VIDEO_SYNC)) { retval = GL_EXTCALL(glXGetVideoSyncSGI(&sync)); if(retval != 0) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 967cec6..95da129 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1449,6 +1449,7 @@ void flip_surface(IWineD3DSurfaceImpl *front, IWineD3DSurfaceImpl *back); #define SFLAG_DS_LOCATIONS (SFLAG_DS_ONSCREEN | \ SFLAG_DS_OFFSCREEN) +#define SFLAG_DS_DISCARDED SFLAG_DS_LOCATIONS BOOL CalculateTexRect(IWineD3DSurfaceImpl *This, RECT *Rect, float glTexCoord[4]);

1 0

Henri Verbeet : wined3d: Add/update the D3DPRESENTFLAG constants.
by Alexandre Julliard 23 Sep '08

23 Sep '08

Module: wine Branch: master Commit: 66654cf057832eda1606d8d664f2b64caa18b8cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=66654cf057832eda1606d8d66… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 22 14:52:42 2008 +0200 wined3d: Add/update the D3DPRESENTFLAG constants. --- include/d3d8types.h | 2 ++ include/d3d9types.h | 2 ++ include/wine/wined3d_types.h | 7 +++++++ 3 files changed, 11 insertions(+), 0 deletions(-) diff --git a/include/d3d8types.h b/include/d3d8types.h index 2ed2bf9..21e30b5 100644 --- a/include/d3d8types.h +++ b/include/d3d8types.h @@ -1131,6 +1131,8 @@ typedef struct _D3DPRESENT_PARAMETERS_ { } D3DPRESENT_PARAMETERS; +#define D3DPRESENTFLAG_LOCKABLE_BACKBUFFER 0x00000001 + typedef struct _D3DRANGE { UINT Offset; UINT Size; diff --git a/include/d3d9types.h b/include/d3d9types.h index 8642339..61e321c 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -201,6 +201,8 @@ #define D3DPRESENTFLAG_DISCARD_DEPTHSTENCIL 0x00000002 /* Discard Z buffer */ #define D3DPRESENTFLAG_DEVICECLIP 0x00000004 /* Clip the window blited into the client area 2k + xp only */ #define D3DPRESENTFLAG_VIDEO 0x00000010 /* backbuffer 'may' contain video data */ +#define D3DPRESENTFLAG_NOAUTOROTATE 0x00000020 /* d3d9ex, ignore display rotation */ +#define D3DPRESENTFLAG_UNPRUNEDMODE 0x00000040 /* d3d9ex, specify invalid display modes */ #define D3DPRESENT_BACK_BUFFERS_MAX 3L #define D3DPRESENT_RATE_DEFAULT 0x00000000 diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 5b722e7..2e7d5d7 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -888,6 +888,13 @@ typedef struct _WINED3DPRESENT_PARAMETERS { UINT PresentationInterval; } WINED3DPRESENT_PARAMETERS; +#define WINED3DPRESENTFLAG_LOCKABLE_BACKBUFFER 0x00000001 +#define WINED3DPRESENTFLAG_DISCARD_DEPTHSTENCIL 0x00000002 +#define WINED3DPRESENTFLAG_DEVICECLIP 0x00000004 +#define WINED3DPRESENTFLAG_VIDEO 0x00000010 +#define WINED3DPRESENTFLAG_NOAUTOROTATE 0x00000020 +#define WINED3DPRESENTFLAG_UNPRUNEDMODE 0x00000040 + typedef enum _WINED3DRESOURCETYPE { WINED3DRTYPE_SURFACE = 1, WINED3DRTYPE_VOLUME = 2,

1 0

Henri Verbeet : wined3d: Get rid of the wantsDepthStencilBuffer in IWineD3DSwapChainImpl.
by Alexandre Julliard 23 Sep '08

23 Sep '08

Module: wine Branch: master Commit: d95ae08ad47e4f3dd27cc6ae5fb6666eb7c0ad60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d95ae08ad47e4f3dd27cc6ae5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 22 14:52:36 2008 +0200 wined3d: Get rid of the wantsDepthStencilBuffer in IWineD3DSwapChainImpl. --- dlls/wined3d/device.c | 9 +-------- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 1 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4887b9b..d83fdcc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1618,19 +1618,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic if (This->auto_depth_stencil_buffer != NULL) IWineD3DSurface_SetContainer(This->auto_depth_stencil_buffer, 0); } - - /** TODO: A check on width, height and multisample types - *(since the zbuffer must be at least as large as the render target and have the same multisample parameters) - ****************************/ - object->wantsDepthStencilBuffer = TRUE; - } else { - object->wantsDepthStencilBuffer = FALSE; } IWineD3DSwapChain_GetGammaRamp((IWineD3DSwapChain *) object, &object->orig_gamma); TRACE("Created swapchain %p\n", object); - TRACE("FrontBuf @ %p, BackBuf @ %p, DepthStencil %d\n",object->frontBuffer, object->backBuffer ? object->backBuffer[0] : NULL, object->wantsDepthStencilBuffer); + TRACE("FrontBuf @ %p, BackBuf @ %p, DepthStencil %d\n",object->frontBuffer, object->backBuffer ? object->backBuffer[0] : NULL, pPresentationParameters->EnableAutoDepthStencil); return WINED3D_OK; error: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0354ead..967cec6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1746,7 +1746,6 @@ typedef struct IWineD3DSwapChainImpl /* IWineD3DSwapChain fields */ IWineD3DSurface **backBuffer; IWineD3DSurface *frontBuffer; - BOOL wantsDepthStencilBuffer; WINED3DPRESENT_PARAMETERS presentParms; DWORD orig_width, orig_height; WINED3DFORMAT orig_fmt;

1 0

Austin English : mscms: Undefine HIWORD to avoid a conflict.
by Alexandre Julliard 23 Sep '08

23 Sep '08

Module: wine Branch: master Commit: c71a89c59773d854e27908e8569a2e8a859a742c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c71a89c59773d854e27908e85… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Sep 22 17:26:42 2008 -0400 mscms: Undefine HIWORD to avoid a conflict. --- dlls/mscms/mscms_priv.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mscms/mscms_priv.h b/dlls/mscms/mscms_priv.h index c979ea8..479148b 100644 --- a/dlls/mscms/mscms_priv.h +++ b/dlls/mscms/mscms_priv.h @@ -44,6 +44,7 @@ #undef CopyMemory #undef LOWORD +#undef HIWORD #undef MAX_PATH #ifdef HAVE_LCMS_LCMS_H

1 0

Paul Vriens : kernel32/tests: Add a skip.
by Alexandre Julliard 23 Sep '08

23 Sep '08

Module: wine Branch: master Commit: a635a4ff4133b37aea87fb60cf1ecf489b5ab910 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a635a4ff4133b37aea87fb60c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Sep 22 22:44:25 2008 +0200 kernel32/tests: Add a skip. --- dlls/ntdll/tests/port.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/port.c b/dlls/ntdll/tests/port.c index 0bb1ff7..c63820a 100644 --- a/dlls/ntdll/tests/port.c +++ b/dlls/ntdll/tests/port.c @@ -138,6 +138,7 @@ static BOOL init_function_ptrs(void) !pNtRequestPort || !pNtRegisterThreadTerminatePort || !pNtConnectPort || !pRtlInitUnicodeString) { + win_skip("Needed port functions are not available\n"); FreeLibrary(hntdll); return FALSE; }

1 0

Paul Vriens : kernel32/tests: Add a skip.
by Alexandre Julliard 23 Sep '08

23 Sep '08

Module: wine Branch: master Commit: 7988506091546364faac2aa822c0cc8a31026f72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7988506091546364faac2aa82… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Sep 22 22:42:24 2008 +0200 kernel32/tests: Add a skip. --- dlls/ntdll/tests/error.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/error.c b/dlls/ntdll/tests/error.c index d8d06cc..b65d7d0 100644 --- a/dlls/ntdll/tests/error.c +++ b/dlls/ntdll/tests/error.c @@ -57,7 +57,10 @@ static int prepare_test(void) ntdll = LoadLibraryA("ntdll.dll"); pRtlNtStatusToDosError = (void*)GetProcAddress(ntdll, "RtlNtStatusToDosError"); if (!pRtlNtStatusToDosError) + { + win_skip("RtlNtStatusToDosError is not available\n"); return 0; + } argc = winetest_get_mainargs(&argv); strict=(argc >= 3 && strcmp(argv[2],"strict")==0);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2008