wine-commits February 2007

wine-commits@winehq.org

4 participants
839 discussions

Stefan Dösinger : wined3d: Load one bump mapping environment matrix into pixel shaders if needed.
by Alexandre Julliard 15 Feb '07

15 Feb '07

Module: wine Branch: master Commit: 49a49fcfec199ce6e972ee339fa28fbbe4643435 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49a49fcfec199ce6e972ee339… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 15 03:05:17 2007 +0100 wined3d: Load one bump mapping environment matrix into pixel shaders if needed. --- dlls/wined3d/baseshader.c | 9 +++++++++ dlls/wined3d/directx.c | 9 ++++++++- dlls/wined3d/glsl_shader.c | 18 ++++++++++++++++-- dlls/wined3d/pixelshader.c | 2 ++ dlls/wined3d/state.c | 12 ++++++++++++ dlls/wined3d/wined3d_private.h | 5 +++++ 6 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index f13d448..3bbdb45 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -344,6 +344,15 @@ HRESULT shader_get_registers_used( reg_maps->samplers[sampler_code] = (0x1 << 31) | WINED3DSTT_2D; } } + + /* texbem is only valid with < 1.4 pixel shaders */ + if(WINED3DSIO_TEXBEM == curOpcode->opcode) { + if(reg_maps->bumpmat != 0 && reg_maps->bumpmat != sampler_code) { + FIXME("Pixel shader uses texbem instruction on more than 1 sampler\n"); + } else { + reg_maps->bumpmat = sampler_code; + } + } } /* This will loop over all the registers and try to diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7e2fc05..398aca0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -284,10 +284,17 @@ void select_shader_max_constants( switch (ps_selected_mode) { case SHADER_GLSL: - /* Subtract the other potential uniforms from the max available (bools & ints) */ + /* Subtract the other potential uniforms from the max available (bools & ints). + * In theory the texbem instruction may need one more shader constant too. But lets assume + * that a sm <= 1.3 shader does not need all the uniforms provided by a glsl-capable card, + * and lets not take away a uniform needlessly from all other shaders. + */ gl_info->max_pshader_constantsF = gl_info->ps_glsl_constantsF - MAX_CONST_B - MAX_CONST_I; break; case SHADER_ARB: + /* The arb shader only loads the bump mapping environment matrix into the shader if it finds + * a free constant to do that, so no need to reduce the number of available constants. + */ gl_info->max_pshader_constantsF = gl_info->ps_arb_constantsF; break; case SHADER_SW: diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9722312..566442b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -283,7 +283,8 @@ void shader_glsl_load_constants( GLhandleARB *constant_locations; struct list *constant_list; GLhandleARB programId; - + GLint pos; + if (!stateBlock->glsl_program) { /* No GLSL program set - nothing to do. */ return; @@ -336,11 +337,22 @@ void shader_glsl_load_constants( shader_glsl_load_constantsI(pshader, gl_info, programId, MAX_CONST_I, stateBlock->pixelShaderConstantI, stateBlock->set.pixelShaderConstantsI); - + /* Load DirectX 9 boolean constants/uniforms for pixel shader */ shader_glsl_load_constantsB(pshader, gl_info, programId, MAX_CONST_B, stateBlock->pixelShaderConstantB, stateBlock->set.pixelShaderConstantsB); + + /* Upload the environment bump map matrix if needed. The needsbumpmat member specifies the texture stage to load the matrix from. + * It can't be 0 for a valid texbem instruction. + */ + if(((IWineD3DPixelShaderImpl *) pshader)->needsbumpmat != 0) { + float *data = (float *) &stateBlock->textureState[(int) ((IWineD3DPixelShaderImpl *) pshader)->needsbumpmat][WINED3DTSS_BUMPENVMAT00]; + pos = GL_EXTCALL(glGetUniformLocationARB(programId, "bumpenvmat")); + checkGLcall("glGetUniformLocationARB"); + GL_EXTCALL(glUniform4fvARB(pos, 1, data)); + checkGLcall("glUniform4fvARB"); + } } } @@ -379,6 +391,8 @@ void shader_generate_glsl_declarations( if(!pshader) shader_addline(buffer, "uniform vec4 posFixup;\n"); + else if(reg_maps->bumpmat) + shader_addline(buffer, "uniform vec4 bumpenvmat;\n"); /* Declare texture samplers */ for (i = 0; i < This->baseShader.limits.sampler; i++) { diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 8958ee0..e83cab1 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -914,6 +914,8 @@ inline static VOID IWineD3DPixelShaderImpl_GenerateShader( } } + This->needsbumpmat = reg_maps->bumpmat; + #if 1 /* if were using the data buffer of device then we don't need to free it */ HeapFree(GetProcessHeap(), 0, buffer.buffer); #endif diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 769f0d1..438f6f0 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1951,6 +1951,18 @@ static void pixelshader(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D } static void tex_bumpenvmat(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / WINED3D_HIGHEST_TEXTURE_STATE; + + if(stateblock->pixelShader && stage != 0 && + ((IWineD3DPixelShaderImpl *) stateblock->pixelShader)->needsbumpmat == stage) { + /* The pixel shader has to know the bump env matrix. Do a constants update if it isn't scheduled + * anyway + */ + if(!isStateDirty(context, STATE_PIXELSHADERCONSTANT) && + !isStateDirty(context, STATE_PIXELSHADER)) { + shaderconstant(STATE_PIXELSHADERCONSTANT, stateblock, context); + } + } } static void transform_world(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6111f53..20c9072 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1468,6 +1468,7 @@ typedef struct shader_reg_maps { /* Sampler usage tokens * Use 0 as default (bit 31 is always 1 on a valid token) */ DWORD samplers[MAX_SAMPLERS]; + char bumpmat; /* Whether or not a loop is used in this shader */ char loop; @@ -1834,6 +1835,10 @@ typedef struct IWineD3DPixelShaderImpl { /* run time data */ PSHADERDATA *data; + /* Some information about the shader behavior */ + char needsbumpmat; + UINT bumpenvmatconst; + #if 0 /* needs reworking */ PSHADERINPUTDATA input; PSHADEROUTPUTDATA output;

1 0

Stefan Dösinger : wined3d: Give the bump env matrices their own states.
by Alexandre Julliard 15 Feb '07

15 Feb '07

Module: wine Branch: master Commit: efbd6d6332c610af5d1a0ce62606b293414f30ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=efbd6d6332c610af5d1a0ce62… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 15 02:57:49 2007 +0100 wined3d: Give the bump env matrices their own states. --- dlls/wined3d/state.c | 67 ++++++++++++++++++++++++++------------------------ 1 files changed, 35 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=efbd6d6332c610af5d1a0…

1 0

Dmitry Timoshkov : gdi32: Revert 1440eb5a35dc95dea1836d9035b51e2b15d83703 and add the test showing that the change was wrong .
by Alexandre Julliard 15 Feb '07

15 Feb '07

Module: wine Branch: master Commit: 37591409b28c2000e70bd0d3c654a3a7559a4a26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37591409b28c2000e70bd0d3c… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Feb 15 15:52:33 2007 +0800 gdi32: Revert 1440eb5a35dc95dea1836d9035b51e2b15d83703 and add the test showing that the change was wrong. --- dlls/gdi32/font.c | 79 ++++++++++++++++++++++++------- dlls/gdi32/tests/font.c | 121 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 179 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=37591409b28c2000e70bd…

1 0

Jason Green : riched20: If outside of the richedit window, return earlier.
by Alexandre Julliard 15 Feb '07

15 Feb '07

Module: wine Branch: master Commit: 2aa8463a94586da94d9f4cab902f5ef68a5e6563 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aa8463a94586da94d9f4cab9… Author: Jason Green <jave27(a)gmail.com> Date: Wed Feb 14 23:40:52 2007 -0500 riched20: If outside of the richedit window, return earlier. Prevents a crash when selecting text outside of a richedit control box. --- dlls/riched20/editor.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 783e91d..c9e9246 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2597,6 +2597,8 @@ void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM lParam x = (short)LOWORD(lParam); y = (short)HIWORD(lParam); nCharOfs = ME_CharFromPos(editor, x, y); + if (nCharOfs < 0) return; + ME_CursorFromCharOfs(editor, nCharOfs, &tmpCursor); tmpRun = &tmpCursor.pRun->member.run;

1 0

H. Verbeet : wined3d: Use WINED3D_OK rather than D3D_OK.
by Alexandre Julliard 15 Feb '07

15 Feb '07

Module: wine Branch: master Commit: 34e74ffc2a085b51c64a89b9b63609aadd24139c URL: http://source.winehq.org/git/wine.git/?a=commit;h=34e74ffc2a085b51c64a89b9b… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Feb 14 23:30:40 2007 +0100 wined3d: Use WINED3D_OK rather than D3D_OK. --- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/surface_gdi.c | 10 +++++----- dlls/wined3d/vertexbuffer.c | 2 +- dlls/wined3d/vertexshader.c | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f511108..a80c3e7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1667,7 +1667,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR /* Setup the implicit swapchain */ TRACE("Creating implicit swapchain\n"); - if (D3D_OK != D3DCB_CreateAdditionalSwapChain((IUnknown *) This->parent, pPresentationParameters, (IWineD3DSwapChain **)&swapchain) || swapchain == NULL) { + if (FAILED(D3DCB_CreateAdditionalSwapChain((IUnknown *) This->parent, pPresentationParameters, (IWineD3DSwapChain **)&swapchain)) || !swapchain) { WARN("Failed to create implicit swapchain\n"); return WINED3DERR_INVALIDCALL; } @@ -1845,10 +1845,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_EnumDisplayModes(IWineD3DDevice *iface, TRACE("Enumerating %dx%d@%s\n", DevModeW.dmPelsWidth, DevModeW.dmPelsHeight, debug_d3dformat(pixelformat_for_depth(DevModeW.dmBitsPerPel))); if (callback((IUnknown *) This, (UINT) DevModeW.dmPelsWidth, (UINT) DevModeW.dmPelsHeight, pixelformat_for_depth(DevModeW.dmBitsPerPel), 60.0, context) == DDENUMRET_CANCEL) - return D3D_OK; + return WINED3D_OK; } - return D3D_OK; + return WINED3D_OK; } static HRESULT WINAPI IWineD3DDeviceImpl_SetDisplayMode(IWineD3DDevice *iface, UINT iSwapChain, WINED3DDISPLAYMODE* pMode) { @@ -1882,7 +1882,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetDisplayMode(IWineD3DDevice *iface, U (This->ddraw_height == pMode->Height) && (This->ddraw_format == pMode->Format) && (pMode->RefreshRate == 0) ) { - return D3D_OK; + return WINED3D_OK; } ret = ChangeDisplaySettingsExW(NULL, &devmode, NULL, CDS_FULLSCREEN, NULL); diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 34d6bff..cd02007 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -243,7 +243,7 @@ IWineGDISurfaceImpl_LockRect(IWineD3DSurface *iface, TRACE("returning memory@%p, pitch(%d)\n", pLockedRect->pBits, pLockedRect->Pitch); This->Flags |= SFLAG_LOCKED; - return D3D_OK; + return WINED3D_OK; } /***************************************************************************** @@ -1206,7 +1206,7 @@ IWineGDISurfaceImpl_BltFast(IWineD3DSurface *iface, /* Lock the union of the two rectangles */ ret = IWineD3DSurface_LockRect(iface, &dlock, &lock_union, 0); - if(ret != D3D_OK) goto error; + if(ret != WINED3D_OK) goto error; pitch = dlock.Pitch; slock.Pitch = dlock.Pitch; @@ -1221,9 +1221,9 @@ IWineGDISurfaceImpl_BltFast(IWineD3DSurface *iface, else { ret = IWineD3DSurface_LockRect(Source, &slock, &lock_src, WINED3DLOCK_READONLY); - if(ret != D3D_OK) goto error; + if(ret != WINED3D_OK) goto error; ret = IWineD3DSurface_LockRect(iface, &dlock, &lock_dst, 0); - if(ret != D3D_OK) goto error; + if(ret != WINED3D_OK) goto error; sbuf = slock.pBits; dbuf = dlock.pBits; @@ -1497,7 +1497,7 @@ const char* filename) * avoid confusion in the shared surface code. * * Returns: - * D3D_OK on success + * WINED3D_OK on success * The return values of called methods on failure * *****************************************************************************/ diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c index 84d0ca3..2e97c20 100644 --- a/dlls/wined3d/vertexbuffer.c +++ b/dlls/wined3d/vertexbuffer.c @@ -433,7 +433,7 @@ HRESULT WINAPI IWineD3DVertexBufferImpl_Unlock(IWineD3DVertexBuffer *iface) { if(lockcount > 0) { /* Delay loading the buffer until everything is unlocked */ TRACE("Ignoring the unlock\n"); - return D3D_OK; + return WINED3D_OK; } if(This->Flags & VBFLAG_HASDESC) { diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 52101f2..eeeb743 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -1244,7 +1244,7 @@ static HRESULT WINAPI IWIneD3DVertexShaderImpl_SetLocalConstantsF(IWineD3DVertex list_add_head(&This->baseShader.constantsF, &lconst->entry); } - return D3D_OK; + return WINED3D_OK; } static HRESULT WINAPI IWineD3DVertexShaderImpl_CompileShader(IWineD3DVertexShader *iface) {

1 0

H. Verbeet : wined3d: Use WINED3DPRESENT_BACK_BUFFER_MAX rather than D3DPRESENT_BACK_BUFFER_MAX.
by Alexandre Julliard 15 Feb '07

15 Feb '07

Module: wine Branch: master Commit: 3e77ffc563e121991f890ea1e26353ae7ccc2eb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e77ffc563e121991f890ea1e… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Feb 14 23:30:30 2007 +0100 wined3d: Use WINED3DPRESENT_BACK_BUFFER_MAX rather than D3DPRESENT_BACK_BUFFER_MAX. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d_types.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7031b7a..f511108 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1247,7 +1247,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic *******************************/ /* Check the params */ - if(*pPresentationParameters->BackBufferCount > D3DPRESENT_BACK_BUFFER_MAX) { + if(*pPresentationParameters->BackBufferCount > WINED3DPRESENT_BACK_BUFFER_MAX) { ERR("App requested %d back buffers, this is not supported for now\n", *pPresentationParameters->BackBufferCount); return WINED3DERR_INVALIDCALL; } else if (*pPresentationParameters->BackBufferCount > 1) { diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 8c82c61..38622ae 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -621,6 +621,8 @@ typedef enum _WINED3DBACKBUFFER_TYPE { WINED3DBACKBUFFER_TYPE_FORCE_DWORD = 0x7fffffff } WINED3DBACKBUFFER_TYPE; +#define WINED3DPRESENT_BACK_BUFFER_MAX 3 + typedef enum _WINED3DSWAPEFFECT { WINED3DSWAPEFFECT_DISCARD = 1, WINED3DSWAPEFFECT_FLIP = 2,

1 0

H. Verbeet : wined3d: Use WINED3DUSAGE rather than D3DUSAGE.
by Alexandre Julliard 15 Feb '07

15 Feb '07

Module: wine Branch: master Commit: d4d165afd86daa16c9cb7f6d6cf800d121dc2187 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4d165afd86daa16c9cb7f6d6… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Feb 14 23:30:23 2007 +0100 wined3d: Use WINED3DUSAGE rather than D3DUSAGE. --- dlls/wined3d/device.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7e6ef3e..7031b7a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -358,13 +358,13 @@ static void CreateVBO(IWineD3DVertexBufferImpl *object) { * quite often even if they specify 0 usage. Because we always keep the local copy * we never read from the vbo and can create a write only opengl buffer. */ - switch(vboUsage & (D3DUSAGE_WRITEONLY | D3DUSAGE_DYNAMIC) ) { - case D3DUSAGE_WRITEONLY | D3DUSAGE_DYNAMIC: - case D3DUSAGE_DYNAMIC: + switch(vboUsage & (WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_DYNAMIC) ) { + case WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_DYNAMIC: + case WINED3DUSAGE_DYNAMIC: TRACE("Gl usage = GL_STREAM_DRAW\n"); glUsage = GL_STREAM_DRAW_ARB; break; - case D3DUSAGE_WRITEONLY: + case WINED3DUSAGE_WRITEONLY: default: TRACE("Gl usage = GL_DYNAMIC_DRAW\n"); glUsage = GL_DYNAMIC_DRAW_ARB;

1 0

H. Verbeet : wined3d: Use WINED3DSTREAMSOURCE_INSTANCEDATA rather than D3DSTREAMSOURCE_INSTANCEDATA .
by Alexandre Julliard 15 Feb '07

15 Feb '07

Module: wine Branch: master Commit: 498f9c507a1ab1d4179794aec3cde04dd44112bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=498f9c507a1ab1d4179794aec… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Feb 14 23:30:16 2007 +0100 wined3d: Use WINED3DSTREAMSOURCE_INSTANCEDATA rather than D3DSTREAMSOURCE_INSTANCEDATA. --- dlls/wined3d/drawprim.c | 4 ++-- dlls/wined3d/state.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 1d2a66e..2cc3a15 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1182,7 +1182,7 @@ inline void drawStridedInstanced(IWineD3DDevice *iface, WineDirect3DVertexStride /* First, figure out how many instances we have to draw */ for(i = 0; i < MAX_STREAMS; i++) { /* Look at all non-instanced streams */ - if(!(stateblock->streamFlags[i] & D3DSTREAMSOURCE_INSTANCEDATA) && + if(!(stateblock->streamFlags[i] & WINED3DSTREAMSOURCE_INSTANCEDATA) && stateblock->streamSource[i]) { int inst = stateblock->streamFreq[i]; @@ -1194,7 +1194,7 @@ inline void drawStridedInstanced(IWineD3DDevice *iface, WineDirect3DVertexStride } for(i = 0; i < sizeof(sd->u.input) / sizeof(sd->u.input[0]); i++) { - if(stateblock->streamFlags[sd->u.input[i].streamNo] & D3DSTREAMSOURCE_INSTANCEDATA) { + if(stateblock->streamFlags[sd->u.input[i].streamNo] & WINED3DSTREAMSOURCE_INSTANCEDATA) { instancedData[numInstancedAttribs] = i; numInstancedAttribs++; } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a434000..5d4f21e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2155,7 +2155,7 @@ static inline void loadNumberedArrays(IWineD3DStateBlockImpl *stateblock, WineDi continue; /* Do not load instance data. It will be specified using glTexCoord by drawprim */ - if(stateblock->streamFlags[strided->u.input[i].streamNo] & D3DSTREAMSOURCE_INSTANCEDATA) { + if(stateblock->streamFlags[strided->u.input[i].streamNo] & WINED3DSTREAMSOURCE_INSTANCEDATA) { GL_EXTCALL(glDisableVertexAttribArrayARB(i)); stateblock->wineD3DDevice->instancedDraw = TRUE; continue;

1 0

Detlef Riekenberg : winspool: Do not access NULL when HeapAlloc failed.
by Alexandre Julliard 15 Feb '07

15 Feb '07

Module: wine Branch: master Commit: 055d8d461137ba00d8075526caeb07b4904d909d URL: http://source.winehq.org/git/wine.git/?a=commit;h=055d8d461137ba00d8075526c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Feb 14 22:54:19 2007 +0100 winspool: Do not access NULL when HeapAlloc failed. --- dlls/winspool.drv/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 73bd574..f730be2 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1261,7 +1261,7 @@ static DWORD get_ports_from_all_monitors(DWORD level, LPBYTE pPorts, DWORD cbBuf needed += (level == 1) ? pm->pi1_needed : pm->pi2_needed; /* fill the buffer, if we have one */ - if (pPorts && (cbBuf >= needed )) { + if (pPorts && (cbBuf >= needed ) && pm->cache) { cacheindex = 0; cache = pm->cache; while (cacheindex < pm->returned) {

1 0

Louis Lenders : user32: Fix error return values in DialogBoxParam + simple test.
by Alexandre Julliard 15 Feb '07

15 Feb '07

Module: wine Branch: master Commit: ba7207cbc0d449e4e1b0fdc3fbe0251eb51a64da URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba7207cbc0d449e4e1b0fdc3f… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed Feb 14 20:32:35 2007 +0000 user32: Fix error return values in DialogBoxParam + simple test. --- dlls/user32/dialog.c | 12 ++++++------ dlls/user32/tests/dialog.c | 15 +++++++++++++++ dlls/user32/tests/resource.rc | 9 +++++++++ 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index e70b33f..3acd37a 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -800,11 +800,11 @@ INT_PTR WINAPI DialogBoxParamA( HINSTANCE hInst, LPCSTR name, HRSRC hrsrc; LPCDLGTEMPLATEA ptr; - if (!(hrsrc = FindResourceA( hInst, name, (LPSTR)RT_DIALOG ))) return 0; - if (!(ptr = (LPCDLGTEMPLATEA)LoadResource(hInst, hrsrc))) return 0; + if (!(hrsrc = FindResourceA( hInst, name, (LPSTR)RT_DIALOG ))) return -1; + if (!(ptr = (LPCDLGTEMPLATEA)LoadResource(hInst, hrsrc))) return -1; hwnd = DIALOG_CreateIndirect( hInst, ptr, owner, dlgProc, param, FALSE, TRUE ); if (hwnd) return DIALOG_DoDialogBox( hwnd, owner ); - return -1; + return 0; } @@ -818,11 +818,11 @@ INT_PTR WINAPI DialogBoxParamW( HINSTANCE hInst, LPCWSTR name, HRSRC hrsrc; LPCDLGTEMPLATEW ptr; - if (!(hrsrc = FindResourceW( hInst, name, (LPWSTR)RT_DIALOG ))) return 0; - if (!(ptr = (LPCDLGTEMPLATEW)LoadResource(hInst, hrsrc))) return 0; + if (!(hrsrc = FindResourceW( hInst, name, (LPWSTR)RT_DIALOG ))) return -1; + if (!(ptr = (LPCDLGTEMPLATEW)LoadResource(hInst, hrsrc))) return -1; hwnd = DIALOG_CreateIndirect( hInst, ptr, owner, dlgProc, param, TRUE, TRUE ); if (hwnd) return DIALOG_DoDialogBox( hwnd, owner ); - return -1; + return 0; } diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index eeea474..fe8a0fd 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -861,6 +861,20 @@ static void test_GetDlgItemText(void) ok(string[0] == '\0', "string retrieved using GetDlgItemText should have been NULL terminated\n"); } +static void test_DialogBoxParamA(void) +{ + int ret; + HWND hwnd_invalid = (HWND)0x4444; + + SetLastError(0xdeadbeef); + ret = DialogBoxParamA(GetModuleHandle(NULL), "IDD_DIALOG" , hwnd_invalid, 0 , 0); + ok(0 == ret, "DialogBoxParamA returned %d, expected 0\n", ret); + ok(ERROR_INVALID_WINDOW_HANDLE == GetLastError(),"got %d, expected ERROR_INVALID_WINDOW_HANDLE\n",GetLastError()); + SetLastError(0xdeadbeef); + ret = DialogBoxParamA(GetModuleHandle(NULL), "RESOURCE_INVALID" , 0, 0, 0); + ok(-1 == ret, "DialogBoxParamA returned %d, expected -1\n", ret); + ok(ERROR_RESOURCE_NAME_NOT_FOUND == GetLastError(),"got %d, expected ERROR_RESOURCE_NAME_NOT_FOUND\n",GetLastError()); +} START_TEST(dialog) { @@ -873,4 +887,5 @@ START_TEST(dialog) WM_NEXTDLGCTLTest(); InitialFocusTest(); test_GetDlgItemText(); + test_DialogBoxParamA(); } diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index e882728..8434f61 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -80,6 +80,15 @@ FONT 8, "MS Shell Dlg" EDITTEXT 200,4,4,50,14 } +IDD_DIALOG DIALOG DISCARDABLE 0, 0, 186, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Dialog" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,129,7,50,14 + PUSHBUTTON "Cancel",IDCANCEL,129,24,50,14 +END + /* BINRES test_mono.bmp */ 100 BITMAP test_mono.bmp /* {

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
84
Older →

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 February 2007