August 2006 - Wine-commits - list.winehq.org

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

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 : regedit: Write-strings warnings fix.
by Alexandre Julliard 17 Aug '06

17 Aug '06

Module: wine Branch: master Commit: 602e0df9f62be3e119a521962f930af2cc904776 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=602e0df9f62be3e119a5219… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Aug 16 20:14:08 2006 +0100 regedit: Write-strings warnings fix. --- programs/regedit/childwnd.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index c284d88..49adfd1 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -128,9 +128,10 @@ static LPTSTR GetPathRoot(HWND hwndTV, H } LPTSTR GetItemFullPath(HWND hwndTV, HTREEITEM hItem, BOOL bFull) { - LPTSTR parts[2] = {_T(""), _T("")}; - HKEY hRootKey = NULL; + LPTSTR parts[2]; LPTSTR ret; + HKEY hRootKey = NULL; + parts[0] = GetPathRoot(hwndTV, hItem, bFull); parts[1] = GetItemPath(hwndTV, hItem, &hRootKey); ret = CombinePaths((LPCTSTR *)parts, 2); @@ -139,7 +140,9 @@ LPTSTR GetItemFullPath(HWND hwndTV, HTRE } LPTSTR GetPathFullPath(HWND hwndTV, LPTSTR path) { - LPTSTR parts[2] = {_T(""), _T("")}, ret; + LPTSTR parts[2]; + LPTSTR ret; + parts[0] = GetPathRoot(hwndTV, 0, TRUE); parts[1] = path; ret = CombinePaths((LPCTSTR *)parts, 2);

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 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: 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 : 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

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

Alexander Nicolaysen Sørnes : winecfg: Updated Norwegian Bokmål resources.
by Alexandre Julliard 17 Aug '06

17 Aug '06

Module: wine Branch: master Commit: 00304d2ec2150d2492f82015afd94848cc3b55d8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=00304d2ec2150d2492f8201… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Aug 16 19:23:33 2006 +0200 winecfg: Updated Norwegian Bokmål resources. --- programs/winecfg/No.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index 7cba3eb..00c2788 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -224,8 +224,8 @@ END IDS_DLL_NATIVE_BUILTIN "innf�dt, innebygget" IDS_DLL_BUILTIN_NATIVE "innebygget, innf�dt" IDS_DLL_DISABLED "sl�tt av" - IDS_DEFAULT_SETTINGS "Default Settings" - IDS_EXECUTABLE_FILTER "Wine Programs (*.exe,*.exe.so)\0*.exe;*.exe.so\0" - IDS_USE_GLOBAL_SETTINGS "Use global settings" - IDS_SELECT_EXECUTABLE "Select an executable file" + IDS_DEFAULT_SETTINGS "Globale innstillinger" + IDS_EXECUTABLE_FILTER "Wine-programmer (*.exe,*.exe.so)\0*.exe;*.exe.so\0" + IDS_USE_GLOBAL_SETTINGS "Bruk globale innstillinger" + IDS_SELECT_EXECUTABLE "Velg en programfil" END

1 0

Fatih Aşıcı : winecfg: Update Turkish resource file.
by Alexandre Julliard 17 Aug '06

17 Aug '06

Module: wine Branch: master Commit: f389e20fee0d1e5c78e02bf219e8e4558c3ff284 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f389e20fee0d1e5c78e02bf… Author: Fatih Aşıcı <fatih.asici(a)gmail.com> Date: Thu Aug 17 00:38:00 2006 +0300 winecfg: Update Turkish resource file. --- programs/winecfg/Tr.rc | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/programs/winecfg/Tr.rc b/programs/winecfg/Tr.rc index dba3d81..ad5a8ab 100644 --- a/programs/winecfg/Tr.rc +++ b/programs/winecfg/Tr.rc @@ -62,11 +62,11 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Pencere ayarlar� ",IDC_STATIC,8,25,244,180 - CONTROL "DirectX uygulamalar�n�n fareyi pencere i�ine kilitlemelerine izin ver",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8 - CONTROL "Masa�st� �ift tamponlamay� etkinle�tir",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,230,8 - LTEXT "Pencereler pencere y�neticiniz taraf�ndan y�netildi�inde, standart kenarlara sahip olacak, sanal masa�st�n�ze uygun davranacak ve pencere listenizde g�r�necektir. \n\nE�er pencereler y�netilmezse, pencere y�neticinizden ba��ms�z olacaklard�r. Bu, pencerelerin masa�st�n�zle tam olarak b�t�nle�emeyece�i anlam�na gelir; ama em�lasyon daha d�zg�n yap�labilice�inden baz� programlar daha iyi �al��abilir.", + CONTROL "DirectX uygulamalar�n�n fareyi pencere i�ine kilitlemelerine izin ver",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8 + CONTROL "Masa�st� �ift tamponlamay� etkinle�tir",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,230,8 + LTEXT "Pencereler pencere y�neticiniz taraf�ndan y�netildi�inde, standart kenarlara sahip olacak, sanal masa�st�n�ze uygun davranacak ve pencere listenizde g�r�necektir. \n\nE�er pencereler y�netilmezse, pencere y�neticinizden ba��ms�z olacaklard�r. Bu, pencerelerin masa�st�n�zle tam olarak b�t�nle�emeyece�i anlam�na gelir; ama em�lasyon daha d�zg�n yap�labilice�inden baz� programlar daha iyi �al��abilir.", IDC_STATIC,15,58,228,80 - CONTROL "Pencere y�neticisinin pencereleri y�netmesine izin ver",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,132,230,8 + CONTROL "Pencere y�neticisinin pencereleri y�netmesine izin ver",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,132,230,8 LTEXT "T�m pencerelerin sanal bir ekrana hapsedildi�i bir windows masa�st� em�le edebilirsiniz veya pencerelerin standart masa�st�n�ze yerle�mesini sa�layabilirsiniz.", IDC_STATIC,15,146,228,28 @@ -80,7 +80,7 @@ BEGIN GROUPBOX " Direct3D ",IDC_STATIC,8,210,244,50 - LTEXT "Vertex Shader Deste�i: ",IDC_STATIC,15,220,80,30 + LTEXT "Vertex Shader Deste�i: ",IDC_STATIC,15,220,80,30 COMBOBOX IDC_D3D_VSHADER_MODE,100,218,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Pixel Shader'a izin ver (donan�m destekliyorsa)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,237,230,10 @@ -161,9 +161,9 @@ BEGIN GROUPBOX " S�r�c� Se�imi ",IDC_STATIC,8,4,244,195 LTEXT "�stedi�iniz s�r�c�n�n kutusunu i�aretleyerek bir ses s�r�c�s� se�in. Hi�bir s�r�c� se�meyerek sesi etkisizle�tirebilirsiniz. Birden fazla s�r�c� se�imi �nerilmez. �zerine sa� t�klayarak bir s�r�c�y� yap�land�r�n.",IDC_STATIC,15,20,227,30 CONTROL "Ayg�tlar",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,140 - PUSHBUTTON "Denetin Masas�",IDC_AUDIO_CONTROL_PANEL,170,50,59,14 + PUSHBUTTON "Denetim Masas�",IDC_AUDIO_CONTROL_PANEL,170,50,59,14 GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 - LTEXT "Donan�m H�zland�rmas�: ",IDC_STATIC,15,215,90,10 + LTEXT "Donan�m H�zland�rmas�: ",IDC_STATIC,15,215,90,10 COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "�ntan�ml� �rnekleme H�z�:",IDC_STATIC,15,232,70,8 COMBOBOX IDC_DSOUND_RATES,90,230,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -217,15 +217,15 @@ END STRINGTABLE DISCARDABLE BEGIN -IDS_DLL_WARNING "Bu kitapl��n y�kleme s�ras�n�n de�i�tirilmesi �nerilmez.\nBunu yapmak istedi�inizden emin misiniz?" -IDS_DLL_WARNING_CAPTION "Uyar�: sistem kitapl��" -IDS_DLL_NATIVE "do�al" -IDS_DLL_BUILTIN "yerle�ik" -IDS_DLL_NATIVE_BUILTIN "do�al, yerle�ik" -IDS_DLL_BUILTIN_NATIVE "yerle�ik, do�al" -IDS_DLL_DISABLED "devre d��" - IDS_DEFAULT_SETTINGS "Default Settings" - IDS_EXECUTABLE_FILTER "Wine Programs (*.exe,*.exe.so)\0*.exe;*.exe.so\0" - IDS_USE_GLOBAL_SETTINGS "Use global settings" - IDS_SELECT_EXECUTABLE "Select an executable file" + IDS_DLL_WARNING "Bu kitapl��n y�kleme s�ras�n�n de�i�tirilmesi �nerilmez.\nBunu yapmak istedi�inizden emin misiniz?" + IDS_DLL_WARNING_CAPTION "Uyar�: sistem kitapl��" + IDS_DLL_NATIVE "do�al" + IDS_DLL_BUILTIN "yerle�ik" + IDS_DLL_NATIVE_BUILTIN "do�al, yerle�ik" + IDS_DLL_BUILTIN_NATIVE "yerle�ik, do�al" + IDS_DLL_DISABLED "devre d��" + IDS_DEFAULT_SETTINGS "�ntan�ml� Ayarlar" + IDS_EXECUTABLE_FILTER "Wine Programlar� (*.exe,*.exe.so)\0*.exe;*.exe.so\0" + IDS_USE_GLOBAL_SETTINGS "Genel ayarlar� kullan" + IDS_SELECT_EXECUTABLE "�al��t�r�labilir bir dosya se�in" END

1 0