September 2007 - Wine-Commits

Alexandre Julliard : ntdll/tests: Skip the debugger test if the child process is not loaded at the right address .
by Alexandre Julliard Sept. 20, 2007

Sept. 20, 2007

Module: wine Branch: master Commit: 088e27c849190584b36ae0fe19afa818b5579018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=088e27c849190584b36ae0fe1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 20 17:01:31 2007 +0200 ntdll/tests: Skip the debugger test if the child process is not loaded at the right address. --- dlls/ntdll/tests/exception.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 8afbc81..ce5d31b 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -596,7 +596,7 @@ static void test_debugger(void) return; } - sprintf(cmdline, "%s %s %s", my_argv[0], my_argv[1], "debuggee"); + sprintf(cmdline, "%s %s %s %p", my_argv[0], my_argv[1], "debuggee", &test_stage); ret = CreateProcess(NULL, cmdline, NULL, NULL, FALSE, DEBUG_PROCESS, NULL, NULL, &si, &pi); ok(ret, "could not create child process error: %u\n", GetLastError()); if (!ret) @@ -699,7 +699,7 @@ static void test_debugger(void) } } else - ok(FALSE, "unexpected stage %d\n", stage); + ok(FALSE, "unexpected stage %x\n", stage); status = pNtSetContextThread(pi.hThread, &ctx); ok(!status, "NtSetContextThread failed with 0x%x\n", status); @@ -828,8 +828,17 @@ START_TEST(exception) } my_argc = winetest_get_mainargs( &my_argv ); - if (my_argc >= 3) + if (my_argc >= 4) { + void *addr; + sscanf( my_argv[3], "%p", &addr ); + + if (addr != &test_stage) + { + skip( "child process not mapped at same address (%p/%p)\n", &test_stage, addr); + return; + } + /* child must be run under a debugger */ if (!pNtCurrentTeb()->Peb->BeingDebugged) {

1 0

Chris Robinson : wgl: Don' t set a pixel format on windows that already have one.
by Alexandre Julliard Sept. 20, 2007

Sept. 20, 2007

Module: wine Branch: master Commit: 87e3cd66ab46a6234424749ed56c018e83e9d889 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87e3cd66ab46a6234424749ed… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Wed Sep 19 03:21:08 2007 -0700 wgl: Don't set a pixel format on windows that already have one. --- dlls/opengl32/tests/opengl.c | 17 +++++++++++++++-- dlls/winex11.drv/opengl.c | 13 ++++++++----- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 2d08cfb..c244bb8 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -176,10 +176,12 @@ static void test_pbuffers(HDC hdc) else skip("Pbuffer test for offscreen pixelformat skipped as no offscreen-only format with pbuffer capabilities has been found\n"); } -static void test_setpixelformat(void) +static void test_setpixelformat(HDC winhdc) { int res = 0; + int nCfgs; int pf; + int i; PIXELFORMATDESCRIPTOR pfd = { sizeof(PIXELFORMATDESCRIPTOR), 1, /* version */ @@ -211,6 +213,17 @@ static void test_setpixelformat(void) /* SetPixelFormat on the main device context 'X root window' should fail */ res = SetPixelFormat(hdc, pf, &pfd); ok(res == 0, "SetPixelFormat on main device context should fail\n"); + + /* Setting the same format that was set on the HDC is allowed; other + formats fail */ + nCfgs = DescribePixelFormat(winhdc, 0, 0, NULL); + pf = GetPixelFormat(winhdc); + for(i = 1;i <= nCfgs;i++) + { + int res = SetPixelFormat(winhdc, i, NULL); + if(i == pf) ok(res, "Failed to set the same pixel format\n"); + else ok(!res, "Unexpectedly set an alternate pixel format\n"); + } } static void test_colorbits(HDC hdc) @@ -366,7 +379,7 @@ START_TEST(opengl) ok(res, "wglMakeCurrent failed!\n"); init_functions(); - test_setpixelformat(); + test_setpixelformat(hdc); test_colorbits(hdc); test_gdi_dbuf(hdc); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index fc33143..091aee5 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1369,35 +1369,38 @@ BOOL X11DRV_SetPixelFormat(X11DRV_PDEVICE *physDev, if (!has_opengl()) { ERR("No libGL on this box - disabling OpenGL support !\n"); - return 0; + return FALSE; } /* SetPixelFormat is not allowed on the X root_window e.g. GetDC(0) */ if(get_glxdrawable(physDev) == root_window) { ERR("Invalid operation on root_window\n"); - return 0; + return FALSE; } /* Check if iPixelFormat is in our list of supported formats to see if it is supported. */ fmt = ConvertPixelFormatWGLtoGLX(gdi_display, iPixelFormat, FALSE /* Offscreen */, &value); if(!fmt) { ERR("Invalid iPixelFormat: %d\n", iPixelFormat); - return 0; + return FALSE; } + if(physDev->current_pf) /* cannot change it if already set */ + return (physDev->current_pf == iPixelFormat); + pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DRAWABLE_TYPE, &value); hwnd = WindowFromDC(physDev->hdc); if(hwnd) { if(!(value&GLX_WINDOW_BIT)) { WARN("Pixel format %d is not compatible for window rendering\n", iPixelFormat); - return 0; + return FALSE; } if(!SendMessageW(hwnd, WM_X11DRV_SET_WIN_FORMAT, (WPARAM)fmt->fmt_id, 0)) { ERR("Couldn't set format of the window, returning failure\n"); - return 0; + return FALSE; } }

1 0

Clinton Stimpson : riched20: Adjust event mask when sending EN_CHANGE notification.
by Alexandre Julliard Sept. 20, 2007

Sept. 20, 2007

Module: wine Branch: master Commit: f8f07dfe549ed3772d2af989f6d4b462a2ddebc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8f07dfe549ed3772d2af989f… Author: Clinton Stimpson <cjstimpson(a)utwire.net> Date: Wed Sep 19 08:31:14 2007 -0600 riched20: Adjust event mask when sending EN_CHANGE notification. --- dlls/riched20/paint.c | 2 ++ dlls/riched20/tests/editor.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 215477b..7c40814 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -120,7 +120,9 @@ void ME_UpdateRepaint(ME_TextEditor *editor) /* send EN_CHANGE if the event mask asks for it */ if(editor->nEventMask & ENM_CHANGE) { + editor->nEventMask &= ~ENM_CHANGE; ME_SendOldNotify(editor, EN_CHANGE); + editor->nEventMask |= ENM_CHANGE; } ME_Repaint(editor); ME_SendSelChange(editor); diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index c929077..98b355e 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -2023,10 +2023,8 @@ static void test_eventMask(void) ok(ret == TRUE, "failed to set text\n"); /* richedit should mask off ENM_CHANGE when it sends an EN_CHANGE notification in response to WM_SETTEXT */ -todo_wine { ok(queriedEventMask == (eventMask & ~ENM_CHANGE), "wrong event mask (0x%x) during WM_COMMAND\n", queriedEventMask); -} }

1 0

Mikolaj Zalewski : winex11.drv: wintab: Add a missing break.
by Alexandre Julliard Sept. 20, 2007

Sept. 20, 2007

Module: wine Branch: master Commit: 704a56864da3ba23b12e3fa50f4c41bac1d2eb1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=704a56864da3ba23b12e3fa50… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Wed Sep 19 11:03:46 2007 -0700 winex11.drv: wintab: Add a missing break. --- dlls/winex11.drv/wintab.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 8846342..3c0e891 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -812,8 +812,8 @@ UINT X11DRV_WTInfoA(UINT wCategory, UINT nIndex, LPVOID lpOutput) default: FIXME("WTI_INTERFACE unhandled index %i\n",nIndex); rc = 0; - } + break; case WTI_DEFSYSCTX: case WTI_DDCTXS: case WTI_DEFCONTEXT:

1 0

Dmitry Timoshkov : gdi32: Use symbolic names for font tags.
by Alexandre Julliard Sept. 20, 2007

Sept. 20, 2007

Module: wine Branch: master Commit: b0d1590defbadf570d4da1fd0461cb6fc1125c50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0d1590defbadf570d4da1fd0… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Sep 20 19:10:31 2007 +0900 gdi32: Use symbolic names for font tags. --- configure | 2 ++ configure.ac | 1 + dlls/gdi32/freetype.c | 15 ++++++++++++--- include/config.h.in | 3 +++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/configure b/configure index ab97690..ed0651b 100755 --- a/configure +++ b/configure @@ -13054,9 +13054,11 @@ fi + for ac_header in ft2build.h \ freetype/freetype.h \ freetype/ftglyph.h \ + freetype/fttypes.h \ freetype/tttables.h \ freetype/ftnames.h \ freetype/ftsnames.h \ diff --git a/configure.ac b/configure.ac index 2c8c5da..b951604 100644 --- a/configure.ac +++ b/configure.ac @@ -872,6 +872,7 @@ then AC_CHECK_HEADERS(ft2build.h \ freetype/freetype.h \ freetype/ftglyph.h \ + freetype/fttypes.h \ freetype/tttables.h \ freetype/ftnames.h \ freetype/ftsnames.h \ diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index c556c3d..89f8b22 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -102,6 +102,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(font); #ifdef HAVE_FREETYPE_TTTABLES_H #include <freetype/tttables.h> #endif +#ifdef HAVE_FREETYPE_FTTYPES_H +#include <freetype/fttypes.h> +#endif #ifdef HAVE_FREETYPE_FTSNAMES_H #include <freetype/ftsnames.h> #else @@ -195,6 +198,12 @@ MAKE_FUNCPTR(FcPatternGetString); #undef MAKE_FUNCPTR +#ifndef FT_MAKE_TAG +#define FT_MAKE_TAG( ch0, ch1, ch2, ch3 ) \ + ( ((DWORD)(BYTE)(ch0) << 24) | ((DWORD)(BYTE)(ch1) << 16) | \ + ((DWORD)(BYTE)(ch2) << 8) | (DWORD)(BYTE)(ch3) ) +#endif + #ifndef ft_encoding_none #define FT_ENCODING_NONE ft_encoding_none #endif @@ -587,7 +596,7 @@ static char **expand_mac_font(const char *path) unsigned short *num_faces_ptr, num_faces, face; AsscEntry *assoc; Handle fond; - ResType fond_res = 0x464f4e44; /* 'FOND' */ + ResType fond_res = FT_MAKE_TAG('F','O','N','D'); fond = Get1IndResource(fond_res, idx); if(!fond) break; @@ -603,7 +612,7 @@ static char **expand_mac_font(const char *path) for(face = 0; face < num_faces; face++, assoc++) { Handle sfnt; - ResType sfnt_res = 0x73666e74; /* 'sfnt' */ + ResType sfnt_res = FT_MAKE_TAG('s','f','n','t'); unsigned short size, font_id; char *output; @@ -1195,7 +1204,7 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ /* check for the presence of the 'CFF ' table to check if the font is Type1 */ tmp_size = 0; - if (pFT_Load_Sfnt_Table && !pFT_Load_Sfnt_Table(ft_face, 0x43464620, 0, NULL, &tmp_size)) + if (pFT_Load_Sfnt_Table && !pFT_Load_Sfnt_Table(ft_face, FT_MAKE_TAG('C','F','F',' '), 0, NULL, &tmp_size)) { TRACE("Font %s/%p is OTF Type1\n", wine_dbgstr_a(file), font_data_ptr); face->ntmFlags = NTM_PS_OPENTYPE; diff --git a/include/config.h.in b/include/config.h.in index 8692bb1..e21e513 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -126,6 +126,9 @@ /* Define if you have the <freetype/fttrigon.h> header file. */ #undef HAVE_FREETYPE_FTTRIGON_H +/* Define to 1 if you have the <freetype/fttypes.h> header file. */ +#undef HAVE_FREETYPE_FTTYPES_H + /* Define to 1 if you have the <freetype/ftwinfnt.h> header file. */ #undef HAVE_FREETYPE_FTWINFNT_H

1 0

Mikolaj Zalewski : winex11.drv: wintab: Add missing CTX_PKTDATA support.
by Alexandre Julliard Sept. 20, 2007

Sept. 20, 2007

Module: wine Branch: master Commit: 8072f6985cafb406b62f92ba9b4ad636eb76893e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8072f6985cafb406b62f92ba9… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Wed Sep 19 11:04:52 2007 -0700 winex11.drv: wintab: Add missing CTX_PKTDATA support. --- dlls/winex11.drv/wintab.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 3c0e891..3d40955 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -851,6 +851,10 @@ UINT X11DRV_WTInfoA(UINT wCategory, UINT nIndex, LPVOID lpOutput) rc = CopyTabletData(lpOutput, &gSysContext.lcPktRate, sizeof(UINT)); break; + case CTX_PKTDATA: + rc = CopyTabletData(lpOutput, &gSysContext.lcPktData, + sizeof(WTPKT)); + break; case CTX_PKTMODE: rc = CopyTabletData(lpOutput, &gSysContext.lcPktMode, sizeof(WTPKT));

1 0

Roderick Colenbrander : wined3d: Better video memory reporting.
by Alexandre Julliard Sept. 20, 2007

Sept. 20, 2007

Module: wine Branch: master Commit: 21a3c1d4be7d9510239c192e0d70890ccc842d4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=21a3c1d4be7d9510239c192e0… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Sep 17 22:16:48 2007 +0200 wined3d: Better video memory reporting. --- dlls/wined3d/directx.c | 146 +++++++++++++++++++++++++++++++++++-------- dlls/wined3d/wined3d_main.c | 2 +- include/wine/wined3d_gl.h | 2 + 3 files changed, 122 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=21a3c1d4be7d9510239c1…

1 0

Stefan Dösinger : wined3d: Fix a typo in shader_glsl_cross.
by Alexandre Julliard Sept. 20, 2007

Sept. 20, 2007

Module: wine Branch: master Commit: d684c9c1a53fb15c8395229c8e607d126dba1230 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d684c9c1a53fb15c8395229c8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 13 12:41:18 2007 +0200 wined3d: Fix a typo in shader_glsl_cross. --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f199019..b3ea71e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1071,7 +1071,7 @@ void shader_glsl_cross(SHADER_OPCODE_ARG *arg) { shader_glsl_append_dst(arg->buffer, arg); shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], src_mask, &src0_param); shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], src_mask, &src1_param); - shader_addline(arg->buffer, "cross(%s, %s).%s);\n", src0_param.param_str, src1_param.param_str, dst_mask); + shader_addline(arg->buffer, "cross(%s, %s)%s);\n", src0_param.param_str, src1_param.param_str, dst_mask); } /* Process the WINED3DSIO_POW instruction in GLSL (dst = |src0|^src1)

1 0

Stefan Dösinger : wined3d: Check for NULL streams.
by Alexandre Julliard Sept. 20, 2007

Sept. 20, 2007

Module: wine Branch: master Commit: 4c51db896c3e8ab84126b6a8f90cd2f17f7245b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c51db896c3e8ab84126b6a8f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 19 00:17:06 2007 +0200 wined3d: Check for NULL streams. --- dlls/d3d9/tests/device.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/drawprim.c | 5 ++- 2 files changed, 87 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index c2012fc..328813c 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1367,6 +1367,88 @@ cleanup: if (hwnd) DestroyWindow(hwnd); } +static void test_null_stream(void) +{ + IDirect3DVertexBuffer9 *buffer = NULL; + D3DPRESENT_PARAMETERS present_parameters; + IDirect3DDevice9 *device = NULL; + IDirect3D9 *d3d9; + HWND hwnd; + HRESULT hr; + IDirect3DVertexShader9 *shader; + IDirect3DVertexDeclaration9 *decl; + DWORD shader_code[] = { + 0xfffe0101, /* vs_1_1 */ + 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x00000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x0000ffff /* end */ + }; + static const D3DVERTEXELEMENT9 decl_elements[] = { + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {1, 0, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 0}, + D3DDECL_END() + }; + + d3d9 = pDirect3DCreate9( D3D_SDK_VERSION ); + ok(d3d9 != NULL, "Failed to create IDirect3D9 object\n"); + hwnd = CreateWindow( "static", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + ok(hwnd != NULL, "Failed to create window\n"); + if (!d3d9 || !hwnd) goto cleanup; + + ZeroMemory(&present_parameters, sizeof(present_parameters)); + present_parameters.Windowed = TRUE; + present_parameters.hDeviceWindow = hwnd; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + + hr = IDirect3D9_CreateDevice( d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device ); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3D9_CreateDevice failed with %s\n", DXGetErrorString9(hr)); + if(!device) + { + skip("Failed to create a d3d device\n"); + goto cleanup; + } + + hr = IDirect3DDevice9_CreateVertexShader(device, shader_code, &shader); + if(FAILED(hr)) { + skip("No vertex shader support\n"); + goto cleanup; + } + hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &decl); + ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateVertexDeclaration failed (0x%08x)\n", hr); + hr = IDirect3DDevice9_CreateVertexBuffer(device, 12 * sizeof(float), 0, 0, D3DPOOL_MANAGED, &buffer, NULL); + ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateVertexBuffer failed (0x%08x)\n", hr); + + hr = IDirect3DDevice9_SetStreamSource(device, 0, buffer, 0, sizeof(float) * 3); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetStreamSource failed (0x%08x)\n", hr); + hr = IDirect3DDevice9_SetStreamSource(device, 1, NULL, 0, 0); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetStreamSource failed (0x%08x)\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, shader); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetVertexShader failed (0x%08x)\n", hr); + hr = IDirect3DDevice9_SetVertexDeclaration(device, decl); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetVertexDeclaration failed (0x%08x)\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed (0x%08x)\n", hr); + if(SUCCEEDED(hr)) { + hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_POINTLIST, 0, 1); + ok(SUCCEEDED(hr), "IDirect3DDevice9_DrawPrimitive failed (0x%08x)\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed (0x%08x)\n", hr); + } + + IDirect3DDevice9_SetStreamSource(device, 0, NULL, 0, 0); + IDirect3DDevice9_SetVertexShader(device, NULL); + IDirect3DDevice9_SetVertexDeclaration(device, NULL); + + cleanup: + if(decl) IDirect3DVertexDeclaration9_Release(decl); + if(shader) IDirect3DVertexShader9_Release(shader); + if(device) IDirect3DDevice9_Release(device); + if(d3d9) IDirect3D9_Release(d3d9); +} + START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); @@ -1390,5 +1472,6 @@ START_TEST(device) test_limits(); test_depthstenciltest(); test_draw_indexed(); + test_null_stream(); } } diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index dcfe20c..cca8c93 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -246,7 +246,10 @@ void primitiveDeclarationConvertToStridedData( * once in there. */ for(i=0; i < numPreloadStreams; i++) { - IWineD3DVertexBuffer_PreLoad(This->stateBlock->streamSource[streams[i]]); + IWineD3DVertexBuffer *vb = This->stateBlock->streamSource[streams[i]]; + if(vb) { + IWineD3DVertexBuffer_PreLoad(vb); + } } }

1 0

Stefan Dösinger : wined3d: Fix a typo in the surface code.
by Alexandre Julliard Sept. 20, 2007

Sept. 20, 2007

Module: wine Branch: master Commit: e94a21b270890a1ce3e895b6c9c074a85b950f56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e94a21b270890a1ce3e895b6c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 19 00:36:39 2007 +0200 wined3d: Fix a typo in the surface code. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6c090b7..1ab0c72 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -246,7 +246,7 @@ static void surface_allocate_surface(IWineD3DSurfaceImpl *This, GLenum internal, */ glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE); checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE)"); - This->Flags &= SFLAG_CLIENT; + This->Flags &= ~SFLAG_CLIENT; enable_client_storage = TRUE; } else { This->Flags |= SFLAG_CLIENT;

1 0