July 2017 - Wine-commits - list.winehq.org

Zebediah Figura : msi: Don' t queue a parent dialog to be shown in EndDialog.
by Alexandre Julliard 21 Jul '17

21 Jul '17

Module: wine Branch: master Commit: 14f865e14fc6f290d392c6c847d2841dcc6ba96e URL: http://source.winehq.org/git/wine.git/?a=commit;h=14f865e14fc6f290d392c6c84… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 20 23:43:14 2017 -0500 msi: Don't queue a parent dialog to be shown in EndDialog. When using "Return", the parent dialog already exists, so there is no need to do this. Moreover, if the parent dialog is queued, a subsequent "Exit" would not properly exit the parent dialog. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 6b57606..a5b839d 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -4381,12 +4381,7 @@ static UINT event_end_dialog( msi_dialog *dialog, const WCHAR *argument ) else if (!strcmpW( argument, ignoreW )) dialog->package->CurrentInstallState = ERROR_SUCCESS; else if (!strcmpW( argument, returnW )) - { - msi_dialog *parent = dialog->parent; - msi_free( dialog->package->next_dialog ); - dialog->package->next_dialog = (parent) ? strdupW( parent->name ) : NULL; dialog->package->CurrentInstallState = ERROR_SUCCESS; - } else { ERR("Unknown argument string %s\n", debugstr_w(argument));

1 0

Zebediah Figura : msi: Send the dialog created message in dialog_create().
by Alexandre Julliard 21 Jul '17

21 Jul '17

Module: wine Branch: master Commit: 39c2ff0283204d6e714917a56f8538292ff62f51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39c2ff0283204d6e714917a56… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 20 23:43:15 2017 -0500 msi: Send the dialog created message in dialog_create(). It should be sent before the message loop, and it should also be sent for dialogs spawned with control events. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index a5b839d..c4a94f1 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3918,6 +3918,8 @@ static BOOL dialog_register_class( void ) static msi_dialog *dialog_create( MSIPACKAGE *package, const WCHAR *name, msi_dialog *parent, control_event_handler event_handler ) { + static const WCHAR szDialogCreated[] = + {'D','i','a','l','o','g',' ','c','r','e','a','t','e','d',0}; MSIRECORD *rec = NULL; msi_dialog *dialog; @@ -3949,6 +3951,13 @@ static msi_dialog *dialog_create( MSIPACKAGE *package, const WCHAR *name, msi_di dialog->control_cancel = strdupW( MSI_RecordGetString( rec, 10 ) ); msiobj_release( &rec->hdr ); + rec = MSI_CreateRecord(2); + if (!rec) return NULL; + MSI_RecordSetStringW(rec, 1, name); + MSI_RecordSetStringW(rec, 2, szDialogCreated); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONSTART, rec); + msiobj_release(&rec->hdr); + return dialog; } @@ -4603,17 +4612,6 @@ UINT ACTION_DialogBox( MSIPACKAGE *package, const WCHAR *dialog ) msi_free( name ); } if (r == ERROR_IO_PENDING) r = ERROR_SUCCESS; - if (r == ERROR_SUCCESS) - { - static const WCHAR szDialogCreated[] = - {'D','i','a','l','o','g',' ','c','r','e','a','t','e','d',0}; - MSIRECORD *row = MSI_CreateRecord(2); - if (!row) return ERROR_OUTOFMEMORY; - MSI_RecordSetStringW(row, 1, dialog); - MSI_RecordSetStringW(row, 2, szDialogCreated); - MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONSTART, row); - msiobj_release(&row->hdr); - } return r; }

1 0

Józef Kucia : d3d11: Introduce d3d_blend_state_create () helper function.
by Alexandre Julliard 21 Jul '17

21 Jul '17

Module: wine Branch: master Commit: 7448012ecc56cc14c4b80a8d1607c703efa1b1a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7448012ecc56cc14c4b80a8d1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 20 14:10:57 2017 +0200 d3d11: Introduce d3d_blend_state_create() helper function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 4 +-- dlls/d3d11/device.c | 70 ++++---------------------------------------- dlls/d3d11/state.c | 73 +++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 80 insertions(+), 67 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 479c84f..b887ac5 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -402,8 +402,8 @@ static inline struct d3d_blend_state *impl_from_ID3D11BlendState(ID3D11BlendStat return CONTAINING_RECORD(iface, struct d3d_blend_state, ID3D11BlendState_iface); } -HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *device, - const D3D11_BLEND_DESC *desc) DECLSPEC_HIDDEN; +HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC *desc, + struct d3d_blend_state **state) DECLSPEC_HIDDEN; struct d3d_blend_state *unsafe_impl_from_ID3D11BlendState(ID3D11BlendState *iface) DECLSPEC_HIDDEN; struct d3d_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *iface) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index e84c365..95783e9 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3001,70 +3001,13 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBlendState(ID3D11Device *ifa { struct d3d_device *device = impl_from_ID3D11Device(iface); struct d3d_blend_state *object; - struct wine_rb_entry *entry; - D3D11_BLEND_DESC tmp_desc; - unsigned int i, j; HRESULT hr; TRACE("iface %p, desc %p, blend_state %p.\n", iface, desc, blend_state); - if (!desc) - return E_INVALIDARG; - - /* D3D11_RENDER_TARGET_BLEND_DESC has a hole, which is a problem because we use - * D3D11_BLEND_DESC as a key in the rbtree. */ - memset(&tmp_desc, 0, sizeof(tmp_desc)); - tmp_desc.AlphaToCoverageEnable = desc->AlphaToCoverageEnable; - tmp_desc.IndependentBlendEnable = desc->IndependentBlendEnable; - for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) - { - j = desc->IndependentBlendEnable ? i : 0; - tmp_desc.RenderTarget[i].BlendEnable = desc->RenderTarget[j].BlendEnable; - tmp_desc.RenderTarget[i].SrcBlend = desc->RenderTarget[j].SrcBlend; - tmp_desc.RenderTarget[i].DestBlend = desc->RenderTarget[j].DestBlend; - tmp_desc.RenderTarget[i].BlendOp = desc->RenderTarget[j].BlendOp; - tmp_desc.RenderTarget[i].SrcBlendAlpha = desc->RenderTarget[j].SrcBlendAlpha; - tmp_desc.RenderTarget[i].DestBlendAlpha = desc->RenderTarget[j].DestBlendAlpha; - tmp_desc.RenderTarget[i].BlendOpAlpha = desc->RenderTarget[j].BlendOpAlpha; - tmp_desc.RenderTarget[i].RenderTargetWriteMask = desc->RenderTarget[j].RenderTargetWriteMask; - - if (i > 3 && tmp_desc.RenderTarget[i].RenderTargetWriteMask != D3D11_COLOR_WRITE_ENABLE_ALL) - FIXME("Color mask %#x not supported for render target %u.\n", - tmp_desc.RenderTarget[i].RenderTargetWriteMask, i); - } - - /* glSampleCoverage() */ - if (tmp_desc.AlphaToCoverageEnable) - FIXME("Ignoring AlphaToCoverageEnable %#x.\n", tmp_desc.AlphaToCoverageEnable); - /* glEnableIndexedEXT(GL_BLEND, ...) */ - if (tmp_desc.IndependentBlendEnable) - FIXME("Per-rendertarget blend not implemented.\n"); - - wined3d_mutex_lock(); - if ((entry = wine_rb_get(&device->blend_states, &tmp_desc))) - { - object = WINE_RB_ENTRY_VALUE(entry, struct d3d_blend_state, entry); - - TRACE("Returning existing blend state %p.\n", object); - *blend_state = &object->ID3D11BlendState_iface; - ID3D11BlendState_AddRef(*blend_state); - wined3d_mutex_unlock(); - - return S_OK; - } - wined3d_mutex_unlock(); - - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) - return E_OUTOFMEMORY; - - if (FAILED(hr = d3d_blend_state_init(object, device, &tmp_desc))) - { - WARN("Failed to initialize blend state, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + if (FAILED(hr = d3d_blend_state_create(device, desc, &object))) return hr; - } - TRACE("Created blend state %p.\n", object); *blend_state = &object->ID3D11BlendState_iface; return S_OK; @@ -5390,18 +5333,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState1(ID3D10Device1 *i const D3D10_BLEND_DESC1 *desc, ID3D10BlendState1 **blend_state) { struct d3d_device *device = impl_from_ID3D10Device(iface); - ID3D11BlendState *d3d11_blend_state; + struct d3d_blend_state *object; HRESULT hr; TRACE("iface %p, desc %p, blend_state %p.\n", iface, desc, blend_state); - if (FAILED(hr = d3d11_device_CreateBlendState(&device->ID3D11Device_iface, (D3D11_BLEND_DESC *)desc, - &d3d11_blend_state))) + if (FAILED(hr = d3d_blend_state_create(device, (const D3D11_BLEND_DESC *)desc, &object))) return hr; - hr = ID3D11BlendState_QueryInterface(d3d11_blend_state, &IID_ID3D10BlendState1, (void **)blend_state); - ID3D11BlendState_Release(d3d11_blend_state); - return hr; + *blend_state = &object->ID3D10BlendState1_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState(ID3D10Device1 *iface, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 43dd10f..39768c5 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -283,7 +283,7 @@ static const struct ID3D10BlendState1Vtbl d3d10_blend_state_vtbl = d3d10_blend_state_GetDesc1, }; -HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *device, +static HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *device, const D3D11_BLEND_DESC *desc) { state->ID3D11BlendState_iface.lpVtbl = &d3d11_blend_state_vtbl; @@ -308,6 +308,77 @@ HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *d return S_OK; } +HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC *desc, + struct d3d_blend_state **state) +{ + struct d3d_blend_state *object; + struct wine_rb_entry *entry; + D3D11_BLEND_DESC tmp_desc; + unsigned int i, j; + HRESULT hr; + + if (!desc) + return E_INVALIDARG; + + /* D3D11_RENDER_TARGET_BLEND_DESC has a hole, which is a problem because we use + * D3D11_BLEND_DESC as a key in the rbtree. */ + memset(&tmp_desc, 0, sizeof(tmp_desc)); + tmp_desc.AlphaToCoverageEnable = desc->AlphaToCoverageEnable; + tmp_desc.IndependentBlendEnable = desc->IndependentBlendEnable; + for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) + { + j = desc->IndependentBlendEnable ? i : 0; + tmp_desc.RenderTarget[i].BlendEnable = desc->RenderTarget[j].BlendEnable; + tmp_desc.RenderTarget[i].SrcBlend = desc->RenderTarget[j].SrcBlend; + tmp_desc.RenderTarget[i].DestBlend = desc->RenderTarget[j].DestBlend; + tmp_desc.RenderTarget[i].BlendOp = desc->RenderTarget[j].BlendOp; + tmp_desc.RenderTarget[i].SrcBlendAlpha = desc->RenderTarget[j].SrcBlendAlpha; + tmp_desc.RenderTarget[i].DestBlendAlpha = desc->RenderTarget[j].DestBlendAlpha; + tmp_desc.RenderTarget[i].BlendOpAlpha = desc->RenderTarget[j].BlendOpAlpha; + tmp_desc.RenderTarget[i].RenderTargetWriteMask = desc->RenderTarget[j].RenderTargetWriteMask; + + if (i > 3 && tmp_desc.RenderTarget[i].RenderTargetWriteMask != D3D11_COLOR_WRITE_ENABLE_ALL) + FIXME("Color mask %#x not supported for render target %u.\n", + tmp_desc.RenderTarget[i].RenderTargetWriteMask, i); + } + + /* glSampleCoverage() */ + if (tmp_desc.AlphaToCoverageEnable) + FIXME("Ignoring AlphaToCoverageEnable %#x.\n", tmp_desc.AlphaToCoverageEnable); + /* glEnableIndexedEXT(GL_BLEND, ...) */ + if (tmp_desc.IndependentBlendEnable) + FIXME("Per-rendertarget blend not implemented.\n"); + + wined3d_mutex_lock(); + if ((entry = wine_rb_get(&device->blend_states, &tmp_desc))) + { + object = WINE_RB_ENTRY_VALUE(entry, struct d3d_blend_state, entry); + + TRACE("Returning existing blend state %p.\n", object); + ID3D11BlendState_AddRef(&object->ID3D11BlendState_iface); + *state = object; + wined3d_mutex_unlock(); + + return S_OK; + } + wined3d_mutex_unlock(); + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d_blend_state_init(object, device, &tmp_desc))) + { + WARN("Failed to initialize blend state, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created blend state %p.\n", object); + *state = object; + + return S_OK; +} + struct d3d_blend_state *unsafe_impl_from_ID3D11BlendState(ID3D11BlendState *iface) { if (!iface)

1 0

Józef Kucia : d3d11: Fix race condition in d3d_blend_state_create().
by Alexandre Julliard 21 Jul '17

21 Jul '17

Module: wine Branch: master Commit: f83159d90bda496ded992ecca9d479414bb46e16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f83159d90bda496ded992ecca… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 20 14:10:58 2017 +0200 d3d11: Fix race condition in d3d_blend_state_create(). Spotted by Kimmo Myllyvirta. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/state.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 39768c5..be687f3 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -67,6 +67,12 @@ static ULONG STDMETHODCALLTYPE d3d11_blend_state_AddRef(ID3D11BlendState *iface) return refcount; } +static void d3d_blend_state_cleanup(struct d3d_blend_state *state) +{ + wined3d_private_store_cleanup(&state->private_store); + ID3D11Device_Release(state->device); +} + static ULONG STDMETHODCALLTYPE d3d11_blend_state_Release(ID3D11BlendState *iface) { struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); @@ -79,8 +85,7 @@ static ULONG STDMETHODCALLTYPE d3d11_blend_state_Release(ID3D11BlendState *iface struct d3d_device *device = impl_from_ID3D11Device(state->device); wined3d_mutex_lock(); wine_rb_remove(&device->blend_states, &state->entry); - ID3D11Device_Release(state->device); - wined3d_private_store_cleanup(&state->private_store); + d3d_blend_state_cleanup(state); wined3d_mutex_unlock(); HeapFree(GetProcessHeap(), 0, state); } @@ -289,19 +294,9 @@ static HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_de state->ID3D11BlendState_iface.lpVtbl = &d3d11_blend_state_vtbl; state->ID3D10BlendState1_iface.lpVtbl = &d3d10_blend_state_vtbl; state->refcount = 1; - wined3d_mutex_lock(); wined3d_private_store_init(&state->private_store); state->desc = *desc; - if (wine_rb_put(&device->blend_states, desc, &state->entry) == -1) - { - ERR("Failed to insert blend state entry.\n"); - wined3d_private_store_cleanup(&state->private_store); - wined3d_mutex_unlock(); - return E_FAIL; - } - wined3d_mutex_unlock(); - state->device = &device->ID3D11Device_iface; ID3D11Device_AddRef(state->device); @@ -361,18 +356,31 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC return S_OK; } - wined3d_mutex_unlock(); if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + { + wined3d_mutex_unlock(); return E_OUTOFMEMORY; + } if (FAILED(hr = d3d_blend_state_init(object, device, &tmp_desc))) { WARN("Failed to initialize blend state, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); + wined3d_mutex_unlock(); return hr; } + if (wine_rb_put(&device->blend_states, desc, &object->entry) == -1) + { + ERR("Failed to insert blend state entry.\n"); + d3d_blend_state_cleanup(object); + HeapFree(GetProcessHeap(), 0, object); + wined3d_mutex_unlock(); + return E_FAIL; + } + wined3d_mutex_unlock(); + TRACE("Created blend state %p.\n", object); *state = object;

1 0

Alexandre Julliard : ntdll: Add small assembly wrappers for snooping instead of saving/ restoring the entire context.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: master Commit: 143143ad00631d97c860fcb6a558b9b02e63e648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=143143ad00631d97c860fcb6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 20 16:18:45 2017 +0200 ntdll: Add small assembly wrappers for snooping instead of saving/restoring the entire context. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/relay.c | 101 +++++++++++++++++++++++++++-------------------------- 1 file changed, 51 insertions(+), 50 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index db21872..9ffe28a 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -840,9 +840,6 @@ typedef struct { /* code part */ BYTE lcall; /* 0xe8 call snoopentry (relative) */ - /* NOTE: If you move snoopentry OR nrofargs fix the relative offset - * calculation! - */ DWORD snoopentry; /* SNOOP_Entry relative */ /* unreached */ int nrofargs; @@ -863,15 +860,12 @@ typedef struct { /* code part */ BYTE lcall; /* 0xe8 call snoopret relative*/ - /* NOTE: If you move snoopret OR origreturn fix the relative offset - * calculation! - */ DWORD snoopret; /* SNOOP_Ret relative */ /* unreached */ FARPROC origreturn; SNOOP_DLL *dll; DWORD ordinal; - DWORD origESP; + void **origESP; DWORD *args; /* saved args across a stdcall */ } SNOOP_RETURNENTRY; @@ -1025,8 +1019,7 @@ FARPROC SNOOP_GetProcAddress( HMODULE hmod, const IMAGE_EXPORT_DIRECTORY *export { fun->name = ename; fun->lcall = 0xe8; - /* NOTE: origreturn struct member MUST come directly after snoopentry */ - fun->snoopentry = (char*)SNOOP_Entry-((char*)(&fun->nrofargs)); + fun->snoopentry = (char *)SNOOP_Entry - (char *)(&fun->snoopentry + 1); fun->origfun = origfun; fun->nrofargs = -1; } @@ -1070,29 +1063,19 @@ static void SNOOP_PrintArg(DWORD x) __ENDTRY } -#define CALLER1REF (*(DWORD*)context->Esp) - -void WINAPI __regs_SNOOP_Entry( CONTEXT *context ) +void WINAPI __regs_SNOOP_Entry( void **stack ) { - DWORD ordinal=0,entry = context->Eip - 5; - SNOOP_DLL *dll = firstdll; - SNOOP_FUN *fun = NULL; + SNOOP_DLL *dll; + SNOOP_FUN *fun = (SNOOP_FUN *)((char *)stack[0] - 5); SNOOP_RETURNENTRIES **rets = &firstrets; SNOOP_RETURNENTRY *ret; int i=0, max; - while (dll) { - if ( ((char*)entry>=(char*)dll->funs) && - ((char*)entry<=(char*)(dll->funs+dll->nrofordinals)) - ) { - fun = (SNOOP_FUN*)entry; - ordinal = fun-dll->funs; - break; - } - dll=dll->next; - } + for (dll = firstdll; dll; dll = dll->next ) + if (fun >= dll->funs && fun < dll->funs + dll->nrofordinals) break; + if (!dll) { - FIXME("entrypoint 0x%08x not found\n",entry); + FIXME("entrypoint %p not found\n", fun); return; /* oops */ } /* guess cdecl ... */ @@ -1102,7 +1085,7 @@ void WINAPI __regs_SNOOP_Entry( CONTEXT *context ) * which has (for xxxxxxxx up to 255 the opcode "83 C4 xx". * (after that 81 C2 xx xx xx xx) */ - LPBYTE reteip = (LPBYTE)CALLER1REF; + LPBYTE reteip = stack[1]; if (reteip) { if ((reteip[0]==0x83)&&(reteip[1]==0xc4)) @@ -1128,33 +1111,31 @@ void WINAPI __regs_SNOOP_Entry( CONTEXT *context ) PAGE_EXECUTE_READWRITE); if (!addr) return; *rets = addr; - memset(*rets,0,4096); i = 0; /* entry 0 is free */ } ret = &((*rets)->entry[i]); ret->lcall = 0xe8; - /* NOTE: origreturn struct member MUST come directly after snoopret */ - ret->snoopret = ((char*)SNOOP_Return)-(char*)(&ret->origreturn); - ret->origreturn = (FARPROC)CALLER1REF; - CALLER1REF = (DWORD)&ret->lcall; + ret->snoopret = (char *)SNOOP_Return - (char *)(&ret->snoopret + 1); + ret->origreturn = stack[1]; + stack[1] = &ret->lcall; ret->dll = dll; ret->args = NULL; - ret->ordinal = ordinal; - ret->origESP = context->Esp; + ret->ordinal = fun - dll->funs; + ret->origESP = stack; - context->Eip = (DWORD)fun->origfun; + stack[0] = fun->origfun; if (!TRACE_ON(snoop)) return; if (TRACE_ON(timestamp)) print_timestamp(); if (fun->name) DPRINTF("%04x:CALL %s.%s(",GetCurrentThreadId(),dll->name,fun->name); - else DPRINTF("%04x:CALL %s.%d(",GetCurrentThreadId(),dll->name,dll->ordbase+ordinal); + else DPRINTF("%04x:CALL %s.%d(",GetCurrentThreadId(),dll->name,dll->ordbase+ret->ordinal); if (fun->nrofargs>0) { max = fun->nrofargs; if (max>16) max=16; for (i=0;i<max;i++) { - SNOOP_PrintArg(*(DWORD*)(context->Esp + 4 + sizeof(DWORD)*i)); + SNOOP_PrintArg( (DWORD)stack[i + 2] ); if (i<fun->nrofargs-1) DPRINTF(","); } if (max!=fun->nrofargs) @@ -1163,16 +1144,16 @@ void WINAPI __regs_SNOOP_Entry( CONTEXT *context ) DPRINTF("<unknown, check return>"); ret->args = RtlAllocateHeap(GetProcessHeap(), 0,16*sizeof(DWORD)); - memcpy(ret->args,(LPBYTE)(context->Esp + 4),sizeof(DWORD)*16); + memcpy(ret->args, stack + 2, sizeof(DWORD)*16); } DPRINTF(") ret=%08x\n",(DWORD)ret->origreturn); } - -void WINAPI __regs_SNOOP_Return( CONTEXT *context ) +void WINAPI __regs_SNOOP_Return( void **stack ) { - SNOOP_RETURNENTRY *ret = (SNOOP_RETURNENTRY*)(context->Eip - 5); + SNOOP_RETURNENTRY *ret = (SNOOP_RETURNENTRY*)((char *)stack[0] - 5); SNOOP_FUN *fun = &ret->dll->funs[ret->ordinal]; + DWORD retval = (DWORD)stack[-1]; /* get saved %eax from the stack */ /* We haven't found out the nrofargs yet. If we called a cdecl * function it is too late anyway and we can just set '0' (which @@ -1180,8 +1161,8 @@ void WINAPI __regs_SNOOP_Return( CONTEXT *context ) * If stdcall -> everything ok. */ if (ret->dll->funs[ret->ordinal].nrofargs<0) - ret->dll->funs[ret->ordinal].nrofargs=(context->Esp - ret->origESP-4)/4; - context->Eip = (DWORD)ret->origreturn; + ret->dll->funs[ret->ordinal].nrofargs = stack - ret->origESP - 1; + stack[0] = ret->origreturn; if (!TRACE_ON(snoop)) { ret->origreturn = NULL; /* mark as empty */ @@ -1207,8 +1188,7 @@ void WINAPI __regs_SNOOP_Return( CONTEXT *context ) SNOOP_PrintArg(ret->args[i]); if (i<max-1) DPRINTF(","); } - DPRINTF(") retval=%08x ret=%08x\n", - context->Eax,(DWORD)ret->origreturn ); + DPRINTF(") retval=%08x ret=%08x\n", retval, (DWORD)ret->origreturn ); RtlFreeHeap(GetProcessHeap(),0,ret->args); ret->args = NULL; } @@ -1217,19 +1197,40 @@ void WINAPI __regs_SNOOP_Return( CONTEXT *context ) if (fun->name) DPRINTF("%04x:RET %s.%s() retval=%08x ret=%08x\n", GetCurrentThreadId(), - ret->dll->name, fun->name, context->Eax, (DWORD)ret->origreturn); + ret->dll->name, fun->name, retval, (DWORD)ret->origreturn); else DPRINTF("%04x:RET %s.%d() retval=%08x ret=%08x\n", GetCurrentThreadId(), ret->dll->name,ret->dll->ordbase+ret->ordinal, - context->Eax, (DWORD)ret->origreturn); + retval, (DWORD)ret->origreturn); } ret->origreturn = NULL; /* mark as empty */ } -/* assembly wrappers that save the context */ -DEFINE_REGS_ENTRYPOINT( SNOOP_Entry, 0 ) -DEFINE_REGS_ENTRYPOINT( SNOOP_Return, 0 ) +/* small wrappers that save registers and get the stack pointer */ +#define SNOOP_WRAPPER(name) \ + __ASM_STDCALL_FUNC( name, 0, \ + "pushl %eax\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") \ + "pushl %ecx\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") \ + "pushl %edx\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") \ + "leal 12(%esp),%eax\n\t" \ + "pushl %eax\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") \ + "call " __ASM_NAME("__regs_" #name) __ASM_STDCALL(4) "\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") \ + "popl %edx\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") \ + "popl %ecx\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") \ + "popl %eax\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") \ + "ret" ) + +SNOOP_WRAPPER( SNOOP_Entry ) +SNOOP_WRAPPER( SNOOP_Return ) #else /* __i386__ */

1 0

Alexandre Julliard : include: Undefine PARITY_NONE to avoid warnings.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: master Commit: 43f5cd4e2827d70f8600fd88db812ff71f1666fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=43f5cd4e2827d70f8600fd88d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 20 16:26:41 2017 +0200 include: Undefine PARITY_NONE to avoid warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winbase.h b/include/winbase.h index d634c86..a8ccb2c 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1478,6 +1478,7 @@ typedef struct tagCOMMPROP { #define STOPBITS_15 ((DWORD)2) #define STOPBITS_20 ((DWORD)4) +#undef PARITY_NONE /* defined on Android */ #define PARITY_NONE ((DWORD)0x100) #define PARITY_ODD ((DWORD)0x200) #define PARITY_EVEN ((DWORD)0x400)

1 0

Hugh McMaster : regedit: Remove an unused #define.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: master Commit: cc1d2525c4e5f15db3e3154ec0b5319975936f92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc1d2525c4e5f15db3e3154ec… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 20 11:33:08 2017 +0000 regedit: Remove an unused #define. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 57be5da..3f036f6 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -37,11 +37,6 @@ #define REG_VAL_BUF_SIZE 4096 -/* maximal number of characters in hexadecimal data line, - * including the indentation, but not including the '\' character - */ -#define REG_FILE_HEX_LINE_LEN (2 + 25 * 3) - extern const WCHAR* reg_class_namesW[]; static HKEY reg_class_keys[] = {

1 0

Hugh McMaster : regedit: Remove unused header includes from regproc.c.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: master Commit: 9d23db6b122fa5ce5f43b2eaf05f94a4b59d179b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d23db6b122fa5ce5f43b2eaf… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 20 11:33:16 2017 +0000 regedit: Remove unused header includes from regproc.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 3f036f6..b726251 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -22,17 +22,12 @@ */ #include <errno.h> -#include <limits.h> #include <stdio.h> #include <stdlib.h> #include <fcntl.h> #include <io.h> #include <windows.h> -#include <winnt.h> -#include <winreg.h> -#include <assert.h> #include <wine/unicode.h> -#include <wine/debug.h> #include "regproc.h" #define REG_VAL_BUF_SIZE 4096

1 0

Hugh McMaster : regedit: Re-size the data export buffer using the required size instead of doubling it.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: master Commit: d62fb298662cbf9dce2cdd5d8b62562b7f981803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d62fb298662cbf9dce2cdd5d8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 20 11:33:24 2017 +0000 regedit: Re-size the data export buffer using the required size instead of doubling it. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index b726251..394023b 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1384,7 +1384,7 @@ static int export_registry_data(FILE *fp, HKEY key, WCHAR *path, BOOL unicode) { if (data_size > max_data_bytes) { - max_data_bytes *= 2; + max_data_bytes = data_size; data = resize_buffer(data, max_data_bytes); } else

1 0

Hugh McMaster : reg: Avoid using RegQueryInfoKey() to enumerate subkeys and values in the query operation.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: master Commit: fb22f6c416c6a95715866ff92a5454e1bc27e3c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb22f6c416c6a95715866ff92… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 20 11:33:33 2017 +0000 reg: Avoid using RegQueryInfoKey() to enumerate subkeys and values in the query operation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 87 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 52 insertions(+), 35 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 0975acd..a6927d0 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -627,11 +627,13 @@ static WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, static unsigned int num_values_found = 0; +#define MAX_SUBKEY_LEN 257 + static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) { LONG rc; - DWORD num_subkeys, max_subkey_len, subkey_len; - DWORD max_data_bytes, data_size; + DWORD max_data_bytes = 2048, data_size; + DWORD subkey_len; DWORD type, path_len, i; BYTE *data; WCHAR fmt[] = {'%','1','\n',0}; @@ -639,14 +641,6 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) WCHAR *subkey_name, *subkey_path; HKEY subkey; - rc = RegQueryInfoKeyW(key, NULL, NULL, NULL, &num_subkeys, &max_subkey_len, - NULL, NULL, NULL, &max_data_bytes, NULL, NULL); - if (rc) - { - ERR("RegQueryInfoKey failed: %d\n", rc); - return 1; - } - data = HeapAlloc(GetProcessHeap(), 0, max_data_bytes); if (!data) { @@ -654,8 +648,18 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) return 1; } - data_size = max_data_bytes; - rc = RegQueryValueExW(key, value_name, NULL, &type, data, &data_size); + for (;;) + { + data_size = max_data_bytes; + rc = RegQueryValueExW(key, value_name, NULL, &type, data, &data_size); + if (rc == ERROR_MORE_DATA) + { + max_data_bytes = data_size; + data = HeapReAlloc(GetProcessHeap(), 0, data, max_data_bytes); + } + else break; + } + if (rc == ERROR_SUCCESS) { output_string(fmt, path); @@ -681,8 +685,7 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) return 0; } - max_subkey_len++; - subkey_name = HeapAlloc(GetProcessHeap(), 0, max_subkey_len * sizeof(WCHAR)); + subkey_name = HeapAlloc(GetProcessHeap(), 0, MAX_SUBKEY_LEN * sizeof(WCHAR)); if (!subkey_name) { ERR("Failed to allocate memory for subkey_name\n"); @@ -691,9 +694,10 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) path_len = strlenW(path); - for (i = 0; i < num_subkeys; i++) + i = 0; + for (;;) { - subkey_len = max_subkey_len; + subkey_len = MAX_SUBKEY_LEN; rc = RegEnumKeyExW(key, i, subkey_name, &subkey_len, NULL, NULL, NULL, NULL); if (rc == ERROR_SUCCESS) { @@ -704,7 +708,9 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) RegCloseKey(subkey); } HeapFree(GetProcessHeap(), 0, subkey_path); + i++; } + else break; } HeapFree(GetProcessHeap(), 0, subkey_name); @@ -714,9 +720,9 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) static int query_all(HKEY key, WCHAR *path, BOOL recurse) { LONG rc; - DWORD num_subkeys, max_subkey_len, subkey_len; - DWORD num_values, max_value_len, value_len; - DWORD max_data_bytes, data_size; + DWORD max_value_len = 256, value_len; + DWORD max_data_bytes = 2048, data_size; + DWORD subkey_len; DWORD i, type, path_len; WCHAR fmt[] = {'%','1','\n',0}; WCHAR fmt_path[] = {'%','1','\\','%','2','\n',0}; @@ -725,17 +731,8 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) BYTE *data; HKEY subkey; - rc = RegQueryInfoKeyW(key, NULL, NULL, NULL, &num_subkeys, &max_subkey_len, NULL, - &num_values, &max_value_len, &max_data_bytes, NULL, NULL); - if (rc) - { - ERR("RegQueryInfoKey failed: %d\n", rc); - return 1; - } - output_string(fmt, path); - max_value_len++; value_name = HeapAlloc(GetProcessHeap(), 0, max_value_len * sizeof(WCHAR)); if (!value_name) { @@ -751,23 +748,40 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) return 1; } - for (i = 0; i < num_values; i++) + i = 0; + for (;;) { value_len = max_value_len; data_size = max_data_bytes; rc = RegEnumValueW(key, i, value_name, &value_len, NULL, &type, data, &data_size); if (rc == ERROR_SUCCESS) + { output_value(value_name, type, data, data_size); + i++; + } + else if (rc == ERROR_MORE_DATA) + { + if (data_size > max_data_bytes) + { + max_data_bytes = data_size; + data = HeapReAlloc(GetProcessHeap(), 0, data, max_data_bytes); + } + else + { + max_value_len *= 2; + value_name = HeapReAlloc(GetProcessHeap(), 0, value_name, max_value_len); + } + } + else break; } HeapFree(GetProcessHeap(), 0, data); HeapFree(GetProcessHeap(), 0, value_name); - if (num_values || recurse) + if (i || recurse) output_string(newlineW); - max_subkey_len++; - subkey_name = HeapAlloc(GetProcessHeap(), 0, max_subkey_len * sizeof(WCHAR)); + subkey_name = HeapAlloc(GetProcessHeap(), 0, MAX_SUBKEY_LEN * sizeof(WCHAR)); if (!subkey_name) { ERR("Failed to allocate memory for subkey_name\n"); @@ -776,9 +790,10 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) path_len = strlenW(path); - for (i = 0; i < num_subkeys; i++) + i = 0; + for (;;) { - subkey_len = max_subkey_len; + subkey_len = MAX_SUBKEY_LEN; rc = RegEnumKeyExW(key, i, subkey_name, &subkey_len, NULL, NULL, NULL, NULL); if (rc == ERROR_SUCCESS) { @@ -793,12 +808,14 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) HeapFree(GetProcessHeap(), 0, subkey_path); } else output_string(fmt_path, path, subkey_name); + i++; } + else break; } HeapFree(GetProcessHeap(), 0, subkey_name); - if (num_subkeys && !recurse) + if (i && !recurse) output_string(newlineW); return 0;

1 0