January 2012 - Wine-commits

Detlef Riekenberg : shell32: Use SHFree for memory allocated with SHAlloc.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: fdeaf7c0b4fc5b28d1b76e650faee63848a40d69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdeaf7c0b4fc5b28d1b76e650… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jan 16 00:06:12 2012 +0100 shell32: Use SHFree for memory allocated with SHAlloc. --- dlls/shell32/assoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index ce3434c..0e6b6ba 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -131,7 +131,7 @@ static ULONG WINAPI IQueryAssociations_fnRelease(IQueryAssociations *iface) TRACE("Destroying IQueryAssociations (%p)\n", This); RegCloseKey(This->hkeySource); RegCloseKey(This->hkeyProgID); - HeapFree(GetProcessHeap(), 0, This); + SHFree(This); } return refCount;

1 0

Detlef Riekenberg : shell32/tests: Start tests for IQueryAssociations.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 9ee18919a588c822ef00bacccd2591f620dd20e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ee18919a588c822ef00baccc… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jan 16 00:06:13 2012 +0100 shell32/tests: Start tests for IQueryAssociations. --- dlls/shell32/tests/Makefile.in | 1 + dlls/shell32/tests/assoc.c | 68 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/Makefile.in b/dlls/shell32/tests/Makefile.in index 61ffc51..4a361e4 100644 --- a/dlls/shell32/tests/Makefile.in +++ b/dlls/shell32/tests/Makefile.in @@ -3,6 +3,7 @@ IMPORTS = shell32 ole32 oleaut32 user32 advapi32 C_SRCS = \ appbar.c \ + assoc.c \ autocomplete.c \ brsfolder.c \ ebrowser.c \ diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c new file mode 100644 index 0000000..00d04ff --- /dev/null +++ b/dlls/shell32/tests/assoc.c @@ -0,0 +1,68 @@ +/* Unit test suite for various shell Association objects + * + * Copyright 2012 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdarg.h> + +#include "shlwapi.h" +#include "shlguid.h" + +#include "wine/test.h" + + +static void test_IQueryAssociations_QueryInterface(void) +{ + IQueryAssociations *qa; + IQueryAssociations *qa2; + IUnknown *unk; + HRESULT hr; + + /* this works since XP */ + hr = CoCreateInstance(&CLSID_QueryAssociations, NULL, CLSCTX_INPROC_SERVER, &IID_IQueryAssociations, (void*)&qa); + + if (FAILED(hr)) { + win_skip("CoCreateInstance for IQueryAssociations returned 0x%x\n", hr); + return; + } + + hr = IUnknown_QueryInterface(qa, &IID_IQueryAssociations, (void**)&qa2); + ok(hr == S_OK, "QueryInterface (IQueryAssociations) returned 0x%x\n", hr); + if (SUCCEEDED(hr)) { + IUnknown_Release(qa2); + } + + hr = IUnknown_QueryInterface(qa, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface (IUnknown) returned 0x%x\n", hr); + if (SUCCEEDED(hr)) { + IUnknown_Release(unk); + } + + IQueryAssociations_Release(qa); +} + + +START_TEST(assoc) +{ + CoInitialize(NULL); + + test_IQueryAssociations_QueryInterface(); + + CoUninitialize(); +}

1 0

Detlef Riekenberg : shell32: Avoid crash on NULL pointer.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 48155b5df04d2c2fc6ced9734ce82ca046b0092f URL: http://source.winehq.org/git/wine.git/?a=commit;h=48155b5df04d2c2fc6ced9734… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jan 16 00:06:14 2012 +0100 shell32: Avoid crash on NULL pointer. --- dlls/shell32/assoc.c | 3 +++ dlls/shell32/tests/assoc.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index 0e6b6ba..942e796 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -84,6 +84,9 @@ static HRESULT WINAPI IQueryAssociations_fnQueryInterface( TRACE("(%p,%s,%p)\n",This, debugstr_guid(riid), ppvObj); + if (ppvObj == NULL) + return E_POINTER; + *ppvObj = NULL; if (IsEqualIID(riid, &IID_IUnknown) || diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c index 00d04ff..8d09ec2 100644 --- a/dlls/shell32/tests/assoc.c +++ b/dlls/shell32/tests/assoc.c @@ -54,6 +54,9 @@ static void test_IQueryAssociations_QueryInterface(void) IUnknown_Release(unk); } + hr = IUnknown_QueryInterface(qa, &IID_IUnknown, NULL); + ok(hr == E_POINTER, "got 0x%x (expected E_POINTER)\n", hr); + IQueryAssociations_Release(qa); }

1 0

Detlef Riekenberg : shell32: Add a stub for IApplicationAssociationRegistration.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 2d4d571ffc02112dfc671b6711ce77086758a27c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d4d571ffc02112dfc671b671… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jan 16 00:06:15 2012 +0100 shell32: Add a stub for IApplicationAssociationRegistration. --- dlls/shell32/assoc.c | 143 ++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32_classes.idl | 6 ++ dlls/shell32/shell32_main.h | 2 + dlls/shell32/shellole.c | 1 + 4 files changed, 152 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index 942e796..d7161ca 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -28,6 +28,7 @@ #include "objbase.h" #include "shlguid.h" #include "shlwapi.h" +#include "shobjidl.h" #include "shell32_main.h" #include "ver.h" #include "wine/unicode.h" @@ -65,6 +66,13 @@ typedef struct HKEY hkeyProgID; } IQueryAssociationsImpl; +typedef struct +{ + IApplicationAssociationRegistration IApplicationAssociationRegistration_iface; + LONG ref; +} IApplicationAssociationRegistrationImpl; + + static inline IQueryAssociationsImpl *impl_from_IQueryAssociations(IQueryAssociations *iface) { return CONTAINING_RECORD(iface, IQueryAssociationsImpl, IQueryAssociations_iface); @@ -711,6 +719,114 @@ static const IQueryAssociationsVtbl IQueryAssociations_vtbl = }; /************************************************************************** + * IApplicationAssociationRegistration implementation + */ +static inline IApplicationAssociationRegistrationImpl *impl_from_IApplicationAssociationRegistration(IApplicationAssociationRegistration *iface) +{ + return CONTAINING_RECORD(iface, IApplicationAssociationRegistrationImpl, IApplicationAssociationRegistration_iface); +} + +static HRESULT WINAPI ApplicationAssociationRegistration_QueryInterface( + IApplicationAssociationRegistration* iface, REFIID riid, LPVOID *ppv) +{ + IApplicationAssociationRegistrationImpl *This = impl_from_IApplicationAssociationRegistration(iface); + + TRACE("(%p, %s, %p)\n",This, debugstr_guid(riid), ppv); + + if (ppv == NULL) + return E_POINTER; + + if (IsEqualGUID(&IID_IUnknown, riid) || + IsEqualGUID(&IID_IApplicationAssociationRegistration, riid)) { + *ppv = &This->IApplicationAssociationRegistration_iface; + IUnknown_AddRef((IUnknown*)*ppv); + TRACE("returning IApplicationAssociationRegistration: %p\n", *ppv); + return S_OK; + } + + *ppv = NULL; + FIXME("(%p)->(%s %p) interface not supported\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI ApplicationAssociationRegistration_AddRef(IApplicationAssociationRegistration *iface) +{ + IApplicationAssociationRegistrationImpl *This = impl_from_IApplicationAssociationRegistration(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + return ref; +} + +static ULONG WINAPI ApplicationAssociationRegistration_Release(IApplicationAssociationRegistration *iface) +{ + IApplicationAssociationRegistrationImpl *This = impl_from_IApplicationAssociationRegistration(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) { + SHFree(This); + } + return ref; +} + +static HRESULT WINAPI ApplicationAssociationRegistration_QueryCurrentDefault(IApplicationAssociationRegistration* This, LPCWSTR query, + ASSOCIATIONTYPE type, ASSOCIATIONLEVEL level, LPWSTR *association) +{ + FIXME("(%p)->(%s, %d, %d, %p)\n", This, debugstr_w(query), type, level, association); + return E_NOTIMPL; +} + +static HRESULT WINAPI ApplicationAssociationRegistration_QueryAppIsDefault(IApplicationAssociationRegistration* This, LPCWSTR query, + ASSOCIATIONTYPE type, ASSOCIATIONLEVEL level, LPCWSTR appname, BOOL *is_default) +{ + FIXME("(%p)->(%s, %d, %d, %s, %p)\n", This, debugstr_w(query), type, level, debugstr_w(appname), is_default); + return E_NOTIMPL; +} + +static HRESULT WINAPI ApplicationAssociationRegistration_QueryAppIsDefaultAll(IApplicationAssociationRegistration* This, ASSOCIATIONLEVEL level, + LPCWSTR appname, BOOL *is_default) +{ + FIXME("(%p)->(%d, %s, %p)\n", This, level, debugstr_w(appname), is_default); + return E_NOTIMPL; +} + +static HRESULT WINAPI ApplicationAssociationRegistration_SetAppAsDefault(IApplicationAssociationRegistration* This, LPCWSTR appname, + LPCWSTR set, ASSOCIATIONTYPE set_type) +{ + FIXME("(%p)->(%s, %s, %d)\n", This, debugstr_w(appname), debugstr_w(set), set_type); + return E_NOTIMPL; +} + +static HRESULT WINAPI ApplicationAssociationRegistration_SetAppAsDefaultAll(IApplicationAssociationRegistration* This, LPCWSTR appname) +{ + FIXME("(%p)->(%s)\n", This, debugstr_w(appname)); + return E_NOTIMPL; +} + + +static HRESULT WINAPI ApplicationAssociationRegistration_ClearUserAssociations(IApplicationAssociationRegistration* This) +{ + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + + +static const IApplicationAssociationRegistrationVtbl IApplicationAssociationRegistration_vtbl = +{ + ApplicationAssociationRegistration_QueryInterface, + ApplicationAssociationRegistration_AddRef, + ApplicationAssociationRegistration_Release, + ApplicationAssociationRegistration_QueryCurrentDefault, + ApplicationAssociationRegistration_QueryAppIsDefault, + ApplicationAssociationRegistration_QueryAppIsDefaultAll, + ApplicationAssociationRegistration_SetAppAsDefault, + ApplicationAssociationRegistration_SetAppAsDefaultAll, + ApplicationAssociationRegistration_ClearUserAssociations +}; + +/************************************************************************** * IQueryAssociations_Constructor [internal] * * Construct a new IQueryAssociations object. @@ -731,3 +847,30 @@ HRESULT WINAPI QueryAssociations_Constructor(IUnknown *pUnkOuter, REFIID riid, L TRACE("returning %p\n", *ppOutput); return ret; } + +/************************************************************************** + * ApplicationAssociationRegistration_Constructor [internal] + * + * Construct a IApplicationAssociationRegistration object. + */ +HRESULT WINAPI ApplicationAssociationRegistration_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv) +{ + IApplicationAssociationRegistrationImpl *This; + HRESULT hr; + + if (outer) + return CLASS_E_NOAGGREGATION; + + if (!(This = SHAlloc(sizeof(*This)))) + return E_OUTOFMEMORY; + + This->IApplicationAssociationRegistration_iface.lpVtbl = &IApplicationAssociationRegistration_vtbl; + This->ref = 0; + + hr = IUnknown_QueryInterface(&This->IApplicationAssociationRegistration_iface, riid, ppv); + if (FAILED(hr)) + SHFree(This); + + TRACE("returning 0x%x with %p\n", hr, *ppv); + return hr; +} diff --git a/dlls/shell32/shell32_classes.idl b/dlls/shell32/shell32_classes.idl index ae3e619..3c96e79 100644 --- a/dlls/shell32/shell32_classes.idl +++ b/dlls/shell32/shell32_classes.idl @@ -61,6 +61,12 @@ coclass KnownFolderManager { interface IKnownFolderManager; } ] coclass QueryAssociations { interface IQueryAssociations; } [ + helpstring("Manage Application associations"), + threading(apartment), + uuid(591209c7-767b-42b2-9fba-44ee4615f2c7) +] coclass ApplicationAssociationRegistration { interface IApplicationAssociationRegistration; } + +[ helpstring("Shell Drag and Drop Helper"), threading(apartment), uuid(4657278a-411b-11d2-839a-00c04fd918d0) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 88a89a7..ece1863 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -107,6 +107,8 @@ HRESULT WINAPI CPanel_ExtractIconA(LPITEMIDLIST pidl, LPCSTR pszFile, UINT nIcon HRESULT WINAPI CPanel_ExtractIconW(LPITEMIDLIST pidl, LPCWSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) DECLSPEC_HIDDEN; HRESULT WINAPI IAutoComplete_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) DECLSPEC_HIDDEN; +HRESULT WINAPI ApplicationAssociationRegistration_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; + LPEXTRACTICONA IExtractIconA_Constructor(LPCITEMIDLIST) DECLSPEC_HIDDEN; LPEXTRACTICONW IExtractIconW_Constructor(LPCITEMIDLIST) DECLSPEC_HIDDEN; diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index fbf917d..b3f847c 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -63,6 +63,7 @@ static const struct { LPFNCREATEINSTANCE lpfnCI; } InterfaceTable[] = { + {&CLSID_ApplicationAssociationRegistration, ApplicationAssociationRegistration_Constructor}, {&CLSID_AutoComplete, IAutoComplete_Constructor}, {&CLSID_ControlPanel, IControlPanel_Constructor}, {&CLSID_DragDropHelper, IDropTargetHelper_Constructor},

1 0

Detlef Riekenberg : shell32/tests: Simple tests for IApplicationAssociationRegistration.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 49e1a1a5dc441b6ab6eead2bcf6782c29907d4e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49e1a1a5dc441b6ab6eead2bc… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jan 16 00:06:16 2012 +0100 shell32/tests: Simple tests for IApplicationAssociationRegistration. --- dlls/shell32/tests/assoc.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c index 8d09ec2..488f8e9 100644 --- a/dlls/shell32/tests/assoc.c +++ b/dlls/shell32/tests/assoc.c @@ -23,6 +23,7 @@ #include "shlwapi.h" #include "shlguid.h" +#include "shobjidl.h" #include "wine/test.h" @@ -61,11 +62,47 @@ static void test_IQueryAssociations_QueryInterface(void) } +static void test_IApplicationAssociationRegistration_QueryInterface(void) +{ + IApplicationAssociationRegistration *appreg; + IApplicationAssociationRegistration *appreg2; + IUnknown *unk; + HRESULT hr; + + /* this works since Vista */ + hr = CoCreateInstance(&CLSID_ApplicationAssociationRegistration, NULL, CLSCTX_INPROC_SERVER, + &IID_IApplicationAssociationRegistration, (LPVOID*)&appreg); + + if (FAILED(hr)) { + skip("IApplicationAssociationRegistration not created: 0x%x\n", hr); + return; + } + + hr = IUnknown_QueryInterface(appreg, &IID_IApplicationAssociationRegistration, (void**)&appreg2); + ok(hr == S_OK, "QueryInterface (IApplicationAssociationRegistration) returned 0x%x\n", hr); + if (SUCCEEDED(hr)) { + IUnknown_Release(appreg2); + } + + hr = IUnknown_QueryInterface(appreg, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface (IUnknown) returned 0x%x\n", hr); + if (SUCCEEDED(hr)) { + IUnknown_Release(unk); + } + + hr = IUnknown_QueryInterface(appreg, &IID_IUnknown, NULL); + ok(hr == E_POINTER, "got 0x%x (expected E_POINTER)\n", hr); + + IApplicationAssociationRegistration_Release(appreg); +} + + START_TEST(assoc) { CoInitialize(NULL); test_IQueryAssociations_QueryInterface(); + test_IApplicationAssociationRegistration_QueryInterface(); CoUninitialize(); }

1 0

Jacek Caban : vbscript: Use 0 as invalid instruction offset.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: ff96e75996b298c3e91f4ade9f4bd8c735c550ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff96e75996b298c3e91f4ade9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 16 12:40:26 2012 +0100 vbscript: Use 0 as invalid instruction offset. --- dlls/vbscript/compile.c | 50 +++++++++++++++++++++++----------------------- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 9f62a23..df6dd2f 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -148,7 +148,7 @@ static unsigned push_instr(compile_ctx_t *ctx, vbsop_t op) new_instr = heap_realloc(ctx->code->instrs, ctx->instr_size*2*sizeof(instr_t)); if(!new_instr) - return -1; + return 0; ctx->code->instrs = new_instr; ctx->instr_size *= 2; @@ -163,7 +163,7 @@ static HRESULT push_instr_int(compile_ctx_t *ctx, vbsop_t op, LONG arg) unsigned ret; ret = push_instr(ctx, op); - if(ret == -1) + if(!ret) return E_OUTOFMEMORY; instr_ptr(ctx, ret)->arg1.lng = arg; @@ -175,7 +175,7 @@ static HRESULT push_instr_uint(compile_ctx_t *ctx, vbsop_t op, unsigned arg) unsigned ret; ret = push_instr(ctx, op); - if(ret == -1) + if(!ret) return E_OUTOFMEMORY; instr_ptr(ctx, ret)->arg1.uint = arg; @@ -187,7 +187,7 @@ static HRESULT push_instr_addr(compile_ctx_t *ctx, vbsop_t op, unsigned arg) unsigned ret; ret = push_instr(ctx, op); - if(ret == -1) + if(!ret) return E_OUTOFMEMORY; instr_ptr(ctx, ret)->arg1.uint = arg; @@ -204,7 +204,7 @@ static HRESULT push_instr_str(compile_ctx_t *ctx, vbsop_t op, const WCHAR *arg) return E_OUTOFMEMORY; instr = push_instr(ctx, op); - if(instr == -1) + if(!instr) return E_OUTOFMEMORY; instr_ptr(ctx, instr)->arg1.str = str; @@ -221,7 +221,7 @@ static HRESULT push_instr_double(compile_ctx_t *ctx, vbsop_t op, double arg) return E_OUTOFMEMORY; instr = push_instr(ctx, op); - if(instr == -1) + if(!instr) return E_OUTOFMEMORY; *d = arg; @@ -264,7 +264,7 @@ static HRESULT push_instr_bstr(compile_ctx_t *ctx, vbsop_t op, const WCHAR *arg) return E_OUTOFMEMORY; instr = push_instr(ctx, op); - if(instr == -1) + if(!instr) return E_OUTOFMEMORY; instr_ptr(ctx, instr)->arg1.bstr = bstr; @@ -281,7 +281,7 @@ static HRESULT push_instr_bstr_uint(compile_ctx_t *ctx, vbsop_t op, const WCHAR return E_OUTOFMEMORY; instr = push_instr(ctx, op); - if(instr == -1) + if(!instr) return E_OUTOFMEMORY; instr_ptr(ctx, instr)->arg1.bstr = bstr; @@ -394,7 +394,7 @@ static HRESULT compile_unary_expression(compile_ctx_t *ctx, unary_expression_t * if(FAILED(hres)) return hres; - return push_instr(ctx, op) == -1 ? E_OUTOFMEMORY : S_OK; + return push_instr(ctx, op) ? S_OK : E_OUTOFMEMORY; } static HRESULT compile_binary_expression(compile_ctx_t *ctx, binary_expression_t *expr, vbsop_t op) @@ -409,7 +409,7 @@ static HRESULT compile_binary_expression(compile_ctx_t *ctx, binary_expression_t if(FAILED(hres)) return hres; - return push_instr(ctx, op) == -1 ? E_OUTOFMEMORY : S_OK; + return push_instr(ctx, op) ? S_OK : E_OUTOFMEMORY; } static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) @@ -428,7 +428,7 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) case EXPR_DOUBLE: return push_instr_double(ctx, OP_double, ((double_expression_t*)expr)->value); case EXPR_EMPTY: - return push_instr(ctx, OP_empty) != -1 ? S_OK : E_OUTOFMEMORY; + return push_instr(ctx, OP_empty) ? S_OK : E_OUTOFMEMORY; case EXPR_EQUAL: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_equal); case EXPR_EQV: @@ -450,7 +450,7 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) case EXPR_LTEQ: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_lteq); case EXPR_ME: - return push_instr(ctx, OP_me) != -1 ? S_OK : E_OUTOFMEMORY; + return push_instr(ctx, OP_me) ? S_OK : E_OUTOFMEMORY; case EXPR_MEMBER: return compile_member_expression(ctx, (member_expression_t*)expr, TRUE); case EXPR_MOD: @@ -466,9 +466,9 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) case EXPR_NOT: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_not); case EXPR_NOTHING: - return push_instr(ctx, OP_nothing) != -1 ? S_OK : E_OUTOFMEMORY; + return push_instr(ctx, OP_nothing) ? S_OK : E_OUTOFMEMORY; case EXPR_NULL: - return push_instr(ctx, OP_null) != -1 ? S_OK : E_OUTOFMEMORY; + return push_instr(ctx, OP_null) ? S_OK : E_OUTOFMEMORY; case EXPR_OR: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_or); case EXPR_STRING: @@ -500,7 +500,7 @@ static HRESULT compile_if_statement(compile_ctx_t *ctx, if_statement_t *stat) return hres; cnd_jmp = push_instr(ctx, OP_jmp_false); - if(cnd_jmp == -1) + if(!cnd_jmp) return E_OUTOFMEMORY; hres = compile_statement(ctx, stat->if_stat); @@ -525,7 +525,7 @@ static HRESULT compile_if_statement(compile_ctx_t *ctx, if_statement_t *stat) return hres; cnd_jmp = push_instr(ctx, OP_jmp_false); - if(cnd_jmp == -1) + if(!cnd_jmp) return E_OUTOFMEMORY; hres = compile_statement(ctx, elseif_decl->stat); @@ -563,7 +563,7 @@ static HRESULT compile_while_statement(compile_ctx_t *ctx, while_statement_t *st return hres; jmp_end = push_instr(ctx, stat->stat.type == STAT_UNTIL ? OP_jmp_true : OP_jmp_false); - if(jmp_end == -1) + if(!jmp_end) return E_OUTOFMEMORY; prev_label = ctx->while_end_label; @@ -637,7 +637,7 @@ static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *st return hres; instr = push_instr(ctx, OP_assign_ident); - if(instr == -1) + if(!instr) return E_OUTOFMEMORY; instr_ptr(ctx, instr)->arg1.bstr = identifier; @@ -645,7 +645,7 @@ static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *st if(FAILED(hres)) return hres; - if(push_instr(ctx, OP_val) == -1) + if(!push_instr(ctx, OP_val)) return E_OUTOFMEMORY; if(stat->step_expr) { @@ -653,7 +653,7 @@ static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *st if(FAILED(hres)) return hres; - if(push_instr(ctx, OP_val) == -1) + if(!push_instr(ctx, OP_val)) return E_OUTOFMEMORY; }else { hres = push_instr_int(ctx, OP_short, 1); @@ -667,7 +667,7 @@ static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *st return E_OUTOFMEMORY; step_instr = push_instr(ctx, OP_step); - if(step_instr == -1) + if(!step_instr) return E_OUTOFMEMORY; instr_ptr(ctx, step_instr)->arg2.bstr = identifier; instr_ptr(ctx, step_instr)->arg1.uint = ctx->for_end_label; @@ -677,7 +677,7 @@ static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *st return hres; instr = push_instr(ctx, OP_incc); - if(instr == -1) + if(!instr) return E_OUTOFMEMORY; instr_ptr(ctx, instr)->arg1.bstr = identifier; @@ -920,7 +920,7 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) hres = compile_assign_statement(ctx, (assign_statement_t*)stat, TRUE); break; case STAT_STOP: - hres = push_instr(ctx, OP_stop) == -1 ? E_OUTOFMEMORY : S_OK; + hres = push_instr(ctx, OP_stop) ? S_OK : E_OUTOFMEMORY; break; case STAT_UNTIL: case STAT_WHILE: @@ -1008,7 +1008,7 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f if(ctx->prop_end_label != -1) label_set_addr(ctx, ctx->prop_end_label); - if(push_instr(ctx, OP_ret) == -1) + if(!push_instr(ctx, OP_ret)) return E_OUTOFMEMORY; resolve_labels(ctx, func->code_off); @@ -1373,7 +1373,7 @@ static vbscode_t *alloc_vbscode(compile_ctx_t *ctx, const WCHAR *source) return NULL; } - ctx->instr_cnt = 0; + ctx->instr_cnt = 1; ctx->instr_size = 32; vbsheap_init(&ret->heap);

1 0

Jacek Caban : vbscript: Use 0 as an invalid label value.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: c53529b48db313c47e559e035799084503da9fd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c53529b48db313c47e559e035… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 16 12:40:50 2012 +0100 vbscript: Use 0 as an invalid label value. --- dlls/vbscript/compile.c | 54 +++++++++++++++++++++++----------------------- 1 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index df6dd2f..846a55d 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -296,14 +296,14 @@ static unsigned alloc_label(compile_ctx_t *ctx) if(!ctx->labels_size) { ctx->labels = heap_alloc(8 * sizeof(*ctx->labels)); if(!ctx->labels) - return -1; + return 0; ctx->labels_size = 8; }else if(ctx->labels_size == ctx->labels_cnt) { unsigned *new_labels; new_labels = heap_realloc(ctx->labels, 2*ctx->labels_size*sizeof(*ctx->labels)); if(!new_labels) - return -1; + return 0; ctx->labels = new_labels; ctx->labels_size *= 2; @@ -491,7 +491,7 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) static HRESULT compile_if_statement(compile_ctx_t *ctx, if_statement_t *stat) { - unsigned cnd_jmp, endif_label = -1; + unsigned cnd_jmp, endif_label = 0; elseif_decl_t *elseif_decl; HRESULT hres; @@ -509,7 +509,7 @@ static HRESULT compile_if_statement(compile_ctx_t *ctx, if_statement_t *stat) if(stat->else_stat || stat->elseifs) { endif_label = alloc_label(ctx); - if(endif_label == -1) + if(!endif_label) return E_OUTOFMEMORY; hres = push_instr_addr(ctx, OP_jmp, endif_label); @@ -545,7 +545,7 @@ static HRESULT compile_if_statement(compile_ctx_t *ctx, if_statement_t *stat) return hres; } - if(endif_label != -1) + if(endif_label) label_set_addr(ctx, endif_label); return S_OK; } @@ -567,7 +567,7 @@ static HRESULT compile_while_statement(compile_ctx_t *ctx, while_statement_t *st return E_OUTOFMEMORY; prev_label = ctx->while_end_label; - if(stat->stat.type != STAT_WHILE && (ctx->while_end_label = alloc_label(ctx)) == -1) + if(stat->stat.type != STAT_WHILE && !(ctx->while_end_label = alloc_label(ctx))) return E_OUTOFMEMORY; hres = compile_statement(ctx, stat->body); @@ -596,7 +596,7 @@ static HRESULT compile_dowhile_statement(compile_ctx_t *ctx, while_statement_t * start_addr = ctx->instr_cnt; prev_label = ctx->while_end_label; - if((ctx->while_end_label = alloc_label(ctx)) == -1) + if(!(ctx->while_end_label = alloc_label(ctx))) return E_OUTOFMEMORY; hres = compile_statement(ctx, stat->body); @@ -663,7 +663,7 @@ static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *st prev_label = ctx->for_end_label; ctx->for_end_label = alloc_label(ctx); - if(ctx->for_end_label == -1) + if(!ctx->for_end_label) return E_OUTOFMEMORY; step_instr = push_instr(ctx, OP_step); @@ -811,7 +811,7 @@ static HRESULT compile_function_statement(compile_ctx_t *ctx, function_statement static HRESULT compile_exitdo_statement(compile_ctx_t *ctx) { - if(ctx->while_end_label == -1) { + if(!ctx->while_end_label) { FIXME("Exit Do outside Do Loop\n"); return E_FAIL; } @@ -821,7 +821,7 @@ static HRESULT compile_exitdo_statement(compile_ctx_t *ctx) static HRESULT compile_exitfor_statement(compile_ctx_t *ctx) { - if(ctx->for_end_label == -1) { + if(!ctx->for_end_label) { FIXME("Exit For outside For Loop\n"); return E_FAIL; } @@ -831,7 +831,7 @@ static HRESULT compile_exitfor_statement(compile_ctx_t *ctx) static HRESULT compile_exitsub_statement(compile_ctx_t *ctx) { - if(ctx->sub_end_label == -1) { + if(!ctx->sub_end_label) { FIXME("Exit Sub outside Sub?\n"); return E_FAIL; } @@ -841,7 +841,7 @@ static HRESULT compile_exitsub_statement(compile_ctx_t *ctx) static HRESULT compile_exitfunc_statement(compile_ctx_t *ctx) { - if(ctx->func_end_label == -1) { + if(!ctx->func_end_label) { FIXME("Exit Function outside Function?\n"); return E_FAIL; } @@ -851,7 +851,7 @@ static HRESULT compile_exitfunc_statement(compile_ctx_t *ctx) static HRESULT compile_exitprop_statement(compile_ctx_t *ctx) { - if(ctx->prop_end_label == -1) { + if(!ctx->prop_end_label) { FIXME("Exit Property outside Property?\n"); return E_FAIL; } @@ -961,21 +961,21 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f func->code_off = ctx->instr_cnt; - ctx->while_end_label = -1; - ctx->for_end_label = -1; - ctx->sub_end_label = -1; - ctx->func_end_label = -1; - ctx->prop_end_label = -1; + ctx->while_end_label = 0; + ctx->for_end_label = 0; + ctx->sub_end_label = 0; + ctx->func_end_label = 0; + ctx->prop_end_label = 0; switch(func->type) { case FUNC_FUNCTION: ctx->func_end_label = alloc_label(ctx); - if(ctx->func_end_label == -1) - return E_OUTOFMEMORY; /* FIXME ! */ + if(!ctx->func_end_label) + return E_OUTOFMEMORY; break; case FUNC_SUB: ctx->sub_end_label = alloc_label(ctx); - if(ctx->sub_end_label == -1) + if(!ctx->sub_end_label) return E_OUTOFMEMORY; break; case FUNC_PROPGET: @@ -983,7 +983,7 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f case FUNC_PROPSET: case FUNC_DEFGET: ctx->prop_end_label = alloc_label(ctx); - if(ctx->prop_end_label == -1) + if(!ctx->prop_end_label) return E_OUTOFMEMORY; break; case FUNC_GLOBAL: @@ -998,14 +998,14 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f if(FAILED(hres)) return hres; - assert(ctx->while_end_label == -1); - assert(ctx->for_end_label == -1); + assert(!ctx->while_end_label); + assert(!ctx->for_end_label); - if(ctx->sub_end_label != -1) + if(ctx->sub_end_label) label_set_addr(ctx, ctx->sub_end_label); - if(ctx->func_end_label != -1) + if(ctx->func_end_label) label_set_addr(ctx, ctx->func_end_label); - if(ctx->prop_end_label != -1) + if(ctx->prop_end_label) label_set_addr(ctx, ctx->prop_end_label); if(!push_instr(ctx, OP_ret))

1 0

Jacek Caban : vbscript: Fixed stack reallocation.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 1791cdaea843dc5731850f323a854842e53d5088 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1791cdaea843dc5731850f323… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 16 12:41:00 2012 +0100 vbscript: Fixed stack reallocation. --- dlls/vbscript/interp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index cca5eb9..4be1d43 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -260,7 +260,7 @@ static HRESULT stack_push(exec_ctx_t *ctx, VARIANT *v) if(ctx->stack_size == ctx->top) { VARIANT *new_stack; - new_stack = heap_realloc(ctx->stack, ctx->stack_size*2); + new_stack = heap_realloc(ctx->stack, ctx->stack_size*2*sizeof(*ctx->stack)); if(!new_stack) { VariantClear(v); return E_OUTOFMEMORY;

1 0

Alexandre Julliard : qedit: Avoid releasing an uninitialized object.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: dc880388e13b60f59c3b7ecfa4e3689b80eb0342 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc880388e13b60f59c3b7ecfa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 16 17:41:56 2012 +0100 qedit: Avoid releasing an uninitialized object. --- dlls/qedit/mediadet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 38a54ce..edb7be5 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -396,7 +396,7 @@ static HRESULT GetSplitter(MediaDetImpl *This) if (FAILED(hr)) { VariantClear(&var); - goto retry; + continue; } hr = IGraphBuilder_AddFilter(This->graph, splitter,

1 0

Alexandre Julliard : dbghelp: Fix a couple of pointer cast warnings.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 55107912f0188fc100e0bbc76b840beca9f3c6c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55107912f0188fc100e0bbc76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 16 17:51:45 2012 +0100 dbghelp: Fix a couple of pointer cast warnings. --- dlls/dbghelp/cpu_i386.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index 70ee9e6..e604e10 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -219,7 +219,7 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO if (NtQueryInformationThread(csw->hThread, ThreadBasicInformation, &info, sizeof(info), NULL) == STATUS_SUCCESS) { - curr_switch = (unsigned long)info.TebBaseAddress + FIELD_OFFSET(TEB, WOW32Reserved); + curr_switch = (DWORD_PTR)info.TebBaseAddress + FIELD_OFFSET(TEB, WOW32Reserved); if (!sw_read_mem(csw, curr_switch, &p, sizeof(p))) { WARN("Can't read TEB:WOW32Reserved\n"); @@ -339,13 +339,13 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO } TRACE("Got a 16 bit stack switch:" - "\n\tframe32: %08lx" + "\n\tframe32: %p" "\n\tedx:%08x ecx:%08x ebp:%08x" "\n\tds:%04x es:%04x fs:%04x gs:%04x" "\n\tcall_from_ip:%08x module_cs:%04x relay=%08x" "\n\tentry_ip:%04x entry_point:%08x" "\n\tbp:%04x ip:%04x cs:%04x\n", - (unsigned long)frame16.frame32, + frame16.frame32, frame16.edx, frame16.ecx, frame16.ebp, frame16.ds, frame16.es, frame16.fs, frame16.gs, frame16.callfrom_ip, frame16.module_cs, frame16.relay,

1 0