December 2014 - Wine-commits

Erich E. Hoover : ddraw: Fix inverted logic for enumerating secondary devices.
by Alexandre Julliard 11 Dec '14

11 Dec '14

Module: wine Branch: master Commit: 3d5fe2074e569a9d846a6018792d68d76d3eb38d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d5fe2074e569a9d846a60187… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Thu Nov 13 09:20:15 2014 -0700 ddraw: Fix inverted logic for enumerating secondary devices. --- dlls/ddraw/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 68bf3e3..eb52360 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -430,7 +430,7 @@ HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA callback, void *contex cont_enum = callback(NULL, driver_desc, driver_name, context, 0); /* The Battle.net System Checker expects both a NULL device and a GUID-based device */ - if (cont_enum && (flags & ~DDENUM_ATTACHEDSECONDARYDEVICES)) + if (cont_enum && (flags & DDENUM_ATTACHEDSECONDARYDEVICES)) ddraw_enumerate_secondary_devices(wined3d, callback, context); } __EXCEPT_PAGE_FAULT

1 0

Nikolay Sivov : dwrite: Block creation of unsupported face types.
by Alexandre Julliard 11 Dec '14

11 Dec '14

Module: wine Branch: master Commit: 44bb2ba295fa010e2a886e981a9a282224d06197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44bb2ba295fa010e2a886e981… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 11 12:33:29 2014 +0300 dwrite: Block creation of unsupported face types. --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/main.c | 26 +++++++++++--- dlls/dwrite/opentype.c | 27 +++++++++----- dlls/dwrite/tests/font.c | 86 +++++++++++++++++++++++++++++++++++--------- 4 files changed, 109 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=44bb2ba295fa010e2a886…

1 0

Jacek Caban : mshtml: Pass HTMLPluginContainer to create_plugin_host.
by Alexandre Julliard 11 Dec '14

11 Dec '14

Module: wine Branch: master Commit: a545fe08ad9a52ac2ad84ef444be630955dc15af URL: http://source.winehq.org/git/wine.git/?a=commit;h=a545fe08ad9a52ac2ad84ef44… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 11 16:25:49 2014 +0100 mshtml: Pass HTMLPluginContainer to create_plugin_host. --- dlls/mshtml/npplugin.c | 27 ++++++++++++++++++++------- dlls/mshtml/pluginhost.c | 37 +++++-------------------------------- dlls/mshtml/pluginhost.h | 2 +- 3 files changed, 26 insertions(+), 40 deletions(-) diff --git a/dlls/mshtml/npplugin.c b/dlls/mshtml/npplugin.c index ca0d9fd..7c31a24 100644 --- a/dlls/mshtml/npplugin.c +++ b/dlls/mshtml/npplugin.c @@ -639,11 +639,14 @@ static IUnknown *create_activex_object(HTMLInnerWindow *window, nsIDOMHTMLElemen static NPError CDECL NPP_New(NPMIMEType pluginType, NPP instance, UINT16 mode, INT16 argc, char **argn, char **argv, NPSavedData *saved) { + HTMLPluginContainer *container; nsIDOMHTMLElement *nselem; HTMLInnerWindow *window; + HTMLDOMNode *node; IUnknown *obj; CLSID clsid; NPError err = NPERR_NO_ERROR; + HRESULT hres; TRACE("(%s %p %x %d %p %p %p)\n", debugstr_a(pluginType), instance, mode, argc, argn, argv, saved); @@ -660,22 +663,32 @@ static NPError CDECL NPP_New(NPMIMEType pluginType, NPP instance, UINT16 mode, I return NPERR_GENERIC_ERROR; } - obj = create_activex_object(window, nselem, &clsid); - if(obj) { - PluginHost *host; - HRESULT hres; + hres = get_node(window->doc, (nsIDOMNode*)nselem, TRUE, &node); + nsIDOMHTMLElement_Release(nselem); + if(FAILED(hres)) + return NPERR_GENERIC_ERROR; - hres = create_plugin_host(window->doc, (nsIDOMElement*)nselem, obj, &clsid, &host); + hres = IHTMLDOMNode_QueryInterface(&node->IHTMLDOMNode_iface, &IID_HTMLPluginContainer, + (void**)&container); + node_release(node); + if(FAILED(hres)) { + ERR("Not an object element\n"); + return NPERR_GENERIC_ERROR; + } + + obj = create_activex_object(window, container->element.nselem, &clsid); + if(obj) { + hres = create_plugin_host(window->doc, container, obj, &clsid); IUnknown_Release(obj); if(SUCCEEDED(hres)) - instance->pdata = host; + instance->pdata = container->plugin_host; else err = NPERR_GENERIC_ERROR; }else { err = NPERR_GENERIC_ERROR; } - nsIDOMHTMLElement_Release(nselem); + node_release(&container->element.node); return err; } diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 7c1b760..2d71264 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -1634,29 +1634,6 @@ static const IServiceProviderVtbl ServiceProviderVtbl = { PHServiceProvider_QueryService }; -static HRESULT assoc_element(PluginHost *host, HTMLDocumentNode *doc, nsIDOMElement *nselem) -{ - HTMLPluginContainer *container_elem; - HTMLDOMNode *node; - HRESULT hres; - - hres = get_node(doc, (nsIDOMNode*)nselem, TRUE, &node); - if(FAILED(hres)) - return hres; - - hres = IHTMLDOMNode_QueryInterface(&node->IHTMLDOMNode_iface, &IID_HTMLPluginContainer, - (void**)&container_elem); - node_release(node); - if(FAILED(hres)) { - ERR("Not an object element\n"); - return hres; - } - - container_elem->plugin_host = host; - host->element = container_elem; - return S_OK; -} - void detach_plugin_host(PluginHost *host) { HRESULT hres; @@ -1717,10 +1694,11 @@ void detach_plugin_host(PluginHost *host) host->doc = NULL; } -HRESULT create_plugin_host(HTMLDocumentNode *doc, nsIDOMElement *nselem, IUnknown *unk, const CLSID *clsid, PluginHost **ret) +HRESULT create_plugin_host(HTMLDocumentNode *doc, HTMLPluginContainer *container, IUnknown *unk, const CLSID *clsid) { PluginHost *host; - HRESULT hres; + + assert(!container->plugin_host); host = heap_alloc_zero(sizeof(*host)); if(!host) @@ -1737,12 +1715,6 @@ HRESULT create_plugin_host(HTMLDocumentNode *doc, nsIDOMElement *nselem, IUnknow host->ref = 1; - hres = assoc_element(host, doc, nselem); - if(FAILED(hres)) { - heap_free(host); - return hres; - } - IUnknown_AddRef(unk); host->plugin_unk = unk; host->clsid = *clsid; @@ -1750,6 +1722,7 @@ HRESULT create_plugin_host(HTMLDocumentNode *doc, nsIDOMElement *nselem, IUnknow host->doc = doc; list_add_tail(&doc->plugin_hosts, &host->entry); - *ret = host; + container->plugin_host = host; + host->element = container; return S_OK; } diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index 5cc5ad0..f1c0a74 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -60,7 +60,7 @@ struct HTMLPluginContainer { extern const IID IID_HTMLPluginContainer DECLSPEC_HIDDEN; -HRESULT create_plugin_host(HTMLDocumentNode*,nsIDOMElement*,IUnknown*,const CLSID*,PluginHost**) DECLSPEC_HIDDEN; +HRESULT create_plugin_host(HTMLDocumentNode*,HTMLPluginContainer*,IUnknown*,const CLSID*) DECLSPEC_HIDDEN; void update_plugin_window(PluginHost*,HWND,const RECT*) DECLSPEC_HIDDEN; void detach_plugin_host(PluginHost*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Create ActiveX object inside create_plugin_host.
by Alexandre Julliard 11 Dec '14

11 Dec '14

Module: wine Branch: master Commit: 2ff987322f63a9f9765fd67d710447c176f10c58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ff987322f63a9f9765fd67d7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 11 16:26:04 2014 +0100 mshtml: Create ActiveX object inside create_plugin_host. --- dlls/mshtml/npplugin.c | 388 +---------------------------------------------- dlls/mshtml/pluginhost.c | 387 +++++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/pluginhost.h | 2 +- 3 files changed, 390 insertions(+), 387 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ff987322f63a9f9765fd…

1 0

Jacek Caban : mshtml: Do more initialization in create_plugin_host.
by Alexandre Julliard 11 Dec '14

11 Dec '14

Module: wine Branch: master Commit: 5bce6044519a2ccc4d0958842bfd40510545632a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bce6044519a2ccc4d0958842… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 11 16:26:09 2014 +0100 mshtml: Do more initialization in create_plugin_host. --- dlls/mshtml/pluginhost.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 8e12865..b6fcf72 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -182,7 +182,7 @@ static void load_plugin(PluginHost *host) FIXME("No IPersistPropertyBag iface\n"); } -static void activate_plugin(PluginHost *host) +static void initialize_plugin_object(PluginHost *host) { IClientSecurity *client_security; IQuickActivate *quick_activate; @@ -191,12 +191,8 @@ static void activate_plugin(PluginHost *host) IViewObjectEx *view_obj; IDispatchEx *dispex; IDispatch *disp; - RECT rect; HRESULT hres; - if(!host->plugin_unk) - return; - /* Note native calls QI on plugin for an undocumented IID and CLSID_HTMLDocument */ /* FIXME: call FreezeEvents(TRUE) */ @@ -281,6 +277,13 @@ static void activate_plugin(PluginHost *host) FIXME("Use IOleCommandTarget\n"); IOleCommandTarget_Release(cmdtrg); } +} + +static void embed_plugin_object(PluginHost *host) +{ + IOleObject *ole_obj; + RECT rect; + HRESULT hres; hres = IUnknown_QueryInterface(host->plugin_unk, &IID_IOleObject, (void**)&ole_obj); if(FAILED(hres)) { @@ -288,13 +291,11 @@ static void activate_plugin(PluginHost *host) return; } - if(ole_obj) { - get_pos_rect(host, &rect); - hres = IOleObject_DoVerb(ole_obj, OLEIVERB_INPLACEACTIVATE, NULL, &host->IOleClientSite_iface, 0, host->hwnd, &rect); - IOleObject_Release(ole_obj); - if(FAILED(hres)) - WARN("DoVerb failed: %08x\n", hres); - } + get_pos_rect(host, &rect); + hres = IOleObject_DoVerb(ole_obj, OLEIVERB_INPLACEACTIVATE, NULL, &host->IOleClientSite_iface, 0, host->hwnd, &rect); + IOleObject_Release(ole_obj); + if(FAILED(hres)) + WARN("DoVerb failed: %08x\n", hres); if(host->ip_object) { HWND hwnd; @@ -323,7 +324,7 @@ void update_plugin_window(PluginHost *host, HWND hwnd, const RECT *rect) if(!host->hwnd) { host->hwnd = hwnd; - activate_plugin(host); + embed_plugin_object(host); } if(rect_changed && host->ip_object) @@ -2103,5 +2104,8 @@ HRESULT create_plugin_host(HTMLDocumentNode *doc, HTMLPluginContainer *container container->plugin_host = host; host->element = container; + + initialize_plugin_object(host); + return S_OK; }

1 0

Jacek Caban : mshtml: Added IHTMLObjectElement2:: put_classid semi-stub implementation.
by Alexandre Julliard 11 Dec '14

11 Dec '14

Module: wine Branch: master Commit: da9fa9e80c9c377608369c29c5ba39e85a074dd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da9fa9e80c9c377608369c29c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 11 16:26:18 2014 +0100 mshtml: Added IHTMLObjectElement2::put_classid semi-stub implementation. --- dlls/mshtml/htmlobject.c | 25 ++++++++++++-- dlls/mshtml/tests/activex.c | 83 ++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 102 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 2a8ccfa..a12384f 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -575,8 +575,29 @@ static HRESULT WINAPI HTMLObjectElement2_namedRecordset(IHTMLObjectElement2 *ifa static HRESULT WINAPI HTMLObjectElement2_put_classid(IHTMLObjectElement2 *iface, BSTR v) { HTMLObjectElement *This = impl_from_IHTMLObjectElement2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + HRESULT hres; + + static const WCHAR classidW[] = {'c','l','a','s','s','i','d',0}; + + FIXME("(%p)->(%s) semi-stub\n", This, debugstr_w(v)); + + hres = elem_string_attr_setter(&This->plugin_container.element, classidW, v); + if(FAILED(hres)) + return hres; + + if(This->plugin_container.plugin_host) { + FIXME("Host already asociated.\n"); + return E_NOTIMPL; + } + + /* + * NOTE: + * If the element is not yet in DOM tree, we should embed it as soon as it's added. + * However, Gecko for some reason decides not to create NP plugin in this case, + * so this won't work. + */ + + return create_plugin_host(This->plugin_container.element.node.doc, &This->plugin_container); } static HRESULT WINAPI HTMLObjectElement2_get_classid(IHTMLObjectElement2 *iface, BSTR *p) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 852f81d..783b976 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -217,6 +217,7 @@ static BSTR a2bstr(const char *str) static IOleClientSite *client_site; static IDispatch *sink_disp; static READYSTATE plugin_readystate = READYSTATE_UNINITIALIZED; +static BOOL have_container; static void set_plugin_readystate(READYSTATE state) { @@ -468,15 +469,19 @@ static HRESULT WINAPI QuickActivate_QuickActivate(IQuickActivate *iface, QACONTA ok(!container->pUnkEventSink, "container->pUnkEventSink != NULL\n"); ok(container->dwAmbientFlags == (QACONTAINER_SUPPORTSMNEMONICS|QACONTAINER_MESSAGEREFLECT|QACONTAINER_USERMODE), "container->dwAmbientFlags = %x\n", container->dwAmbientFlags); - ok(!container->colorFore, "container->colorFore == 0\n"); /* FIXME */ + if(have_container) + ok(!container->colorFore, "container->colorFore = %d\n", container->colorFore); /* FIXME */ todo_wine ok(container->colorBack, "container->colorBack == 0\n"); /* FIXME */ - todo_wine - ok(container->pFont != NULL, "container->pFont == NULL\n"); + if(have_container) + todo_wine ok(container->pFont != NULL, "container->pFont == NULL\n"); + else + ok(!container->pFont, "container->pFont = %p\n", container->pFont); todo_wine ok(container->pUndoMgr != NULL, "container->pUndoMgr == NULL\n"); ok(!container->dwAppearance, "container->dwAppearance = %x\n", container->dwAppearance); - ok(!container->lcid, "container->lcid = %x\n", container->lcid); + if(have_container) + ok(!container->lcid, "container->lcid = %x\n", container->lcid); ok(!container->hpal, "container->hpal = %p\n", container->hpal); ok(!container->pBindHost, "container->pBindHost != NULL\n"); ok(!container->pOleControlSite, "container->pOleControlSite != NULL\n"); @@ -2366,6 +2371,7 @@ static void init_test(int behavior) activex_refcnt = 0; no_quickact = behavior == TEST_NOQUICKACT || behavior == TEST_DISPONLY; + have_container = TRUE; } static void test_event_call(void) @@ -2594,6 +2600,73 @@ static void test_nooleobj_ax(void) release_doc(doc); } +static void test_exec_script(IHTMLDocument2 *doc, const char *codea, const char *langa) +{ + IHTMLWindow2 *window; + BSTR code, lang; + VARIANT v; + HRESULT hres; + + hres = IHTMLDocument2_get_parentWindow(doc, &window); + ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + + code = a2bstr(codea); + lang = a2bstr(langa); + + hres = IHTMLWindow2_execScript(window, code, lang, &v); + ok(hres == S_OK, "execScript failed: %08x\n", hres); + SysFreeString(lang); + VariantClear(&v); + + IHTMLWindow2_Release(window); +} + +static void test_create_element(void) +{ + IHTMLDocument2 *doc; + + init_test(TEST_FLASH); + + doc = create_doc("<html></html>"); + + have_container = FALSE; + + SET_EXPECT(CreateInstance); + SET_EXPECT(FreezeEvents_TRUE); + SET_EXPECT(QuickActivate); + SET_EXPECT(IPersistPropertyBag_InitNew); + SET_EXPECT(Invoke_READYSTATE); + SET_EXPECT(FreezeEvents_FALSE); + + test_exec_script(doc, + "var test_elem = document.createElement('object');" + "test_elem.classid = 'CLSID:178fc163-f585-4e24-9c13-4bb7f6680746';", + "javascript"); + + CHECK_CALLED(CreateInstance); + todo_wine CHECK_CALLED(FreezeEvents_TRUE); + CHECK_CALLED(QuickActivate); + CHECK_CALLED(IPersistPropertyBag_InitNew); + CHECK_CALLED(Invoke_READYSTATE); + todo_wine CHECK_CALLED(FreezeEvents_FALSE); + + have_container = TRUE; + + SET_EXPECT(DoVerb); + test_exec_script(doc, + "document.body.appendChild(test_elem);", + "javascript"); + todo_wine CHECK_CALLED(DoVerb); + + SET_EXPECT(InPlaceDeactivate); + SET_EXPECT(Close); + SET_EXPECT(SetClientSite_NULL); + release_doc(doc); + todo_wine CHECK_CALLED(InPlaceDeactivate); + CHECK_CALLED(Close); + CHECK_CALLED(SetClientSite_NULL); +} + static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { return DefWindowProcW(hwnd, msg, wParam, lParam); @@ -2730,6 +2803,8 @@ START_TEST(activex) test_nooleobj_ax(); trace("Testing event object binding...\n"); test_event_binding(); + trace("Testing createElement(object)...\n"); + test_create_element(); init_registry(FALSE); }else { skip("Could not register ActiveX\n");

1 0

Nikolay Sivov : regsvr32: Update program version.
by Alexandre Julliard 11 Dec '14

11 Dec '14

Module: wine Branch: master Commit: 37d5149ea59b8c70606e8451afff7272741441e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37d5149ea59b8c70606e8451a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 11 18:59:58 2014 +0300 regsvr32: Update program version. --- programs/regsvr32/regsvr32.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/regsvr32/regsvr32.rc b/programs/regsvr32/regsvr32.rc index 9b951b1..88ba364 100644 --- a/programs/regsvr32/regsvr32.rc +++ b/programs/regsvr32/regsvr32.rc @@ -53,10 +53,10 @@ Options:\n\ #define WINE_FILEDESCRIPTION_STR "Wine Register Server" #define WINE_FILENAME_STR "REGSVR32.EXE" #define WINE_FILETYPE VFT_APP -#define WINE_FILEVERSION 5,0,1586,1 -#define WINE_FILEVERSION_STR "5.0.1586.1" +#define WINE_FILEVERSION 5,1,2600,2180 +#define WINE_FILEVERSION_STR "5.1.2600.2180" -#define WINE_PRODUCTVERSION 5,0,1586,1 -#define WINE_PRODUCTVERSION_STR "5.0" +#define WINE_PRODUCTVERSION 5,1,2600,2180 +#define WINE_PRODUCTVERSION_STR "5.1" #include "wine/wine_common_ver.rc"

1 0

André Hentschel : widl: Fix compiler warnings with flag -Wunused-macros.
by Alexandre Julliard 10 Dec '14

10 Dec '14

Module: wine Branch: master Commit: 900e7c5d6559eddfc14518f203fb36bc97881cda URL: http://source.winehq.org/git/wine.git/?a=commit;h=900e7c5d6559eddfc14518f20… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 9 23:29:18 2014 +0100 widl: Fix compiler warnings with flag -Wunused-macros. --- tools/widl/proxy.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 0c0d7ce..f4fe6f5 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -37,14 +37,6 @@ #include "typegen.h" #include "expr.h" -#define END_OF_LIST(list) \ - do { \ - if (list) { \ - while (NEXT_LINK(list)) \ - list = NEXT_LINK(list); \ - } \ - } while(0) - static FILE* proxy; static int indent = 0;

1 0

André Hentschel : dbghelp: Fix compiler warnings with flag -Wunused-macros.
by Alexandre Julliard 10 Dec '14

10 Dec '14

Module: wine Branch: master Commit: b2f967e0865f231991a8c83693bbc81ef5afba74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2f967e0865f231991a8c8369… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 9 23:29:52 2014 +0100 dbghelp: Fix compiler warnings with flag -Wunused-macros. --- dlls/dbghelp/cpu_i386.c | 1 - dlls/dbghelp/cpu_x86_64.c | 18 ++---------------- dlls/dbghelp/msc.c | 2 -- 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index 87f833f..8a3c074 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -29,7 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); -#define STEP_FLAG 0x00000100 /* single step flag */ #define V86_FLAG 0x00020000 #define IS_VM86_MODE(ctx) (ctx->EFlags & V86_FLAG) diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index e0ffb11..94f561c 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -76,21 +76,6 @@ typedef struct _UNWIND_INFO */ } UNWIND_INFO, *PUNWIND_INFO; -#define GetUnwindCodeEntry(info, index) \ - ((info)->UnwindCode[index]) - -#define GetLanguageSpecificDataPtr(info) \ - ((PVOID)&GetUnwindCodeEntry((info),((info)->CountOfCodes + 1) & ~1)) - -#define GetExceptionHandler(base, info) \ - ((PEXCEPTION_HANDLER)((base) + *(PULONG)GetLanguageSpecificDataPtr(info))) - -#define GetChainedFunctionEntry(base, info) \ - ((PRUNTIME_FUNCTION)((base) + *(PULONG)GetLanguageSpecificDataPtr(info))) - -#define GetExceptionDataPtr(info) \ - ((PVOID)((PULONG)GetLanguageSpecificData(info) + 1) - static BOOL x86_64_get_addr(HANDLE hThread, const CONTEXT* ctx, enum cpu_addr ca, ADDRESS64* addr) { @@ -107,6 +92,8 @@ static BOOL x86_64_get_addr(HANDLE hThread, const CONTEXT* ctx, } } +#ifdef __x86_64__ + enum st_mode {stm_start, stm_64bit, stm_done}; /* indexes in Reserved array */ @@ -118,7 +105,6 @@ enum st_mode {stm_start, stm_64bit, stm_done}; #define curr_count (frame->Reserved[__CurrentCount]) /* #define ??? (frame->Reserved[__]) (unused) */ -#ifdef __x86_64__ union handler_data { RUNTIME_FUNCTION chain; diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 636655f..3b12a3a 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -58,8 +58,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_msc); -#define MAX_PATHNAME_LEN 1024 - struct pdb_stream_name { const char* name;

1 0

André Hentschel : gdiplus: Fix compiler warnings with flag -Wunused-macros.
by Alexandre Julliard 10 Dec '14

10 Dec '14

Module: wine Branch: master Commit: 1d0ff2ded3c214f5e25eb59d600bc1916e6b7f18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d0ff2ded3c214f5e25eb59d6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 9 23:30:28 2014 +0100 gdiplus: Fix compiler warnings with flag -Wunused-macros. --- dlls/gdiplus/image.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index eec76f6..e6921f5 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3876,11 +3876,6 @@ GpStatus WINGDIPAPI GdipSaveImageToFile(GpImage *image, GDIPCONST WCHAR* filenam * Encoding functions - * These functions encode an image in different image file formats. */ -#define BITMAP_FORMAT_BMP 0x4d42 /* "BM" */ -#define BITMAP_FORMAT_JPEG 0xd8ff -#define BITMAP_FORMAT_GIF 0x4947 -#define BITMAP_FORMAT_PNG 0x5089 -#define BITMAP_FORMAT_APM 0xcdd7 static GpStatus encode_image_WIC(GpImage *image, IStream* stream, GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params)

1 0