January 2011 - Wine-Commits

Henri Verbeet : wined3d: Set color / depth / stencil surfaces to NULL before releasing them in IWineD3DDeviceImpl_Uninit3D ().
by Alexandre Julliard Jan. 31, 2011

Jan. 31, 2011

Module: wine Branch: master Commit: a538d28f28308b08d700c1c4d1c84b08d3ee4861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a538d28f28308b08d700c1c4d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 28 20:05:40 2011 +0100 wined3d: Set color / depth / stencil surfaces to NULL before releasing them in IWineD3DDeviceImpl_Uninit3D(). --- dlls/wined3d/device.c | 41 ++++++++++++++++++++++------------------- 1 files changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 676eafc..d5ae431 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2112,6 +2112,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; const struct wined3d_gl_info *gl_info; + struct IWineD3DSurfaceImpl *surface; struct wined3d_context *context; int sampler; UINT i; @@ -2200,44 +2201,46 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, /* Release the buffers (with sanity checks)*/ if (This->onscreen_depth_stencil) { - IWineD3DSurface_Release((IWineD3DSurface *)This->onscreen_depth_stencil); + surface = This->onscreen_depth_stencil; This->onscreen_depth_stencil = NULL; + IWineD3DSurface_Release((IWineD3DSurface *)surface); } if (This->depth_stencil) { - IWineD3DSurfaceImpl *ds = This->depth_stencil; + surface = This->depth_stencil; - TRACE("Releasing depth/stencil buffer %p.\n", ds); + TRACE("Releasing depth/stencil buffer %p.\n", surface); This->depth_stencil = NULL; - if (IWineD3DSurface_Release((IWineD3DSurface *)ds) - && ds != This->auto_depth_stencil) + if (IWineD3DSurface_Release((IWineD3DSurface *)surface) + && surface != This->auto_depth_stencil) { - ERR("Something is still holding a reference to depth/stencil buffer %p.\n", ds); + ERR("Something is still holding a reference to depth/stencil buffer %p.\n", surface); } } - for (i = 1; i < gl_info->limits.buffers; ++i) - { - IWineD3DDevice_SetRenderTarget(iface, i, NULL, FALSE); - } - - TRACE("Releasing the render target at %p\n", This->render_targets[0]); - IWineD3DSurface_Release((IWineD3DSurface *)This->render_targets[0]); - - TRACE("Setting rendertarget to NULL\n"); - This->render_targets[0] = NULL; - if (This->auto_depth_stencil) { - if (IWineD3DSurface_Release((IWineD3DSurface *)This->auto_depth_stencil)) + surface = This->auto_depth_stencil; + This->auto_depth_stencil = NULL; + if (IWineD3DSurface_Release((IWineD3DSurface *)surface)) { FIXME("(%p) Something's still holding the auto depth stencil buffer\n", This); } - This->auto_depth_stencil = NULL; } + for (i = 1; i < gl_info->limits.buffers; ++i) + { + IWineD3DDevice_SetRenderTarget(iface, i, NULL, FALSE); + } + + surface = This->render_targets[0]; + TRACE("Setting rendertarget 0 to NULL\n"); + This->render_targets[0] = NULL; + TRACE("Releasing the render target at %p\n", surface); + IWineD3DSurface_Release((IWineD3DSurface *)surface); + context_release(context); for (i = 0; i < This->NumberOfSwapChains; ++i)

1 0

Nikolay Sivov : comctl32/tests: Initialize item mask on item insert ( Valgrind).
by Alexandre Julliard Jan. 31, 2011

Jan. 31, 2011

Module: wine Branch: master Commit: 0edfb1b4a07b468309da85587d967f6afb0cc611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0edfb1b4a07b468309da85587… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 29 11:02:43 2011 +0300 comctl32/tests: Initialize item mask on item insert (Valgrind). --- dlls/comctl32/tests/treeview.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 457dd70..5ef277c 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1425,12 +1425,14 @@ static void test_htreeitem_layout(void) ins.hParent = hChild; ins.hInsertAfter = TVI_FIRST; + ins.item.mask = 0; item1 = TreeView_InsertItem(hTree, &ins); check_item(item1, hChild, 0, 0); ins.hParent = hRoot; ins.hInsertAfter = TVI_FIRST; + ins.item.mask = 0; item2 = TreeView_InsertItem(hTree, &ins); check_item(item2, hRoot, hChild, 0);

1 0

Henri Verbeet : wined3d: Get rid of the IWineD3DStateBlockImpl typedef.
by Alexandre Julliard Jan. 31, 2011

Jan. 31, 2011

Module: wine Branch: master Commit: 96d225d4dd6459684989f3cf9a6b4dffa1516b4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=96d225d4dd6459684989f3cf9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 28 20:05:43 2011 +0100 wined3d: Get rid of the IWineD3DStateBlockImpl typedef. --- dlls/wined3d/arb_program_shader.c | 23 ++-- dlls/wined3d/ati_fragment_shader.c | 16 ++-- dlls/wined3d/device.c | 8 +- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/nvidia_texture_shader.c | 8 +- dlls/wined3d/state.c | 224 +++++++++++++++++----------------- dlls/wined3d/stateblock.c | 10 +- dlls/wined3d/swapchain_base.c | 8 +- dlls/wined3d/utils.c | 5 +- dlls/wined3d/wined3d_private.h | 38 +++---- 10 files changed, 168 insertions(+), 174 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96d225d4dd6459684989f…

1 0

Nikolay Sivov : explorerframe/tests: Initialize hit test point before first use (Valgrind).
by Alexandre Julliard Jan. 31, 2011

Jan. 31, 2011

Module: wine Branch: master Commit: 5f26248a39a9c61f4dcafd53fcf410083dbcfeba URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f26248a39a9c61f4dcafd53f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 29 11:26:59 2011 +0300 explorerframe/tests: Initialize hit test point before first use (Valgrind). --- dlls/explorerframe/tests/nstc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 2022828..df69a1a 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -1611,6 +1611,7 @@ static void test_basics(void) ok(hr == E_POINTER, "Got 0x%08x\n", hr); psi = (void*)0xdeadbeef; + pt.x = pt.y = 0; hr = INameSpaceTreeControl_HitTest(pnstc, &pt, &psi); ok(hr == S_FALSE, "Got 0x%08x\n", hr); ok(psi == NULL, "Got psi %p\n", psi); @@ -1621,7 +1622,6 @@ static void test_basics(void) ok(hr == S_OK, "Got 0x%08x\n", hr); process_msgs(); - pt.x = pt.y = 0; hr = INameSpaceTreeControl_HitTest(pnstc, &pt, &psi); ok(hr == S_OK, "Got 0x%08x\n", hr); if(SUCCEEDED(hr))

1 0

Henri Verbeet : wined3d: Get rid of the IWineD3DStateBlock typedef.
by Alexandre Julliard Jan. 31, 2011

Jan. 31, 2011

Module: wine Branch: master Commit: b98cd5d982be5094be585e83daeb8bea7d301fda URL: http://source.winehq.org/git/wine.git/?a=commit;h=b98cd5d982be5094be585e83d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 28 20:05:42 2011 +0100 wined3d: Get rid of the IWineD3DStateBlock typedef. --- dlls/wined3d/device.c | 28 +++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0d45b8b..5de080f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1007,7 +1007,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateIndexBuffer(IWineD3DDevice *iface } static HRESULT WINAPI IWineD3DDeviceImpl_CreateStateBlock(IWineD3DDevice *iface, - WINED3DSTATEBLOCKTYPE type, IWineD3DStateBlock **stateblock) + WINED3DSTATEBLOCKTYPE type, struct wined3d_stateblock **stateblock) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DStateBlockImpl *object; @@ -1029,7 +1029,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateStateBlock(IWineD3DDevice *iface, } TRACE("Created stateblock %p.\n", object); - *stateblock = (IWineD3DStateBlock *)object; + *stateblock = object; return WINED3D_OK; } @@ -1886,7 +1886,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, if(!This->adapter->opengl) return WINED3DERR_INVALIDCALL; TRACE("(%p) : Creating stateblock\n", This); - hr = IWineD3DDevice_CreateStateBlock(iface, WINED3DSBT_INIT, (IWineD3DStateBlock **)&This->stateBlock); + hr = IWineD3DDevice_CreateStateBlock(iface, WINED3DSBT_INIT, &This->stateBlock); if (FAILED(hr)) { WARN("Failed to create stateblock\n"); @@ -4637,9 +4637,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetDisplayMode(IWineD3DDevice *iface, U * Stateblock related functions *****/ -static HRESULT WINAPI IWineD3DDeviceImpl_BeginStateBlock(IWineD3DDevice *iface) { +static HRESULT WINAPI IWineD3DDeviceImpl_BeginStateBlock(IWineD3DDevice *iface) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DStateBlock *stateblock; + struct wined3d_stateblock *stateblock; HRESULT hr; TRACE("(%p)\n", This); @@ -4658,24 +4659,29 @@ static HRESULT WINAPI IWineD3DDeviceImpl_BeginStateBlock(IWineD3DDevice *iface) return WINED3D_OK; } -static HRESULT WINAPI IWineD3DDeviceImpl_EndStateBlock(IWineD3DDevice *iface, IWineD3DStateBlock** ppStateBlock) { +static HRESULT WINAPI IWineD3DDeviceImpl_EndStateBlock(IWineD3DDevice *iface, + struct wined3d_stateblock **stateblock) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DStateBlockImpl *object = This->updateStateBlock; + TRACE("iface %p, stateblock %p.\n", iface, stateblock); + if (!This->isRecordingState) { WARN("(%p) not recording! returning error\n", This); - *ppStateBlock = NULL; + *stateblock = NULL; return WINED3DERR_INVALIDCALL; } stateblock_init_contained_states(object); - *ppStateBlock = (IWineD3DStateBlock*) object; + *stateblock = object; This->isRecordingState = FALSE; This->updateStateBlock = This->stateBlock; wined3d_stateblock_incref(This->updateStateBlock); - /* IWineD3DStateBlock_AddRef(*ppStateBlock); don't need to do this, since we should really just release UpdateStateBlock first */ - TRACE("(%p) returning token (ptr to stateblock) of %p\n", This, *ppStateBlock); + + TRACE("Returning stateblock %p.\n", *stateblock); + return WINED3D_OK; } @@ -6521,7 +6527,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice *iface, } /* Note: No parent needed for initial internal stateblock */ - hr = IWineD3DDevice_CreateStateBlock(iface, WINED3DSBT_INIT, (IWineD3DStateBlock **)&This->stateBlock); + hr = IWineD3DDevice_CreateStateBlock(iface, WINED3DSBT_INIT, &This->stateBlock); if (FAILED(hr)) ERR("Resetting the stateblock failed with error 0x%08x\n", hr); else TRACE("Created stateblock %p\n", This->stateBlock); This->updateStateBlock = This->stateBlock; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2693031..7fc57b9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -53,7 +53,6 @@ #define WINED3D_QUIRK_FBO_TEX_UPDATE 0x00000020 typedef struct wined3d_stateblock IWineD3DStateBlockImpl; -typedef struct wined3d_stateblock IWineD3DStateBlock; typedef struct IWineD3DSurfaceImpl IWineD3DSurfaceImpl; typedef struct IWineD3DPaletteImpl IWineD3DPaletteImpl; typedef struct IWineD3DDeviceImpl IWineD3DDeviceImpl;

1 0

Detlef Riekenberg : msvcrt: Add private define and header tests for _set_error_mode options.
by Alexandre Julliard Jan. 28, 2011

Jan. 28, 2011

Module: wine Branch: master Commit: 58786dc8ea237cf646e62edb865dc260684eb784 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58786dc8ea237cf646e62edb8… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jan 28 15:49:27 2011 +0100 msvcrt: Add private define and header tests for _set_error_mode options. --- dlls/msvcrt/msvcrt.h | 2 ++ dlls/msvcrt/tests/headers.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 5176802..5544722 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -568,6 +568,8 @@ struct MSVCRT__stat64 { #define MSVCRT__USEDENTRY 1 #define MSVCRT__OUT_TO_DEFAULT 0 +#define MSVCRT__OUT_TO_STDERR 1 +#define MSVCRT__OUT_TO_MSGBOX 2 #define MSVCRT__REPORT_ERRMODE 3 /* ASCII char classification table - binary compatible */ diff --git a/dlls/msvcrt/tests/headers.c b/dlls/msvcrt/tests/headers.c index f02b61f..25e2277 100644 --- a/dlls/msvcrt/tests/headers.c +++ b/dlls/msvcrt/tests/headers.c @@ -340,6 +340,8 @@ static void test_defines(void) CHECK_DEF(_FREEENTRY); CHECK_DEF(_USEDENTRY); CHECK_DEF(_OUT_TO_DEFAULT); + CHECK_DEF(_OUT_TO_STDERR); + CHECK_DEF(_OUT_TO_MSGBOX); CHECK_DEF(_REPORT_ERRMODE); CHECK_DEF(_UPPER); CHECK_DEF(_LOWER);

1 0

Charles Davis : ntdll: Check for case-insensitive volumes.
by Alexandre Julliard Jan. 28, 2011

Jan. 28, 2011

Module: wine Branch: master Commit: 4e44e153c5c78339f17baeabe22f2015cfc8737c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e44e153c5c78339f17baeabe… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Tue Jan 18 13:09:44 2011 -0700 ntdll: Check for case-insensitive volumes. --- configure | 2 + configure.ac | 2 + dlls/ntdll/directory.c | 245 ++++++++++++++++++++++++++++++++++++++++++++++++ include/config.h.in | 6 + 4 files changed, 255 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4e44e153c5c78339f17ba…

1 0

Greg Geldorp : winmm/tests: Skip some tests on VMware.
by Alexandre Julliard Jan. 28, 2011

Jan. 28, 2011

Module: wine Branch: master Commit: e45caf5d6b89599fb13e906492c50aa9d1ed945d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e45caf5d6b89599fb13e90649… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Fri Jan 28 13:30:21 2011 +0100 winmm/tests: Skip some tests on VMware. --- dlls/winmm/tests/Makefile.in | 2 +- dlls/winmm/tests/midi.c | 82 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 78 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/tests/Makefile.in b/dlls/winmm/tests/Makefile.in index 4a74bdf..fcd8ece 100644 --- a/dlls/winmm/tests/Makefile.in +++ b/dlls/winmm/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = winmm.dll -IMPORTS = winmm user32 +IMPORTS = winmm user32 advapi32 C_SRCS = \ capture.c \ diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index 01055e3..e40e1d7 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -625,6 +625,72 @@ static void test_midiStream(UINT udev, HWND hwnd) } } +static BOOL scan_subkeys(HKEY parent, const LPCSTR *sub_keys) +{ + char name[64]; + DWORD index = 0; + DWORD name_len = sizeof(name); + BOOL found_vmware = FALSE; + + if (sub_keys[0] == NULL) + { + /* We're at the deepest level, check "Identifier" value now */ + char *test; + if (RegQueryValueExA(parent, "Identifier", NULL, NULL, (LPBYTE) name, &name_len) != ERROR_SUCCESS) + return FALSE; + for (test = name; test < name + lstrlenA(name) - 6 && ! found_vmware; test++) + { + char c = test[6]; + test[6] = '\0'; + found_vmware = (lstrcmpiA(test, "VMware") == 0); + test[6] = c; + } + return found_vmware; + } + + while (RegEnumKeyExA(parent, index, name, &name_len, NULL, NULL, NULL, NULL) == ERROR_SUCCESS && + ! found_vmware) { + char c = name[lstrlenA(sub_keys[0])]; + name[lstrlenA(sub_keys[0])] = '\0'; + if (lstrcmpiA(name, sub_keys[0]) == 0) { + HKEY sub_key; + name[lstrlenA(sub_keys[0])] = c; + if (RegOpenKeyExA(parent, name, 0, KEY_ENUMERATE_SUB_KEYS | KEY_QUERY_VALUE, &sub_key) == ERROR_SUCCESS) { + found_vmware = scan_subkeys(sub_key, sub_keys + 1); + RegCloseKey(sub_key); + } + } + + name_len = sizeof(name); + index++; + } + + return found_vmware; +} + +/* + * Usual method to detect whether running inside a VMware virtual machine involves direct port I/O requiring + * some assembly and an exception handler. Can't do that in Wine tests. Alternative method of querying WMI + * is not available on NT4. So instead we look at the device map and check the Identifier value in the + * registry keys HKLM\HARDWARE\DEVICEMAP\SCSI\Scsi Port x\Scsi Bus x\Target Id x\Logical Unit Id x (where + * x is some number). If the Identifier value contains the string "VMware" we assume running in a VMware VM. + */ +static BOOL on_vmware(void) +{ + static const LPCSTR sub_keys[] = { "Scsi Port ", "Scsi Bus ", "Target Id ", "Logical Unit Id ", NULL }; + HKEY scsi; + BOOL found_vmware = FALSE; + + if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, "HARDWARE\\DEVICEMAP\\Scsi", 0, KEY_ENUMERATE_SUB_KEYS, &scsi) != ERROR_SUCCESS) + return FALSE; + + found_vmware = scan_subkeys(scsi, sub_keys); + + RegCloseKey(scsi); + + return found_vmware; +} + static void test_midi_outfns(HWND hwnd) { HMIDIOUT hm; @@ -662,11 +728,17 @@ static void test_midi_outfns(HWND hwnd) test_midi_mci(hwnd); for (udev=0; udev < ndevs; udev++) { - trace("** Testing device %d\n", udev); - test_midiOut_device(udev, hwnd); - Sleep(800); /* Let the synth rest */ - test_midiStream(udev, hwnd); - Sleep(800); + MIDIOUTCAPSA capsA; + rc = midiOutGetDevCapsA(udev, &capsA, sizeof(capsA)); + if (rc || strcmp(capsA.szPname, "Creative Sound Blaster MPU-401") != 0 || ! on_vmware()) { + trace("** Testing device %d\n", udev); + test_midiOut_device(udev, hwnd); + Sleep(800); /* Let the synth rest */ + test_midiStream(udev, hwnd); + Sleep(800); + } + else + win_skip("Skipping this device on VMware, driver problem\n"); } trace("** Testing MIDI mapper\n"); test_midiOut_device(MIDIMAPPER, hwnd);

1 0

Alexander Morozov : shell32: Implement IShellDispatch::NameSpace.
by Alexandre Julliard Jan. 28, 2011

Jan. 28, 2011

Module: wine Branch: master Commit: 287009875324024f2b4fedea05b4542801a94330 URL: http://source.winehq.org/git/wine.git/?a=commit;h=287009875324024f2b4fedea0… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Tue Jan 18 21:37:20 2011 +0300 shell32: Implement IShellDispatch::NameSpace. --- dlls/shell32/shelldispatch.c | 326 +++++++++++++++++++++++++++++++++++- dlls/shell32/tests/shelldispatch.c | 5 - 2 files changed, 322 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=287009875324024f2b4fe…

1 0

Alexandre Julliard : server: Create anonymous file mappings in the config directory if the server directory is mounted noexec .
by Alexandre Julliard Jan. 28, 2011

Jan. 28, 2011

Module: wine Branch: master Commit: 8dbd06a1f8ab3f89e46be62e05a51f4b15f20b1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dbd06a1f8ab3f89e46be62e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 28 17:23:45 2011 +0100 server: Create anonymous file mappings in the config directory if the server directory is mounted noexec. --- server/mapping.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 41 insertions(+), 2 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index c8b8edf..5c77989 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -26,6 +26,9 @@ #include <stdio.h> #include <stdlib.h> #include <sys/stat.h> +#ifdef HAVE_SYS_MMAN_H +# include <sys/mman.h> +#endif #include <unistd.h> #include "ntstatus.h" @@ -161,13 +164,47 @@ static int grow_file( int unix_fd, file_pos_t new_size ) return 0; } +/* check if the current directory allows exec mappings */ +static int check_current_dir_for_exec(void) +{ + int fd; + char tmpfn[] = "anonmap.XXXXXX"; + void *ret = MAP_FAILED; + + fd = mkstemps( tmpfn, 0 ); + if (fd == -1) return 0; + if (grow_file( fd, 1 )) + { + ret = mmap( NULL, get_page_size(), PROT_READ | PROT_EXEC, MAP_PRIVATE, fd, 0 ); + if (ret != MAP_FAILED) munmap( ret, get_page_size() ); + } + close( fd ); + unlink( tmpfn ); + return (ret != MAP_FAILED); +} + /* create a temp file for anonymous mappings */ static int create_temp_file( file_pos_t size ) { - char tmpfn[16]; + static int temp_dir_fd = -1; + char tmpfn[] = "anonmap.XXXXXX"; int fd; - sprintf( tmpfn, "anonmap.XXXXXX" ); /* create it in the server directory */ + if (temp_dir_fd == -1) + { + temp_dir_fd = server_dir_fd; + if (!check_current_dir_for_exec()) + { + /* the server dir is noexec, try the config dir instead */ + fchdir( config_dir_fd ); + if (check_current_dir_for_exec()) + temp_dir_fd = config_dir_fd; + else /* neither works, fall back to server dir */ + fchdir( server_dir_fd ); + } + } + else if (temp_dir_fd != server_dir_fd) fchdir( temp_dir_fd ); + fd = mkstemps( tmpfn, 0 ); if (fd != -1) { @@ -179,6 +216,8 @@ static int create_temp_file( file_pos_t size ) unlink( tmpfn ); } else file_set_error(); + + if (temp_dir_fd != server_dir_fd) fchdir( server_dir_fd ); return fd; }

1 0