wine-commits August 2006

wine-commits@winehq.org

5 participants
746 discussions

Andrew Talbot : ddraw: Write-strings warnings fix.
by Alexandre Julliard 17 Aug '06

17 Aug '06

Module: wine Branch: master Commit: 704f8d7848263690a60e828538490a33a114c2b3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=704f8d7848263690a60e828… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Aug 16 19:30:26 2006 +0100 ddraw: Write-strings warnings fix. --- dlls/ddraw/direct3d.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c index fe56729..ab59340 100644 --- a/dlls/ddraw/direct3d.c +++ b/dlls/ddraw/direct3d.c @@ -290,6 +290,7 @@ IDirect3DImpl_3_EnumDevices(IDirect3D3 * ICOM_THIS_FROM(IDirectDrawImpl, IDirect3D3, iface); D3DDEVICEDESC dref, d1, d2; D3DDEVICEDESC7 newDesc; + static CHAR wined3d_description[] = "Wine D3DDevice using WineD3D and OpenGL"; HRESULT hr; /* Some games (Motoracer 2 demo) have the bad idea to modify the device name string. @@ -317,10 +318,12 @@ IDirect3DImpl_3_EnumDevices(IDirect3D3 * if(This->d3dversion != 1) { + static CHAR reference_description[] = "Reference Direct3D ID"; + TRACE("(%p) Enumerating WineD3D D3DDevice interface\n", This); d1 = dref; d2 = dref; - hr = Callback( (LPIID) &IID_IDirect3DRefDevice, "Reference Direct3D ID", device_name, &d1, &d2, Context); + hr = Callback( (LPIID) &IID_IDirect3DRefDevice, reference_description, device_name, &d1, &d2, Context); if(hr != D3DENUMRET_OK) { TRACE("Application cancelled the enumeration\n"); @@ -331,7 +334,7 @@ IDirect3DImpl_3_EnumDevices(IDirect3D3 * TRACE("(%p) Enumerating WineD3D D3DDevice interface\n", This); d1 = dref; d2 = dref; - hr = Callback( (LPIID) &IID_D3DDEVICE_WineD3D, "Wine D3DDevice using WineD3D and OpenGL", device_name, &d1, &d2, Context); + hr = Callback( (LPIID) &IID_D3DDEVICE_WineD3D, wined3d_description, device_name, &d1, &d2, Context); if(hr != D3DENUMRET_OK) { TRACE("Application cancelled the enumeration\n");

1 0

Andrew Talbot : winspool.drv: Write-strings warning fix.
by Alexandre Julliard 17 Aug '06

17 Aug '06

Module: wine Branch: master Commit: 8c56ffdde075377c99af78f9a7aca5ae1588b717 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8c56ffdde075377c99af78f… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Aug 16 21:00:14 2006 +0100 winspool.drv: Write-strings warning fix. --- dlls/winspool.drv/info.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index bf91f9e..a7c5d68 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1166,6 +1166,7 @@ LONG WINAPI DocumentPropertiesA(HWND hWn LPDEVMODEA pDevModeInput,DWORD fMode ) { LPSTR lpName = pDeviceName; + static CHAR port[] = "LPT1:"; LONG ret; TRACE("(%p,%p,%s,%p,%p,%ld)\n", @@ -1191,7 +1192,7 @@ LONG WINAPI DocumentPropertiesA(HWND hWn return -1; } } - ret = GDI_CallExtDeviceMode16(hWnd, pDevModeOutput, lpName, "LPT1:", + ret = GDI_CallExtDeviceMode16(hWnd, pDevModeOutput, lpName, port, pDevModeInput, NULL, fMode); if(!pDeviceName)

1 0

Dan Hipschman : widl: Use typegen.c format-string functions in proxy.c.
by Alexandre Julliard 17 Aug '06

17 Aug '06

Module: wine Branch: master Commit: ed10b24e14cd13d68fa380683f805a617d67dabc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ed10b24e14cd13d68fa3806… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Aug 16 18:27:47 2006 -0700 widl: Use typegen.c format-string functions in proxy.c. --- tools/widl/proxy.c | 63 +++++----------------------------------------------- 1 files changed, 6 insertions(+), 57 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 1943b22..608c856 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -36,6 +36,7 @@ #include "widl.h" #include "utils.h" #include "parser.h" #include "header.h" +#include "typegen.h" #define END_OF_LIST(list) \ do { \ @@ -91,59 +92,7 @@ static void write_stubdesc(void) print_proxy( "\n"); } -static void write_formatdesc( const char *str ) -{ - print_proxy( "typedef struct _MIDL_%s_FORMAT_STRING\n", str ); - indent++; - print_proxy( "{\n"); - print_proxy( "short Pad;\n"); - print_proxy( "unsigned char Format[%s_FORMAT_STRING_SIZE];\n", str); - indent--; - print_proxy( "} MIDL_%s_FORMAT_STRING;\n", str); - print_proxy( "\n"); -} - -static void write_formatstringsdecl(void) -{ - print_proxy( "#define TYPE_FORMAT_STRING_SIZE %d\n",1); /* FIXME */ - print_proxy( "#define PROC_FORMAT_STRING_SIZE %d\n",1); /* FIXME */ - fprintf(proxy, "\n"); - write_formatdesc( "TYPE" ); - write_formatdesc( "PROC" ); - fprintf(proxy, "\n"); - print_proxy( "static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString;\n"); - print_proxy( "static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString;\n"); - print_proxy( "\n"); -} - -static void write_formatstring( int proc ) -{ - const char *t, *n; - if( !proc ) - { - t = "TYPE"; - n = "Type"; - } - else - { - t = "PROC"; - n = "Proc"; - } - print_proxy( "static const MIDL_%s_FORMAT_STRING __MIDL_%sFormatString =\n", t, n); - print_proxy( "{\n"); - indent++; - print_proxy( "0,\n"); - print_proxy( "{\n"); - indent++; - print_proxy( "0\n"); - indent--; - print_proxy( "}\n"); - indent--; - print_proxy( "};\n"); - print_proxy( "\n"); -} - -static void init_proxy(void) +static void init_proxy(ifref_t *ifaces) { if (proxy) return; if(!(proxy = fopen(proxy_name, "w"))) @@ -161,7 +110,7 @@ static void init_proxy(void) print_proxy( "\n"); print_proxy( "#include \"%s\"\n", header_name); print_proxy( "\n"); - write_formatstringsdecl(); + write_formatstringsdecl(proxy, indent, ifaces); write_stubdescproto(); } @@ -1064,7 +1013,7 @@ void write_proxies(ifref_t *ifaces) if (!lcur) return; END_OF_LIST(lcur); - init_proxy(); + init_proxy(ifaces); if(!proxy) return; cur = lcur; @@ -1082,8 +1031,8 @@ void write_proxies(ifref_t *ifaces) print_proxy( "#error Currently only Wine and WIN32 are supported.\n"); print_proxy( "#endif\n"); print_proxy( "\n"); - write_formatstring( 1 ); - write_formatstring( 0 ); + write_procformatstring(proxy, ifaces); + write_typeformatstring(proxy, ifaces); fprintf(proxy, "const CInterfaceProxyVtbl* _%s_ProxyVtblList[] =\n", file_id); fprintf(proxy, "{\n");

1 0

Dan Hipschman : widl: Move format-string declaration output to typegen.c.
by Alexandre Julliard 17 Aug '06

17 Aug '06

Module: wine Branch: master Commit: b7e7243a1e5a4eb17c868246d075751fb1c1ac45 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b7e7243a1e5a4eb17c86824… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Aug 16 18:01:56 2006 -0700 widl: Move format-string declaration output to typegen.c. --- tools/widl/client.c | 33 +-------------------------------- tools/widl/server.c | 32 +------------------------------- tools/widl/typegen.c | 27 +++++++++++++++++++++++++++ tools/widl/typegen.h | 1 + 4 files changed, 30 insertions(+), 63 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 267bbfe..3bc47b2 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -395,37 +395,6 @@ static void write_clientinterfacedecl(ty } -static void write_formatdesc( const char *str ) -{ - print_client("typedef struct _MIDL_%s_FORMAT_STRING\n", str ); - print_client("{\n"); - indent++; - print_client("short Pad;\n"); - print_client("unsigned char Format[%s_FORMAT_STRING_SIZE];\n", str); - indent--; - print_client("} MIDL_%s_FORMAT_STRING;\n", str); - print_client("\n"); -} - - -static void write_formatstringsdecl(ifref_t *ifaces) -{ - print_client("#define TYPE_FORMAT_STRING_SIZE %d\n", - get_size_typeformatstring(ifaces)); - - print_client("#define PROC_FORMAT_STRING_SIZE %d\n", - get_size_procformatstring(ifaces)); - - fprintf(client, "\n"); - write_formatdesc("TYPE"); - write_formatdesc("PROC"); - fprintf(client, "\n"); - print_client("static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString;\n"); - print_client("static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString;\n"); - print_client("\n"); -} - - static void write_implicithandledecl(type_t *iface) { const char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); @@ -471,7 +440,7 @@ void write_client(ifref_t *ifaces) if (!client) return; - write_formatstringsdecl(ifaces); + write_formatstringsdecl(client, indent, ifaces); for (; iface; iface = PREV_LINK(iface)) { diff --git a/tools/widl/server.c b/tools/widl/server.c index 7a4aed9..69eddb8 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -550,36 +550,6 @@ static void write_serverinterfacedecl(ty fprintf(server, "\n"); } -static void write_formatdesc( const char *str ) -{ - print_server("typedef struct _MIDL_%s_FORMAT_STRING\n", str ); - print_server("{\n"); - indent++; - print_server("short Pad;\n"); - print_server("unsigned char Format[%s_FORMAT_STRING_SIZE];\n", str); - indent--; - print_server("} MIDL_%s_FORMAT_STRING;\n", str); - print_server("\n"); -} - - -static void write_formatstringsdecl(ifref_t *ifaces) -{ - print_server("#define TYPE_FORMAT_STRING_SIZE %d\n", - get_size_typeformatstring(ifaces)); - - print_server("#define PROC_FORMAT_STRING_SIZE %d\n", - get_size_procformatstring(ifaces)); - - fprintf(server, "\n"); - write_formatdesc("TYPE"); - write_formatdesc("PROC"); - fprintf(server, "\n"); - print_server("static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString;\n"); - print_server("static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString;\n"); - print_server("\n"); -} - static void init_server(void) { @@ -612,7 +582,7 @@ void write_server(ifref_t *ifaces) if (!server) return; - write_formatstringsdecl(ifaces); + write_formatstringsdecl(server, indent, ifaces); for (; iface; iface = PREV_LINK(iface)) { diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 83af2eb..632bc8a 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -132,6 +132,33 @@ static int print_file(FILE *file, int in return r; } +static void write_formatdesc(FILE *f, int indent, const char *str) +{ + print_file(f, indent, "typedef struct _MIDL_%s_FORMAT_STRING\n", str); + print_file(f, indent, "{\n"); + print_file(f, indent + 1, "short Pad;\n"); + print_file(f, indent + 1, "unsigned char Format[%s_FORMAT_STRING_SIZE];\n", str); + print_file(f, indent, "} MIDL_%s_FORMAT_STRING;\n", str); + print_file(f, indent, "\n"); +} + +void write_formatstringsdecl(FILE *f, int indent, ifref_t *ifaces) +{ + print_file(f, indent, "#define TYPE_FORMAT_STRING_SIZE %d\n", + get_size_typeformatstring(ifaces)); + + print_file(f, indent, "#define PROC_FORMAT_STRING_SIZE %d\n", + get_size_procformatstring(ifaces)); + + fprintf(f, "\n"); + write_formatdesc(f, indent, "TYPE"); + write_formatdesc(f, indent, "PROC"); + fprintf(f, "\n"); + print_file(f, indent, "static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString;\n"); + print_file(f, indent, "static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString;\n"); + print_file(f, indent, "\n"); +} + static inline int type_has_ref(const type_t *type) { return (type->type == 0 && type->ref); diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index eb4c4c7..4509032 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -35,6 +35,7 @@ enum remoting_phase PHASE_FREE }; +void write_formatstringsdecl(FILE *f, int indent, ifref_t *ifaces); void write_procformatstring(FILE *file, const ifref_t *ifaces); void write_typeformatstring(FILE *file, const ifref_t *ifaces); size_t get_type_memsize(const type_t *type);

1 0

Jacek Caban : mshtml: Added test of edit mode.
by Alexandre Julliard 17 Aug '06

17 Aug '06

Module: wine Branch: master Commit: cf6492629c525ae765d585a47edfdab382a41b9f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cf6492629c525ae765d585a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 17 03:35:53 2006 +0200 mshtml: Added test of edit mode. --- dlls/mshtml/tests/htmldoc.c | 94 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 83 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 697ddaf..c66c452 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -28,6 +28,7 @@ #include "mshtml.h" #include "docobj.h" #include "mshtmhst.h" #include "mshtmdid.h" +#include "mshtmcid.h" #include "hlink.h" #include "idispids.h" #include "shlguid.h" @@ -106,7 +107,7 @@ DEFINE_EXPECT(OnFrameWindowActivate); static BOOL expect_LockContainer_fLock; static BOOL expect_SetActiveObject_active; static BOOL set_clientsite = FALSE, container_locked = FALSE; -static enum { +static enum load_state_t { LD_NO = 0, LD_DOLOAD, LD_LOADING, @@ -800,7 +801,7 @@ static HRESULT WINAPI DocHostUIHandler_S { CHECK_EXPECT(ShowUI); - ok(dwID == 0, "dwID=%ld, expected 0\n", dwID); + ok(dwID == DOCHOSTUITYPE_BROWSE, "dwID=%ld, expected DOCHOSTUITYPE_BROWSE\n", dwID); ok(pActiveObject != NULL, "pActiveObject = NULL\n"); ok(pCommandTarget != NULL, "pCommandTarget = NULL\n"); ok(pFrame == &InPlaceFrame, "pFrame=%p, expected %p\n", pFrame, &InPlaceFrame); @@ -1026,7 +1027,7 @@ static HRESULT WINAPI OleCommandTarget_E if(IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup)) { switch(nCmdID) { case 37: - CHECK_EXPECT(Exec_ShellDocView_37); + CHECK_EXPECT2(Exec_ShellDocView_37); ok(pvaOut == NULL, "pvaOut=%p, expected NULL\n", pvaOut); ok(pvaIn != NULL, "pvaIn == NULL\n"); if(pvaIn) { @@ -1601,6 +1602,36 @@ static void test_exec_onunload(IUnknown IOleCommandTarget_Release(cmdtrg); } +static void test_exec_editmode(IUnknown *unk) +{ + IOleCommandTarget *cmdtrg; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IOleCommandTarget, (void**)&cmdtrg); + ok(hres == S_OK, "QueryInterface(IID_IOleCommandTarget) failed: %08lx\n", hres); + if(FAILED(hres)) + return; + + SET_EXPECT(SetStatusText); + SET_EXPECT(Exec_ShellDocView_37); + SET_EXPECT(GetHostInfo); + SET_EXPECT(Invoke_AMBIENT_SILENT); + SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + expect_status_text = NULL; + + hres = IOleCommandTarget_Exec(cmdtrg, &CGID_MSHTML, IDM_EDITMODE, + OLECMDEXECOPT_DODEFAULT, NULL, NULL); + ok(hres == S_OK, "Exec failed: %08lx\n", hres); + + CHECK_CALLED(SetStatusText); + CHECK_CALLED(Exec_ShellDocView_37); + CHECK_CALLED(GetHostInfo); + CHECK_CALLED(Invoke_AMBIENT_SILENT); + CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + + IOleCommandTarget_Release(cmdtrg); +} + static HWND create_container_window(void) { static const WCHAR wszHTMLDocumentTest[] = @@ -2014,13 +2045,20 @@ static void test_Navigate(IUnknown *unk) IHlinkTarget_Release(hlink); } -static void test_HTMLDocument(void) +static void init_test(enum load_state_t ls) { + hwnd = last_hwnd = NULL; + set_clientsite = FALSE; + call_UIActivate = FALSE; + load_state = ls; +} + +static void test_HTMLDocument(enum load_state_t ls) { IUnknown *unk; HRESULT hres; ULONG ref; - hwnd = last_hwnd = NULL; + init_test(ls); hres = create_document(&unk); if(FAILED(hres)) @@ -2098,7 +2136,7 @@ static void test_HTMLDocument_hlink(void HRESULT hres; ULONG ref; - hwnd = last_hwnd = NULL; + init_test(LD_DOLOAD); hres = create_document(&unk); if(FAILED(hres)) @@ -2124,6 +2162,42 @@ #endif ok(ref == 0, "ref=%ld, expected 0\n", ref); } +static void test_editing_mode(void) +{ + IUnknown *unk; + IOleObject *oleobj; + HRESULT hres; + ULONG ref; + + init_test(LD_DOLOAD); + + hres = create_document(&unk); + if(FAILED(hres)) + return; + + hres = IUnknown_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); + ok(hres == S_OK, "Could not get IOleObject: %08lx\n", hres); + + test_ClientSite(oleobj, CLIENTSITE_EXPECTPATH); + test_DoVerb(oleobj); + + IOleObject_Release(oleobj); + + test_exec_editmode(unk); + + test_UIDeactivate(); + test_InPlaceDeactivate(unk, TRUE); + test_Close(unk, FALSE); + + if(view) { + IOleDocumentView_Release(view); + view = NULL; + } + + ref = IUnknown_Release(unk); + ok(ref == 0, "ref=%ld, expected 0\n", ref); +} + static void gecko_installer_workaround(BOOL disable) { HKEY hkey; @@ -2161,12 +2235,10 @@ START_TEST(htmldoc) CoInitialize(NULL); container_hwnd = create_container_window(); - load_state = LD_NO; - test_HTMLDocument(); - load_state = LD_DOLOAD; - test_HTMLDocument(); - load_state = LD_DOLOAD; + test_HTMLDocument(LD_NO); + test_HTMLDocument(LD_DOLOAD); test_HTMLDocument_hlink(); + test_editing_mode(); DestroyWindow(container_hwnd); CoUninitialize();

1 0

Jacek Caban : mshtml: Added beginning implementation of IDM_EDITMODE.
by Alexandre Julliard 17 Aug '06

17 Aug '06

Module: wine Branch: master Commit: 2405002403c3e364ea88b27161e1452d11470068 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2405002403c3e364ea88b27… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 17 03:35:18 2006 +0200 mshtml: Added beginning implementation of IDM_EDITMODE. --- dlls/mshtml/olecmd.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 66 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 67369cd..1669aaa 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -247,6 +247,68 @@ static HRESULT exec_browsemode(HTMLDocum return S_OK; } +static HRESULT exec_editmode(HTMLDocument *This) +{ + HRESULT hres; + + FIXME("(%p)\n", This); + + This->usermode = EDITMODE; + + if(This->frame) + IOleInPlaceFrame_SetStatusText(This->frame, NULL); + + if(This->client) { + IOleCommandTarget *cmdtrg = NULL; + + hres = IOleClientSite_QueryInterface(This->client, &IID_IOleCommandTarget, + (void**)&cmdtrg); + if(SUCCEEDED(hres)) { + VARIANT var; + + V_VT(&var) = VT_I4; + V_I4(&var) = 0; + IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 37, 0, &var, NULL); + } + } + + if(This->hostui) { + DOCHOSTUIINFO hostinfo; + + memset(&hostinfo, 0, sizeof(DOCHOSTUIINFO)); + hostinfo.cbSize = sizeof(DOCHOSTUIINFO); + hres = IDocHostUIHandler_GetHostInfo(This->hostui, &hostinfo); + if(SUCCEEDED(hres)) + /* FIXME: use hostinfo */ + TRACE("hostinfo = {%lu %08lx %08lx %s %s}\n", + hostinfo.cbSize, hostinfo.dwFlags, hostinfo.dwDoubleClick, + debugstr_w(hostinfo.pchHostCss), debugstr_w(hostinfo.pchHostNS)); + } + + if(This->client) { + VARIANT silent, offline; + + hres = get_client_disp_property(This->client, DISPID_AMBIENT_SILENT, &silent); + if(SUCCEEDED(hres)) { + if(V_VT(&silent) != VT_BOOL) + WARN("V_VT(silent) = %d\n", V_VT(&silent)); + else if(V_BOOL(&silent)) + FIXME("silent == true\n"); + } + + hres = get_client_disp_property(This->client, + DISPID_AMBIENT_OFFLINEIFNOTCONNECTED, &offline); + if(SUCCEEDED(hres)) { + if(V_VT(&silent) != VT_BOOL) + WARN("V_VT(offline) = %d\n", V_VT(&silent)); + else if(V_BOOL(&silent)) + FIXME("offline == true\n"); + } + } + + return S_OK; +} + static HRESULT exec_baselinefont3(HTMLDocument *This) { FIXME("(%p)\n", This); @@ -393,6 +455,10 @@ static HRESULT WINAPI OleCommandTarget_E switch(nCmdID) { case IDM_BROWSEMODE: return exec_browsemode(This); + case IDM_EDITMODE: + if(pvaIn || pvaOut) + FIXME("unsupported arguments\n"); + return exec_editmode(This); case IDM_BASELINEFONT3: return exec_baselinefont3(This); default:

1 0

Jacek Caban : mshtml: Rename get_property to get_client_disp_property and make it available for other files .
by Alexandre Julliard 17 Aug '06

17 Aug '06

Module: wine Branch: master Commit: 40f3ad06e9756af618085560352754d8dea57620 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=40f3ad06e9756af61808556… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 17 03:34:22 2006 +0200 mshtml: Rename get_property to get_client_disp_property and make it available for other files. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/oleobj.c | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 8e956bc..7abcf7e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -288,6 +288,7 @@ void HTMLDocument_ShowContextMenu(HTMLDo void show_tooltip(HTMLDocument*,DWORD,DWORD,LPCWSTR); void hide_tooltip(HTMLDocument*); +HRESULT get_client_disp_property(IOleClientSite*,DISPID,VARIANT*); HRESULT ProtocolFactory_Create(REFCLSID,REFIID,void**); diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 981f65b..127a8aa 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -520,7 +520,7 @@ static HRESULT WINAPI OleControl_OnMnemo return E_NOTIMPL; } -static HRESULT get_property(IOleClientSite *client, DISPID dispid, VARIANT *res) +HRESULT get_client_disp_property(IOleClientSite *client, DISPID dispid, VARIANT *res) { IDispatch *disp = NULL; DISPPARAMS dispparams = {NULL, 0}; @@ -548,7 +548,7 @@ static HRESULT on_change_dlcontrol(HTMLD VARIANT res; HRESULT hres; - hres = get_property(This->client, DISPID_AMBIENT_DLCONTROL, &res); + hres = get_client_disp_property(This->client, DISPID_AMBIENT_DLCONTROL, &res); if(SUCCEEDED(hres)) FIXME("unsupported dlcontrol %08lx\n", V_I4(&res)); @@ -569,7 +569,7 @@ static HRESULT WINAPI OleControl_OnAmbie switch(dispID) { case DISPID_AMBIENT_USERMODE: TRACE("(%p)->(DISPID_AMBIENT_USERMODE)\n", This); - hres = get_property(This->client, DISPID_AMBIENT_USERMODE, &res); + hres = get_client_disp_property(This->client, DISPID_AMBIENT_USERMODE, &res); if(FAILED(hres)) return S_OK; @@ -590,7 +590,7 @@ static HRESULT WINAPI OleControl_OnAmbie case DISPID_AMBIENT_OFFLINEIFNOTCONNECTED: TRACE("(%p)->(DISPID_AMBIENT_OFFLINEIFNOTCONNECTED)\n", This); on_change_dlcontrol(This); - hres = get_property(This->client, DISPID_AMBIENT_OFFLINEIFNOTCONNECTED, &res); + hres = get_client_disp_property(This->client, DISPID_AMBIENT_OFFLINEIFNOTCONNECTED, &res); if(FAILED(hres)) return S_OK; @@ -606,7 +606,7 @@ static HRESULT WINAPI OleControl_OnAmbie case DISPID_AMBIENT_SILENT: TRACE("(%p)->(DISPID_AMBIENT_SILENT)\n", This); on_change_dlcontrol(This); - hres = get_property(This->client, DISPID_AMBIENT_SILENT, &res); + hres = get_client_disp_property(This->client, DISPID_AMBIENT_SILENT, &res); if(FAILED(hres)) return S_OK; @@ -621,7 +621,7 @@ static HRESULT WINAPI OleControl_OnAmbie return S_OK; case DISPID_AMBIENT_USERAGENT: TRACE("(%p)->(DISPID_AMBIENT_USERAGENT)\n", This); - hres = get_property(This->client, DISPID_AMBIENT_USERAGENT, &res); + hres = get_client_disp_property(This->client, DISPID_AMBIENT_USERAGENT, &res); if(FAILED(hres)) return S_OK; @@ -630,7 +630,7 @@ static HRESULT WINAPI OleControl_OnAmbie return S_OK; case DISPID_AMBIENT_PALETTE: TRACE("(%p)->(DISPID_AMBIENT_PALETTE)\n", This); - hres = get_property(This->client, DISPID_AMBIENT_PALETTE, &res); + hres = get_client_disp_property(This->client, DISPID_AMBIENT_PALETTE, &res); if(FAILED(hres)) return S_OK;

1 0

Jacek Caban : mshtmhst.idl: Added DOCHOSTUITYPE declaration.
by Alexandre Julliard 17 Aug '06

17 Aug '06

Module: wine Branch: master Commit: 00b4413ded207a5760e9f514ea22725b70d5fae4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=00b4413ded207a5760e9f51… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 17 02:41:24 2006 +0200 mshtmhst.idl: Added DOCHOSTUITYPE declaration. --- include/mshtmhst.idl | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/mshtmhst.idl b/include/mshtmhst.idl index 3d43ecc..344a88f 100644 --- a/include/mshtmhst.idl +++ b/include/mshtmhst.idl @@ -99,6 +99,11 @@ coclass HostDialogHelper * IDocHostUIHandler interface */ +typedef enum tagDOCHOSTUITYPE { + DOCHOSTUITYPE_BROWSE = 0, + DOCHOSTUITYPE_AUTHOR = 1 +} DOCHOSTUITYPE; + typedef enum tagDOCHOSTUIDBLCLK { DOCHOSTUIDBLCLK_DEFAULT = 0,

1 0

Christian Costa : wined3d: Make sure b_info structure is properly allocated and released.
by Alexandre Julliard 17 Aug '06

17 Aug '06

Module: wine Branch: master Commit: f50bb771c9cb4f63031d5a2ec873947359430fa5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f50bb771c9cb4f63031d5a2… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Wed Aug 16 22:35:58 2006 +0200 wined3d: Make sure b_info structure is properly allocated and released. --- dlls/wined3d/surface.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f7b73b6..0e0e6dd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1269,6 +1269,9 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetDC break; } + if (!b_info) + return E_OUTOFMEMORY; + /* Some apps access the surface in via DWORDs, and do not take the necessary care at the end of the * surface. So we need at least extra 4 bytes at the end of the surface. Check against the page size, * if the last page used for the surface has at least 4 spare bytes we're safe, otherwise @@ -1347,9 +1350,9 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetDC if (!This->dib.DIBsection) { ERR("CreateDIBSection failed!\n"); + HeapFree(GetProcessHeap(), 0, b_info); return HRESULT_FROM_WIN32(GetLastError()); } - HeapFree(GetProcessHeap(), 0, b_info); TRACE("DIBSection at : %p\n", This->dib.bitmap_data); @@ -1363,6 +1366,8 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetDC This->Flags |= SFLAG_GLDIRTY; } + HeapFree(GetProcessHeap(), 0, b_info); + /* Use the dib section from now on */ This->resource.allocatedMemory = This->dib.bitmap_data;

1 0

Stefan Leichter : winedump: Print each 64bit integers as two 32 bit integers.
by Alexandre Julliard 17 Aug '06

17 Aug '06

Module: wine Branch: master Commit: 8904529dda3818598b98c1645001efc4f3170527 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8904529dda3818598b98c16… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Aug 16 22:30:42 2006 +0200 winedump: Print each 64bit integers as two 32 bit integers. --- tools/winedump/minidump.c | 44 +++++++++++++++++++++++++++----------------- 1 files changed, 27 insertions(+), 17 deletions(-) diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index f0645e7..f1c08d9 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -78,7 +78,7 @@ void mdmp_dump(void) printf("StreamDirectoryRva: %lu\n", hdr->StreamDirectoryRva); printf("CheckSum: %lu\n", hdr->CheckSum); printf("TimeDateStamp: %s\n", get_time_str(hdr->u.TimeDateStamp)); - printf("Flags: %llx\n", hdr->Flags); + printf("Flags: %lx%08lx\n", (DWORD)(hdr->Flags >> 32), (DWORD)hdr->Flags); for (idx = 0; idx <= LastReservedStream; idx++) { @@ -102,10 +102,12 @@ void mdmp_dump(void) printf(" SuspendCount: %lu\n", mt->SuspendCount); printf(" PriorityClass: %lu\n", mt->PriorityClass); printf(" Priority: %lu\n", mt->Priority); - printf(" Teb: 0x%llx\n", mt->Teb); - printf(" Stack: 0x%llx-0x%llx\n", - mt->Stack.StartOfMemoryRange, - mt->Stack.StartOfMemoryRange + mt->Stack.Memory.DataSize); + printf(" Teb: 0x%lx%08lx\n", (DWORD)(mt->Teb >> 32), (DWORD)mt->Teb); + printf(" Stack: 0x%lx%08lx-0x%lx%08lx\n", + (DWORD)(mt->Stack.StartOfMemoryRange >> 32), + (DWORD)mt->Stack.StartOfMemoryRange, + (DWORD)((mt->Stack.StartOfMemoryRange + mt->Stack.Memory.DataSize) >> 32), + (DWORD)(mt->Stack.StartOfMemoryRange + mt->Stack.Memory.DataSize)); dump_mdmp_data(&mt->Stack.Memory, " "); printf(" ThreadContext:\n"); dump_mdmp_data(&mt->ThreadContext, " "); @@ -127,7 +129,8 @@ void mdmp_dump(void) for (i = 0; i < mml->NumberOfModules; i++, mm++) { printf(" Module #%d:\n", i); - printf(" BaseOfImage: 0x%llx\n", mm->BaseOfImage); + printf(" BaseOfImage: 0x%lx%08lx\n", + (DWORD)(mm->BaseOfImage >> 32), (DWORD) mm->BaseOfImage); printf(" SizeOfImage: %lu\n", mm->SizeOfImage); printf(" CheckSum: %lu\n", mm->CheckSum); printf(" TimeDateStamp: %s\n", get_time_str(mm->TimeDateStamp)); @@ -200,8 +203,10 @@ void mdmp_dump(void) dump_mdmp_data(&mm->CvRecord, " "); printf(" MiscRecord: <%lu>\n", mm->MiscRecord.DataSize); dump_mdmp_data(&mm->MiscRecord, " "); - printf(" Reserved0: %llu\n", mm->Reserved0); - printf(" Reserved1: %llu\n", mm->Reserved1); + printf(" Reserved0: 0x%lx%08lx\n", + (DWORD)(mm->Reserved0 >> 32), (DWORD)mm->Reserved0); + printf(" Reserved1: 0x%lx%08lx\n", + (DWORD)(mm->Reserved1 >> 32), (DWORD)mm->Reserved1); } } break; @@ -215,9 +220,11 @@ void mdmp_dump(void) for (i = 0; i < mml->NumberOfMemoryRanges; i++, mmd++) { printf(" Memory Range #%d:\n", i); - printf(" Range: 0x%llx-0x%llx\n", - mmd->StartOfMemoryRange, - mmd->StartOfMemoryRange + mmd->Memory.DataSize); + printf(" Range: 0x%lx%08lx-0x%lx%08lx\n", + (DWORD)(mmd->StartOfMemoryRange >> 32), + (DWORD)mmd->StartOfMemoryRange, + (DWORD)((mmd->StartOfMemoryRange + mmd->Memory.DataSize) >> 32), + (DWORD)(mmd->StartOfMemoryRange + mmd->Memory.DataSize)); dump_mdmp_data(&mmd->Memory, " "); } } @@ -346,16 +353,19 @@ void mdmp_dump(void) printf(" ExceptionRecord:\n"); printf(" ExceptionCode: %lu\n", mes->ExceptionRecord.ExceptionCode); printf(" ExceptionFlags: %lu\n", mes->ExceptionRecord.ExceptionFlags); - printf(" ExceptionRecord: 0x%llx\n", - mes->ExceptionRecord.ExceptionRecord); - printf(" ExceptionAddress: 0x%llx\n", - mes->ExceptionRecord.ExceptionAddress); + printf(" ExceptionRecord: 0x%lx%08lx\n", + (DWORD)(mes->ExceptionRecord.ExceptionRecord >> 32), + (DWORD)mes->ExceptionRecord.ExceptionRecord); + printf(" ExceptionAddress: 0x%lx%08lx\n", + (DWORD)(mes->ExceptionRecord.ExceptionAddress >> 32), + (DWORD)(mes->ExceptionRecord.ExceptionAddress)); printf(" ExceptionNumberParameters: %lu\n", mes->ExceptionRecord.NumberParameters); for (i = 0; i < mes->ExceptionRecord.NumberParameters; i++) { - printf(" [%d]: 0x%llx\n", i, - mes->ExceptionRecord.ExceptionInformation[i]); + printf(" [%d]: 0x%lx%08lx\n", i, + (DWORD)(mes->ExceptionRecord.ExceptionInformation[i] >> 32), + (DWORD)mes->ExceptionRecord.ExceptionInformation[i]); } printf(" ThreadContext:\n"); dump_mdmp_data(&mes->ThreadContext, " ");

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
75
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 August 2006