December 2012 - Wine-Commits

Henri Verbeet : d3d10core/tests: Add a small test for ID3D10Device_CreateDepthStencilState().
by Alexandre Julliard Dec. 14, 2012

Dec. 14, 2012

Module: wine Branch: master Commit: 93700423e8d23c9c1d8ead78297ea37231559f50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93700423e8d23c9c1d8ead782… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 13 22:09:00 2012 +0100 d3d10core/tests: Add a small test for ID3D10Device_CreateDepthStencilState(). --- dlls/d3d10core/tests/device.c | 48 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index cfa131c..b045c50 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -672,6 +672,53 @@ static void test_create_blend_state(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_create_depthstencil_state(void) +{ + ID3D10DepthStencilState *ds_state1, *ds_state2; + D3D10_DEPTH_STENCIL_DESC ds_desc; + ID3D10Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + hr = ID3D10Device_CreateDepthStencilState(device, NULL, &ds_state1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + ds_desc.DepthEnable = TRUE; + ds_desc.DepthWriteMask = D3D10_DEPTH_WRITE_MASK_ALL; + ds_desc.DepthFunc = D3D10_COMPARISON_LESS; + ds_desc.StencilEnable = FALSE; + ds_desc.StencilReadMask = D3D10_DEFAULT_STENCIL_READ_MASK; + ds_desc.StencilWriteMask = D3D10_DEFAULT_STENCIL_WRITE_MASK; + ds_desc.FrontFace.StencilFailOp = D3D10_STENCIL_OP_KEEP; + ds_desc.FrontFace.StencilDepthFailOp = D3D10_STENCIL_OP_KEEP; + ds_desc.FrontFace.StencilPassOp = D3D10_STENCIL_OP_KEEP; + ds_desc.FrontFace.StencilFunc = D3D10_COMPARISON_ALWAYS; + ds_desc.BackFace.StencilFailOp = D3D10_STENCIL_OP_KEEP; + ds_desc.BackFace.StencilDepthFailOp = D3D10_STENCIL_OP_KEEP; + ds_desc.BackFace.StencilPassOp = D3D10_STENCIL_OP_KEEP; + ds_desc.BackFace.StencilFunc = D3D10_COMPARISON_ALWAYS; + + hr = ID3D10Device_CreateDepthStencilState(device, &ds_desc, &ds_state1); + ok(SUCCEEDED(hr), "Failed to create depthstencil state, hr %#x.\n", hr); + hr = ID3D10Device_CreateDepthStencilState(device, &ds_desc, &ds_state2); + ok(SUCCEEDED(hr), "Failed to create depthstencil state, hr %#x.\n", hr); + ok(ds_state1 == ds_state2, "Got different depthstencil state objects.\n"); + + refcount = ID3D10DepthStencilState_Release(ds_state2); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + refcount = ID3D10DepthStencilState_Release(ds_state1); + ok(!refcount, "Got unexpected refcount %u.\n", refcount); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(device) { test_device_interfaces(); @@ -683,4 +730,5 @@ START_TEST(device) test_create_shader(); test_create_sampler_state(); test_create_blend_state(); + test_create_depthstencil_state(); }

1 0

Henri Verbeet : ddraw: Avoid LPD3DMATERIALHANDLE.
by Alexandre Julliard Dec. 14, 2012

Dec. 14, 2012

Module: wine Branch: master Commit: ecdddd60676aa343c32150eb62544749df19686d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecdddd60676aa343c32150eb6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 13 22:08:57 2012 +0100 ddraw: Avoid LPD3DMATERIALHANDLE. --- include/d3d.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index c478a04..fa6179f 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -658,7 +658,7 @@ DECLARE_INTERFACE_(IDirect3DViewport,IUnknown) STDMETHOD(TransformVertices)(THIS_ DWORD dwVertexCount, LPD3DTRANSFORMDATA lpData, DWORD dwFlags, LPDWORD lpOffScreen) PURE; STDMETHOD(LightElements)(THIS_ DWORD dwElementCount, LPD3DLIGHTDATA lpData) PURE; STDMETHOD(SetBackground)(THIS_ D3DMATERIALHANDLE hMat) PURE; - STDMETHOD(GetBackground)(THIS_ LPD3DMATERIALHANDLE lphMat, LPBOOL lpValid) PURE; + STDMETHOD(GetBackground)(THIS_ D3DMATERIALHANDLE *material, BOOL *valid) PURE; STDMETHOD(SetBackgroundDepth)(THIS_ IDirectDrawSurface *surface) PURE; STDMETHOD(GetBackgroundDepth)(THIS_ IDirectDrawSurface **surface, BOOL *valid) PURE; STDMETHOD(Clear)(THIS_ DWORD dwCount, LPD3DRECT lpRects, DWORD dwFlags) PURE; @@ -726,7 +726,7 @@ DECLARE_INTERFACE_(IDirect3DViewport2,IDirect3DViewport) STDMETHOD(TransformVertices)(THIS_ DWORD dwVertexCount, LPD3DTRANSFORMDATA lpData, DWORD dwFlags, LPDWORD lpOffScreen) PURE; STDMETHOD(LightElements)(THIS_ DWORD dwElementCount, LPD3DLIGHTDATA lpData) PURE; STDMETHOD(SetBackground)(THIS_ D3DMATERIALHANDLE hMat) PURE; - STDMETHOD(GetBackground)(THIS_ LPD3DMATERIALHANDLE lphMat, LPBOOL lpValid) PURE; + STDMETHOD(GetBackground)(THIS_ D3DMATERIALHANDLE *material, BOOL *valid) PURE; STDMETHOD(SetBackgroundDepth)(THIS_ IDirectDrawSurface *surface) PURE; STDMETHOD(GetBackgroundDepth)(THIS_ IDirectDrawSurface **surface, BOOL *valid) PURE; STDMETHOD(Clear)(THIS_ DWORD dwCount, LPD3DRECT lpRects, DWORD dwFlags) PURE; @@ -802,7 +802,7 @@ DECLARE_INTERFACE_(IDirect3DViewport3,IDirect3DViewport2) STDMETHOD(TransformVertices)(THIS_ DWORD dwVertexCount, LPD3DTRANSFORMDATA lpData, DWORD dwFlags, LPDWORD lpOffScreen) PURE; STDMETHOD(LightElements)(THIS_ DWORD dwElementCount, LPD3DLIGHTDATA lpData) PURE; STDMETHOD(SetBackground)(THIS_ D3DMATERIALHANDLE hMat) PURE; - STDMETHOD(GetBackground)(THIS_ LPD3DMATERIALHANDLE lphMat, LPBOOL lpValid) PURE; + STDMETHOD(GetBackground)(THIS_ D3DMATERIALHANDLE *material, BOOL *valid) PURE; STDMETHOD(SetBackgroundDepth)(THIS_ IDirectDrawSurface *surface) PURE; STDMETHOD(GetBackgroundDepth)(THIS_ IDirectDrawSurface **surface, BOOL *valid) PURE; STDMETHOD(Clear)(THIS_ DWORD dwCount, LPD3DRECT lpRects, DWORD dwFlags) PURE;

1 0

Henri Verbeet : d3d10core: Only create unique depthstencil state objects.
by Alexandre Julliard Dec. 14, 2012

Dec. 14, 2012

Module: wine Branch: master Commit: 0ffda86f761bb3b94133e8b4363baa9ffa73af2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ffda86f761bb3b94133e8b43… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 13 22:08:59 2012 +0100 d3d10core: Only create unique depthstencil state objects. --- dlls/d3d10core/d3d10core_private.h | 5 +++- dlls/d3d10core/device.c | 41 +++++++++++++++++++++++++++++++++++- dlls/d3d10core/state.c | 19 ++++++++++++---- 3 files changed, 58 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 391207b..b5ba293 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -232,10 +232,12 @@ struct d3d10_depthstencil_state ID3D10DepthStencilState ID3D10DepthStencilState_iface; LONG refcount; + struct d3d10_device *device; D3D10_DEPTH_STENCIL_DESC desc; + struct wine_rb_entry entry; }; -HRESULT d3d10_depthstencil_state_init(struct d3d10_depthstencil_state *state, +HRESULT d3d10_depthstencil_state_init(struct d3d10_depthstencil_state *state, struct d3d10_device *device, const D3D10_DEPTH_STENCIL_DESC *desc) DECLSPEC_HIDDEN; struct d3d10_depthstencil_state *unsafe_impl_from_ID3D10DepthStencilState( ID3D10DepthStencilState *iface) DECLSPEC_HIDDEN; @@ -288,6 +290,7 @@ struct d3d10_device struct wined3d_device *wined3d_device; struct wine_rb_tree blend_states; + struct wine_rb_tree depthstencil_states; struct wine_rb_tree sampler_states; struct d3d10_blend_state *blend_state; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 13bd9a6..bcf49da 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -82,6 +82,7 @@ static ULONG STDMETHODCALLTYPE d3d10_device_inner_Release(IUnknown *iface) if (device->wined3d_device) wined3d_device_decref(device->wined3d_device); wine_rb_destroy(&device->sampler_states, NULL, NULL); + wine_rb_destroy(&device->depthstencil_states, NULL, NULL); wine_rb_destroy(&device->blend_states, NULL, NULL); } @@ -1430,7 +1431,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState(ID3D10Device *ifa static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilState(ID3D10Device *iface, const D3D10_DEPTH_STENCIL_DESC *desc, ID3D10DepthStencilState **depth_stencil_state) { + struct d3d10_device *device = impl_from_ID3D10Device(iface); struct d3d10_depthstencil_state *object; + struct wine_rb_entry *entry; HRESULT hr; TRACE("iface %p, desc %p, depth_stencil_state %p.\n", iface, desc, depth_stencil_state); @@ -1438,6 +1441,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilState(ID3D10Devi if (!desc) return E_INVALIDARG; + if ((entry = wine_rb_get(&device->depthstencil_states, desc))) + { + object = WINE_RB_ENTRY_VALUE(entry, struct d3d10_depthstencil_state, entry); + + TRACE("Returning existing depthstencil state %p.\n", object); + *depth_stencil_state = &object->ID3D10DepthStencilState_iface; + ID3D10DepthStencilState_AddRef(*depth_stencil_state); + + return S_OK; + } + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { @@ -1445,7 +1459,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilState(ID3D10Devi return E_OUTOFMEMORY; } - if (FAILED(hr = d3d10_depthstencil_state_init(object, desc))) + if (FAILED(hr = d3d10_depthstencil_state_init(object, device, desc))) { WARN("Failed to initialize depthstencil state, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -1987,6 +2001,23 @@ static const struct wine_rb_functions d3d10_blend_state_rb_ops = d3d10_blend_state_compare, }; +static int d3d10_depthstencil_state_compare(const void *key, const struct wine_rb_entry *entry) +{ + const D3D10_DEPTH_STENCIL_DESC *ka = key; + const D3D10_DEPTH_STENCIL_DESC *kb = &WINE_RB_ENTRY_VALUE(entry, + const struct d3d10_depthstencil_state, entry)->desc; + + return memcmp(ka, kb, sizeof(*ka)); +} + +static const struct wine_rb_functions d3d10_depthstencil_state_rb_ops = +{ + d3d10_rb_alloc, + d3d10_rb_realloc, + d3d10_rb_free, + d3d10_depthstencil_state_compare, +}; + HRESULT d3d10_device_init(struct d3d10_device *device, void *outer_unknown) { device->ID3D10Device_iface.lpVtbl = &d3d10_device_vtbl; @@ -2003,9 +2034,17 @@ HRESULT d3d10_device_init(struct d3d10_device *device, void *outer_unknown) return E_FAIL; } + if (wine_rb_init(&device->depthstencil_states, &d3d10_depthstencil_state_rb_ops) == -1) + { + WARN("Failed to initialize depthstencil state rbtree.\n"); + wine_rb_destroy(&device->blend_states, NULL, NULL); + return E_FAIL; + } + if (wine_rb_init(&device->sampler_states, &d3d10_sampler_state_rb_ops) == -1) { WARN("Failed to initialize sampler state rbtree.\n"); + wine_rb_destroy(&device->depthstencil_states, NULL, NULL); wine_rb_destroy(&device->blend_states, NULL, NULL); return E_FAIL; } diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index a34df32..b2aebdc 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -202,14 +202,15 @@ static ULONG STDMETHODCALLTYPE d3d10_depthstencil_state_AddRef(ID3D10DepthStenci static ULONG STDMETHODCALLTYPE d3d10_depthstencil_state_Release(ID3D10DepthStencilState *iface) { - struct d3d10_depthstencil_state *This = impl_from_ID3D10DepthStencilState(iface); - ULONG refcount = InterlockedDecrement(&This->refcount); + struct d3d10_depthstencil_state *state = impl_from_ID3D10DepthStencilState(iface); + ULONG refcount = InterlockedDecrement(&state->refcount); - TRACE("%p decreasing refcount to %u.\n", This, refcount); + TRACE("%p decreasing refcount to %u.\n", state, refcount); if (!refcount) { - HeapFree(GetProcessHeap(), 0, This); + wine_rb_remove(&state->device->depthstencil_states, &state->desc); + HeapFree(GetProcessHeap(), 0, state); } return refcount; @@ -275,12 +276,20 @@ static const struct ID3D10DepthStencilStateVtbl d3d10_depthstencil_state_vtbl = d3d10_depthstencil_state_GetDesc, }; -HRESULT d3d10_depthstencil_state_init(struct d3d10_depthstencil_state *state, const D3D10_DEPTH_STENCIL_DESC *desc) +HRESULT d3d10_depthstencil_state_init(struct d3d10_depthstencil_state *state, struct d3d10_device *device, + const D3D10_DEPTH_STENCIL_DESC *desc) { state->ID3D10DepthStencilState_iface.lpVtbl = &d3d10_depthstencil_state_vtbl; state->refcount = 1; + state->device = device; state->desc = *desc; + if (wine_rb_put(&device->depthstencil_states, desc, &state->entry) == -1) + { + ERR("Failed to insert depthstencil state entry.\n"); + return E_FAIL; + } + return S_OK; }

1 0

Francois Gouget : d3dx9_36/tests: Skip some tests when DXT5 textures are not supported.
by Alexandre Julliard Dec. 14, 2012

Dec. 14, 2012

Module: wine Branch: master Commit: a20db48dae249fd76577f5147fa2f2bb64a169ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=a20db48dae249fd76577f5147… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 14 00:48:12 2012 +0100 d3dx9_36/tests: Skip some tests when DXT5 textures are not supported. --- dlls/d3dx9_36/tests/texture.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 87be95c..3277577 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -25,6 +25,8 @@ #include "d3dx9tex.h" #include "resources.h" +static int has_dxt5; + /* 2x2 16-bit dds, no mipmaps */ static const unsigned char dds_16bit[] = { 0x44,0x44,0x53,0x20,0x7c,0x00,0x00,0x00,0x07,0x10,0x08,0x00,0x02,0x00,0x00,0x00, @@ -1444,6 +1446,11 @@ static void test_D3DXCreateTextureFromFileInMemory(IDirect3DDevice9 *device) /* Check that D3DXCreateTextureFromFileInMemory accepts cube texture dds file (only first face texture is loaded) */ hr = D3DXCreateTextureFromFileInMemory(device, dds_cube_map, sizeof(dds_cube_map), &texture); + if (!has_dxt5 && hr == E_NOTIMPL) + { + skip("DXT5 is not supported, skipping the D3DXCreateTextureFromFileInMemory() tests\n"); + return; + } ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); if (SUCCEEDED(hr)) { @@ -1542,6 +1549,11 @@ static void test_D3DXCreateCubeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic hr = D3DXCreateCubeTextureFromFileInMemoryEx(device, dds_cube_map, sizeof(dds_cube_map), D3DX_DEFAULT, D3DX_DEFAULT, D3DUSAGE_DYNAMIC | D3DUSAGE_AUTOGENMIPMAP, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, &cube_texture); + if (!has_dxt5 && hr == E_NOTIMPL) + { + skip("DXT5 is not supported, skipping the D3DXCreateCubeTextureFromFileInMemoryEx() tests\n"); + return; + } ok(hr == D3D_OK, "D3DXCreateCubeTextureFromFileInMemoryEx returned %#x, expected %#x\n", hr, D3D_OK); if (SUCCEEDED(hr)) IDirect3DCubeTexture9_Release(cube_texture); } @@ -1567,6 +1579,11 @@ static void test_D3DXCreateVolumeTextureFromFileInMemory(IDirect3DDevice9 *devic ok(hr == D3DERR_INVALIDCALL, "D3DXCreateVolumeTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); hr = D3DXCreateVolumeTextureFromFileInMemory(device, dds_volume_map, sizeof(dds_volume_map), &volume_texture); + if (!has_dxt5 && hr == E_NOTIMPL) + { + skip("DXT5 is not supported, skipping the D3DXCreateVolumeTextureFromFileInMemory() tests\n"); + return; + } ok(hr == D3D_OK, "D3DXCreateVolumeTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); if (SUCCEEDED(hr)) { @@ -1811,6 +1828,11 @@ START_TEST(texture) return; } + /* Check whether DXT5 textures are supported */ + hr = IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, D3DFMT_DXT5); + has_dxt5 = SUCCEEDED(hr); + test_D3DXCheckTextureRequirements(device); test_D3DXCheckCubeTextureRequirements(device); test_D3DXCheckVolumeTextureRequirements(device);

1 0

Piotr Caban : msvcrt: Fixed wildcard expanding when path is specified in __getmainargs.
by Alexandre Julliard Dec. 14, 2012

Dec. 14, 2012

Module: wine Branch: master Commit: 7c39023f604ad139556cde73edde3ea29d823d8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c39023f604ad139556cde73e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 14 10:33:14 2012 +0100 msvcrt: Fixed wildcard expanding when path is specified in __getmainargs. --- dlls/msvcrt/data.c | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 2dc393c..c093e75 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -365,7 +365,8 @@ void msvcrt_free_args(void) static int build_expanded_argv(int *argc, char **argv) { - int i, size=0, args_no=0; + int i, size=0, args_no=0, path_len; + BOOL is_expandable; HANDLE h; args_no = 0; @@ -373,7 +374,20 @@ static int build_expanded_argv(int *argc, char **argv) WIN32_FIND_DATAA data; int len = 0; - h = FindFirstFileA(__wine_main_argv[i], &data); + is_expandable = FALSE; + for(path_len = strlen(__wine_main_argv[i])-1; path_len>=0; path_len--) { + if(__wine_main_argv[i][path_len]=='*' || __wine_main_argv[i][path_len]=='?') + is_expandable = TRUE; + else if(__wine_main_argv[i][path_len]=='\\' || __wine_main_argv[i][path_len]=='/') + break; + } + path_len++; + + if(is_expandable) + h = FindFirstFileA(__wine_main_argv[i], &data); + else + h = INVALID_HANDLE_VALUE; + if(h != INVALID_HANDLE_VALUE) { do { if(data.cFileName[0]=='.' && (data.cFileName[1]=='\0' || @@ -383,10 +397,11 @@ static int build_expanded_argv(int *argc, char **argv) len = strlen(data.cFileName)+1; if(argv) { argv[args_no] = (char*)(argv+*argc)+size; - memcpy(argv[args_no], data.cFileName, len*sizeof(char)); + memcpy(argv[args_no], __wine_main_argv[i], path_len*sizeof(char)); + memcpy(argv[args_no]+path_len, data.cFileName, len*sizeof(char)); } args_no++; - size += len; + size += len+path_len; }while(FindNextFileA(h, &data)); CloseHandle(h); }

1 0

Piotr Caban : msvcrt: Support expand_wildcards parameter in __wgetmainargs function.
by Alexandre Julliard Dec. 14, 2012

Dec. 14, 2012

Module: wine Branch: master Commit: 678abf406484303b4949233828e102519cafcbfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=678abf406484303b494923382… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 14 10:33:49 2012 +0100 msvcrt: Support expand_wildcards parameter in __wgetmainargs function. --- dlls/msvcrt/data.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 93 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index c093e75..94254ab 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -31,6 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); int MSVCRT___argc = 0; static int argc_expand; +static int wargc_expand; unsigned int MSVCRT_basemajor = 0;/* FIXME: */ unsigned int MSVCRT_baseminor = 0;/* FIXME: */ unsigned int MSVCRT_baseversion = 0; /* FIXME: */ @@ -51,6 +52,7 @@ double MSVCRT__HUGE = 0; char **MSVCRT___argv = NULL; static char **argv_expand; MSVCRT_wchar_t **MSVCRT___wargv = NULL; +static MSVCRT_wchar_t **wargv_expand; char *MSVCRT__acmdln = NULL; MSVCRT_wchar_t *MSVCRT__wcmdln = NULL; char **MSVCRT__environ = NULL; @@ -361,6 +363,7 @@ void msvcrt_free_args(void) HeapFree(GetProcessHeap(), 0, MSVCRT__pgmptr); HeapFree(GetProcessHeap(), 0, MSVCRT__wpgmptr); HeapFree(GetProcessHeap(), 0, argv_expand); + HeapFree(GetProcessHeap(), 0, wargv_expand); } static int build_expanded_argv(int *argc, char **argv) @@ -458,22 +461,102 @@ void CDECL __getmainargs(int *argc, char** *argv, char** *envp, MSVCRT__set_new_mode( *new_mode ); } +static int build_expanded_wargv(int *argc, MSVCRT_wchar_t **argv) +{ + int i, size=0, args_no=0, path_len; + BOOL is_expandable; + HANDLE h; + + args_no = 0; + for(i=0; i<__wine_main_argc; i++) { + WIN32_FIND_DATAW data; + int len = 0; + + is_expandable = FALSE; + for(path_len = strlenW(__wine_main_wargv[i])-1; path_len>=0; path_len--) { + if(__wine_main_wargv[i][path_len]=='*' || __wine_main_wargv[i][path_len]=='?') + is_expandable = TRUE; + else if(__wine_main_wargv[i][path_len]=='\\' || __wine_main_wargv[i][path_len]=='/') + break; + } + path_len++; + + if(is_expandable) + h = FindFirstFileW(__wine_main_wargv[i], &data); + else + h = INVALID_HANDLE_VALUE; + + if(h != INVALID_HANDLE_VALUE) { + do { + if(data.cFileName[0]=='.' && (data.cFileName[1]=='\0' || + (data.cFileName[1]=='.' && data.cFileName[2]=='\0'))) + continue; + + len = strlenW(data.cFileName)+1; + if(argv) { + argv[args_no] = (MSVCRT_wchar_t*)(argv+*argc)+size; + memcpy(argv[args_no], __wine_main_wargv[i], path_len*sizeof(MSVCRT_wchar_t)); + memcpy(argv[args_no]+path_len, data.cFileName, len*sizeof(MSVCRT_wchar_t)); + } + args_no++; + size += len+path_len; + }while(FindNextFileW(h, &data)); + CloseHandle(h); + } + + if(!len) { + len = strlenW(__wine_main_wargv[i])+1; + if(argv) { + argv[args_no] = (MSVCRT_wchar_t*)(argv+*argc)+size; + memcpy(argv[args_no], __wine_main_wargv[i], len*sizeof(MSVCRT_wchar_t)); + } + args_no++; + size += len; + } + } + + size *= sizeof(MSVCRT_wchar_t); + size += args_no*sizeof(MSVCRT_wchar_t*); + *argc = args_no; + return size; +} + /********************************************************************* * __wgetmainargs (MSVCRT.@) */ void CDECL __wgetmainargs(int *argc, MSVCRT_wchar_t** *wargv, MSVCRT_wchar_t** *wenvp, int expand_wildcards, int *new_mode) { - TRACE("(%p,%p,%p,%d,%p).\n", argc, wargv, wenvp, expand_wildcards, new_mode); - - /* Initialize the _wenviron array if it's not already created. */ - if (!MSVCRT__wenviron) - MSVCRT__wenviron = msvcrt_SnapshotOfEnvironmentW(NULL); - *argc = MSVCRT___argc; - *wargv = MSVCRT___wargv; - *wenvp = MSVCRT___winitenv; - if (new_mode) - MSVCRT__set_new_mode( *new_mode ); + TRACE("(%p,%p,%p,%d,%p).\n", argc, wargv, wenvp, expand_wildcards, new_mode); + + if (expand_wildcards) { + HeapFree(GetProcessHeap(), 0, wargv_expand); + wargv_expand = NULL; + + wargv_expand = HeapAlloc(GetProcessHeap(), 0, + build_expanded_wargv(&wargc_expand, NULL)); + if (wargv_expand) { + build_expanded_wargv(&wargc_expand, wargv_expand); + + MSVCRT___argc = wargc_expand; + MSVCRT___wargv = wargv_expand; + }else { + expand_wildcards = 0; + } + } + if (!expand_wildcards) { + MSVCRT___argc = __wine_main_argc; + MSVCRT___wargv = __wine_main_wargv; + } + + /* Initialize the _wenviron array if it's not already created. */ + if (!MSVCRT__wenviron) + MSVCRT__wenviron = msvcrt_SnapshotOfEnvironmentW(NULL); + *argc = MSVCRT___argc; + *wargv = MSVCRT___wargv; + *wenvp = MSVCRT___winitenv; + if (new_mode) + MSVCRT__set_new_mode( *new_mode ); } /*********************************************************************

1 0

Piotr Caban : msvcrt: Added __getmainargs tests.
by Alexandre Julliard Dec. 14, 2012

Dec. 14, 2012

Module: wine Branch: master Commit: 42d5cc3c6ebd2f3335b139a2c21ca904f16eba55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42d5cc3c6ebd2f3335b139a2c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 14 10:35:36 2012 +0100 msvcrt: Added __getmainargs tests. --- dlls/msvcrt/tests/data.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 112 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/data.c b/dlls/msvcrt/tests/data.c index c20be18..0723093 100644 --- a/dlls/msvcrt/tests/data.c +++ b/dlls/msvcrt/tests/data.c @@ -30,6 +30,11 @@ #include <winnls.h> #include <process.h> #include <errno.h> +#include <direct.h> + +void __cdecl __getmainargs(int *, char ***, char ***, int, int *); +static int* (__cdecl *p___p___argc)(void); +static char*** (__cdecl *p___p___argv)(void); typedef void (__cdecl *_INITTERMFUN)(void); static void (__cdecl *p_initterm)(_INITTERMFUN *start, _INITTERMFUN *end); @@ -124,9 +129,106 @@ static void test_get_pgmptr(void) ok( pgm != NULL, "_get_pgmptr returned a NULL pointer\n" ); } +static void test___getmainargs(void) +{ + int argc, new_argc, mode; + char **argv, **new_argv, **envp; + char tmppath[MAX_PATH], filepath[MAX_PATH]; + FILE *f; + + ok(GetTempPathA(MAX_PATH, tmppath) != 0, "GetTempPath failed\n"); + + mode = 0; + __getmainargs(&argc, &argv, &envp, 0, &mode); + ok(argc == 4, "argc = %d\n", argc); + ok(!strcmp(argv[1], "data"), "argv[1] = %s\n", argv[1]); + sprintf(filepath, "%s*\\*", tmppath); + ok(!strcmp(argv[2], filepath), "argv[2] = %s\n", argv[2]); + sprintf(filepath, "%swine_test/*", tmppath); + ok(!strcmp(argv[3], filepath), "argv[3] = %s\n", argv[3]); + + if(p___p___argc && p___p___argv) { + new_argc = *p___p___argc(); + new_argv = *p___p___argv(); + ok(new_argc == 4, "*__p___argc() = %d\n", new_argc); + ok(new_argv == argv, "*__p___argv() = %p, epxected %p\n", new_argv, argv); + }else { + win_skip("__p___argc or __p___argv is not available\n"); + } + + mode = 0; + __getmainargs(&argc, &argv, &envp, 1, &mode); + ok(argc == 5, "argc = %d\n", argc); + ok(!strcmp(argv[1], "data"), "argv[1] = %s\n", argv[1]); + sprintf(filepath, "%s*\\*", tmppath); + ok(!strcmp(argv[2], filepath), "argv[2] = %s\n", argv[2]); + sprintf(filepath, "%swine_test/a", tmppath); + if(argv[3][strlen(argv[3])-1] == 'a') { + ok(!strcmp(argv[3], filepath), "argv[3] = %s\n", argv[3]); + sprintf(filepath, "%swine_test/test", tmppath); + ok(!strcmp(argv[4], filepath), "argv[4] = %s\n", argv[4]); + }else { + ok(!strcmp(argv[4], filepath), "argv[4] = %s\n", argv[4]); + sprintf(filepath, "%swine_test/test", tmppath); + ok(!strcmp(argv[3], filepath), "argv[3] = %s\n", argv[3]); + } + + if(p___p___argc && p___p___argv) { + new_argc = *p___p___argc(); + new_argv = *p___p___argv(); + ok(new_argc == argc, "*__p___argc() = %d, expected %d\n", new_argc, argc); + ok(new_argv == argv, "*__p___argv() = %p, epxected %p\n", new_argv, argv); + } + + sprintf(filepath, "%swine_test/b", tmppath); + f = fopen(filepath, "w"); + ok(f != NULL, "fopen(%s) failed: %d\n", filepath, errno); + fclose(f); + mode = 0; + __getmainargs(&new_argc, &new_argv, &envp, 1, &mode); + ok(new_argc == argc+1, "new_argc = %d, expected %d\n", new_argc, argc+1); + _unlink(filepath); +} + +static void test___getmainargs_parent(char *name) +{ + char cmdline[3*MAX_PATH]; + char tmppath[MAX_PATH], filepath[MAX_PATH]; + STARTUPINFO startup; + PROCESS_INFORMATION proc; + FILE *f; + + ok(GetTempPathA(MAX_PATH, tmppath) != 0, "GetTempPath failed\n"); + sprintf(cmdline, "%s data %s*\\* %swine_test/*", name, tmppath, tmppath); + + sprintf(filepath, "%swine_test", tmppath); + ok(!_mkdir(filepath), "_mkdir failed: %d\n", errno); + sprintf(filepath, "%swine_test\\a", tmppath); + f = fopen(filepath, "w"); + ok(f != NULL, "fopen(%s) failed: %d\n", filepath, errno); + fclose(f); + sprintf(filepath, "%swine_test\\test", tmppath); + f = fopen(filepath, "w"); + ok(f != NULL, "fopen(%s) failed: %d\n", filepath, errno); + fclose(f); + + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + CreateProcessA(NULL, cmdline, NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE|NORMAL_PRIORITY_CLASS, NULL, NULL, &startup, &proc); + winetest_wait_child_process(proc.hProcess); + + _unlink(filepath); + sprintf(filepath, "%swine_test\\a", tmppath); + _unlink(filepath); + sprintf(filepath, "%swine_test", tmppath); + _rmdir(filepath); +} + START_TEST(data) { HMODULE hmsvcrt; + int arg_c; + char** arg_v; hmsvcrt = GetModuleHandleA("msvcrt.dll"); if (!hmsvcrt) @@ -135,8 +237,18 @@ START_TEST(data) { p_initterm=(void*)GetProcAddress(hmsvcrt, "_initterm"); p_get_pgmptr=(void*)GetProcAddress(hmsvcrt, "_get_pgmptr"); + p___p___argc=(void*)GetProcAddress(hmsvcrt, "__p___argc"); + p___p___argv=(void*)GetProcAddress(hmsvcrt, "__p___argv"); } + + arg_c = winetest_get_mainargs(&arg_v); + if(arg_c >= 3) { + test___getmainargs(); + return; + } + test_initterm(); test_initvar(hmsvcrt); test_get_pgmptr(); + test___getmainargs_parent(arg_v[0]); }

1 0

Christian Costa : d3drm: Handle texture load proc when loading mesh data.
by Alexandre Julliard Dec. 14, 2012

Dec. 14, 2012

Module: wine Branch: master Commit: 53e37121a42f708586e843c886e1b1c88b21d235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53e37121a42f708586e843c88… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Dec 14 08:37:38 2012 +0100 d3drm: Handle texture load proc when loading mesh data. --- dlls/d3drm/d3drm.c | 6 +++--- dlls/d3drm/d3drm_private.h | 3 ++- dlls/d3drm/meshbuilder.c | 37 ++++++++++++++++++++++++++----------- 3 files changed, 31 insertions(+), 15 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 2fe4fce..7f246ce 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1257,8 +1257,8 @@ static HRESULT WINAPI IDirect3DRM3Impl_EnumerateObjects(IDirect3DRM3* iface, D3D return E_NOTIMPL; } -static HRESULT load_data(IDirect3DRM3* iface, LPDIRECTXFILEDATA data_object, LPIID* GUIDs, DWORD nb_GUIDs, D3DRMLOADCALLBACK LoadProc, - LPVOID ArgLP, D3DRMLOADTEXTURECALLBACK LoadTextureProc, LPVOID ArgLTP, LPDIRECT3DRMFRAME3 parent_frame) +static HRESULT load_data(IDirect3DRM3 *iface, IDirectXFileData *data_object, IID **GUIDs, DWORD nb_GUIDs, D3DRMLOADCALLBACK LoadProc, + void *ArgLP, D3DRMLOADTEXTURECALLBACK LoadTextureProc, void *ArgLTP, IDirect3DRMFrame3 *parent_frame) { HRESULT ret = D3DRMERR_BADOBJECT; HRESULT hr; @@ -1296,7 +1296,7 @@ static HRESULT load_data(IDirect3DRM3* iface, LPDIRECTXFILEDATA data_object, LPI hr = IDirect3DRM3_CreateMeshBuilder(iface, &meshbuilder); if (SUCCEEDED(hr)) { - hr = load_mesh_data(meshbuilder, data_object); + hr = load_mesh_data(meshbuilder, data_object, LoadTextureProc, ArgLTP); if (SUCCEEDED(hr)) { /* Only top level objects are notified */ diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 95eca5f..941e467 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -36,7 +36,8 @@ HRESULT Direct3DRMViewport_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN HRESULT Direct3DRMMaterial_create(IDirect3DRMMaterial2** ret_iface) DECLSPEC_HIDDEN; HRESULT Direct3DRMTexture_create(REFIID riid, IUnknown** ret_iface) DECLSPEC_HIDDEN; -HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) DECLSPEC_HIDDEN; +HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *data, + D3DRMLOADTEXTURECALLBACK load_texture_proc, void *arg) DECLSPEC_HIDDEN; typedef struct { WORD major; diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 4ef2477..75f058b 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1129,7 +1129,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetClassName(IDirect3DRMMeshBu return D3DRM_OK; } -HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) +HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, IDirectXFileData *pData, D3DRMLOADTEXTURECALLBACK load_texture_proc, void *arg) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); LPDIRECTXFILEOBJECT pObject = NULL; @@ -1372,19 +1372,33 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) hr = IDirectXFileData_GetData(data, NULL, &size, (void**)&filename); if (SUCCEEDED(hr)) { - HANDLE file; + if (load_texture_proc) + { + IDirect3DRMTexture *texture; - /* If the texture file is not found, no texture is associated with the material */ - file = CreateFileA(*filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); - if (file != INVALID_HANDLE_VALUE) + hr = load_texture_proc(*filename, arg, &texture); + if (SUCCEEDED(hr)) + { + hr = IDirect3DTexture_QueryInterface(texture, &IID_IDirect3DRMTexture3, (void**)&This->materials[i].texture); + IDirect3DTexture_Release(texture); + } + } + else { - CloseHandle(file); + HANDLE file; - hr = Direct3DRMTexture_create(&IID_IDirect3DRMTexture3, (LPUNKNOWN*)&This->materials[i].texture); - if (FAILED(hr)) + /* If the texture file is not found, no texture is associated with the material */ + file = CreateFileA(*filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); + if (file != INVALID_HANDLE_VALUE) { - IDirectXFileData_Release(data); - goto end; + CloseHandle(file); + + hr = Direct3DRMTexture_create(&IID_IDirect3DRMTexture3, (IUnknown**)&This->materials[i].texture); + if (FAILED(hr)) + { + IDirectXFileData_Release(data); + goto end; + } } } } @@ -1630,7 +1644,8 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3* goto end; } - hr = load_mesh_data(iface, pData); + /* We don't care about the texture interface version since we rely on QueryInterface */ + hr = load_mesh_data(iface, pData, (D3DRMLOADTEXTURECALLBACK)cb, arg); if (hr == S_OK) ret = D3DRM_OK;

1 0

Christian Costa : d3drm: Face data size is in number of DWORD.
by Alexandre Julliard Dec. 14, 2012

Dec. 14, 2012

Module: wine Branch: master Commit: ec51c5f737d4f7dc3def84044ad51605dcc3e79b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec51c5f737d4f7dc3def84044… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Dec 14 08:37:53 2012 +0100 d3drm: Face data size is in number of DWORD. --- dlls/d3drm/meshbuilder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 75f058b..ffbdec7 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2943,7 +2943,7 @@ static HRESULT WINAPI IDirect3DRMMeshImpl_GetGroup(IDirect3DRMMesh* iface, if (face_data_size) *face_data_size = This->groups[id].face_data_size; if (face_data) - memcpy(face_data, This->groups[id].face_data, This->groups[id].face_data_size); + memcpy(face_data, This->groups[id].face_data, This->groups[id].face_data_size * sizeof(DWORD)); return D3DRM_OK; }

1 0

Daniel Jelinski : msi: Do not convert MaskedEdit contents to uppercase.
by Alexandre Julliard Dec. 14, 2012

Dec. 14, 2012

Module: wine Branch: master Commit: bd59df8ddd56a57ac07ca6df2f977bf80b78f4bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd59df8ddd56a57ac07ca6df2… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Thu Dec 13 20:31:23 2012 +0100 msi: Do not convert MaskedEdit contents to uppercase. --- dlls/msi/dialog.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index a983106..4d8564d 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1804,7 +1804,6 @@ static void msi_mask_control_change( struct msi_maskedit_info *info ) if( i == info->num_groups ) { TRACE("Set property %s to %s\n", debugstr_w(info->prop), debugstr_w(val)); - CharUpperBuffW( val, info->num_chars ); msi_dialog_set_property( info->dialog->package, info->prop, val ); msi_dialog_evaluate_control_conditions( info->dialog ); }

1 0