June 2007 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Store current moniker in HTMLDocument.
by Alexandre Julliard 12 Jun '07

12 Jun '07

Module: wine Branch: master Commit: 54d2a44794be928453e86ae307cfa671a512587f URL: http://source.winehq.org/git/wine.git/?a=commit;h=54d2a44794be928453e86ae30… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 11 17:27:19 2007 +0200 mshtml: Store current moniker in HTMLDocument. --- dlls/mshtml/htmldoc.c | 1 + dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/nsio.c | 8 ++++++++ dlls/mshtml/persist.c | 12 ++++++++++++ 4 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index a009cc8..ba57e3e 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -159,6 +159,7 @@ static ULONG WINAPI HTMLDocument_Release(IHTMLDocument2 *iface) IOleDocumentView_SetInPlaceSite(DOCVIEW(This), NULL); set_document_bscallback(This, NULL); + set_current_mon(This, NULL); if(This->tooltips_hwnd) DestroyWindow(This->tooltips_hwnd); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 74ee748..b9f5d61 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -101,6 +101,7 @@ struct HTMLDocument { IOleInPlaceFrame *frame; BSCallback *bscallback; + IMoniker *mon; HWND hwnd; HWND tooltips_hwnd; @@ -353,6 +354,7 @@ BSCallback *create_bscallback(IMoniker*); HRESULT start_binding(BSCallback*); HRESULT load_stream(BSCallback*,IStream*); void set_document_bscallback(HTMLDocument*,BSCallback*); +void set_current_mon(HTMLDocument*,IMoniker*); IHlink *Hlink_Create(void); IHTMLSelectionObject *HTMLSelectionObject_Create(nsISelection*); diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 735a577..1b50d2e 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -690,6 +690,11 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen return This->channel ? nsIChannel_AsyncOpen(This->channel, aListener, aContext) : NS_ERROR_UNEXPECTED; + + hres = create_mon_for_nschannel(This, &mon); + if(FAILED(hres)) + return NS_ERROR_UNEXPECTED; + set_current_mon(container->doc, mon); } } @@ -715,6 +720,9 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen nsres = nsIChannel_AsyncOpen(This->channel, aListener, aContext); + if(mon) + IMoniker_Release(mon); + if(NS_FAILED(nsres) && (This->load_flags & LOAD_INITIAL_DOCUMENT_URI)) return WINE_NS_LOAD_FROM_MONIKER; return nsres; diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 8959cd7..4b3df40 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -113,6 +113,15 @@ static nsIInputStream *get_post_data_stream(IBindCtx *bctx) return ret; } +void set_current_mon(HTMLDocument *This, IMoniker *mon) +{ + if(This->mon) + IMoniker_Release(This->mon); + if(mon) + IMoniker_AddRef(mon); + This->mon = mon; +} + static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BOOL *bind_complete) { BSCallback *bscallback; @@ -165,6 +174,8 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO TRACE("got url: %s\n", debugstr_w(url)); + set_current_mon(This, mon); + if(This->client) { VARIANT silent, offline; IOleCommandTarget *cmdtrg = NULL; @@ -655,4 +666,5 @@ void HTMLDocument_Persist_Init(HTMLDocument *This) This->lpPersistStreamInitVtbl = &PersistStreamInitVtbl; This->bscallback = NULL; + This->mon = NULL; }

1 0

Jacek Caban : mshtml: Added GetCurMoniker implementation.
by Alexandre Julliard 12 Jun '07

12 Jun '07

Module: wine Branch: master Commit: 56eedcb6fbdcda0da0f679527effa5d3720a4a81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56eedcb6fbdcda0da0f679527… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 11 17:29:13 2007 +0200 mshtml: Added GetCurMoniker implementation. --- dlls/mshtml/persist.c | 11 ++++++- dlls/mshtml/tests/htmldoc.c | 62 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 68 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 4b3df40..f933b73 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -384,8 +384,15 @@ static HRESULT WINAPI PersistMoniker_SaveCompleted(IPersistMoniker *iface, IMoni static HRESULT WINAPI PersistMoniker_GetCurMoniker(IPersistMoniker *iface, IMoniker **ppimkName) { HTMLDocument *This = PERSISTMON_THIS(iface); - FIXME("(%p)->(%p)\n", This, ppimkName); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, ppimkName); + + if(!This->mon) + return E_UNEXPECTED; + + IMoniker_AddRef(This->mon); + *ppimkName = This->mon; + return S_OK; } static const IPersistMonikerVtbl PersistMonikerVtbl = { diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 6196610..af5d7a4 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -146,12 +146,15 @@ static const char html_page[] = static const char css_data[] = "body {color: red}"; static const WCHAR doc_url[] = {'w','i','n','e','t','e','s','t',':','d','o','c',0}; +static const WCHAR about_blank_url[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; static HRESULT QueryInterface(REFIID riid, void **ppv); static void test_readyState(IUnknown*); static void test_MSHTML_QueryStatus(IUnknown*,DWORD); static BOOL nogecko = FALSE; +static void test_GetCurMoniker(IUnknown*,IMoniker*,LPCWSTR); + static const WCHAR wszTimesNewRoman[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n',0}; static const WCHAR wszArial[] = @@ -1852,6 +1855,12 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID switch(nCmdID) { case 37: CHECK_EXPECT2(Exec_ShellDocView_37); + + if(load_from_stream) + test_GetCurMoniker(doc_unk, NULL, about_blank_url); + else if(!editmode) + test_GetCurMoniker(doc_unk, &Moniker, NULL); + ok(pvaOut == NULL, "pvaOut=%p, expected NULL\n", pvaOut); ok(pvaIn != NULL, "pvaIn == NULL\n"); if(pvaIn) { @@ -2178,6 +2187,43 @@ static void test_ConnectionPointContainer(IUnknown *unk) IConnectionPointContainer_Release(container); } +static void test_GetCurMoniker(IUnknown *unk, IMoniker *exmon, LPCWSTR exurl) +{ + IPersistMoniker *permon; + IMoniker *mon = (void*)0xdeadbeef; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IPersistMoniker, (void**)&permon); + ok(hres == S_OK, "QueryInterface(IID_IPersistMoniker) failed: %08x\n", hres); + if(FAILED(hres)) + return; + + hres = IPersistMoniker_GetCurMoniker(permon, &mon); + IPersistMoniker_Release(permon); + + if(exmon) { + ok(hres == S_OK, "GetCurrentMoniker failed: %08x\n", hres); + ok(mon == exmon, "mon(%p) != exmon(%p)\n", mon, exmon); + }else if(exurl) { + BSTR url; + + ok(hres == S_OK, "GetCurrentMoniker failed: %08x\n", hres); + + hres = IMoniker_GetDisplayName(mon, NULL, NULL, &url); + ok(hres == S_OK, "GetDisplayName failed: %08x\n", hres); + + ok(!lstrcmpW(url, exurl), "unexpected url\n"); + SysFreeString(url); + }else { + ok(hres == E_UNEXPECTED, + "GetCurrentMoniker failed: %08x, expected E_UNEXPECTED\n", hres); + ok(mon == (IMoniker*)0xdeadbeef, "mon=%p\n", mon); + } + + if(mon && mon != (void*)0xdeadbeef) + IMoniker_Release(mon); +} + static void test_Load(IPersistMoniker *persist) { IBindCtx *bind; @@ -2258,6 +2304,8 @@ static void test_Load(IPersistMoniker *persist) set_clientsite = container_locked = TRUE; + test_GetCurMoniker((IUnknown*)persist, &Moniker, NULL); + IBindCtx_Release(bind); test_readyState((IUnknown*)persist); @@ -2585,6 +2633,8 @@ static void test_exec_editmode(IUnknown *unk) if(FAILED(hres)) return; + editmode = TRUE; + SET_EXPECT(SetStatusText); SET_EXPECT(Exec_ShellDocView_37); SET_EXPECT(GetHostInfo); @@ -2609,8 +2659,6 @@ static void test_exec_editmode(IUnknown *unk) IOleCommandTarget_Release(cmdtrg); - editmode = TRUE; - hres = IOleCommandTarget_Exec(cmdtrg, &CGID_MSHTML, IDM_EDITMODE, OLECMDEXECOPT_DODEFAULT, NULL, NULL); ok(hres == S_OK, "Exec failed: %08x\n", hres); @@ -3145,6 +3193,7 @@ static void test_StreamLoad(IUnknown *unk) CHECK_CALLED(Read); test_timer(EXPECT_SETTITLE); + test_GetCurMoniker(unk, NULL, about_blank_url); IPersistStreamInit_Release(init); } @@ -3190,6 +3239,7 @@ static void test_HTMLDocument(enum load_state_t ls) test_IsDirty(unk, S_FALSE); test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); test_ConnectionPointContainer(unk); + test_GetCurMoniker(unk, NULL, NULL); test_Persist(unk); if(load_state == LD_NO) test_OnAmbientPropertyChange2(unk); @@ -3200,8 +3250,10 @@ static void test_HTMLDocument(enum load_state_t ls) return; } - if(load_state == LD_LOADING) + if(load_state == LD_LOADING) { test_download(FALSE, TRUE); + test_GetCurMoniker(unk, &Moniker, NULL); + } test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); test_OleCommandTarget_fail(unk); @@ -3241,6 +3293,7 @@ static void test_HTMLDocument(enum load_state_t ls) test_CloseView(); test_Close(unk, TRUE); test_OnAmbientPropertyChange2(unk); + test_GetCurMoniker(unk, load_state == LD_NO ? NULL : &Moniker, NULL); if(view) IOleDocumentView_Release(view); @@ -3270,6 +3323,7 @@ static void test_HTMLDocument_hlink(void) doc_unk = unk; test_ConnectionPointContainer(unk); + test_GetCurMoniker(unk, NULL, NULL); test_Persist(unk); test_Navigate(unk); @@ -3282,6 +3336,7 @@ static void test_HTMLDocument_hlink(void) test_InPlaceDeactivate(unk, TRUE); test_Close(unk, FALSE); test_IsDirty(unk, S_FALSE); + test_GetCurMoniker(unk, &Moniker, NULL); if(view) IOleDocumentView_Release(view); @@ -3320,6 +3375,7 @@ static void test_HTMLDocument_StreamLoad(void) IOleObject_Release(oleobj); + test_GetCurMoniker(unk, NULL, NULL); test_StreamLoad(unk); test_download(TRUE, FALSE);

1 0

Jacek Caban : mshtml: Move Exec(CGID_ShellDocView, 37) call to match native .
by Alexandre Julliard 12 Jun '07

12 Jun '07

Module: wine Branch: master Commit: 8d4c839ab8914399b7dbbef2fd00540606712043 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d4c839ab8914399b7dbbef2f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 11 17:26:31 2007 +0200 mshtml: Move Exec(CGID_ShellDocView, 37) call to match native. --- dlls/mshtml/persist.c | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 13c07d4..8959cd7 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -166,23 +166,8 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO TRACE("got url: %s\n", debugstr_w(url)); 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); - - IOleCommandTarget_Release(cmdtrg); - } - } - - if(This->client) { VARIANT silent, offline; + IOleCommandTarget *cmdtrg = NULL; hres = get_client_disp_property(This->client, DISPID_AMBIENT_SILENT, &silent); if(SUCCEEDED(hres)) { @@ -200,6 +185,18 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO else if(V_BOOL(&silent)) FIXME("offline == true\n"); } + + 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); + + IOleCommandTarget_Release(cmdtrg); + } } bscallback = create_bscallback(mon);

1 0

Jacek Caban : mshtml: Move createing URL moniker to separated function.
by Alexandre Julliard 12 Jun '07

12 Jun '07

Module: wine Branch: master Commit: c221a36d53f22ad3444efad2680828f075b2dc19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c221a36d53f22ad3444efad26… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 11 17:25:51 2007 +0200 mshtml: Move createing URL moniker to separated function. --- dlls/mshtml/nsio.c | 59 ++++++++++++++++++++++++++++++--------------------- 1 files changed, 35 insertions(+), 24 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 399eb6e..735a577 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -605,15 +605,45 @@ static BOOL do_load_from_moniker_hack(nsChannel *This) return FALSE; } +static HRESULT create_mon_for_nschannel(nsChannel *channel, IMoniker **mon) +{ + nsIWineURI *wine_uri; + LPCWSTR wine_url; + nsresult nsres; + HRESULT hres; + + if(!channel->original_uri) { + ERR("original_uri == NULL\n"); + return E_FAIL; + } + + nsres = nsIURI_QueryInterface(channel->original_uri, &IID_nsIWineURI, (void**)&wine_uri); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIWineURI: %08x\n", nsres); + return E_FAIL; + } + + nsIWineURI_GetWineURL(wine_uri, &wine_url); + nsIWineURI_Release(wine_uri); + if(!wine_url) { + TRACE("wine_url == NULL\n"); + return E_FAIL; + } + + hres = CreateURLMoniker(NULL, wine_url, mon); + if(FAILED(hres)) + WARN("CreateURLMonikrer failed: %08x\n", hres); + + return hres; +} + static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListener *aListener, nsISupports *aContext) { nsChannel *This = NSCHANNEL_THIS(iface); BSCallback *bscallback; - nsIWineURI *wine_uri; - IMoniker *mon; + IMoniker *mon = NULL; PRBool is_doc_uri; - LPCWSTR wine_url; nsresult nsres; task_t *task; HRESULT hres; @@ -692,28 +722,9 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen TRACE("channel == NULL\n"); - if(!This->original_uri) { - ERR("original_uri == NULL\n"); - return NS_ERROR_UNEXPECTED; - } - - nsres = nsIURI_QueryInterface(This->original_uri, &IID_nsIWineURI, (void**)&wine_uri); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIWineURI: %08x\n", nsres); - return NS_ERROR_UNEXPECTED; - } - - nsIWineURI_GetWineURL(wine_uri, &wine_url); - if(!wine_url) { - TRACE("wine_url == NULL\n"); - return NS_ERROR_UNEXPECTED; - } - - hres = CreateURLMoniker(NULL, wine_url, &mon); - if(FAILED(hres)) { - WARN("CreateURLMonikrer failed: %08x\n", hres); + hres = create_mon_for_nschannel(This, &mon); + if(FAILED(hres)) return NS_ERROR_UNEXPECTED; - } bscallback = create_bscallback(mon); IMoniker_Release(mon);

1 0

Jacek Caban : mshtml: Call Exec(CGID_ShellDocView, 37) in exec_editmode.
by Alexandre Julliard 12 Jun '07

12 Jun '07

Module: wine Branch: master Commit: 5766b55e40727b6c0538c91f1f900d0d1859a5cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5766b55e40727b6c0538c91f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 11 17:24:54 2007 +0200 mshtml: Call Exec(CGID_ShellDocView, 37) in exec_editmode. --- dlls/mshtml/olecmd.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 288a12b..c481e6a 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -546,6 +546,22 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, if(This->frame) IOleInPlaceFrame_SetStatusText(This->frame, NULL); + if(This->client) { + IOleCommandTarget *cmdtrg; + + 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); + + IOleCommandTarget_Release(cmdtrg); + } + } + if(This->hostui) { DOCHOSTUIINFO hostinfo;

1 0

Alexandre Julliard : shell32: Remove a redundant include.
by Alexandre Julliard 12 Jun '07

12 Jun '07

Module: wine Branch: master Commit: 371e5c0628d5bb03236074238bcc712abe6cd82a URL: http://source.winehq.org/git/wine.git/?a=commit;h=371e5c0628d5bb03236074238… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 11 20:20:12 2007 +0200 shell32: Remove a redundant include. --- dlls/shell32/shell32_En.rc | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shell32_En.rc b/dlls/shell32/shell32_En.rc index ca902c8..5941917 100644 --- a/dlls/shell32/shell32_En.rc +++ b/dlls/shell32/shell32_En.rc @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "shresdef.h" - LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT MENU_001 MENU DISCARDABLE

1 0

Alexandre Julliard : winecfg: Fix potential null pointer access ( spotted by Yaroslav Skorokhodov).
by Alexandre Julliard 12 Jun '07

12 Jun '07

Module: wine Branch: master Commit: 78bdd9ba94f4b5e96d8aebc215bec7c4659d228a URL: http://source.winehq.org/git/wine.git/?a=commit;h=78bdd9ba94f4b5e96d8aebc21… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 11 20:20:39 2007 +0200 winecfg: Fix potential null pointer access (spotted by Yaroslav Skorokhodov). --- programs/winecfg/appdefaults.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index ed61f9d..1df045e 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -107,7 +107,7 @@ static void update_comboboxes(HWND dialog) winver = get_reg_key(config_key, keypath(""), "Version", ""); ver = get_registry_version(); - if (*winver == '\0') + if (!winver || !winver[0]) { HeapFree(GetProcessHeap(), 0, winver);

1 0

Alexandre Julliard : shell32: Fix contents of string returned in load_path.
by Alexandre Julliard 12 Jun '07

12 Jun '07

Module: wine Branch: master Commit: 92571d8d39f48e2b8c749647c51a83992e1f11fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=92571d8d39f48e2b8c749647c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 11 20:20:02 2007 +0200 shell32: Fix contents of string returned in load_path. --- dlls/shell32/xdg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/xdg.c b/dlls/shell32/xdg.c index 6521232..108d92a 100644 --- a/dlls/shell32/xdg.c +++ b/dlls/shell32/xdg.c @@ -113,7 +113,7 @@ static char *load_path(int path_id) ret = SHAlloc(strlen(paths[path_id].default_value)+1); if (ret != NULL) - lstrcpyA(ret, env); + lstrcpyA(ret, paths[path_id].default_value); return ret; }

1 0

Hwang YunSong(황윤성) : shell32: Updated Korean resource.
by Alexandre Julliard 12 Jun '07

12 Jun '07

Module: wine Branch: master Commit: 2d1157e466bdcfbd953dd7870565e3992e4d6f75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d1157e466bdcfbd953dd7870… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Jun 11 09:08:23 2007 +0900 shell32: Updated Korean resource. --- dlls/shell32/shell32_Ko.rc | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_Ko.rc b/dlls/shell32/shell32_Ko.rc index 89ae367..eb07c53 100644 --- a/dlls/shell32/shell32_Ko.rc +++ b/dlls/shell32/shell32_Ko.rc @@ -105,6 +105,26 @@ WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 } + +SHNEWBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 218, 196 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK +CAPTION "�� Ž��" +FONT 8, "MS Shell Dlg" +{ +LTEXT "", IDD_TITLE, 10, 8, 198, 24 +LTEXT "", IDD_STATUS, 10, 25, 198, 12 +LTEXT "��:", IDD_FOLDER, 10, 156, 40, 12 +CONTROL "", IDD_TREEVIEW, "SysTreeView32", +TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | +WS_BORDER | WS_TABSTOP, +12, 38, 194, 105 +EDITTEXT IDD_FOLDERTEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP +PUSHBUTTON "�� (&M)", IDD_MAKENEWFOLDER, 12, 174, 70, 14, WS_GROUP | WS_TABSTOP +DEFPUSHBUTTON "Ȯ��", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP +PUSHBUTTON "��", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP +} + + SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "%s ��"

1 0

Francois Gouget : advapi32: Update win32. api to fix the winapi_check warnings.
by Alexandre Julliard 12 Jun '07

12 Jun '07

Module: wine Branch: master Commit: 393c2271453d3226cb808ae6c6552585addd3495 URL: http://source.winehq.org/git/wine.git/?a=commit;h=393c2271453d3226cb808ae6c… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jun 11 13:13:40 2007 +0200 advapi32: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 9460244..1039cbd 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -46,6 +46,7 @@ NTSTATUS POLICY_INFORMATION_CLASS POLICY_NOTIFICATION_INFORMATION_CLASS REGSAM +SC_ENUM_TYPE SC_HANDLE SC_STATUS_TYPE SE_OBJECT_TYPE @@ -96,8 +97,6 @@ LPQUERY_SERVICE_LOCK_STATUSA LPQUERY_SERVICE_LOCK_STATUSW LPSECURITY_ATTRIBUTES LPSERVICE_STATUS -LPSERVICE_TABLE_ENTRYA -LPSERVICE_TABLE_ENTRYW LPSTARTUPINFOA LPSTARTUPINFOW LPSTR * @@ -152,13 +151,15 @@ PTRUSTEEA PTRUSTEEW PUCHAR PULONG -PUNICODE_STRING PVALENTA PVALENTW PVOID PVOID * SC_LOCK SECURITY_ATTRIBUTES * +SERVICE_TABLE_ENTRYA * +SERVICE_TABLE_ENTRYW * +UNICODE_STRING * WMIDPREQUEST struct ustring * unsigned char *

1 0