November 2011 - Wine-commits

Jacek Caban : mshtml: Properly handle fragment-only navigation.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: fbdfec74b04ee4fd627892102da026f90aba9d04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbdfec74b04ee4fd627892102… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 15 13:30:28 2011 +0100 mshtml: Properly handle fragment-only navigation. --- dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/navigate.c | 44 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/nsiface.idl | 30 +++++++++++++++++++++++++++- dlls/mshtml/nsio.c | 2 +- dlls/mshtml/persist.c | 2 +- 5 files changed, 77 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 0915977..625fc52 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -671,6 +671,7 @@ void release_nsio(void) DECLSPEC_HIDDEN; BOOL is_gecko_path(const char*) DECLSPEC_HIDDEN; HRESULT nsuri_to_url(LPCWSTR,BOOL,BSTR*) DECLSPEC_HIDDEN; +BOOL compare_ignoring_frag(IUri*,IUri*) DECLSPEC_HIDDEN; HRESULT navigate_url(HTMLWindow*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; HRESULT set_frame_doc(HTMLFrameBase*,nsIDOMDocument*) DECLSPEC_HIDDEN; @@ -700,6 +701,7 @@ nsresult get_nsinterface(nsISupports*,REFIID,void**) DECLSPEC_HIDDEN; void set_window_bscallback(HTMLWindow*,nsChannelBSC*) DECLSPEC_HIDDEN; void set_current_mon(HTMLWindow*,IMoniker*) DECLSPEC_HIDDEN; +void set_current_uri(HTMLWindow*,IUri*) DECLSPEC_HIDDEN; HRESULT start_binding(HTMLWindow*,HTMLDocumentNode*,BSCallback*,IBindCtx*) DECLSPEC_HIDDEN; HRESULT async_start_doc_binding(HTMLWindow*,nsChannelBSC*) DECLSPEC_HIDDEN; void abort_document_bindings(HTMLDocumentNode*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index ea1c650..bb97ee1 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1766,6 +1766,45 @@ static void navigate_task_destr(task_t *_task) heap_free(task); } +static HRESULT navigate_fragment(HTMLWindow *window, IUri *uri) +{ + nsIDOMLocation *nslocation; + nsAString nsfrag_str; + BSTR frag; + nsresult nsres; + HRESULT hres; + + set_current_uri(window, uri); + + nsres = nsIDOMWindow_GetLocation(window->nswindow, &nslocation); + if(FAILED(nsres) || !nslocation) + return E_FAIL; + + hres = IUri_GetFragment(uri, &frag); + if(FAILED(hres)) { + nsIDOMLocation_Release(nslocation); + return hres; + } + + nsAString_InitDepend(&nsfrag_str, frag); + nsres = nsIDOMLocation_SetHash(nslocation, &nsfrag_str); + nsAString_Finish(&nsfrag_str); + nsIDOMLocation_Release(nslocation); + SysFreeString(frag); + if(NS_FAILED(nsres)) { + ERR("SetHash failed: %08x\n", nsres); + return E_FAIL; + } + + if(window->doc_obj->doc_object_service) { + IDocObjectService_FireNavigateComplete2(window->doc_obj->doc_object_service, &window->IHTMLWindow2_iface, 0x10); + IDocObjectService_FireDocumentComplete(window->doc_obj->doc_object_service, &window->IHTMLWindow2_iface, 0); + + } + + return S_OK; +} + HRESULT super_navigate(HTMLWindow *window, IUri *uri, const WCHAR *headers, BYTE *post_data, DWORD post_data_size) { nsChannelBSC *bsc; @@ -1796,6 +1835,11 @@ HRESULT super_navigate(HTMLWindow *window, IUri *uri, const WCHAR *headers, BYTE } } + if(window->uri && compare_ignoring_frag(window->uri, uri)) { + TRACE("fragment navigate\n"); + return navigate_fragment(window, uri); + } + hres = CreateURLMonikerEx2(NULL, uri, &mon, URL_MK_UNIFORM); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 56fefa3..5a1970d 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -130,7 +130,6 @@ typedef nsISupports nsIDOMMediaList; typedef nsISupports nsIDOMHTMLTableCaptionElement; typedef nsISupports nsIDOMHTMLTableSectionElement; typedef nsISupports nsIDOMClientRectList; -typedef nsISupports nsIDOMLocation; typedef nsISupports nsINode; typedef nsISupports nsIStyleSheet; typedef nsISupports nsIStyleRule; @@ -556,6 +555,35 @@ interface nsIChannelEventSink : nsISupports [ object, + uuid(a6cf906d-15b3-11d2-932e-00805f8add32), + local +] +interface nsIDOMLocation : nsISupports +{ + nsresult GetHash(nsAString *aHash); + nsresult SetHash(const nsAString *aHash); + nsresult GetHost(nsAString *aHost); + nsresult SetHost(const nsAString *aHost); + nsresult GetHostname(nsAString *aHostname); + nsresult SetHostname(const nsAString *aHostname); + nsresult GetHref(nsAString *aHref); + nsresult SetHref(const nsAString *aHref); + nsresult GetPathname(nsAString *aPathname); + nsresult SetPathname(const nsAString *aPathname); + nsresult GetPort(nsAString *aPort); + nsresult SetPort(const nsAString *aPort); + nsresult GetProtocol(nsAString *aProtocol); + nsresult SetProtocol(const nsAString *aProtocol); + nsresult GetSearch(nsAString *aSearch); + nsresult SetSearch(const nsAString *aSearch); + nsresult Reload(PRBool forceget); + nsresult Replace(const nsAString *url); + nsresult Assign(const nsAString *url); + nsresult ToString(nsAString *_retval); +} + +[ + object, uuid(2938307a-9d70-4b63-8afc-0197e82318ad), local ] diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index b39453e..b507446 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -113,7 +113,7 @@ static IUri *get_uri_nofrag(IUri *uri) return ret; } -static BOOL compare_ignoring_frag(IUri *uri1, IUri *uri2) +BOOL compare_ignoring_frag(IUri *uri1, IUri *uri2) { IUri *uri_nofrag1, *uri_nofrag2; BOOL ret = FALSE; diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index ad7f4a6..4167659 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -70,7 +70,7 @@ static BOOL use_gecko_script(HTMLWindow *window) return FAILED(hres) || scheme != URL_SCHEME_ABOUT; } -static void set_current_uri(HTMLWindow *window, IUri *uri) +void set_current_uri(HTMLWindow *window, IUri *uri) { if(window->uri) { IUri_Release(window->uri);

1 0

Jacek Caban : mshtml: Added more navigation tests.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 95053e83cc651736c71fdb7cd04635c4ac070703 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95053e83cc651736c71fdb7cd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 15 13:30:59 2011 +0100 mshtml: Added more navigation tests. --- dlls/mshtml/tests/htmldoc.c | 1188 +++++++++++++++++++++++++++++++++++-------- 1 files changed, 982 insertions(+), 206 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=95053e83cc651736c71fd…

1 0

Jacek Caban : mshtml: Added nsIURI::GetSpecIgnoringRef implementation.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: af9508a13a1c605d0ba9ab07af73e79a3b661a28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af9508a13a1c605d0ba9ab07a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 15 13:31:44 2011 +0100 mshtml: Added nsIURI::GetSpecIgnoringRef implementation. --- dlls/mshtml/nsio.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index b507446..e16c25e 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2411,8 +2411,20 @@ static nsresult NSAPI nsURI_GetSpecIgnoringRef(nsIURL *iface, nsACString *aSpecI static nsresult NSAPI nsURI_GetHasRef(nsIURL *iface, PRBool *aHasRef) { nsWineURI *This = impl_from_nsIURL(iface); - FIXME("(%p)->(%p)\n", This, aHasRef); - return NS_ERROR_NOT_IMPLEMENTED; + BOOL b; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, aHasRef); + + if(!ensure_uri(This)) + return NS_ERROR_UNEXPECTED; + + hres = IUri_HasProperty(This->uri, Uri_PROPERTY_FRAGMENT, &b); + if(FAILED(hres)) + return NS_ERROR_FAILURE; + + *aHasRef = b; + return NS_OK; } static nsresult NSAPI nsURL_GetFilePath(nsIURL *iface, nsACString *aFilePath)

1 0

Alexandre Julliard : wineps: Print a fixme for unhandled composite glyph scaling.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 4801b91fd66ad23ffbd3a2604685a10c764d9180 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4801b91fd66ad23ffbd3a2604… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 15 12:44:25 2011 +0100 wineps: Print a fixme for unhandled composite glyph scaling. --- dlls/wineps.drv/type1.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/type1.c b/dlls/wineps.drv/type1.c index e686853..fbda3de 100644 --- a/dlls/wineps.drv/type1.c +++ b/dlls/wineps.drv/type1.c @@ -414,7 +414,7 @@ static BOOL append_complex_glyph(HDC hdc, const BYTE *data, glyph_outline *outli const BYTE *ptr = data; WORD flags, index; short arg1, arg2; - WORD scale_xx = 1, scale_xy = 0, scale_yx = 0, scale_yy = 1; + WORD scale_xx = 1 << 14, scale_xy = 0, scale_yx = 0, scale_yy = 1 << 14; WORD start_pt, end_pt; ptr += 10; @@ -460,6 +460,11 @@ static BOOL append_complex_glyph(HDC hdc, const BYTE *data, glyph_outline *outli ptr += 2; } + if ((flags & (WE_HAVE_A_SCALE | WE_HAVE_AN_X_AND_Y_SCALE | WE_HAVE_A_TWO_BY_TWO)) && + (scale_xx != 1 << 14 || scale_yy != 1 << 14 || scale_xy || scale_yx)) + FIXME( "unhandled scaling %x,%x,%x,%x of glyph %x\n", + scale_xx, scale_xy, scale_yx, scale_yy, index ); + start_pt = pts_in_outline(outline); append_glyph_outline(hdc, index, outline); end_pt = pts_in_outline(outline);

1 0

Dmitry Timoshkov : user32: Add tests for mixed WS_CHILD | WS_POPUP window styles.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 50d37fe0abc6c35ead2442970e256820cc176f63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50d37fe0abc6c35ead2442970… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 15 12:56:49 2011 +0800 user32: Add tests for mixed WS_CHILD | WS_POPUP window styles. --- dlls/user32/tests/win.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 16a56dc..804d452 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3710,7 +3710,7 @@ static void check_window_style(DWORD dwStyleIn, DWORD dwExStyleIn, DWORD dwStyle dwActualStyle = GetWindowLong(hwnd, GWL_STYLE); dwActualExStyle = GetWindowLong(hwnd, GWL_EXSTYLE); /* WS_CLIPSIBLINGS can't be reset on top-level windows */ - if (dwStyleIn & WS_CHILD) dwStyleOut = dwStyleIn; + if ((dwStyleIn & (WS_CHILD|WS_POPUP)) == WS_CHILD) dwStyleOut = dwStyleIn; else dwStyleOut = dwStyleIn | WS_CLIPSIBLINGS; /* WS_EX_WINDOWEDGE can't always be changed */ if ((dwExStyleIn & WS_EX_DLGMODALFRAME) || (dwStyleIn & WS_THICKFRAME)) @@ -3735,6 +3735,9 @@ static void test_window_styles(void) check_window_style(0, 0, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE); check_window_style(WS_OVERLAPPEDWINDOW, 0, WS_CLIPSIBLINGS|WS_OVERLAPPEDWINDOW, WS_EX_WINDOWEDGE); check_window_style(WS_CHILD, 0, WS_CHILD, 0); + check_window_style(WS_CHILD|WS_POPUP, 0, WS_CHILD|WS_POPUP|WS_CLIPSIBLINGS, 0); + check_window_style(WS_CHILD|WS_POPUP, WS_EX_APPWINDOW, WS_CHILD|WS_POPUP|WS_CLIPSIBLINGS, WS_EX_APPWINDOW); + check_window_style(WS_CHILD|WS_POPUP, WS_EX_WINDOWEDGE, WS_CHILD|WS_POPUP|WS_CLIPSIBLINGS, 0); check_window_style(WS_CHILD, WS_EX_WINDOWEDGE, WS_CHILD, 0); check_window_style(0, WS_EX_TOOLWINDOW, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE|WS_EX_TOOLWINDOW); check_window_style(WS_POPUP, 0, WS_POPUP|WS_CLIPSIBLINGS, 0);

1 0

Dmitry Timoshkov : user32: Dialog creation code should force WS_CHILD style for dialog controls.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 2429ef905c46aec91465ac187c5f0b528cd35612 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2429ef905c46aec91465ac187… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 15 15:27:13 2011 +0800 user32: Dialog creation code should force WS_CHILD style for dialog controls. --- dlls/user32/dialog.c | 4 +++- dlls/user32/tests/dialog.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/user32/tests/resource.rc | 10 ++++++++++ 3 files changed, 54 insertions(+), 1 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 1e47374..7643241 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -263,7 +263,9 @@ static BOOL DIALOG_CreateControls32( HWND hwnd, LPCSTR template, const DLG_TEMPL { template = (LPCSTR)DIALOG_GetControl32( (const WORD *)template, &info, dlgTemplate->dialogEx ); - /* Is this it? */ + info.style &= ~WS_POPUP; + info.style |= WS_CHILD; + if (info.style & WS_BORDER) { info.style &= ~WS_BORDER; diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index f749278..a716f79 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -33,6 +33,8 @@ #include <stdio.h> #include <stdarg.h> +#define WINVER 0x0600 /* For NONCLIENTMETRICS with padding */ + #include "wine/test.h" #include "windef.h" #include "winbase.h" @@ -1058,11 +1060,50 @@ static INT_PTR CALLBACK TestReturnKeyDlgProc (HWND hDlg, UINT uiMsg, return FALSE; } +static INT_PTR CALLBACK TestControlStyleDlgProc(HWND hdlg, UINT msg, + WPARAM wparam, LPARAM lparam) +{ + HWND control; + DWORD style, exstyle; + char buf[256]; + + switch (msg) + { + case WM_INITDIALOG: + control = GetDlgItem(hdlg, 7); + ok(control != 0, "dialog control with id 7 not found\n"); + style = GetWindowLong(control, GWL_STYLE); + ok(style == (WS_CHILD|WS_VISIBLE), "expected WS_CHILD|WS_VISIBLE, got %#x\n", style); + exstyle = GetWindowLong(control, GWL_EXSTYLE); + ok(exstyle == (WS_EX_NOPARENTNOTIFY|WS_EX_TRANSPARENT|WS_EX_CLIENTEDGE), "expected WS_EX_NOPARENTNOTIFY|WS_EX_TRANSPARENT|WS_EX_CLIENTEDGE, got %#x\n", exstyle); + buf[0] = 0; + GetWindowText(control, buf, sizeof(buf)); + ok(lstrcmp(buf, "bump7") == 0, "expected bump7, got %s\n", buf); + + control = GetDlgItem(hdlg, 8); + ok(control != 0, "dialog control with id 8 not found\n"); + style = GetWindowLong(control, GWL_STYLE); + ok(style == (WS_CHILD|WS_VISIBLE), "expected WS_CHILD|WS_VISIBLE, got %#x\n", style); + exstyle = GetWindowLong(control, GWL_EXSTYLE); + ok(exstyle == (WS_EX_NOPARENTNOTIFY|WS_EX_TRANSPARENT), "expected WS_EX_NOPARENTNOTIFY|WS_EX_TRANSPARENT, got %#x\n", exstyle); + buf[0] = 0; + GetWindowText(control, buf, sizeof(buf)); + ok(lstrcmp(buf, "bump8") == 0, "expected bump8, got %s\n", buf); + + EndDialog(hdlg, -7); + return TRUE; + } + return FALSE; +} + static void test_DialogBoxParamA(void) { INT_PTR ret; HWND hwnd_invalid = (HWND)0x4444; + ret = DialogBoxParamA(GetModuleHandle(0), "TEST_DLG_CHILD_POPUP", 0, TestControlStyleDlgProc, 0); + ok(ret == -7, "expected -7, got %ld\n", ret); + SetLastError(0xdeadbeef); ret = DialogBoxParamA(GetModuleHandle(NULL), "IDD_DIALOG" , hwnd_invalid, 0 , 0); ok(0 == ret || broken(ret == -1), "DialogBoxParamA returned %ld, expected 0\n", ret); diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index 4341710..cce1478 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -45,6 +45,16 @@ STRINGTABLE 65534 "Test high id" } +/* Test dialog with a mixed style WS_CHILD | WS_POPUP control */ +TEST_DLG_CHILD_POPUP DIALOG 0, 0, 60, 30 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Test dialog with mixed style controls" +FONT 8, "MS Shell Dlg" +{ + CONTROL "bump7",7,"static",WS_CHILD|WS_POPUP|WS_BORDER,0,0,40,10,WS_EX_TRANSPARENT + CONTROL "bump8",8,"static",WS_POPUP,0,10,40,10,WS_EX_TRANSPARENT +} + TEST_DIALOG DIALOG 0, 0, 60, 30 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Test dialog"

1 0

Piotr Caban : userenv: Improved CreateEnvironmentBlock implementation.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: f0d8c3383efecebc54c160dbce67730fbe29373a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0d8c3383efecebc54c160dbc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 15 12:55:36 2011 +0100 userenv: Improved CreateEnvironmentBlock implementation. --- dlls/userenv/tests/userenv.c | 94 ++++++----- dlls/userenv/userenv_main.c | 375 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 425 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f0d8c3383efecebc54c16…

1 0

Piotr Caban : services: Create service environment when first service is started.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 8141fb80eb4d11b31ff5b4c67449455b1512e57e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8141fb80eb4d11b31ff5b4c67… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 15 12:55:58 2011 +0100 services: Create service environment when first service is started. --- programs/services/Makefile.in | 2 +- programs/services/services.c | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/programs/services/Makefile.in b/programs/services/Makefile.in index 96ab500..e2c8086 100644 --- a/programs/services/Makefile.in +++ b/programs/services/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -DWINE_NO_UNICODE_MACROS MODULE = services.exe APPMODE = -mconsole -IMPORTS = rpcrt4 advapi32 +IMPORTS = rpcrt4 advapi32 userenv C_SRCS = \ rpc.c \ diff --git a/programs/services/services.c b/programs/services/services.c index 7134ae7..94b4747 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -24,6 +24,7 @@ #include <windows.h> #include <winsvc.h> #include <rpc.h> +#include <userenv.h> #include "wine/unicode.h" #include "wine/debug.h" @@ -40,6 +41,7 @@ struct scmdatabase *active_database; DWORD service_pipe_timeout = 10000; DWORD service_kill_timeout = 20000; +static void *env = NULL; static const int is_win64 = (sizeof(void *) > sizeof(int)); @@ -581,6 +583,17 @@ static DWORD service_start_process(struct service_entry *service_entry, HANDLE * service_lock_exclusive(service_entry); + if (!env) + { + HANDLE htok; + + if (OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY|TOKEN_DUPLICATE, &htok)) + CreateEnvironmentBlock(&env, htok, FALSE); + + if (!env) + WINE_ERR("failed to create services environment\n"); + } + size = ExpandEnvironmentStringsW(service_entry->config.lpBinaryPathName,NULL,0); path = HeapAlloc(GetProcessHeap(),0,size*sizeof(WCHAR)); if (!path) @@ -632,7 +645,7 @@ static DWORD service_start_process(struct service_entry *service_entry, HANDLE * service_unlock(service_entry); - r = CreateProcessW(NULL, path, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + r = CreateProcessW(NULL, path, NULL, NULL, FALSE, CREATE_UNICODE_ENVIRONMENT, env, NULL, &si, &pi); HeapFree(GetProcessHeap(),0,path); if (!r) { @@ -867,5 +880,7 @@ int main(int argc, char *argv[]) RPC_MainLoop(); } scmdatabase_destroy(active_database); + if (env) + DestroyEnvironmentBlock(env); return err; }

1 0

Alistair Leslie-Hughes : mscoree: Implement ICorDebug CreateProcess.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 3d6708a194370153a25c49e0a58d75a36e9ec2e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d6708a194370153a25c49e0a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 4 12:18:21 2011 +1100 mscoree: Implement ICorDebug CreateProcess. --- dlls/mscoree/cordebug.c | 431 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 427 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d6708a194370153a25c4…

1 0

Michael Mc Donnell : d3dx9/tests: Test for D3DXMESH_VB_SHARE option.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 656e8a872677e849d63f64463aeaae6b297acbdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=656e8a872677e849d63f64463… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Wed Nov 9 11:45:58 2011 -0500 d3dx9/tests: Test for D3DXMESH_VB_SHARE option. --- dlls/d3dx9_36/tests/mesh.c | 68 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 65 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=656e8a872677e849d63f6…

1 0