October 2012 - Wine-commits

Christian Costa : ntoskrnl.exe: Add stub for PsImpersonateClient.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: e3607c9858b4d7de6a0435a8d31c04d2cd85ac8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3607c9858b4d7de6a0435a8d… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Oct 2 00:10:38 2012 +0200 ntoskrnl.exe: Add stub for PsImpersonateClient. --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index ba2034d..a127551 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1660,6 +1660,18 @@ BOOLEAN WINAPI PsGetVersion(ULONG *major, ULONG *minor, ULONG *build, UNICODE_ST /*********************************************************************** + * PsImpersonateClient (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI PsImpersonateClient(PETHREAD Thread, PACCESS_TOKEN Token, BOOLEAN CopyOnOpen, + BOOLEAN EffectiveOnly, SECURITY_IMPERSONATION_LEVEL ImpersonationLevel) +{ + FIXME("(%p, %p, %u, %u, %u): stub\n", Thread, Token, CopyOnOpen, EffectiveOnly, ImpersonationLevel); + + return STATUS_NOT_IMPLEMENTED; +} + + +/*********************************************************************** * PsSetCreateProcessNotifyRoutine (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI PsSetCreateProcessNotifyRoutine( PCREATE_PROCESS_NOTIFY_ROUTINE callback, BOOLEAN remove ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 3a871de..b169815 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -885,7 +885,7 @@ @ stub PsGetThreadTeb @ stub PsGetThreadWin32Thread @ stdcall PsGetVersion(ptr ptr ptr ptr) -@ stub PsImpersonateClient +@ stdcall PsImpersonateClient(ptr ptr long long long) @ stub PsInitialSystemProcess @ stub PsIsProcessBeingDebugged @ stub PsIsSystemThread

1 0

Jacek Caban : mshtml: Store nsIDOMNodeSelector in HTMLDocumentNode.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 359a9041b1c4747ee7bcbaae13bf9c3535553968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=359a9041b1c4747ee7bcbaae1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 2 15:44:10 2012 +0200 mshtml: Store nsIDOMNodeSelector in HTMLDocumentNode. --- dlls/mshtml/htmldoc.c | 16 ++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/navigate.c | 8 +------- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 322751a..6954d17 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2101,6 +2101,11 @@ static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) while(!list_empty(&This->plugin_hosts)) detach_plugin_host(LIST_ENTRY(list_head(&This->plugin_hosts), PluginHost, entry)); + if(This->nsnode_selector) { + nsIDOMNodeSelector_Release(This->nsnode_selector); + This->nsnode_selector = NULL; + } + if(This->nsdoc) { assert(!This->window); release_document_mutation(This); @@ -2126,6 +2131,8 @@ static void HTMLDocumentNode_traverse(HTMLDOMNode *iface, nsCycleCollectionTrave { HTMLDocumentNode *This = impl_from_HTMLDOMNode(iface); + if(This->nsnode_selector) + note_cc_edge((nsISupports*)This->nsnode_selector, "This->nsnode_selector", cb); if(This->nsdoc) note_cc_edge((nsISupports*)This->nsdoc, "This->nsdoc", cb); } @@ -2134,6 +2141,11 @@ static void HTMLDocumentNode_unlink(HTMLDOMNode *iface) { HTMLDocumentNode *This = impl_from_HTMLDOMNode(iface); + if(This->nsnode_selector) { + nsIDOMNodeSelector_Release(This->nsnode_selector); + This->nsnode_selector = NULL; + } + if(This->nsdoc) { nsIDOMHTMLDocument *nsdoc = This->nsdoc; @@ -2285,6 +2297,7 @@ static HTMLDocumentNode *alloc_doc_node(HTMLDocumentObj *doc_obj, HTMLInnerWindo HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_obj, HTMLInnerWindow *window, HTMLDocumentNode **ret) { HTMLDocumentNode *doc; + nsresult nsres; doc = alloc_doc_node(doc_obj, window); if(!doc) @@ -2298,6 +2311,9 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_ob nsIDOMHTMLDocument_AddRef(nsdoc); doc->nsdoc = nsdoc; + nsres = nsIDOMHTMLDocument_QueryInterface(nsdoc, &IID_nsIDOMNodeSelector, (void**)&doc->nsnode_selector); + assert(nsres == NS_OK); + init_document_mutation(doc); doc_init_events(doc); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index aec754f..dd41224 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -689,6 +689,7 @@ struct HTMLDocumentNode { HTMLInnerWindow *window; nsIDOMHTMLDocument *nsdoc; + nsIDOMNodeSelector *nsnode_selector; BOOL content_ready; event_target_t *body_event_target; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index fea8b4c..bec5ed6 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2004,19 +2004,13 @@ static HRESULT navigate_fragment(HTMLOuterWindow *window, IUri *uri) */ selector = heap_alloc(sizeof(selector_formatW)+SysStringLen(frag)*sizeof(WCHAR)); if(selector) { - nsIDOMNodeSelector *node_selector; nsIDOMElement *nselem = NULL; nsAString selector_str; - nsres = nsIDOMHTMLDocument_QueryInterface(window->base.inner_window->doc->nsdoc, &IID_nsIDOMNodeSelector, - (void**)&node_selector); - assert(nsres == NS_OK); - sprintfW(selector, selector_formatW, frag); nsAString_InitDepend(&selector_str, selector); /* NOTE: Gecko doesn't set result to NULL if there is no match, so nselem must be initialized */ - nsres = nsIDOMNodeSelector_QuerySelector(node_selector, &selector_str, &nselem); - nsIDOMNodeSelector_Release(node_selector); + nsres = nsIDOMNodeSelector_QuerySelector(window->base.inner_window->doc->nsnode_selector, &selector_str, &nselem); nsAString_Finish(&selector_str); heap_free(selector); if(NS_SUCCEEDED(nsres) && nselem) {

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_RSSetState().
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: fbcce6787af79c7a6e11b45a7403a90a8519522b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbcce6787af79c7a6e11b45a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 1 22:48:09 2012 +0200 d3d10core: Implement d3d10_device_RSSetState(). --- dlls/d3d10core/d3d10core_private.h | 35 ++++++++++++++++++++--------------- dlls/d3d10core/device.c | 6 +++++- dlls/d3d10core/state.c | 9 +++++++++ 3 files changed, 34 insertions(+), 16 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index f88355b..4f98c93 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -44,6 +44,8 @@ #define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N') #define TAG_SHDR MAKE_TAG('S', 'H', 'D', 'R') +struct d3d10_device; + struct d3d10_shader_info { const DWORD *shader_code; @@ -68,21 +70,6 @@ void skip_dword_unknown(const char **ptr, unsigned int count) DECLSPEC_HIDDEN; HRESULT parse_dxbc(const char *data, SIZE_T data_size, HRESULT (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx) DECLSPEC_HIDDEN; -/* IDirect3D10Device */ -struct d3d10_device -{ - IUnknown IUnknown_inner; - ID3D10Device ID3D10Device_iface; - IWineDXGIDeviceParent IWineDXGIDeviceParent_iface; - IUnknown *outer_unk; - LONG refcount; - - struct wined3d_device_parent device_parent; - struct wined3d_device *wined3d_device; -}; - -void d3d10_device_init(struct d3d10_device *device, void *outer_unknown) DECLSPEC_HIDDEN; - /* ID3D10Texture2D */ struct d3d10_texture2d { @@ -248,6 +235,7 @@ struct d3d10_rasterizer_state }; HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state) DECLSPEC_HIDDEN; +struct d3d10_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) DECLSPEC_HIDDEN; /* ID3D10SamplerState */ struct d3d10_sampler_state @@ -267,6 +255,23 @@ struct d3d10_query HRESULT d3d10_query_init(struct d3d10_query *query) DECLSPEC_HIDDEN; +/* IDirect3D10Device */ +struct d3d10_device +{ + IUnknown IUnknown_inner; + ID3D10Device ID3D10Device_iface; + IWineDXGIDeviceParent IWineDXGIDeviceParent_iface; + IUnknown *outer_unk; + LONG refcount; + + struct wined3d_device_parent device_parent; + struct wined3d_device *wined3d_device; + + struct d3d10_rasterizer_state *rasterizer_state; +}; + +void d3d10_device_init(struct d3d10_device *device, void *outer_unknown) DECLSPEC_HIDDEN; + /* Layered device */ enum dxgi_device_layer_id { diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 00a34a9..d43ee4b 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -342,7 +342,11 @@ static void STDMETHODCALLTYPE d3d10_device_DrawAuto(ID3D10Device *iface) static void STDMETHODCALLTYPE d3d10_device_RSSetState(ID3D10Device *iface, ID3D10RasterizerState *rasterizer_state) { - FIXME("iface %p, rasterizer_state %p stub!\n", iface, rasterizer_state); + struct d3d10_device *device = impl_from_ID3D10Device(iface); + + TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state); + + device->rasterizer_state = unsafe_impl_from_ID3D10RasterizerState(rasterizer_state); } static void STDMETHODCALLTYPE d3d10_device_RSSetViewports(ID3D10Device *iface, diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index edb2030..3b5c45f 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -372,6 +372,15 @@ HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state) return S_OK; } +struct d3d10_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d10_rasterizer_state_vtbl); + + return impl_from_ID3D10RasterizerState(iface); +} + static inline struct d3d10_sampler_state *impl_from_ID3D10SamplerState(ID3D10SamplerState *iface) { return CONTAINING_RECORD(iface, struct d3d10_sampler_state, ID3D10SamplerState_iface);

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_RSGetState().
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: c7caabb864189c74ded7a221c93154e6bfce326a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7caabb864189c74ded7a221c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 1 22:48:10 2012 +0200 d3d10core: Implement d3d10_device_RSGetState(). --- dlls/d3d10core/device.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index d43ee4b..eaf0793 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -580,7 +580,12 @@ static void STDMETHODCALLTYPE d3d10_device_SOGetTargets(ID3D10Device *iface, static void STDMETHODCALLTYPE d3d10_device_RSGetState(ID3D10Device *iface, ID3D10RasterizerState **rasterizer_state) { - FIXME("iface %p, rasterizer_state %p stub!\n", iface, rasterizer_state); + struct d3d10_device *device = impl_from_ID3D10Device(iface); + + TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state); + + if ((*rasterizer_state = device->rasterizer_state ? &device->rasterizer_state->ID3D10RasterizerState_iface : NULL)) + ID3D10RasterizerState_AddRef(*rasterizer_state); } static void STDMETHODCALLTYPE d3d10_device_RSGetViewports(ID3D10Device *iface,

1 0

Jason Edmeades : cmd: Fix setlocal/endlocal implementation.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: c55cd87632bdb54c0ea506edc279ebb9118def95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c55cd87632bdb54c0ea506edc… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Sun Sep 30 23:07:01 2012 +0100 cmd: Fix setlocal/endlocal implementation. --- programs/cmd/batch.c | 9 ++ programs/cmd/builtins.c | 14 +++- programs/cmd/tests/test_builtins.cmd | 136 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 50 +++++++++++- programs/cmd/wcmd.h | 3 +- 5 files changed, 207 insertions(+), 5 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 4926b1f..b77931d 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -22,6 +22,8 @@ #include "wcmd.h" #include "wine/debug.h" +extern struct env_stack *saved_environment; + WINE_DEFAULT_DEBUG_CHANNEL(cmd); /**************************************************************************** @@ -94,6 +96,13 @@ void WCMD_batch (WCHAR *file, WCHAR *command, BOOL called, WCHAR *startLabel, HA CloseHandle (h); /* + * If there are outstanding setlocal's to the current context, unwind them. + */ + while (saved_environment && saved_environment->batchhandle == context->h) { + WCMD_endlocal(); + } + +/* * If invoked by a CALL, we return to the context of our caller. Otherwise return * to the caller's caller. */ diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index f9e51e5..f6922ad 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -103,7 +103,7 @@ static const WCHAR parmY[] = {'/','Y','\0'}; static const WCHAR parmNoY[] = {'/','-','Y','\0'}; static HINSTANCE hinst; -static struct env_stack *saved_environment; +struct env_stack *saved_environment; static BOOL verify_mode = FALSE; /************************************************************************** @@ -2087,6 +2087,9 @@ void WCMD_setlocal (const WCHAR *s) { struct env_stack *env_copy; WCHAR cwd[MAX_PATH]; + /* setlocal does nothing outside of batch programs */ + if (!context) return; + /* DISABLEEXTENSIONS ignored */ env_copy = LocalAlloc (LMEM_FIXED, sizeof (struct env_stack)); @@ -2097,10 +2100,10 @@ void WCMD_setlocal (const WCHAR *s) { } env = GetEnvironmentStringsW (); - env_copy->strings = WCMD_dupenv (env); if (env_copy->strings) { + env_copy->batchhandle = context->h; env_copy->next = saved_environment; saved_environment = env_copy; @@ -2127,7 +2130,12 @@ void WCMD_endlocal (void) { struct env_stack *temp; int len, n; - if (!saved_environment) + /* setlocal does nothing outside of batch programs */ + if (!context) return; + + /* setlocal needs a saved environment from within the same context (batch + program) as it was saved in */ + if (!saved_environment || saved_environment->batchhandle != context->h) return; /* pop the old environment from the stack */ diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index f564aed..d89721a 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1659,27 +1659,163 @@ cmd /e:oN /C tmp.cmd rem FIXME: creating file before setting envvar value to prevent parsing-time evaluation (due to EnableDelayedExpansion not being implemented/available yet) echo --- setlocal with corresponding endlocal +rem %CD% does not tork on NT4 so use the following workaround +for /d %%i in (.) do set CURDIR=%%~dpnxi echo @echo off> test.cmd echo echo %%VAR%%>> test.cmd echo setlocal>> test.cmd echo set VAR=localval>> test.cmd +echo md foobar2>> test.cmd +echo cd foobar2>> test.cmd echo echo %%VAR%%>> test.cmd +echo for /d %%%%i in (.) do echo %%%%~dpnxi>> test.cmd echo endlocal>> test.cmd echo echo %%VAR%%>> test.cmd +echo for /d %%%%i in (.) do echo %%%%~dpnxi>> test.cmd set VAR=globalval call test.cmd echo %VAR% +for /d %%i in (.) do echo %%~dpnxi +cd /d %curdir% +rd foobar2 set VAR= echo --- setlocal with no corresponding endlocal echo @echo off> test.cmd echo echo %%VAR%%>> test.cmd echo setlocal>> test.cmd echo set VAR=localval>> test.cmd +echo md foobar2>> test.cmd +echo cd foobar2>> test.cmd echo echo %%VAR%%>> test.cmd +echo for /d %%%%i in (.) do echo %%%%~dpnxi>> test.cmd set VAR=globalval +rem %CD% does not tork on NT4 so use the following workaround +for /d %%i in (.) do set CURDIR=%%~dpnxi call test.cmd echo %VAR% +for /d %%i in (.) do echo %%~dpnxi +cd /d %curdir% +rd foobar2 set VAR= +echo --- setlocal within same batch program +set var1=one +set var2= +set var3= +rem %CD% does not tork on NT4 so use the following workaround +for /d %%i in (.) do set CURDIR=%%~dpnxi +setlocal +set var2=two +mkdir foobar2 +cd foobar2 +setlocal +set var3=three +if "%var1%"=="one" echo Var1 ok 1 +if "%var2%"=="two" echo Var2 ok 2 +if "%var3%"=="three" echo Var3 ok 3 +for /d %%i in (.) do set curdir2=%%~dpnxi +if "%curdir2%"=="%curdir%\foobar2" echo Directory is ok 1 +endlocal +if "%var1%"=="one" echo Var1 ok 1 +if "%var2%"=="two" echo Var2 ok 2 +if "%var3%"=="" echo Var3 ok 3 +for /d %%i in (.) do set curdir2=%%~dpnxi +if "%curdir2%"=="%curdir%\foobar2" echo Directory is ok 2 +endlocal +if "%var1%"=="one" echo Var1 ok 1 +if "%var2%"=="" echo Var2 ok 2 +if "%var3%"=="" echo Var3 ok 3 +for /d %%i in (.) do set curdir2=%%~dpnxi +if "%curdir2%"=="%curdir%" echo Directory is ok 3 +rd foobar2 /s /q +set var1= + +echo --- Mismatched set and end locals +mkdir foodir2 2>nul +mkdir foodir3 2>nul +mkdir foodir4 2>nul +rem %CD% does not tork on NT4 so use the following workaround +for /d %%i in (.) do set curdir=%%~dpnxi + +echo @echo off> 2set1end.cmd +echo echo %%VAR%%>> 2set1end.cmd +echo setlocal>> 2set1end.cmd +echo set VAR=2set1endvalue1>> 2set1end.cmd +echo cd ..\foodir3>> 2set1end.cmd +echo setlocal>> 2set1end.cmd +echo set VAR=2set1endvalue2>> 2set1end.cmd +echo cd ..\foodir4>> 2set1end.cmd +echo endlocal>> 2set1end.cmd +echo echo %%VAR%%>> 2set1end.cmd +echo for /d %%%%i in (.) do echo %%%%~dpnxi>> 2set1end.cmd + +echo @echo off> 1set2end.cmd +echo echo %%VAR%%>> 1set2end.cmd +echo setlocal>> 1set2end.cmd +echo set VAR=1set2endvalue1>> 1set2end.cmd +echo cd ..\foodir3>> 1set2end.cmd +echo endlocal>> 1set2end.cmd +echo echo %%VAR%%>> 1set2end.cmd +echo for /d %%%%i in (.) do echo %%%%~dpnxi>> 1set2end.cmd +echo endlocal>> 1set2end.cmd +echo echo %%VAR%%>> 1set2end.cmd +echo for /d %%%%i in (.) do echo %%%%~dpnxi>> 1set2end.cmd + +echo --- Extra setlocal in called batch +set VAR=value1 +rem -- setlocal1 == this batch, should never be used inside a called routine +setlocal +set var=value2 +cd foodir2 +call %curdir%\2set1end.cmd +echo Finished: +echo %VAR% +for /d %%i in (.) do echo %%~dpnxi +endlocal +echo %VAR% +for /d %%i in (.) do echo %%~dpnxi +cd /d %curdir% + +echo --- Extra endlocal in called batch +set VAR=value1 +rem -- setlocal1 == this batch, should never be used inside a called routine +setlocal +set var=value2 +cd foodir2 +call %curdir%\1set2end.cmd +echo Finished: +echo %VAR% +for /d %%i in (.) do echo %%~dpnxi +endlocal +echo %VAR% +for /d %%i in (.) do echo %%~dpnxi +cd /d %curdir% + +echo --- endlocal in called function rather than batch pgm is ineffective +(a)echo off +set var=1 +set var2=1 +setlocal +set var=2 +call :endlocalroutine +echo %var% +endlocal +echo %var% +goto :endlocalfinished +:endlocalroutine +echo %var% +endlocal +echo %var% +setlocal +set var2=2 +endlocal +echo %var2% +endlocal +echo %var% +echo %var2% +goto :eof +:endlocalfinished +echo %var% + cd .. & rd /q/s foobar echo ------------ Testing Errorlevel ------------ diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 435d0e6..4bab1ef 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -853,12 +853,60 @@ ErrLev: 0 --- setlocal with corresponding endlocal globalval localval +(a)pwd@\foobar\foobar2 globalval +(a)pwd@\foobar globalval +(a)pwd@\foobar --- setlocal with no corresponding endlocal globalval localval -(a)todo_wine@globalval +(a)pwd@\foobar\foobar2 +globalval +(a)pwd@\foobar +--- setlocal within same batch program +Var1 ok 1 +Var2 ok 2 +Var3 ok 3 +Directory is ok 1 +Var1 ok 1 +Var2 ok 2 +Var3 ok 3 +Directory is ok 2 +Var1 ok 1 +Var2 ok 2 +Var3 ok 3 +Directory is ok 3 +--- Mismatched set and end locals +--- Extra setlocal in called batch +value2 +2set1endvalue1 +(a)pwd@\foobar\foodir3 +Finished: +value2 +(a)pwd@\foobar\foodir2 +value1 +(a)pwd@\foobar +--- Extra endlocal in called batch +value2 +value2 +(a)pwd@\foobar\foodir2 +value2 +(a)pwd@\foobar\foodir2 +Finished: +value2 +(a)pwd@\foobar\foodir2 +value1 +(a)pwd@\foobar +--- endlocal in called function rather than batch pgm is ineffective +2 +2 +1 +2 +1 +2 +1 +1 ------------ Testing Errorlevel ------------ 9009 1 diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 451c49b..32edc2b 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -146,9 +146,10 @@ struct env_stack struct env_stack *next; union { int stackdepth; /* Only used for pushd and popd */ - WCHAR cwd; /* Only used for set/endlocal */ + WCHAR cwd; /* Only used for set/endlocal */ } u; WCHAR *strings; + HANDLE batchhandle; /* Used to ensure set/endlocals stay in scope */ }; /* Data structure to save setlocal and pushd information */

1 0

Jason Edmeades : cmd: Ensure current directory saved during cmd /c.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 4e10456bf61c444bac39ad278e63aa5a9e9cb399 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e10456bf61c444bac39ad278… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Mon Oct 1 00:12:59 2012 +0100 cmd: Ensure current directory saved during cmd /c. --- programs/cmd/wcmdmain.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 64dd21d..02babea 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2509,6 +2509,15 @@ int wmain (int argc, WCHAR *argvW[]) WCMD_strip_quotes(cmd); } + /* Save cwd into appropriate env var (Must be before the /c processing */ + GetCurrentDirectoryW(sizeof(string)/sizeof(WCHAR), string); + if (IsCharAlphaW(string[0]) && string[1] == ':') { + static const WCHAR fmt[] = {'=','%','c',':','\0'}; + wsprintfW(envvar, fmt, string[0]); + SetEnvironmentVariableW(envvar, string); + WINE_TRACE("Set %s to %s\n", wine_dbgstr_w(envvar), wine_dbgstr_w(string)); + } + if (opt_c) { /* If we do a "cmd /c command", we don't want to allocate a new * console since the command returns immediately. Rather, we use @@ -2602,15 +2611,6 @@ int wmain (int argc, WCHAR *argvW[]) } - /* Save cwd into appropriate env var */ - GetCurrentDirectoryW(1024, string); - if (IsCharAlphaW(string[0]) && string[1] == ':') { - static const WCHAR fmt[] = {'=','%','c',':','\0'}; - wsprintfW(envvar, fmt, string[0]); - SetEnvironmentVariableW(envvar, string); - WINE_TRACE("Set %s to %s\n", wine_dbgstr_w(envvar), wine_dbgstr_w(string)); - } - if (opt_k) { /* Parse the command string, without reading any more input */ WCMD_ReadAndParseLine(cmd, &toExecute, INVALID_HANDLE_VALUE);

1 0

Piotr Caban : wininet: Added more fields to cookie structure.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: ee47def0adf81da86c8a6ff9ced626124cca0fd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee47def0adf81da86c8a6ff9c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 1 14:20:35 2012 +0200 wininet: Added more fields to cookie structure. --- dlls/wininet/cookie.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 8552548..6f21628 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -65,7 +65,9 @@ struct _cookie LPWSTR lpCookieName; LPWSTR lpCookieData; + DWORD flags; FILETIME expiry; + FILETIME create; }; struct _cookie_domain @@ -90,14 +92,25 @@ static void COOKIE_deleteDomain(cookie_domain *deadDomain); static cookie *COOKIE_addCookie(cookie_domain *domain, LPCWSTR name, LPCWSTR data, FILETIME expiry) { cookie *newCookie = heap_alloc(sizeof(cookie)); + if (!newCookie) + return NULL; - list_init(&newCookie->entry); - newCookie->lpCookieName = NULL; - newCookie->lpCookieData = NULL; - newCookie->expiry = expiry; newCookie->lpCookieName = heap_strdupW(name); newCookie->lpCookieData = heap_strdupW(data); + if (!newCookie->lpCookieName || !newCookie->lpCookieData) + { + heap_free(newCookie->lpCookieName); + heap_free(newCookie->lpCookieData); + heap_free(newCookie); + + return NULL; + } + + newCookie->flags = 0; /* TODO */ + newCookie->expiry = expiry; + GetSystemTimeAsFileTime(&newCookie->create); + TRACE("added cookie %p (data is %s)\n", newCookie, debugstr_w(data) ); list_add_tail(&domain->cookie_list, &newCookie->entry);

1 0

Piotr Caban : wininet: Added support for urlcache file name generating.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: e4a0281679ee8436a8a4632590d11f0f5c675776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4a0281679ee8436a8a463259… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 1 14:21:04 2012 +0200 wininet: Added support for urlcache file name generating. --- dlls/wininet/urlcache.c | 41 +++++++++++++++++++++++++++++------------ 1 files changed, 29 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 249ac46..24bf48b 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2861,13 +2861,13 @@ BOOL WINAPI CreateUrlCacheEntryW( BYTE CacheDir; LONG lBufferSize; BOOL bFound = FALSE; + BOOL generate_name = FALSE; int count; DWORD error; HANDLE hFile; FILETIME ft; static const WCHAR szWWW[] = {'w','w','w',0}; - static const WCHAR fmt[] = {'%','0','8','X','%','s',0}; TRACE("(%s, 0x%08x, %s, %p, 0x%08x)\n", debugstr_w(lpszUrlName), @@ -2879,7 +2879,7 @@ BOOL WINAPI CreateUrlCacheEntryW( if (dwReserved) FIXME("dwReserved 0x%08x\n", dwReserved); - lpszUrlEnd = lpszUrlName + strlenW(lpszUrlName); + lpszUrlEnd = lpszUrlName + strlenW(lpszUrlName); if (((lpszUrlEnd - lpszUrlName) > 1) && (*(lpszUrlEnd - 1) == '/' || *(lpszUrlEnd - 1) == '\\')) lpszUrlEnd--; @@ -2917,14 +2917,14 @@ BOOL WINAPI CreateUrlCacheEntryW( while(len && szFile[--len] == '/') szFile[len] = '\0'; /* FIXME: get rid of illegal characters like \, / and : */ + TRACE("File name: %s\n", debugstr_a(szFile)); } else { - FIXME("need to generate a random filename\n"); + generate_name = TRUE; + szFile[0] = 0; } - TRACE("File name: %s\n", debugstr_a(szFile)); - error = URLCacheContainers_FindContainerW(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) { @@ -2978,7 +2978,7 @@ BOOL WINAPI CreateUrlCacheEntryW( lstrcpyW(szExtension+1, lpszFileExtension); } - for (i = 0; i < 255; i++) + for (i = 0; i<255 && !generate_name; i++) { static const WCHAR szFormat[] = {'[','%','u',']','%','s',0}; WCHAR *p; @@ -3008,15 +3008,32 @@ BOOL WINAPI CreateUrlCacheEntryW( } } + /* Try to generate random name */ GetSystemTimeAsFileTime(&ft); - wsprintfW(lpszFileNameNoPath + countnoextension, fmt, ft.dwLowDateTime, szExtension); + strcpyW(lpszFileNameNoPath+countnoextension+8, szExtension); - TRACE("Trying: %s\n", debugstr_w(lpszFileName)); - hFile = CreateFileW(lpszFileName, GENERIC_READ, 0, NULL, CREATE_NEW, 0, NULL); - if (hFile != INVALID_HANDLE_VALUE) + for(i=0; i<255; i++) { - CloseHandle(hFile); - return TRUE; + int j; + ULONGLONG n = ft.dwHighDateTime; + n <<= 32; + n += ft.dwLowDateTime; + n ^= (ULONGLONG)i<<48; + + for(j=0; j<8; j++) + { + int r = (n % 36); + n /= 37; + lpszFileNameNoPath[countnoextension+j] = (r < 10 ? '0' + r : 'A' + r - 10); + } + + TRACE("Trying: %s\n", debugstr_w(lpszFileName)); + hFile = CreateFileW(lpszFileName, GENERIC_READ, 0, NULL, CREATE_NEW, 0, NULL); + if (hFile != INVALID_HANDLE_VALUE) + { + CloseHandle(hFile); + return TRUE; + } } WARN("Could not find a unique filename\n");

1 0

Piotr Caban : wininet: Added support for persistent cookies.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: b49c980d0d003f1cbaa750ded2b60fc143b04c1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b49c980d0d003f1cbaa750ded… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 1 14:21:59 2012 +0200 wininet: Added support for persistent cookies. --- dlls/wininet/cookie.c | 297 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 279 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b49c980d0d003f1cbaa75…

1 0

Piotr Caban : wininet: Added basic persistent cookie tests.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: c34bc977a012957b56076f65f227c2c58af7e7f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c34bc977a012957b56076f65f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 1 14:22:27 2012 +0200 wininet: Added basic persistent cookie tests. --- dlls/wininet/tests/internet.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index a0b6466..5a8ba99 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <stdio.h> #include <string.h> #include "windef.h" #include "winbase.h" @@ -368,6 +369,7 @@ static void test_complicated_cookie(void) BOOL ret; CHAR buffer[1024]; + CHAR user[256]; ret = InternetSetCookie("http://www.example.com/bar",NULL,"A=B; domain=.example.com"); ok(ret == TRUE,"InternetSetCookie failed\n"); @@ -471,6 +473,29 @@ static void test_complicated_cookie(void) ok(strstr(buffer,"K=L")!=NULL,"K=L missing\n"); ok(strstr(buffer,"M=N")==NULL,"M=N present\n"); ok(strstr(buffer,"O=P")==NULL,"O=P present\n"); + + /* test persistent cookies */ + ret = InternetSetCookie("http://testing.example.com", NULL, "A=B; expires=Fri, 01-Jan-2038 00:00:00 GMT"); + ok(ret, "InternetSetCookie failed with error %d\n", GetLastError()); + + len = sizeof(user); + ret = GetUserName(user, &len); + ok(ret, "GetUserName failed with error %d\n", GetLastError()); + for(; len>0; len--) + user[len-1] = tolower(user[len-1]); + + sprintf(buffer, "Cookie:%s(a)testing.example.com/", user); + ret = GetUrlCacheEntryInfo(buffer, NULL, &len); + ok(!ret, "GetUrlCacheEntryInfo succeeded\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetLastError() = %d\n", GetLastError()); + + /* remove persistent cookie */ + ret = InternetSetCookie("http://testing.example.com", NULL, "A=B"); + ok(ret, "InternetSetCookie failed with error %d\n", GetLastError()); + + ret = GetUrlCacheEntryInfo(buffer, NULL, &len); + ok(!ret, "GetUrlCacheEntryInfo succeeded\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() = %d\n", GetLastError()); } static void test_cookie_url(void)

1 0