wine-commits December 2012

wine-commits@winehq.org

2 participants
549 discussions

Henri Verbeet : d3d10core: Implement d3d10_depthstencil_state_GetDesc().
by Alexandre Julliard 14 Dec '12

14 Dec '12

Module: wine Branch: master Commit: d1582890207f5cf520b58cae8d697220c128a809 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1582890207f5cf520b58cae8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 13 22:08:58 2012 +0100 d3d10core: Implement d3d10_depthstencil_state_GetDesc(). --- dlls/d3d10core/d3d10core_private.h | 5 ++++- dlls/d3d10core/device.c | 6 ++++-- dlls/d3d10core/state.c | 9 +++++++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index dd7d8f5..391207b 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -231,9 +231,12 @@ struct d3d10_depthstencil_state { ID3D10DepthStencilState ID3D10DepthStencilState_iface; LONG refcount; + + D3D10_DEPTH_STENCIL_DESC desc; }; -HRESULT d3d10_depthstencil_state_init(struct d3d10_depthstencil_state *state) DECLSPEC_HIDDEN; +HRESULT d3d10_depthstencil_state_init(struct d3d10_depthstencil_state *state, + const D3D10_DEPTH_STENCIL_DESC *desc) DECLSPEC_HIDDEN; struct d3d10_depthstencil_state *unsafe_impl_from_ID3D10DepthStencilState( ID3D10DepthStencilState *iface) DECLSPEC_HIDDEN; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 3ee13ae..13bd9a6 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1435,6 +1435,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilState(ID3D10Devi TRACE("iface %p, desc %p, depth_stencil_state %p.\n", iface, desc, depth_stencil_state); + if (!desc) + return E_INVALIDARG; + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { @@ -1442,8 +1445,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilState(ID3D10Devi return E_OUTOFMEMORY; } - hr = d3d10_depthstencil_state_init(object); - if (FAILED(hr)) + if (FAILED(hr = d3d10_depthstencil_state_init(object, desc))) { WARN("Failed to initialize depthstencil state, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index 0992273..a34df32 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -253,7 +253,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_state_SetPrivateDataInterfac static void STDMETHODCALLTYPE d3d10_depthstencil_state_GetDesc(ID3D10DepthStencilState *iface, D3D10_DEPTH_STENCIL_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3d10_depthstencil_state *state = impl_from_ID3D10DepthStencilState(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + *desc = state->desc; } static const struct ID3D10DepthStencilStateVtbl d3d10_depthstencil_state_vtbl = @@ -271,10 +275,11 @@ static const struct ID3D10DepthStencilStateVtbl d3d10_depthstencil_state_vtbl = d3d10_depthstencil_state_GetDesc, }; -HRESULT d3d10_depthstencil_state_init(struct d3d10_depthstencil_state *state) +HRESULT d3d10_depthstencil_state_init(struct d3d10_depthstencil_state *state, const D3D10_DEPTH_STENCIL_DESC *desc) { state->ID3D10DepthStencilState_iface.lpVtbl = &d3d10_depthstencil_state_vtbl; state->refcount = 1; + state->desc = *desc; return S_OK; }

1 0

Henri Verbeet : ddraw: Avoid LPD3DMATERIALHANDLE.
by Alexandre Julliard 14 Dec '12

14 Dec '12

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 : ddraw: Avoid LPD3DVALUE.
by Alexandre Julliard 14 Dec '12

14 Dec '12

Module: wine Branch: master Commit: 5ff7ea239c0c6abc7bdf838385ca34d9326e91b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ff7ea239c0c6abc7bdf83838… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 13 22:08:56 2012 +0100 ddraw: Avoid LPD3DVALUE. --- include/d3d.h | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index e326754..c478a04 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -1183,7 +1183,8 @@ DECLARE_INTERFACE_(IDirect3DDevice3,IUnknown) DWORD start_vertex, DWORD vertex_count, DWORD flags) PURE; STDMETHOD(DrawIndexedPrimitiveVB)(THIS_ D3DPRIMITIVETYPE primitive_type, struct IDirect3DVertexBuffer *vb, WORD *indices, DWORD index_count, DWORD flags) PURE; - STDMETHOD(ComputeSphereVisibility)(THIS_ LPD3DVECTOR lpCenters,LPD3DVALUE lpRadii,DWORD dwNumSpheres,DWORD dwFlags,LPDWORD lpdwReturnValues) PURE; + STDMETHOD(ComputeSphereVisibility)(THIS_ D3DVECTOR *centers, D3DVALUE *radii, DWORD sphere_count, + DWORD flags, DWORD *ret) PURE; STDMETHOD(GetTexture)(THIS_ DWORD stage, IDirect3DTexture2 **texture) PURE; STDMETHOD(SetTexture)(THIS_ DWORD stage, IDirect3DTexture2 *texture) PURE; STDMETHOD(GetTextureStageState)(THIS_ DWORD dwStage,D3DTEXTURESTAGESTATETYPE d3dTexStageStateType,LPDWORD lpdwState) PURE; @@ -1327,7 +1328,8 @@ DECLARE_INTERFACE_(IDirect3DDevice7,IUnknown) DWORD start_vertex, DWORD vertex_count, DWORD flags) PURE; STDMETHOD(DrawIndexedPrimitiveVB)(THIS_ D3DPRIMITIVETYPE primitive_type, struct IDirect3DVertexBuffer7 *vb, DWORD start_vertex, DWORD vertex_count, WORD *indices, DWORD index_count, DWORD flags) PURE; - STDMETHOD(ComputeSphereVisibility)(THIS_ LPD3DVECTOR lpCenters,LPD3DVALUE lpRadii,DWORD dwNumSpheres,DWORD dwFlags,LPDWORD lpdwReturnValues) PURE; + STDMETHOD(ComputeSphereVisibility)(THIS_ D3DVECTOR *centers, D3DVALUE *radii, DWORD sphere_count, + DWORD flags, DWORD *ret) PURE; STDMETHOD(GetTexture)(THIS_ DWORD stage, IDirectDrawSurface7 **surface) PURE; STDMETHOD(SetTexture)(THIS_ DWORD stage, IDirectDrawSurface7 *surface) PURE; STDMETHOD(GetTextureStageState)(THIS_ DWORD dwStage,D3DTEXTURESTAGESTATETYPE d3dTexStageStateType,LPDWORD lpdwState) PURE;

1 0

Christian Costa : d3drm: Handle all materials in material list and create corresponding mesh groups + tests .
by Alexandre Julliard 13 Dec '12

13 Dec '12

Module: wine Branch: master Commit: 7a5b12c8ef8f8ea11861f617acf2e2f41a316fdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a5b12c8ef8f8ea11861f617a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Dec 13 10:03:11 2012 +0100 d3drm: Handle all materials in material list and create corresponding mesh groups + tests. --- dlls/d3drm/meshbuilder.c | 210 +++++++++++++++++++++++++++++---------------- dlls/d3drm/tests/d3drm.c | 168 ++++++++++++++++++++++++++++++++++++ 2 files changed, 303 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7a5b12c8ef8f8ea11861f…

1 0

Daniel Jelinski : user32: Always call ScrollWindowEx in the listbox WM_VSCROLL handler.
by Alexandre Julliard 13 Dec '12

13 Dec '12

Module: wine Branch: master Commit: 39222f6ab7b1fce3985014a39d12bc6327b17993 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39222f6ab7b1fce3985014a39… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Wed Dec 12 20:34:31 2012 +0100 user32: Always call ScrollWindowEx in the listbox WM_VSCROLL handler. --- dlls/user32/listbox.c | 23 ++++++----------------- 1 files changed, 6 insertions(+), 17 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 5686e24..b3709ef 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -297,20 +297,12 @@ static LRESULT LISTBOX_SetTopItem( LB_DESCR *descr, INT index, BOOL scroll ) if (index < 0) index = 0; if (descr->style & LBS_MULTICOLUMN) index -= index % descr->page_size; if (descr->top_item == index) return LB_OKAY; - if (descr->style & LBS_MULTICOLUMN) - { - INT diff = (descr->top_item - index) / descr->page_size * descr->column_width; - if (scroll && (abs(diff) < descr->width)) - ScrollWindowEx( descr->self, diff, 0, NULL, NULL, 0, NULL, - SW_INVALIDATE | SW_ERASE | SW_SCROLLCHILDREN ); - - else - scroll = FALSE; - } - else if (scroll) + if (scroll) { INT diff; - if (descr->style & LBS_OWNERDRAWVARIABLE) + if (descr->style & LBS_MULTICOLUMN) + diff = (descr->top_item - index) / descr->page_size * descr->column_width; + else if (descr->style & LBS_OWNERDRAWVARIABLE) { INT i; diff = 0; @@ -328,11 +320,8 @@ static LRESULT LISTBOX_SetTopItem( LB_DESCR *descr, INT index, BOOL scroll ) else diff = (descr->top_item - index) * descr->item_height; - if (abs(diff) < descr->height) - ScrollWindowEx( descr->self, 0, diff, NULL, NULL, 0, NULL, - SW_INVALIDATE | SW_ERASE | SW_SCROLLCHILDREN ); - else - scroll = FALSE; + ScrollWindowEx( descr->self, 0, diff, NULL, NULL, 0, NULL, + SW_INVALIDATE | SW_ERASE | SW_SCROLLCHILDREN ); } if (!scroll) InvalidateRect( descr->self, NULL, TRUE ); descr->top_item = index;

1 0

Jacek Caban : ole32: Added IMoniker::BindToStorage proxy/ stub implementation.
by Alexandre Julliard 13 Dec '12

13 Dec '12

Module: wine Branch: master Commit: 4eb769451ebbca52baa2bde74c590a740f4dc375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eb769451ebbca52baa2bde74… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 13 17:25:03 2012 +0100 ole32: Added IMoniker::BindToStorage proxy/stub implementation. --- dlls/ole32/usrmarshal.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index d1f56c7..9c877b4 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -2357,8 +2357,8 @@ HRESULT CALLBACK IMoniker_BindToStorage_Proxy( REFIID riid, void **ppvObj) { - FIXME(":stub\n"); - return E_NOTIMPL; + TRACE("(%p)->(%p %p %s %p)\n", This, pbc, pmkToLeft, debugstr_guid(riid), ppvObj); + return IMoniker_RemoteBindToStorage_Proxy(This, pbc, pmkToLeft, riid, (IUnknown**)ppvObj); } HRESULT __RPC_STUB IMoniker_BindToStorage_Stub( @@ -2368,8 +2368,8 @@ HRESULT __RPC_STUB IMoniker_BindToStorage_Stub( REFIID riid, IUnknown **ppvObj) { - FIXME(":stub\n"); - return E_NOTIMPL; + TRACE("(%p)->(%p %p %s %p)\n", This, pbc, pmkToLeft, debugstr_guid(riid), ppvObj); + return IMoniker_BindToStorage(This, pbc, pmkToLeft, riid, (void**)ppvObj); } HRESULT CALLBACK IEnumString_Next_Proxy(

1 0

Michael Stefaniuc : msi: Use FIELD_OFFSET for the size of structs with a varlength array.
by Alexandre Julliard 13 Dec '12

13 Dec '12

Module: wine Branch: master Commit: 62029ff586262ecdfee77d6be9750e8139c79e72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62029ff586262ecdfee77d6be… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 13 16:56:42 2012 +0100 msi: Use FIELD_OFFSET for the size of structs with a varlength array. --- dlls/msi/dialog.c | 4 ++-- dlls/msi/record.c | 5 ++--- dlls/msi/where.c | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index c0ff204..a983106 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1135,7 +1135,7 @@ static UINT msi_dialog_line_control( msi_dialog *dialog, MSIRECORD *rec ) msi_dialog_map_events(dialog, name); - control = msi_alloc( sizeof(*control) + strlenW(name) * sizeof(WCHAR) ); + control = msi_alloc( FIELD_OFFSET(msi_control, name[strlenW( name ) + 1] )); if (!control) return ERROR_OUTOFMEMORY; @@ -3735,7 +3735,7 @@ msi_dialog *msi_dialog_create( MSIPACKAGE* package, msi_dialog_register_class(); /* allocate the structure for the dialog to use */ - dialog = msi_alloc_zero( sizeof *dialog + sizeof(WCHAR)*strlenW(szDialogName) ); + dialog = msi_alloc_zero( FIELD_OFFSET( msi_dialog, name[strlenW( szDialogName ) + 1] )); if( !dialog ) return NULL; strcpyW( dialog->name, szDialogName ); diff --git a/dlls/msi/record.c b/dlls/msi/record.c index dd097ea..a44f42d 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -79,15 +79,14 @@ void MSI_CloseRecord( MSIOBJECTHDR *arg ) MSIRECORD *MSI_CreateRecord( UINT cParams ) { MSIRECORD *rec; - UINT len; TRACE("%d\n", cParams); if( cParams>65535 ) return NULL; - len = sizeof (MSIRECORD) + sizeof (MSIFIELD)*cParams; - rec = alloc_msiobject( MSIHANDLETYPE_RECORD, len, MSI_CloseRecord ); + rec = alloc_msiobject( MSIHANDLETYPE_RECORD, FIELD_OFFSET(MSIRECORD, fields[cParams + 1]), + MSI_CloseRecord ); if( rec ) rec->count = cParams; return rec; diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 1bf7788..10c4b37 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -1068,7 +1068,7 @@ static UINT WHERE_sort(struct tagMSIVIEW *view, column_info *columns) if (count == 0) return ERROR_SUCCESS; - orderinfo = msi_alloc(sizeof(MSIORDERINFO) + (count - 1) * sizeof(union ext_column)); + orderinfo = msi_alloc(FIELD_OFFSET(MSIORDERINFO, columns[count])); if (!orderinfo) return ERROR_OUTOFMEMORY;

1 0

Piotr Caban : msvcrt: Support expand_wildcards parameter in __getmainargs function.
by Alexandre Julliard 13 Dec '12

13 Dec '12

Module: wine Branch: master Commit: c34769cfa1624aea76186fc9f524902cd38ecad3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c34769cfa1624aea76186fc9f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 13 13:45:24 2012 +0100 msvcrt: Support expand_wildcards parameter in __getmainargs function. --- dlls/msvcrt/data.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 75 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 0b8695a..2dc393c 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -30,6 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); int MSVCRT___argc = 0; +static int argc_expand; unsigned int MSVCRT_basemajor = 0;/* FIXME: */ unsigned int MSVCRT_baseminor = 0;/* FIXME: */ unsigned int MSVCRT_baseversion = 0; /* FIXME: */ @@ -48,6 +49,7 @@ unsigned int MSVCRT___setlc_active = 0; unsigned int MSVCRT___unguarded_readlc_active = 0; double MSVCRT__HUGE = 0; char **MSVCRT___argv = NULL; +static char **argv_expand; MSVCRT_wchar_t **MSVCRT___wargv = NULL; char *MSVCRT__acmdln = NULL; MSVCRT_wchar_t *MSVCRT__wcmdln = NULL; @@ -348,7 +350,6 @@ void msvcrt_init_args(void) } } - /* INTERNAL: free memory used by args */ void msvcrt_free_args(void) { @@ -359,6 +360,51 @@ void msvcrt_free_args(void) HeapFree(GetProcessHeap(), 0, MSVCRT__wenviron); HeapFree(GetProcessHeap(), 0, MSVCRT__pgmptr); HeapFree(GetProcessHeap(), 0, MSVCRT__wpgmptr); + HeapFree(GetProcessHeap(), 0, argv_expand); +} + +static int build_expanded_argv(int *argc, char **argv) +{ + int i, size=0, args_no=0; + HANDLE h; + + args_no = 0; + for(i=0; i<__wine_main_argc; i++) { + WIN32_FIND_DATAA data; + int len = 0; + + h = FindFirstFileA(__wine_main_argv[i], &data); + if(h != INVALID_HANDLE_VALUE) { + do { + if(data.cFileName[0]=='.' && (data.cFileName[1]=='\0' || + (data.cFileName[1]=='.' && data.cFileName[2]=='\0'))) + continue; + + len = strlen(data.cFileName)+1; + if(argv) { + argv[args_no] = (char*)(argv+*argc)+size; + memcpy(argv[args_no], data.cFileName, len*sizeof(char)); + } + args_no++; + size += len; + }while(FindNextFileA(h, &data)); + CloseHandle(h); + } + + if(!len) { + len = strlen(__wine_main_argv[i])+1; + if(argv) { + argv[args_no] = (char*)(argv+*argc)+size; + memcpy(argv[args_no], __wine_main_argv[i], len*sizeof(char)); + } + args_no++; + size += len; + } + } + + size += args_no*sizeof(char*); + *argc = args_no; + return size; } /********************************************************************* @@ -367,12 +413,34 @@ void msvcrt_free_args(void) void CDECL __getmainargs(int *argc, char** *argv, char** *envp, int expand_wildcards, int *new_mode) { - TRACE("(%p,%p,%p,%d,%p).\n", argc, argv, envp, expand_wildcards, new_mode); - *argc = MSVCRT___argc; - *argv = MSVCRT___argv; - *envp = MSVCRT___initenv; - if (new_mode) - MSVCRT__set_new_mode( *new_mode ); + TRACE("(%p,%p,%p,%d,%p).\n", argc, argv, envp, expand_wildcards, new_mode); + + if (expand_wildcards) { + HeapFree(GetProcessHeap(), 0, argv_expand); + argv_expand = NULL; + + argv_expand = HeapAlloc(GetProcessHeap(), 0, + build_expanded_argv(&argc_expand, NULL)); + if (argv_expand) { + build_expanded_argv(&argc_expand, argv_expand); + + MSVCRT___argc = argc_expand; + MSVCRT___argv = argv_expand; + }else { + expand_wildcards = 0; + } + } + if (!expand_wildcards) { + MSVCRT___argc = __wine_main_argc; + MSVCRT___argv = __wine_main_argv; + } + + *argc = MSVCRT___argc; + *argv = MSVCRT___argv; + *envp = MSVCRT___initenv; + + if (new_mode) + MSVCRT__set_new_mode( *new_mode ); } /*********************************************************************

1 0

Piotr Caban : msvcrt: Don't flush stream in fputs function.
by Alexandre Julliard 13 Dec '12

13 Dec '12

Module: wine Branch: master Commit: bc33d39e23d7c87b4ab520a771b17a091c217ced URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc33d39e23d7c87b4ab520a77… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 13 13:45:00 2012 +0100 msvcrt: Don't flush stream in fputs function. --- dlls/msvcrt/file.c | 16 +++------------- 1 files changed, 3 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index e157ede..9d75bc6 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3434,23 +3434,13 @@ int CDECL MSVCRT_fgetpos(MSVCRT_FILE* file, MSVCRT_fpos_t *pos) */ int CDECL MSVCRT_fputs(const char *s, MSVCRT_FILE* file) { - MSVCRT_size_t i, len = strlen(s); + MSVCRT_size_t len = strlen(s); int ret; MSVCRT__lock_file(file); - if (!(msvcrt_get_ioinfo(file->_file)->wxflag & WX_TEXT)) { - ret = MSVCRT_fwrite(s,sizeof(*s),len,file) == len ? 0 : MSVCRT_EOF; - MSVCRT__unlock_file(file); - return ret; - } - for (i=0; i<len; i++) - if (MSVCRT_fputc(s[i], file) == MSVCRT_EOF) { - MSVCRT__unlock_file(file); - return MSVCRT_EOF; - } - + ret = MSVCRT_fwrite(s, sizeof(*s), len, file) == len ? 0 : MSVCRT_EOF; MSVCRT__unlock_file(file); - return 0; + return ret; } /*********************************************************************

1 0

Jacek Caban : jscript: Ensure correct stack state for non-returning expression evaluation in compile_expression .
by Alexandre Julliard 13 Dec '12

13 Dec '12

Module: wine Branch: master Commit: 1000a6bf340a6d921951ae7a893adab3bcb12618 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1000a6bf340a6d921951ae7a8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 13 12:08:59 2012 +0100 jscript: Ensure correct stack state for non-returning expression evaluation in compile_expression. --- dlls/jscript/compile.c | 322 ++++++++++++++++++++++++++---------------------- 1 files changed, 176 insertions(+), 146 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1000a6bf340a6d921951a…

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
55
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 December 2012