December 2009 - Wine-Devel - list.winehq.org

Fixing the kernel32:actctx tests on Vista+
by Paul Vriens Dec. 3, 2009

Dec. 3, 2009

Hi Jacek, You are the original author of these tests. Is there any reason the "test3.manifest" name is reused? The tests currently crash (intermittently on some) on Vista+ and with the attached patch things seem to get better. I'm just renaming one of the manifest files so there are no duplicates in these tests. -- Cheers, Paul.

4 7

Re: [PATCH 1/2] msvcrt: Add test to check if signal(SIGBREAK, ...) works (todo_wine).
by Charles Davis Dec. 3, 2009

Dec. 3, 2009

You don't get added to AUTHORS until you've hacked on Wine enough. I learned that the hard way when I tried to put my name at the top of an already-existing file. Chip

4 3

Re: [4/6] WineD3D: Infrastructure to render swapchains to a FBO
by Henri Verbeet Dec. 3, 2009

Dec. 3, 2009

2009/12/2 Stefan Dösinger <stefan(a)codeweavers.com>: > @@ -1082,6 +1082,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSwapChain(IWineD3DDevice *iface, > object->wineD3DDevice = This; > object->parent = parent; > object->ref = 1; > + object->render_to_fbo = FALSE; This is redundant, the field is already initialized to 0. > @@ -1880,6 +1881,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, > > switch(wined3d_settings.offscreen_rendering_mode) { > case ORM_FBO: > + This->offscreenBuffer = GL_COLOR_ATTACHMENT0; This change is probably correct, but note that if it matters you're probably doing something wrong. > @@ -959,22 +963,25 @@ static void read_from_framebuffer(IWineD3DSurfaceImpl *This, CONST RECT *rect, v ... > @@ -3102,7 +3109,7 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D ... > @@ -3241,12 +3248,12 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine Most of this should be part of patch 3. Note that since we have SFLAG_SWAPCHAIN we don't really need to pass the swapchain to surface_get_gl_buffer() anymore, we can just cast This->container directly to IWineD3DSwapChainImpl *. > +static inline void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_context *context) We have a number of functions now that do something very similar to what this function does. Perhaps it's time to spend some time on our blitter in order to unify those?

2 3

Re: [5/6] imagehlp: Recalculate PE checksum after file modification
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Owen Rudge <orudge(a)codeweavers.com> writes: > +static BOOL IMAGEHLP_RecalculateChecksum(HANDLE handle) > +{ > + IMAGE_DOS_HEADER dos_hdr; > + IMAGE_NT_HEADERS nt_hdr; > + HANDLE hMapping; > + LPVOID BaseAddress; > + DWORD FileLength, count, HeaderSum, CheckSum = 0; > + BOOL r; > + > + TRACE("handle %p\n", handle); > + > + /* read the DOS header */ > + count = SetFilePointer(handle, 0, NULL, FILE_BEGIN); > + > + if (count == INVALID_SET_FILE_POINTER) > + return FALSE; > + > + count = 0; > + > + r = ReadFile(handle, &dos_hdr, sizeof dos_hdr, &count, NULL); > + > + if (!r) > + return FALSE; > + > + if (count != sizeof dos_hdr) > + return FALSE; > + > + /* verify magic number of 'MZ' */ > + if (dos_hdr.e_magic != 0x5A4D) > + return FALSE; > + > + /* read the PE header */ > + count = SetFilePointer(handle, dos_hdr.e_lfanew, NULL, FILE_BEGIN); > + > + if (count == INVALID_SET_FILE_POINTER) > + return FALSE; > + > + count = 0; > + r = ReadFile(handle, &nt_hdr, sizeof nt_hdr, &count, NULL); > + > + if (!r) > + return FALSE; > + > + if (count != sizeof nt_hdr) > + return FALSE; > + > + /* verify NT signature */ > + if (nt_hdr.Signature != IMAGE_NT_SIGNATURE) > + return FALSE; Please write a helper for this, we don't need 3 implementations of the same thing. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [1/6] imagehlp: Verify magic numbers and pad certificates to 8 byte boundaries
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Owen Rudge <orudge(a)codeweavers.com> writes: > @@ -64,6 +64,10 @@ static BOOL IMAGEHLP_GetSecurityDirOffset( HANDLE handle, > if( count != sizeof dos_hdr ) > return FALSE; > > + /* verify magic number of 'MZ' */ > + if( dos_hdr.e_magic != 0x5A4D ) > + return FALSE; > + > /* read the PE header */ > count = SetFilePointer( handle, dos_hdr.e_lfanew, NULL, FILE_BEGIN ); > if( count == INVALID_SET_FILE_POINTER ) > @@ -75,6 +79,10 @@ static BOOL IMAGEHLP_GetSecurityDirOffset( HANDLE handle, > if( count != sizeof nt_hdr ) > return FALSE; > > + /* verify NT signature */ > + if( nt_hdr.Signature != IMAGE_NT_SIGNATURE ) > + return FALSE; > + > sd = &nt_hdr.OptionalHeader. > DataDirectory[IMAGE_FILE_SECURITY_DIRECTORY]; You also need to check the optional header magic to differentiate between 32-bit and 64-bit PE files. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: ntdll: add partial support for HEAP_FREE_CHECKING_ENABLED heap overrun detection (take 2)
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Dan Kegel <dank(a)kegel.com> writes: > @@ -467,6 +475,156 @@ static void test_HeapQueryInformation(void) > ok(info == 0 || info == 1 || info == 2, "expected 0, 1 or 2, got %u\n", info); > } > > +static LPVOID (WINAPI * pRtlAllocateHeap)(HANDLE,ULONG,ULONG); > +static HANDLE (WINAPI * pRtlCreateHeap)(ULONG,PVOID,SIZE_T,SIZE_T,PVOID,PRTL_HEAP_DEFINITION); > +static HANDLE (WINAPI * pRtlDestroyHeap)(HANDLE); > +static NTSTATUS (WINAPI * pRtlFreeHeap)(HANDLE, ULONG, PVOID); > +static ULONG (WINAPI * pRtlGetNtGlobalFlags)(void); > +static LPVOID (WINAPI * pRtlReAllocateHeap)(HANDLE, ULONG, PVOID, ULONG); > +static SIZE_T (WINAPI * pRtlSizeHeap)( HANDLE, ULONG, LPCVOID); > +static BOOLEAN (WINAPI * pRtlValidateHeap)(HANDLE, ULONG, LPCVOID); > + > +static HMODULE hntdll; Now that it's in kernel32 you should of course use the kernel32 heap functions instead. > @@ -348,7 +349,10 @@ HANDLE thread_init(void) > peb->NtGlobalFlag = get_global_flag(); > > /* create the process heap */ > - if (!(peb->ProcessHeap = RtlCreateHeap( HEAP_GROWABLE, NULL, 0, 0, NULL, NULL ))) > + heapflags = HEAP_GROWABLE; > + if (peb->NtGlobalFlag & FLG_HEAP_ENABLE_FREE_CHECK) > + heapflags |= HEAP_FREE_CHECKING_ENABLED; > + if (!(peb->ProcessHeap = RtlCreateHeap( heapflags, NULL, 0, 0, NULL, NULL ))) Is there any reason for not doing this for all created heaps, instead of just the main one? -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [2/6] WineD3D: Add a function for initializing surface sysmem
by Henri Verbeet Dec. 3, 2009

Dec. 3, 2009

2009/12/2 Stefan Dösinger <stefan(a)codeweavers.com>: > - updateSurfaceDesc((IWineD3DSurfaceImpl *)swapchain->frontBuffer, pPresentationParameters); > + hr = updateSurfaceDesc((IWineD3DSurfaceImpl *)swapchain->frontBuffer, pPresentationParameters); > + if(FAILED(hr)) > + { > + IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); > + return hr; > + } > + > for(i = 0; i < swapchain->presentParms.BackBufferCount; i++) { > - updateSurfaceDesc((IWineD3DSurfaceImpl *)swapchain->backBuffer[i], pPresentationParameters); > + hr = updateSurfaceDesc((IWineD3DSurfaceImpl *)swapchain->backBuffer[i], pPresentationParameters); > + if(FAILED(hr)) > + { > + IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); > + return hr; > + } > } IWineD3DDeviceImpl_Reset() suffers from similar issues in general, so maybe we just don't care, but if one of the updateSurfaceDesc() calls fails you're left with inconsistent surface sizes. > + This->Flags |= SFLAG_INSYSMEM; Why is this in surface_init_sysmem(), instead of a ModifyLocation() call after the call to surface_init_sysmem()?

2 2

Re: RFC: dsound: Add support for enumerating capture devices through openal, try 4
by Ken Thomases Dec. 3, 2009

Dec. 3, 2009

On Dec 2, 2009, at 12:11 PM, Maarten Lankhorst wrote: > This patch doesn't apply, just a rfc email to see if this approach > is correct :) > +static void *openal_handle = RTLD_DEFAULT; > +#ifdef SONAME_LIBOPENAL > + char error[128]; > + openal_handle = wine_dlopen(SONAME_LIBOPENAL, RTLD_NOW, error, > sizeof(error)); > + if (!openal_handle) > + ERR("Couldn't load " SONAME_LIBOPENAL ": %s\n", error); > +#endif > +#define LOAD_FUNCPTR(f) \ > + if((p##f = wine_dlsym(openal_handle, #f, NULL, 0)) == NULL) { \ > + ERR("Couldn't lookup %s in libopenal\n", #f); \ > + failed = 1; \ > + } > + > + LOAD_FUNCPTR(alcCreateContext); By defaulting to RTLD_DEFAULT on the Mac (where SONAME_LIBOPENAL won't be defined), is there any risk that wine_dlsym will find the symbols from Wine's openal32.dll.so rather than the linked OpenAL framework? If it does, is that a problem? I had proposed using RTLD_NEXT for the default to avoid that possibility, although it seems that RTLD_NEXT isn't universally available. We might use RTLD_NEXT if it's defined and RTLD_DEFAULT otherwise. -Ken

2 1

Slackware packager?
by Jeremy White Dec. 2, 2009

Dec. 2, 2009

So Adam Schreiber reports that he's no longer doing the Slackware packages. Is there an active Packager currently? If so, can you submit a patch to remove Adam's name and insert yours? If not, I guess I'll submit a patch to remove that column for Slackware... Cheers, Jeremy

2 1

Re: [3/6] WineD3D: A function for checking if a surface is offscreen
by Henri Verbeet Dec. 2, 2009

Dec. 2, 2009

2009/12/2 Stefan Dösinger <stefan(a)codeweavers.com>: > @@ -5674,7 +5674,7 @@ static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, > IWineD3DSwapChain *swapchain; > > swapchain = get_swapchain(surface); > - if (swapchain) { > + if (!surface_is_offscreen(surface)) { That's ok, but the code that sets up the scissor rect further down also uses "swapchain" like this. Also, some of the changes to e.g. read_from_framebuffer() in patch 4 are really the same as what you're doing in this patch. Btw, note that the surface being offscreen is the common case, and onscreen surfaces are the exception. Maybe surface_is_onscreen() makes more sense, but I'll leave that up to you.

2 1