September 2008 - Wine-Commits

Erik Inge Bolsø : kernel32: Fix PROFILE_Load to handle mac line endings.
by Alexandre Julliard Sept. 23, 2008

Sept. 23, 2008

Module: wine Branch: master Commit: e8754b8ea6facf5d72120eee227b2b51d226b32e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8754b8ea6facf5d72120eee2… Author: Erik Inge Bolsø <knan-wine(a)anduin.net> Date: Sun Sep 21 16:49:16 2008 +0200 kernel32: Fix PROFILE_Load to handle mac line endings. --- dlls/kernel32/profile.c | 1 + dlls/kernel32/tests/profile.c | 32 +++++++++++++++++++++----------- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index ab26533..3ed2dcd 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -405,6 +405,7 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) { szLineStart = next_line; next_line = memchrW(szLineStart, '\n', szEnd - szLineStart); + if (!next_line) next_line = memchrW(szLineStart, '\r', szEnd - szLineStart); if (!next_line) next_line = szEnd; else next_line++; szLineEnd = next_line; diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 8a3e83b..2a9f08a 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -428,7 +428,7 @@ static BOOL emptystr_ok(CHAR emptystr[MAX_PATH]) return TRUE; } -static void test_GetPrivateProfileString(void) +static void test_GetPrivateProfileString(const char *content, const char *descript) { DWORD ret; CHAR buf[MAX_PATH]; @@ -441,15 +441,10 @@ static void test_GetPrivateProfileString(void) LPSTR tempfile; static const char filename[] = ".\\winetest.ini"; - static const char content[]= - "[section1]\r\n" - "name1=val1\r\n" - "name2=\"val2\"\r\n" - "name3\r\n" - "name4=a\r\n" - "[section2]\r\n"; - create_test_file(filename, content, sizeof(content)); + trace("test_GetPrivateProfileStringA: %s\n", descript); + + create_test_file(filename, content, lstrlenA(content)); /* Run this test series with caching. Wine won't cache profile files younger than 2.1 seconds. */ @@ -674,7 +669,7 @@ static void test_GetPrivateProfileString(void) GetWindowsDirectoryA(windir, MAX_PATH); GetTempFileNameA(windir, "pre", 0, path); tempfile = strrchr(path, '\\') + 1; - create_test_file(path, content, sizeof(content)); + create_test_file(path, content, lstrlenA(content)); /* only filename is used, file exists in windows directory */ lstrcpyA(buf, "kumquat"); @@ -703,5 +698,20 @@ START_TEST(profile) test_profile_existing(); test_profile_delete_on_close(); test_profile_refresh(); - test_GetPrivateProfileString(); + test_GetPrivateProfileString( + "[section1]\r\n" + "name1=val1\r\n" + "name2=\"val2\"\r\n" + "name3\r\n" + "name4=a\r\n" + "[section2]\r\n", + "CR+LF"); + test_GetPrivateProfileString( + "[section1]\r" + "name1=val1\r" + "name2=\"val2\"\r" + "name3\r" + "name4=a\r" + "[section2]\r", + "CR only"); }

1 0

Christian Costa : d3dxof: Implement IDirectXFileDataImpl_GetNextObject.
by Alexandre Julliard Sept. 23, 2008

Sept. 23, 2008

Module: wine Branch: master Commit: 8002b790874c1f4dcf6d30a4dcc30661644bcaa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8002b790874c1f4dcf6d30a4d… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Sep 22 20:27:09 2008 +0200 d3dxof: Implement IDirectXFileDataImpl_GetNextObject. --- dlls/d3dxof/d3dxof.c | 47 ++++++++++++++++++++++++++++------------- dlls/d3dxof/d3dxof_private.h | 1 + 2 files changed, 33 insertions(+), 15 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index eb0e5c2..d5a1569 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -161,7 +161,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV DWORD size; HANDLE hFile = INVALID_HANDLE_VALUE; - FIXME("(%p/%p)->(%p,%x,%p) partial stub!\n", This, iface, pvSource, dwLoadOptions, ppEnumObj); + TRACE("(%p/%p)->(%p,%x,%p)\n", This, iface, pvSource, dwLoadOptions, ppEnumObj); if (!ppEnumObj) return DXFILEERR_BADVALUE; @@ -1393,14 +1393,25 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetType(IDirectXFileData* iface, cons static HRESULT WINAPI IDirectXFileDataImpl_GetNextObject(IDirectXFileData* iface, LPDIRECTXFILEOBJECT* ppChildObj) { + HRESULT hr; IDirectXFileDataImpl *This = (IDirectXFileDataImpl *)iface; + IDirectXFileDataImpl *object; - FIXME("(%p/%p)->(%p) stub!\n", This, iface, ppChildObj); + TRACE("(%p/%p)->(%p)\n", This, iface, ppChildObj); if (This->cur_enum_object >= This->pobj->nb_childs) return DXFILEERR_NOMOREOBJECTS; - return DXFILEERR_BADVALUE; + hr = IDirectXFileDataImpl_Create(&object); + if (hr != S_OK) + return DXFILEERR_BADVALUE; + + object->pobj = This->pobj->childs[This->cur_enum_object++]; + object->cur_enum_object = 0; + + *ppChildObj = (LPDIRECTXFILEOBJECT)object; + + return DXFILE_OK; } static HRESULT WINAPI IDirectXFileDataImpl_AddDataObject(IDirectXFileData* iface, LPDIRECTXFILEDATA pDataObj) @@ -1751,6 +1762,8 @@ static BOOL parse_object_parts(parse_buffer * buf, BOOL allow_optional) if (allow_optional) { + buf->pxo->size = buf->cur_pdata - buf->pxo->pdata; + /* Skip trailing semicolon */ while (check_TOKEN(buf) == TOKEN_SEMICOLON) get_TOKEN(buf); @@ -1767,6 +1780,9 @@ static BOOL parse_object_parts(parse_buffer * buf, BOOL allow_optional) } else if (check_TOKEN(buf) == TOKEN_NAME) { + xobject* pxo = buf->pxo; + buf->pxo = buf->pxo->childs[buf->pxo->nb_childs] = &buf->pxo_tab[buf->cur_subobject++]; + TRACE("Enter optional %s\n", (char*)buf->value); buf->level++; if (!parse_object(buf)) @@ -1775,6 +1791,8 @@ static BOOL parse_object_parts(parse_buffer * buf, BOOL allow_optional) return FALSE; } buf->level--; + buf->pxo = pxo; + buf->pxo->nb_childs++; } else break; @@ -1788,6 +1806,8 @@ static BOOL parse_object(parse_buffer * buf) { int i; + buf->pxo->pdata = buf->cur_pdata; + if (get_TOKEN(buf) != TOKEN_NAME) return FALSE; @@ -1849,10 +1869,9 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE IDirectXFileEnumObjectImpl *This = (IDirectXFileEnumObjectImpl *)iface; IDirectXFileDataImpl* object; HRESULT hr; + LPBYTE pdata; - FIXME("(%p/%p)->(%p) stub!\n", This, iface, ppDataObj); - - /*printf("%d\n", This->buf.rem_bytes);*/ + TRACE("(%p/%p)->(%p)\n", This, iface, ppDataObj); if (!This->buf.rem_bytes) return DXFILEERR_NOMOREOBJECTS; @@ -1861,20 +1880,19 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE if (!SUCCEEDED(hr)) return hr; - This->buf.pxo = &This->xobjects[This->nb_xobjects][This->buf.cur_subobject]; - TRACE("Start %d %d\n", This->nb_xobjects, This->buf.cur_subobject); + This->buf.pxo_tab = &This->xobjects[This->nb_xobjects][0]; + This->buf.cur_subobject = 0; + This->buf.pxo = &This->buf.pxo_tab[This->buf.cur_subobject++]; - This->buf.pxo->pdata = HeapAlloc(GetProcessHeap(), 0, MAX_DATA_SIZE); - if (!This->buf.pxo->pdata) + pdata = HeapAlloc(GetProcessHeap(), 0, MAX_DATA_SIZE); + if (!pdata) { WARN("Out of memory\n"); return DXFILEERR_BADALLOC; } - This->buf.cur_pdata = This->buf.pxo->pdata; + This->buf.cur_pdata = pdata; This->buf.level = 0; - This->buf.pxo->pdata = This->buf.cur_pdata; - if (!parse_object(&This->buf)) { TRACE("Object is not correct\n"); @@ -1882,9 +1900,8 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE return DXFILEERR_PARSEERROR; } - This->buf.pxo->size = This->buf.cur_pdata - This->buf.pxo->pdata; - object->pobj = This->buf.pxo; + object->cur_enum_object = 0; *ppDataObj = (LPDIRECTXFILEDATA)object; diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index 5a77e56..14542f2 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -120,6 +120,7 @@ typedef struct { ULONG cur_subobject; LPBYTE cur_pdata; BYTE value[100]; + xobject* pxo_tab; IDirectXFileImpl* pdxf; xobject* pxo; xtemplate* pxt[MAX_SUBOBJECTS];

1 0

Henri Verbeet : wined3d: Use shader_glsl_log() in some more places.
by Alexandre Julliard Sept. 23, 2008

Sept. 23, 2008

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: Skip copying the depth stencil if it's discarded.
by Alexandre Julliard Sept. 23, 2008

Sept. 23, 2008

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: Merge pshader_hw_map2gl() and vshader_hw_map2gl().
by Alexandre Julliard Sept. 23, 2008

Sept. 23, 2008

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: Add/update the D3DPRESENTFLAG constants.
by Alexandre Julliard Sept. 23, 2008

Sept. 23, 2008

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

Austin English : mscms: Undefine HIWORD to avoid a conflict.
by Alexandre Julliard Sept. 23, 2008

Sept. 23, 2008

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

Henri Verbeet : wined3d: Get rid of the wantsDepthStencilBuffer in IWineD3DSwapChainImpl.
by Alexandre Julliard Sept. 23, 2008

Sept. 23, 2008

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

Paul Vriens : kernel32/tests: Add a skip.
by Alexandre Julliard Sept. 23, 2008

Sept. 23, 2008

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 Sept. 23, 2008

Sept. 23, 2008

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