September 2010 - Wine-Commits

Hwang YunSong : shell32: Update Korean resource.
by Alexandre Julliard Sept. 15, 2010

Sept. 15, 2010

Module: wine Branch: master Commit: 44fb3c393dd9a8cfee913b85018cbf9e776acd7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=44fb3c393dd9a8cfee913b850… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed Sep 15 17:46:25 2010 +0900 shell32: Update Korean resource. --- dlls/shell32/shell32_Ko.rc | 292 ++++++++++++++++++++++++-------------------- 1 files changed, 157 insertions(+), 135 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=44fb3c393dd9a8cfee913…

1 0

Henri Verbeet : wined3d: Move the viewport to wined3d_state.
by Alexandre Julliard Sept. 15, 2010

Sept. 15, 2010

Module: wine Branch: master Commit: 16d9c91b97745916eb3afc10f15f20681394fe62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16d9c91b97745916eb3afc10f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 15 12:00:06 2010 +0200 wined3d: Move the viewport to wined3d_state. --- dlls/wined3d/device.c | 22 +++++++++++----------- dlls/wined3d/state.c | 22 +++++++++++----------- dlls/wined3d/stateblock.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 4 +--- 4 files changed, 27 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3bf1eac..15df5ab 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -561,7 +561,7 @@ void device_context_remove(IWineD3DDeviceImpl *device, struct wined3d_context *c void device_get_draw_rect(IWineD3DDeviceImpl *device, RECT *rect) { IWineD3DStateBlockImpl *stateblock = device->stateBlock; - WINED3DVIEWPORT *vp = &stateblock->viewport; + WINED3DVIEWPORT *vp = &stateblock->state.viewport; SetRect(rect, vp->X, vp->Y, vp->X + vp->Width, vp->Y + vp->Height); @@ -2998,7 +2998,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetViewport(IWineD3DDevice *iface, CONS TRACE("(%p)\n", This); This->updateStateBlock->changed.viewport = TRUE; - This->updateStateBlock->viewport = *pViewport; + This->updateStateBlock->state.viewport = *pViewport; /* Handle recording of state blocks */ if (This->isRecordingState) { @@ -3017,7 +3017,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetViewport(IWineD3DDevice *iface, CONS static HRESULT WINAPI IWineD3DDeviceImpl_GetViewport(IWineD3DDevice *iface, WINED3DVIEWPORT* pViewport) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; TRACE("(%p)\n", This); - *pViewport = This->stateBlock->viewport; + *pViewport = This->stateBlock->state.viewport; return WINED3D_OK; } @@ -5752,18 +5752,18 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface, /* Set the viewport and scissor rectangles, if requested. Tests show * that stateblock recording is ignored, the change goes directly * into the primary stateblock. */ - device->stateBlock->viewport.Height = device->render_targets[0]->currentDesc.Height; - device->stateBlock->viewport.Width = device->render_targets[0]->currentDesc.Width; - device->stateBlock->viewport.X = 0; - device->stateBlock->viewport.Y = 0; - device->stateBlock->viewport.MaxZ = 1.0f; - device->stateBlock->viewport.MinZ = 0.0f; + device->stateBlock->state.viewport.Height = device->render_targets[0]->currentDesc.Height; + device->stateBlock->state.viewport.Width = device->render_targets[0]->currentDesc.Width; + device->stateBlock->state.viewport.X = 0; + device->stateBlock->state.viewport.Y = 0; + device->stateBlock->state.viewport.MaxZ = 1.0f; + device->stateBlock->state.viewport.MinZ = 0.0f; IWineD3DDeviceImpl_MarkStateDirty(device, STATE_VIEWPORT); device->stateBlock->state.scissor_rect.top = 0; device->stateBlock->state.scissor_rect.left = 0; - device->stateBlock->state.scissor_rect.right = device->stateBlock->viewport.Width; - device->stateBlock->state.scissor_rect.bottom = device->stateBlock->viewport.Height; + device->stateBlock->state.scissor_rect.right = device->stateBlock->state.viewport.Width; + device->stateBlock->state.scissor_rect.bottom = device->stateBlock->state.viewport.Height; IWineD3DDeviceImpl_MarkStateDirty(device, STATE_SCISSORRECT); } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ebd89b3..50447b8 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1516,7 +1516,7 @@ static void state_pscale(DWORD state, IWineD3DStateBlockImpl *stateblock, struct if (stateblock->state.render_states[WINED3DRS_POINTSCALEENABLE]) { GLfloat scaleFactor; - DWORD h = stateblock->viewport.Height; + DWORD h = stateblock->state.viewport.Height; if (pointSize.f < gl_info->limits.pointsize_min) { @@ -3943,10 +3943,10 @@ static void transform_projection(DWORD state, IWineD3DStateBlockImpl *stateblock if (context->last_was_rhw) { - double x = stateblock->viewport.X; - double y = stateblock->viewport.Y; - double w = stateblock->viewport.Width; - double h = stateblock->viewport.Height; + double x = stateblock->state.viewport.X; + double y = stateblock->state.viewport.Y; + double w = stateblock->state.viewport.Width; + double h = stateblock->state.viewport.Height; TRACE("Calling glOrtho with x %.8e, y %.8e, w %.8e, h %.8e.\n", x, y, w, h); if (context->render_offscreen) @@ -4010,8 +4010,8 @@ static void transform_projection(DWORD state, IWineD3DStateBlockImpl *stateblock * filling convention. We want the difference to be large enough that * it doesn't get lost due to rounding inside the driver, but small * enough to prevent it from interfering with any anti-aliasing. */ - GLfloat xoffset = (63.0f / 64.0f) / stateblock->viewport.Width; - GLfloat yoffset = -(63.0f / 64.0f) / stateblock->viewport.Height; + GLfloat xoffset = (63.0f / 64.0f) / stateblock->state.viewport.Width; + GLfloat yoffset = -(63.0f / 64.0f) / stateblock->state.viewport.Height; if (context->render_offscreen) { @@ -4597,7 +4597,7 @@ static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, s */ if (useVertexShaderFunction) { - GLfloat yoffset = -(63.0f / 64.0f) / stateblock->viewport.Height; + GLfloat yoffset = -(63.0f / 64.0f) / stateblock->state.viewport.Height; device->posFixup[1] = context->render_offscreen ? -1.0f : 1.0f; device->posFixup[3] = device->posFixup[1] * yoffset; } @@ -4723,7 +4723,7 @@ static void viewport_miscpart(DWORD state, IWineD3DStateBlockImpl *stateblock, s { IWineD3DSurfaceImpl *target = stateblock->device->render_targets[0]; UINT width, height; - WINED3DVIEWPORT vp = stateblock->viewport; + WINED3DVIEWPORT vp = stateblock->state.viewport; if(vp.Width > target->currentDesc.Width) vp.Width = target->currentDesc.Width; if(vp.Height > target->currentDesc.Height) vp.Height = target->currentDesc.Height; @@ -4748,9 +4748,9 @@ static void viewport_miscpart(DWORD state, IWineD3DStateBlockImpl *stateblock, s static void viewport_vertexpart(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { - GLfloat yoffset = -(63.0f / 64.0f) / stateblock->viewport.Height; + GLfloat yoffset = -(63.0f / 64.0f) / stateblock->state.viewport.Height; - stateblock->device->posFixup[2] = (63.0f / 64.0f) / stateblock->viewport.Width; + stateblock->device->posFixup[2] = (63.0f / 64.0f) / stateblock->state.viewport.Width; stateblock->device->posFixup[3] = stateblock->device->posFixup[1] * yoffset; if(!isStateDirty(context, STATE_TRANSFORM(WINED3DTS_PROJECTION))) { diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 3f20ae5..5a6d58e 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -747,12 +747,12 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) This->material = targetStateBlock->material; } - if (This->changed.viewport - && memcmp(&targetStateBlock->viewport, &This->viewport, sizeof(This->viewport))) + if (This->changed.viewport && memcmp(&targetStateBlock->state.viewport, + &This->state.viewport, sizeof(This->state.viewport))) { TRACE("Updating viewport.\n"); - This->viewport = targetStateBlock->viewport; + This->state.viewport = targetStateBlock->state.viewport; } if (This->changed.scissorRect && memcmp(&targetStateBlock->state.scissor_rect, @@ -995,7 +995,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Apply(IWineD3DStateBlock *iface) if (This->changed.viewport) { - IWineD3DDevice_SetViewport(device, &This->viewport); + IWineD3DDevice_SetViewport(device, &This->state.viewport); } if (This->changed.scissorRect) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ed8ea55..49e741a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2349,6 +2349,7 @@ struct wined3d_stream_state struct wined3d_state { + WINED3DVIEWPORT viewport; RECT scissor_rect; DWORD render_states[WINEHIGHEST_RENDER_STATE + 1]; @@ -2404,9 +2405,6 @@ struct IWineD3DStateBlockImpl double clipplane[MAX_CLIPPLANES][4]; WINED3DCLIPSTATUS clip_status; - /* ViewPort */ - WINED3DVIEWPORT viewport; - /* Material */ WINED3DMATERIAL material;

1 0

Henri Verbeet : wined3d: Introduce a separate structure for stateblock states.
by Alexandre Julliard Sept. 15, 2010

Sept. 15, 2010

Module: wine Branch: master Commit: 1ef4f075c160a826a57e8cf5613a3211005c8eb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ef4f075c160a826a57e8cf56… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 15 12:00:04 2010 +0200 wined3d: Introduce a separate structure for stateblock states. We'd like to not pass an entire stateblock to things like state handlers and the shader backend, because those then use the stateblock to get to the device and through there to all the rest of wined3d. This would also be required for serialization of wined3d draw and state change commands into a single GL context. Resource updates would be explicitly excluded from serialization. --- dlls/wined3d/arb_program_shader.c | 36 +-- dlls/wined3d/ati_fragment_shader.c | 4 +- dlls/wined3d/device.c | 30 +- dlls/wined3d/drawprim.c | 20 +- dlls/wined3d/nvidia_texture_shader.c | 2 +- dlls/wined3d/shader.c | 15 +- dlls/wined3d/state.c | 552 ++++++++++++++++++---------------- dlls/wined3d/stateblock.c | 6 +- dlls/wined3d/utils.c | 36 ++- dlls/wined3d/wined3d_private.h | 9 +- 10 files changed, 382 insertions(+), 328 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ef4f075c160a826a57e8…

1 0

Paul Vriens : msxml3/tests: Step to the next item on failure as well.
by Alexandre Julliard Sept. 15, 2010

Sept. 15, 2010

Module: wine Branch: master Commit: 14316fc17f1c6d5da95aa55a952342a3c74112b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14316fc17f1c6d5da95aa55a9… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Sep 15 16:39:25 2010 +0200 msxml3/tests: Step to the next item on failure as well. --- dlls/msxml3/tests/domdoc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 0ed8f33..0a50ca0 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -5647,6 +5647,7 @@ static void test_default_properties(void) if (hr != S_OK) { win_skip("can't create %s instance\n", entry->clsid); + entry++; continue; }

1 0

Joris Huizer : d3dx9_36: D3DXPreprocessShaderFromFileW: remove unneeded code.
by Alexandre Julliard Sept. 14, 2010

Sept. 14, 2010

Module: wine Branch: master Commit: 5815b639794fa5e8e79754d86b66c6a03596731d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5815b639794fa5e8e79754d86… Author: Joris Huizer <joris_huizer(a)yahoo.com> Date: Tue Sep 14 21:56:21 2010 +0200 d3dx9_36: D3DXPreprocessShaderFromFileW: remove unneeded code. --- dlls/d3dx9_36/shader.c | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 7361e85..8c4580a 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -548,10 +548,9 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileW(LPCWSTR filename, LPD3DXBUFFER* error_messages) { void *buffer; - DWORD len, filename_len; + DWORD len; HRESULT hr; struct D3DXIncludeImpl includefromfile; - char *filename_a; if (FAILED(map_view_of_file(filename, &buffer, &len))) return D3DXERR_INVALIDDATA; @@ -562,21 +561,11 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileW(LPCWSTR filename, include = (LPD3DXINCLUDE)&includefromfile; } - filename_len = WideCharToMultiByte(CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL); - filename_a = HeapAlloc(GetProcessHeap(), 0, filename_len * sizeof(char)); - if (!filename_a) - { - UnmapViewOfFile(buffer); - return E_OUTOFMEMORY; - } - WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, filename_len, NULL, NULL); - hr = D3DPreprocess(buffer, len, NULL, (const D3D_SHADER_MACRO *)defines, (ID3DInclude *) include, (ID3DBlob **)shader, (ID3DBlob **)error_messages); - HeapFree(GetProcessHeap(), 0, filename_a); UnmapViewOfFile(buffer); return hr; }

1 0

André Hentschel : shdocvw: Update German translation.
by Alexandre Julliard Sept. 14, 2010

Sept. 14, 2010

Module: wine Branch: master Commit: a418f2572d1aafc7212a375e05839a0435179d66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a418f2572d1aafc7212a375e0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 14 20:21:08 2010 +0200 shdocvw: Update German translation. --- dlls/shdocvw/De.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/De.rc b/dlls/shdocvw/De.rc index 14559a3..560d93d 100644 --- a/dlls/shdocvw/De.rc +++ b/dlls/shdocvw/De.rc @@ -51,6 +51,7 @@ IDR_BROWSE_MAIN_MENU MENU MENUITEM "Seiten&vorschau...", ID_BROWSE_PRINT_PREVIEW MENUITEM SEPARATOR MENUITEM "Ei&genschaften...", ID_BROWSE_PROPERTIES + MENUITEM "&Beenden", ID_BROWSE_QUIT } POPUP "&Ansicht" {

1 0

Oldřich Jedlička : ddraw/tests: New attachment tests for 3D back buffers.
by Alexandre Julliard Sept. 14, 2010

Sept. 14, 2010

Module: wine Branch: master Commit: 7085a3f85b62bb3532164908b47640750e665572 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7085a3f85b62bb3532164908b… Author: Oldřich Jedlička <oldium.pro(a)seznam.cz> Date: Tue Sep 14 18:51:59 2010 +0200 ddraw/tests: New attachment tests for 3D back buffers. --- dlls/ddraw/tests/d3d.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 98 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 3427563..d291705 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3618,6 +3618,103 @@ static void BackBuffer3DCreateSurfaceTest(void) IDirectDraw7_Release(dd7); } +static void BackBuffer3DAttachmentTest(void) +{ + HRESULT hr; + IDirectDrawSurface *surface1, *surface2, *surface3, *surface4; + DDSURFACEDESC ddsd; + HWND window = CreateWindow( "static", "ddraw_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + + hr = IDirectDraw_SetCooperativeLevel(DirectDraw1, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(hr == DD_OK, "SetCooperativeLevel returned %08x\n", hr); + + /* Perform attachment tests on a back-buffer */ + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd.ddsCaps.dwCaps = DDSCAPS_BACKBUFFER | DDSCAPS_3DDEVICE; + ddsd.dwWidth = GetSystemMetrics(SM_CXSCREEN); + ddsd.dwHeight = GetSystemMetrics(SM_CYSCREEN); + hr = IDirectDraw_CreateSurface(DirectDraw1, &ddsd, &surface2, NULL); + todo_wine ok(SUCCEEDED(hr), "CreateSurface returned: %x\n",hr); + + if (surface2 != NULL) + { + /* Try a single primary and a two back buffers */ + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS; + ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + hr = IDirectDraw_CreateSurface(DirectDraw1, &ddsd, &surface1, NULL); + ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd.ddsCaps.dwCaps = DDSCAPS_BACKBUFFER | DDSCAPS_3DDEVICE; + ddsd.dwWidth = GetSystemMetrics(SM_CXSCREEN); + ddsd.dwHeight = GetSystemMetrics(SM_CYSCREEN); + hr = IDirectDraw_CreateSurface(DirectDraw1, &ddsd, &surface3, NULL); + ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); + + /* This one has a different size */ + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd.ddsCaps.dwCaps = DDSCAPS_BACKBUFFER | DDSCAPS_3DDEVICE; + ddsd.dwWidth = 128; + ddsd.dwHeight = 128; + hr = IDirectDraw_CreateSurface(DirectDraw1, &ddsd, &surface4, NULL); + ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); + + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2); + todo_wine ok(hr == DD_OK || broken(hr == DDERR_CANNOTATTACHSURFACE), + "Attaching a back buffer to a front buffer returned %08x\n", hr); + if(SUCCEEDED(hr)) + { + /* Try the reverse without detaching first */ + hr = IDirectDrawSurface_AddAttachedSurface(surface2, surface1); + ok(hr == DDERR_SURFACEALREADYATTACHED, "Attaching an attached surface to its attachee returned %08x\n", hr); + hr = IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface2); + ok(hr == DD_OK, "DeleteAttachedSurface failed with %08x\n", hr); + } + hr = IDirectDrawSurface_AddAttachedSurface(surface2, surface1); + todo_wine ok(hr == DD_OK || broken(hr == DDERR_CANNOTATTACHSURFACE), + "Attaching a front buffer to a back buffer returned %08x\n", hr); + if(SUCCEEDED(hr)) + { + /* Try to detach reversed */ + hr = IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface2); + ok(hr == DDERR_CANNOTDETACHSURFACE, "DeleteAttachedSurface returned %08x\n", hr); + /* Now the proper detach */ + hr = IDirectDrawSurface_DeleteAttachedSurface(surface2, 0, surface1); + ok(hr == DD_OK, "DeleteAttachedSurface failed with %08x\n", hr); + } + hr = IDirectDrawSurface_AddAttachedSurface(surface2, surface3); + todo_wine ok(hr == DD_OK || broken(hr == DDERR_CANNOTATTACHSURFACE), + "Attaching a back buffer to another back buffer returned %08x\n", hr); + if(SUCCEEDED(hr)) + { + hr = IDirectDrawSurface_DeleteAttachedSurface(surface2, 0, surface3); + ok(hr == DD_OK, "DeleteAttachedSurface failed with %08x\n", hr); + } + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface4); + ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a back buffer to a front buffer of different size returned %08x\n", hr); + hr = IDirectDrawSurface_AddAttachedSurface(surface4, surface1); + ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a front buffer to a back buffer of different size returned %08x\n", hr); + + IDirectDrawSurface_Release(surface4); + IDirectDrawSurface_Release(surface3); + IDirectDrawSurface_Release(surface2); + IDirectDrawSurface_Release(surface1); + } + + hr =IDirectDraw_SetCooperativeLevel(DirectDraw1, NULL, DDSCL_NORMAL); + ok(hr == DD_OK, "SetCooperativeLevel returned %08x\n", hr); + + DestroyWindow(window); +} + START_TEST(d3d) { init_function_pointers(); @@ -3654,6 +3751,7 @@ START_TEST(d3d) ViewportTest(); FindDevice(); BackBuffer3DCreateSurfaceTest(); + BackBuffer3DAttachmentTest(); D3D1_releaseObjects(); }

1 0

Rico Schüller : wined3d: Add argument check for Type to Get/SetTextureStageState().
by Alexandre Julliard Sept. 14, 2010

Sept. 14, 2010

Module: wine Branch: master Commit: e6d52c0c8bd7f70fd0046508e0e76c66b525daf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6d52c0c8bd7f70fd0046508e… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Sep 12 10:34:20 2010 +0200 wined3d: Add argument check for Type to Get/SetTextureStageState(). --- dlls/d3d8/device.c | 26 ++++++++++++++++++++++---- dlls/d3d9/device.c | 18 ++++++++++++++++-- dlls/ddraw/device.c | 9 ++++++--- dlls/wined3d/device.c | 23 ++++++++++++++++++++--- 4 files changed, 64 insertions(+), 12 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index c547da4..f54f043 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1575,13 +1575,22 @@ tss_lookup[] = {FALSE, WINED3DTSS_RESULTARG}, /* 28, D3DTSS_RESULTARG */ }; -static HRESULT WINAPI IDirect3DDevice8Impl_GetTextureStageState(LPDIRECT3DDEVICE8 iface, DWORD Stage,D3DTEXTURESTAGESTATETYPE Type,DWORD* pValue) { +static HRESULT WINAPI IDirect3DDevice8Impl_GetTextureStageState(LPDIRECT3DDEVICE8 iface, DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD *pValue) +{ IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; - const struct tss_lookup *l = &tss_lookup[Type]; + const struct tss_lookup *l; HRESULT hr; TRACE("iface %p, stage %u, state %#x, value %p.\n", iface, Stage, Type, pValue); + if (Type >= sizeof(tss_lookup) / sizeof(*tss_lookup)) + { + WARN("Invalid Type %#x passed.\n", Type); + return D3D_OK; + } + + l = &tss_lookup[Type]; + wined3d_mutex_lock(); if (l->sampler_state) hr = IWineD3DDevice_GetSamplerState(This->WineD3DDevice, Stage, l->state, pValue); else hr = IWineD3DDevice_GetTextureStageState(This->WineD3DDevice, Stage, l->state, pValue); @@ -1590,13 +1599,22 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetTextureStageState(LPDIRECT3DDEVI return hr; } -static HRESULT WINAPI IDirect3DDevice8Impl_SetTextureStageState(LPDIRECT3DDEVICE8 iface, DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD Value) { +static HRESULT WINAPI IDirect3DDevice8Impl_SetTextureStageState(LPDIRECT3DDEVICE8 iface, DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD Value) +{ IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; - const struct tss_lookup *l = &tss_lookup[Type]; + const struct tss_lookup *l; HRESULT hr; TRACE("iface %p, stage %u, state %#x, value %#x.\n", iface, Stage, Type, Value); + if (Type >= sizeof(tss_lookup) / sizeof(*tss_lookup)) + { + WARN("Invalid Type %#x passed.\n", Type); + return D3D_OK; + } + + l = &tss_lookup[Type]; + wined3d_mutex_lock(); if (l->sampler_state) hr = IWineD3DDevice_SetSamplerState(This->WineD3DDevice, Stage, l->state, Value); else hr = IWineD3DDevice_SetTextureStageState(This->WineD3DDevice, Stage, l->state, Value); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index af9cc48..c788b98 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1681,12 +1681,19 @@ static const WINED3DTEXTURESTAGESTATETYPE tss_lookup[] = WINED3DTSS_CONSTANT, /* 32, D3DTSS_CONSTANT */ }; -static HRESULT WINAPI IDirect3DDevice9Impl_GetTextureStageState(LPDIRECT3DDEVICE9EX iface, DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD* pValue) { +static HRESULT WINAPI IDirect3DDevice9Impl_GetTextureStageState(LPDIRECT3DDEVICE9EX iface, DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD *pValue) +{ IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; TRACE("iface %p, stage %u, state %#x, value %p.\n", iface, Stage, Type, pValue); + if (Type >= sizeof(tss_lookup) / sizeof(*tss_lookup)) + { + WARN("Invalid Type %#x passed.\n", Type); + return D3D_OK; + } + wined3d_mutex_lock(); hr = IWineD3DDevice_GetTextureStageState(This->WineD3DDevice, Stage, tss_lookup[Type], pValue); wined3d_mutex_unlock(); @@ -1694,12 +1701,19 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetTextureStageState(LPDIRECT3DDEVI return hr; } -static HRESULT WINAPI IDirect3DDevice9Impl_SetTextureStageState(LPDIRECT3DDEVICE9EX iface, DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD Value) { +static HRESULT WINAPI IDirect3DDevice9Impl_SetTextureStageState(LPDIRECT3DDEVICE9EX iface, DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD Value) +{ IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; TRACE("iface %p, stage %u, state %#x, value %#x.\n", iface, Stage, Type, Value); + if (Type >= sizeof(tss_lookup) / sizeof(*tss_lookup)) + { + WARN("Invalid Type %#x passed.\n", Type); + return D3D_OK; + } + wined3d_mutex_lock(); hr = IWineD3DDevice_SetTextureStageState(This->WineD3DDevice, Stage, tss_lookup[Type], Value); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 8e25543..30109e9 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4870,7 +4870,7 @@ IDirect3DDeviceImpl_7_GetTextureStageState(IDirect3DDevice7 *iface, { IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface; HRESULT hr; - const struct tss_lookup *l = &tss_lookup[TexStageStateType]; + const struct tss_lookup *l; TRACE("iface %p, stage %u, state %#x, value %p.\n", iface, Stage, TexStageStateType, State); @@ -4881,10 +4881,11 @@ IDirect3DDeviceImpl_7_GetTextureStageState(IDirect3DDevice7 *iface, if (TexStageStateType > D3DTSS_TEXTURETRANSFORMFLAGS) { WARN("Invalid TexStageStateType %#x passed.\n", TexStageStateType); - *State = 0; return DD_OK; } + l = &tss_lookup[TexStageStateType]; + EnterCriticalSection(&ddraw_cs); if (l->sampler_state) @@ -5003,7 +5004,7 @@ IDirect3DDeviceImpl_7_SetTextureStageState(IDirect3DDevice7 *iface, DWORD State) { IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface; - const struct tss_lookup *l = &tss_lookup[TexStageStateType]; + const struct tss_lookup *l; HRESULT hr; TRACE("iface %p, stage %u, state %#x, value %#x.\n", @@ -5015,6 +5016,8 @@ IDirect3DDeviceImpl_7_SetTextureStageState(IDirect3DDevice7 *iface, return DD_OK; } + l = &tss_lookup[TexStageStateType]; + EnterCriticalSection(&ddraw_cs); if (l->sampler_state) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7c75309..0be7e03 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4199,13 +4199,20 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ProcessVertices(IWineD3DDevice *iface, * Get / Set Texture Stage States * TODO: Verify against dx9 definitions *****/ -static HRESULT WINAPI IWineD3DDeviceImpl_SetTextureStageState(IWineD3DDevice *iface, DWORD Stage, WINED3DTEXTURESTAGESTATETYPE Type, DWORD Value) { +static HRESULT WINAPI IWineD3DDeviceImpl_SetTextureStageState(IWineD3DDevice *iface, DWORD Stage, WINED3DTEXTURESTAGESTATETYPE Type, DWORD Value) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - DWORD oldValue = This->updateStateBlock->textureState[Stage][Type]; const struct wined3d_gl_info *gl_info = &This->adapter->gl_info; + DWORD oldValue; TRACE("(%p) : Stage=%d, Type=%s(%d), Value=%d\n", This, Stage, debug_d3dtexturestate(Type), Type, Value); + if (Type > WINED3D_HIGHEST_TEXTURE_STATE) + { + WARN("Invalid Type %d passed.\n", Type); + return WINED3D_OK; + } + if (Stage >= gl_info->limits.texture_stages) { WARN("Attempting to set stage %u which is higher than the max stage %u, ignoring.\n", @@ -4213,6 +4220,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetTextureStageState(IWineD3DDevice *if return WINED3D_OK; } + oldValue = This->updateStateBlock->textureState[Stage][Type]; This->updateStateBlock->changed.textureState[Stage] |= 1 << Type; This->updateStateBlock->textureState[Stage][Type] = Value; @@ -4276,9 +4284,18 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetTextureStageState(IWineD3DDevice *if return WINED3D_OK; } -static HRESULT WINAPI IWineD3DDeviceImpl_GetTextureStageState(IWineD3DDevice *iface, DWORD Stage, WINED3DTEXTURESTAGESTATETYPE Type, DWORD* pValue) { +static HRESULT WINAPI IWineD3DDeviceImpl_GetTextureStageState(IWineD3DDevice *iface, DWORD Stage, WINED3DTEXTURESTAGESTATETYPE Type, DWORD *pValue) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + + if (Type > WINED3D_HIGHEST_TEXTURE_STATE) + { + WARN("Invalid Type %d passed.\n", Type); + return WINED3D_OK; + } + TRACE("(%p) : requesting Stage %d, Type %d getting %d\n", This, Stage, Type, This->updateStateBlock->textureState[Stage][Type]); + *pValue = This->updateStateBlock->textureState[Stage][Type]; return WINED3D_OK; }

1 0

Stefan Leichter : setupapi: Added tests for SetupDiGetINFClassA.
by Alexandre Julliard Sept. 14, 2010

Sept. 14, 2010

Module: wine Branch: master Commit: 7e8ab4c8b4642f9952c687c04c1cf259b2bf9192 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e8ab4c8b4642f9952c687c04… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sat Sep 11 23:15:19 2010 +0200 setupapi: Added tests for SetupDiGetINFClassA. --- dlls/setupapi/stubs.c | 1 + dlls/setupapi/tests/devinst.c | 149 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 150 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index fd40343..643d2df 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -236,6 +236,7 @@ BOOL WINAPI SetupDiGetINFClassA(PCSTR inf, LPGUID class_guid, PSTR class_name, DWORD size, PDWORD required_size) { FIXME("%s %p %p %d %p\n", debugstr_a(inf), class_guid, class_name, size, required_size); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 1ae0720..21fbb01 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -40,6 +40,7 @@ static BOOL (WINAPI *pSetupDiCallClassInstaller)(DI_FUNCTION, HDEVINFO, PSP_ static BOOL (WINAPI *pSetupDiDestroyDeviceInfoList)(HDEVINFO); static BOOL (WINAPI *pSetupDiEnumDeviceInfo)(HDEVINFO, DWORD, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiEnumDeviceInterfaces)(HDEVINFO, PSP_DEVINFO_DATA, const GUID *, DWORD, PSP_DEVICE_INTERFACE_DATA); +static BOOL (WINAPI *pSetupDiGetINFClassA)(PCSTR, LPGUID, PSTR, DWORD, PDWORD); static BOOL (WINAPI *pSetupDiInstallClassA)(HWND, PCSTR, DWORD, HSPFILEQ); static HKEY (WINAPI *pSetupDiOpenClassRegKeyExA)(GUID*,REGSAM,DWORD,PCSTR,PVOID); static HKEY (WINAPI *pSetupDiOpenDevRegKey)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, DWORD, DWORD, REGSAM); @@ -83,6 +84,7 @@ static void init_function_pointers(void) pSetupDiRegisterDeviceInfo = (void *)GetProcAddress(hSetupAPI, "SetupDiRegisterDeviceInfo"); pSetupDiGetClassDevsA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetClassDevsA"); pSetupDiGetClassDevsW = (void *)GetProcAddress(hSetupAPI, "SetupDiGetClassDevsW"); + pSetupDiGetINFClassA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetINFClassA"); pSetupDiSetDeviceRegistryPropertyA = (void *)GetProcAddress(hSetupAPI, "SetupDiSetDeviceRegistryPropertyA"); pSetupDiSetDeviceRegistryPropertyW = (void *)GetProcAddress(hSetupAPI, "SetupDiSetDeviceRegistryPropertyW"); pSetupDiGetDeviceRegistryPropertyA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetDeviceRegistryPropertyA"); @@ -1343,6 +1345,152 @@ static void testDeviceRegistryPropertyW(void) } } +static void testSetupDiGetINFClassA(void) +{ + static const char inffile[] = "winetest.inf"; + static const char content[] = "[Version]\r\n\r\n"; + + char cn[MAX_PATH]; + char filename[MAX_PATH]; + DWORD count; + BOOL retval; + GUID guid; + HANDLE h; + + if(!pSetupDiGetINFClassA) + { + win_skip("SetupDiGetINFClassA not present\n"); + return; + } + + count = GetTempPathA(MAX_PATH, filename); + if(!count) + { + win_skip("GetTempPathA failed\n"); + return; + } + + strcat(filename, inffile); + DeleteFileA(filename); + + /* not existing file */ + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + if (ERROR_CALL_NOT_IMPLEMENTED == GetLastError()) + { + skip("SetupDiGetINFClassA is not implemented\n"); + return; + } + ok(ERROR_FILE_NOT_FOUND == GetLastError(), + "expected error ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); + + /* missing file wins against other invalid parameter */ + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, NULL, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_FILE_NOT_FOUND == GetLastError(), + "expected error ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, NULL, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_FILE_NOT_FOUND == GetLastError(), + "expected error ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, cn, 0, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_FILE_NOT_FOUND == GetLastError(), + "expected error ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, NULL); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_FILE_NOT_FOUND == GetLastError(), + "expected error ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); + + /* test file content */ + h = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + if(h == INVALID_HANDLE_VALUE) + { + win_skip("failed to create file %s (error %u)\n", filename, GetLastError()); + return; + } + CloseHandle( h); + + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + + h = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + if(h == INVALID_HANDLE_VALUE) + { + win_skip("failed to create file %s (error %u)\n", filename, GetLastError()); + return; + } + WriteFile( h, content, sizeof(content), &count, NULL); + CloseHandle( h); + + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + + WritePrivateProfileStringA("Version", "Signature", "\"$CHICAGO$\"", filename); + + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + + WritePrivateProfileStringA("Version", "Class", "WINE", filename); + + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); + + /* invalid parameter */ + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, NULL, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, NULL, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, cn, 0, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INSUFFICIENT_BUFFER == GetLastError() || + ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INSUFFICIENT_BUFFER or ERROR_INVALID_PARAMETER, " + "got %u\n", GetLastError()); + + DeleteFileA(filename); + + WritePrivateProfileStringA("Version", "Signature", "\"$CHICAGO$\"", filename); + WritePrivateProfileStringA("Version", "ClassGUID", "WINE", filename); + + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(RPC_S_INVALID_STRING_UUID == GetLastError() || + ERROR_INVALID_PARAMETER == GetLastError(), + "expected error RPC_S_INVALID_STRING_UUID or ERROR_INVALID_PARAMETER, " + "got %u\n", GetLastError()); + + /* network adapter guid */ + WritePrivateProfileStringA("Version", "ClassGUID", + "{4d36e972-e325-11ce-bfc1-08002be10318}", filename); + + /* this test succeeds only if the guid is known to the system */ + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); + + DeleteFileA(filename); +} + START_TEST(devinst) { HDEVINFO set; @@ -1381,4 +1529,5 @@ START_TEST(devinst) testRegisterAndGetDetail(); testDeviceRegistryPropertyA(); testDeviceRegistryPropertyW(); + testSetupDiGetINFClassA(); }

1 0

Matej Spindler : jscript: Update Slovenian translation.
by Alexandre Julliard Sept. 14, 2010

Sept. 14, 2010

Module: wine Branch: master Commit: ef65b6c30185a0d439e6a477e422aa2ed7e59aae URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef65b6c30185a0d439e6a477e… Author: Matej Spindler <spindler.matej(a)gmail.com> Date: Mon Sep 13 09:24:55 2010 +0200 jscript: Update Slovenian translation. --- dlls/jscript/jscript_Si.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Si.rc b/dlls/jscript/jscript_Si.rc index 1f282dd..b38ec21 100644 --- a/dlls/jscript/jscript_Si.rc +++ b/dlls/jscript/jscript_Si.rc @@ -28,6 +28,7 @@ STRINGTABLE IDS_INVALID_CALL_ARG "Napačen klic postopka ali argument" IDS_CREATE_OBJ_ERROR "Avtomatizacijski server ne more ustvariti objekta" IDS_NO_PROPERTY "Objekt ne podpira atributa ali metode" + IDS_UNSUPPORTED_ACTION "Objekt ne podpira akcije" IDS_ARG_NOT_OPT "Argument je obvezen" IDS_SYNTAX_ERROR "Napačna sintaksa" IDS_SEMICOLON "Pričakujem ';'"

1 0