wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Roderick Colenbrander : wgl: Get rid of glXQueryDrawable because officially it only works on GLXDrawables .
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: 28a2646d21c5b16af974677f00ac02c678e08dc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28a2646d21c5b16af974677f0… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Jun 16 23:49:12 2009 +0200 wgl: Get rid of glXQueryDrawable because officially it only works on GLXDrawables. Nvidia allows it to operate on a standard Window too but Mesa and AMD don't and this isn't needed according to the GLX specs. This prevents crashes when creating +wgl logs. --- dlls/winex11.drv/opengl.c | 41 ++++++++++++++--------------------------- 1 files changed, 14 insertions(+), 27 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index f207a32..f1557b6 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -146,6 +146,7 @@ static const WineGLExtension *WineGLExtensionList[MAX_EXTENSIONS]; static int WineGLExtensionListSize; static void X11DRV_WineGL_LoadExtensions(void); +static WineGLPixelFormat* ConvertPixelFormatWGLtoGLX(Display *display, int iPixelFormat, BOOL AllowOffscreen, int *fmt_count); static BOOL glxRequireVersion(int requiredVersion); static BOOL glxRequireExtension(const char *requiredExtension); @@ -582,37 +583,23 @@ static int describeContext(Wine_GLContext* ctx) { return ctx_vis_id; } -static int describeDrawable(Wine_GLContext* ctx, Drawable drawable) { +static BOOL describeDrawable(X11DRV_PDEVICE *physDev) { int tmp; - int nElements; - int attribList[3] = { GLX_FBCONFIG_ID, 0, None }; - GLXFBConfig *fbCfgs; - - if (pglXQueryDrawable == NULL) { - /** glXQueryDrawable not available so returns not supported */ - return -1; - } - - TRACE(" Drawable %p have :\n", (void*) drawable); - pglXQueryDrawable(gdi_display, drawable, GLX_WIDTH, (unsigned int*) &tmp); - TRACE(" - WIDTH as %d\n", tmp); - pglXQueryDrawable(gdi_display, drawable, GLX_HEIGHT, (unsigned int*) &tmp); - TRACE(" - HEIGHT as %d\n", tmp); - pglXQueryDrawable(gdi_display, drawable, GLX_FBCONFIG_ID, (unsigned int*) &tmp); - TRACE(" - FBCONFIG_ID as 0x%x\n", tmp); + WineGLPixelFormat *fmt; + int fmt_count = 0; - attribList[1] = tmp; - fbCfgs = pglXChooseFBConfig(gdi_display, DefaultScreen(gdi_display), attribList, &nElements); - if (fbCfgs == NULL) { - return -1; - } + fmt = ConvertPixelFormatWGLtoGLX(gdi_display, physDev->current_pf, TRUE /* Offscreen */, &fmt_count); + if(!fmt) return FALSE; - pglXGetFBConfigAttrib(gdi_display, fbCfgs[0], GLX_VISUAL_ID, &tmp); - TRACE(" - VISUAL_ID as 0x%x\n", tmp); + TRACE(" HDC %p has:\n", physDev->hdc); + TRACE(" - iPixelFormat %d\n", fmt->iPixelFormat); + TRACE(" - Drawable %p\n", (void*) get_glxdrawable(physDev)); + TRACE(" - FBCONFIG_ID 0x%x\n", fmt->fmt_id); - XFree(fbCfgs); + pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_VISUAL_ID, &tmp); + TRACE(" - VISUAL_ID 0x%x\n", tmp); - return tmp; + return TRUE; } static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuffer* pbuf) { @@ -1842,7 +1829,7 @@ BOOL CDECL X11DRV_wglMakeCurrent(X11DRV_PDEVICE *physDev, HGLRC hglrc) { if (ctx->ctx == NULL) { /* The describe lines below are for debugging purposes only */ if (TRACE_ON(wgl)) { - describeDrawable(ctx, drawable); + describeDrawable(physDev); describeContext(ctx); }

1 0

Francois Gouget : wineesd.drv: Remove a redundant assignment.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: f6c7e48af19296b4f8b7c49f30c61b5664e9015a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6c7e48af19296b4f8b7c49f3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 16 19:15:54 2009 +0200 wineesd.drv: Remove a redundant assignment. --- dlls/wineesd.drv/audio.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wineesd.drv/audio.c b/dlls/wineesd.drv/audio.c index f198ace..a69949c 100644 --- a/dlls/wineesd.drv/audio.c +++ b/dlls/wineesd.drv/audio.c @@ -1466,8 +1466,6 @@ static DWORD wodGetVolume(WORD wDevID, LPDWORD lpdwVol) *lpdwVol = left + (right << 16); ret = MMSYSERR_NOERROR; } - else - ret = MMSYSERR_ERROR; if (esd_all_info) esd_free_all_info(esd_all_info);

1 0

Francois Gouget : winweesd.drv: Make sure esd_all_info is always initialized and freed when needed.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: 45311c6724ab5c46e928d90bfb59f3c763acb9ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=45311c6724ab5c46e928d90bf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 16 19:15:45 2009 +0200 winweesd.drv: Make sure esd_all_info is always initialized and freed when needed. --- dlls/wineesd.drv/audio.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wineesd.drv/audio.c b/dlls/wineesd.drv/audio.c index 4ce176f..f198ace 100644 --- a/dlls/wineesd.drv/audio.c +++ b/dlls/wineesd.drv/audio.c @@ -1416,6 +1416,7 @@ static esd_player_info_t* wod_get_player(WINE_WAVEOUT* wwo, esd_info_t** esd_all if (wwo->esd_fd < 0) { WARN("esd_open_sound() failed (%d)\n", errno); + *esd_all_info = NULL; return NULL; } } @@ -1468,7 +1469,8 @@ static DWORD wodGetVolume(WORD wDevID, LPDWORD lpdwVol) else ret = MMSYSERR_ERROR; - esd_free_all_info(esd_all_info); + if (esd_all_info) + esd_free_all_info(esd_all_info); return ret; } @@ -1493,7 +1495,8 @@ static DWORD wodSetVolume(WORD wDevID, DWORD dwParam) esd_info_t* esd_all_info; /* wod_get_player sets the stream_id as a side effect */ wod_get_player(wwo, &esd_all_info); - esd_free_all_info(esd_all_info); + if (esd_all_info) + esd_free_all_info(esd_all_info); } if (!wwo->stream_id) return MMSYSERR_ERROR;

1 0

Francois Gouget : wineesd.drv: Initialize the stream name before using it.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: f7faba23094d7c26769e36f8d80ef357cbf11f16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7faba23094d7c26769e36f8d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 16 19:15:21 2009 +0200 wineesd.drv: Initialize the stream name before using it. --- dlls/wineesd.drv/audio.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/wineesd.drv/audio.c b/dlls/wineesd.drv/audio.c index bb6aae0..4ce176f 100644 --- a/dlls/wineesd.drv/audio.c +++ b/dlls/wineesd.drv/audio.c @@ -1176,11 +1176,15 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) out_rate = (int) wwo->waveFormat.Format.nSamplesPerSec; TRACE("esd output format = 0x%08x, rate = %d\n", out_format, out_rate); + wwo->stream_name = get_stream_name("out", wDevID); wwo->stream_fd = esd_play_stream(out_format, out_rate, NULL, wwo->stream_name); TRACE("wwo->stream_fd=%d\n", wwo->stream_fd); - if(wwo->stream_fd < 0) return MMSYSERR_ALLOCATED; + if(wwo->stream_fd < 0) + { + HeapFree(GetProcessHeap(), 0, wwo->stream_name); + return MMSYSERR_ALLOCATED; + } - wwo->stream_name = get_stream_name("out", wDevID); wwo->stream_id = 0; wwo->dwPlayedTotal = 0; wwo->dwWrittenTotal = 0; @@ -1899,14 +1903,18 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) in_rate = (int) wwi->waveFormat.Format.nSamplesPerSec; TRACE("esd input format = 0x%08x, rate = %d\n", in_format, in_rate); + wwi->stream_name = get_stream_name("in", wDevID); #ifdef WID_USE_ESDMON wwi->stream_fd = esd_monitor_stream(in_format, in_rate, NULL, wwi->stream_name); #else wwi->stream_fd = esd_record_stream(in_format, in_rate, NULL, wwi->stream_name); #endif TRACE("wwi->stream_fd=%d\n",wwi->stream_fd); - if(wwi->stream_fd < 0) return MMSYSERR_ALLOCATED; - wwi->stream_name = get_stream_name("in", wDevID); + if(wwi->stream_fd < 0) + { + HeapFree(GetProcessHeap(), 0, wwi->stream_name); + return MMSYSERR_ALLOCATED; + } wwi->state = WINE_WS_STOPPED; if (wwi->lpQueuePtr) {

1 0

Alexander Nicolaysen Sørnes : regedit: Fix reading from stdin.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: dcade8526185e67b3e2e2eceff2de7244a2980bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcade8526185e67b3e2e2ecef… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Jun 16 15:46:33 2009 +0200 regedit: Fix reading from stdin. --- programs/regedit/regproc.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 55b0d5f..c46edc6 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -610,20 +610,29 @@ static void processRegEntry(WCHAR* stdInput, BOOL isUnicode) * * Parameters: * in - input stream to read from + * first_chars - beginning of stream, read due to Unicode check */ -static void processRegLinesA(FILE *in) +static void processRegLinesA(FILE *in, char* first_chars) { LPSTR line = NULL; /* line read from input stream */ ULONG lineSize = REG_VAL_BUF_SIZE; line = HeapAlloc(GetProcessHeap(), 0, lineSize); CHECK_ENOUGH_MEMORY(line); + memcpy(line, first_chars, 2); while (!feof(in)) { LPSTR s; /* The pointer into line for where the current fgets should read */ LPSTR check; WCHAR* lineW; s = line; + + if(first_chars) + { + s += 2; + first_chars = NULL; + } + for (;;) { size_t size_remaining; int size_to_get; @@ -1373,8 +1382,7 @@ BOOL import_registry_file(FILE* reg_file) processRegLinesW(reg_file); } else { - rewind(reg_file); - processRegLinesA(reg_file); + processRegLinesA(reg_file, (char*)s); } } return TRUE;

1 0

Hans Leidekker : wininet: Implement InternetQueryOption( INTERNET_OPTION_CACHE_TIMESTAMPS).
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: c29328583d9b2aab39193401371369029f44389b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c29328583d9b2aab391934013… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 16 15:13:52 2009 +0200 wininet: Implement InternetQueryOption(INTERNET_OPTION_CACHE_TIMESTAMPS). --- dlls/wininet/http.c | 63 +++++++++++++++++++++++++++++++++++++++----------- include/wininet.h | 6 +++++ 2 files changed, 55 insertions(+), 14 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 1922835..e1a7ddc 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1568,6 +1568,20 @@ static void HTTPREQ_CloseConnection(WININETHANDLEHEADER *hdr) INTERNET_STATUS_CONNECTION_CLOSED, 0, 0); } +static BOOL HTTP_GetRequestURL(WININETHTTPREQW *req, LPWSTR buf) +{ + LPHTTPHEADERW host_header; + + static const WCHAR formatW[] = {'h','t','t','p',':','/','/','%','s','%','s',0}; + + host_header = HTTP_GetHeader(req, hostW); + if(!host_header) + return FALSE; + + sprintfW(buf, formatW, host_header->lpszValue, req->lpszPath); /* FIXME */ + return TRUE; +} + static DWORD HTTPREQ_QueryOption(WININETHANDLEHEADER *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode) { WININETHTTPREQW *req = (WININETHTTPREQW*)hdr; @@ -1620,6 +1634,41 @@ static DWORD HTTPREQ_QueryOption(WININETHANDLEHEADER *hdr, DWORD option, void *b } } + case INTERNET_OPTION_CACHE_TIMESTAMPS: { + INTERNET_CACHE_ENTRY_INFOW *info; + INTERNET_CACHE_TIMESTAMPS *ts = buffer; + WCHAR url[INTERNET_MAX_URL_LENGTH]; + DWORD nbytes, error; + BOOL ret; + + TRACE("INTERNET_OPTION_CACHE_TIMESTAMPS\n"); + + if (*size < sizeof(*ts)) + { + *size = sizeof(*ts); + return ERROR_INSUFFICIENT_BUFFER; + } + nbytes = 0; + HTTP_GetRequestURL(req, url); + ret = GetUrlCacheEntryInfoW(url, NULL, &nbytes); + error = GetLastError(); + if (!ret && error == ERROR_INSUFFICIENT_BUFFER) + { + if (!(info = HeapAlloc(GetProcessHeap(), 0, nbytes))) + return ERROR_OUTOFMEMORY; + + GetUrlCacheEntryInfoW(url, info, &nbytes); + + ts->ftExpires = info->ExpireTime; + ts->ftLastModified = info->LastModifiedTime; + + HeapFree(GetProcessHeap(), 0, info); + *size = sizeof(*ts); + return ERROR_SUCCESS; + } + return error; + } + case INTERNET_OPTION_DATAFILE_NAME: { DWORD req_size; @@ -3244,20 +3293,6 @@ BOOL WINAPI HttpSendRequestA(HINTERNET hHttpRequest, LPCSTR lpszHeaders, return result; } -static BOOL HTTP_GetRequestURL(WININETHTTPREQW *req, LPWSTR buf) -{ - LPHTTPHEADERW host_header; - - static const WCHAR formatW[] = {'h','t','t','p',':','/','/','%','s','%','s',0}; - - host_header = HTTP_GetHeader(req, hostW); - if(!host_header) - return FALSE; - - sprintfW(buf, formatW, host_header->lpszValue, req->lpszPath); /* FIXME */ - return TRUE; -} - /*********************************************************************** * HTTP_GetRedirectURL (internal) */ diff --git a/include/wininet.h b/include/wininet.h index e37700a..fb6f31f 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1536,6 +1536,12 @@ typedef struct _INTERNET_CACHE_ENTRY_INFOW { DECL_WINELIB_TYPE_AW(INTERNET_CACHE_ENTRY_INFO) DECL_WINELIB_TYPE_AW(LPINTERNET_CACHE_ENTRY_INFO) +typedef struct _INTERNET_CACHE_TIMESTAMPS +{ + FILETIME ftExpires; + FILETIME ftLastModified; +} INTERNET_CACHE_TIMESTAMPS, *LPINTERNET_CACHE_TIMESTAMPS; + BOOLAPI CreateUrlCacheEntryA(LPCSTR ,DWORD ,LPCSTR ,LPSTR ,DWORD); BOOLAPI CreateUrlCacheEntryW(LPCWSTR ,DWORD ,LPCWSTR ,LPWSTR ,DWORD); #define CreateUrlCacheEntry WINELIB_NAME_AW(CreateUrlCacheEntry)

1 0

Hans Leidekker : wininet: Don' t fail if dwReserved is set in CreateUrlCacheEntryW.
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: 7ba8c86f852f668ec54f965e3cdda3a23ed93c94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ba8c86f852f668ec54f965e3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 16 15:13:31 2009 +0200 wininet: Don't fail if dwReserved is set in CreateUrlCacheEntryW. --- dlls/wininet/urlcache.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index f385c7e..418f508 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2222,11 +2222,7 @@ BOOL WINAPI CreateUrlCacheEntryW( dwReserved); if (dwReserved) - { - ERR("dwReserved != 0\n"); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + FIXME("dwReserved 0x%08x\n", dwReserved); lpszUrlEnd = lpszUrlName + strlenW(lpszUrlName);

1 0

Anders Jonsson : ntoskrnl.exe: Stub for ExInitializeNPagedLookasideList.
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: a2f6bac10781303381d45da8417b12dd3f517f40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2f6bac10781303381d45da84… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Mon Jun 15 18:23:28 2009 +0200 ntoskrnl.exe: Stub for ExInitializeNPagedLookasideList. --- dlls/ntoskrnl.exe/ntoskrnl.c | 15 +++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 3 +++ 3 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 236b3fa..59268f3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -909,6 +909,21 @@ NTSTATUS WINAPI ExInitializeResourceLite(PERESOURCE Resource) /*********************************************************************** + * ExInitializeNPagedLookasideList (NTOSKRNL.EXE.@) + */ +void WINAPI ExInitializeNPagedLookasideList(PNPAGED_LOOKASIDE_LIST Lookaside, + PALLOCATE_FUNCTION Allocate, + PFREE_FUNCTION Free, + ULONG Flags, + SIZE_T Size, + ULONG Tag, + USHORT Depth) +{ + FIXME( "stub: %p, %p, %p, %u, %lu, %u, %u\n", Lookaside, Allocate, Free, Flags, Size, Tag, Depth ); +} + + +/*********************************************************************** * ExInitializeZone (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI ExInitializeZone(PZONE_HEADER Zone, diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 8b7de2d..0d874bc 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -139,7 +139,7 @@ @ stub ExGetExclusiveWaiterCount @ stub ExGetPreviousMode @ stub ExGetSharedWaiterCount -@ stub ExInitializeNPagedLookasideList +@ stdcall ExInitializeNPagedLookasideList(ptr ptr ptr long long long long) @ stub ExInitializePagedLookasideList @ stdcall ExInitializeResourceLite(ptr) @ stdcall ExInitializeZone(ptr long ptr long) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 9ba76de..ccdeca3 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -124,13 +124,16 @@ typedef enum _KWAIT_REASON MaximumWaitReason, } KWAIT_REASON; +typedef struct _ALLOCATE_FUNCTION *PALLOCATE_FUNCTION; typedef struct _IO_TIMER *PIO_TIMER; typedef struct _IO_TIMER_ROUTINE *PIO_TIMER_ROUTINE; typedef struct _ETHREAD *PETHREAD; +typedef struct _FREE_FUNCTION *PFREE_FUNCTION; typedef struct _KTHREAD *PKTHREAD; typedef struct _EPROCESS *PEPROCESS; typedef struct _ERESOURCE *PERESOURCE; typedef struct _IO_WORKITEM *PIO_WORKITEM; +typedef struct _NPAGED_LOOKASIDE_LIST *PNPAGED_LOOKASIDE_LIST; typedef struct _OBJECT_TYPE *POBJECT_TYPE; typedef struct _OBJECT_HANDLE_INFORMATION *POBJECT_HANDLE_INFORMATION; typedef struct _ZONE_HEADER *PZONE_HEADER;

1 0

Paul Vriens : shell32/tests: Fix some test failures on NT4 ( and some Win95 boxes).
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: 4e4d477c4de9a5e5e1d5952fd61e4aa8d73ae050 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e4d477c4de9a5e5e1d5952fd… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jun 16 15:07:22 2009 +0200 shell32/tests: Fix some test failures on NT4 (and some Win95 boxes). --- dlls/shell32/tests/appbar.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/appbar.c b/dlls/shell32/tests/appbar.c index dbb75b9..73dc0b2 100644 --- a/dlls/shell32/tests/appbar.c +++ b/dlls/shell32/tests/appbar.c @@ -36,6 +36,7 @@ struct testwindow_info { HWND hwnd; BOOL registered; + BOOL to_be_deleted; RECT desired_rect; UINT edge; RECT allocated_rect; @@ -58,6 +59,12 @@ static void testwindow_setpos(HWND hwnd) return; } + if (info->to_be_deleted) + { + win_skip("Some Win95 and NT4 systems send messages to removed taskbars\n"); + return; + } + abd.cbSize = sizeof(abd); abd.hWnd = hwnd; abd.uEdge = info->edge; @@ -221,6 +228,7 @@ static void test_setpos(void) /* dock windows[0] to the bottom of the screen */ windows[0].registered = TRUE; + windows[0].to_be_deleted = FALSE; windows[0].edge = ABE_BOTTOM; windows[0].desired_rect.left = 0; windows[0].desired_rect.right = screen_width; @@ -241,6 +249,7 @@ static void test_setpos(void) /* dock windows[1] to the bottom of the screen */ windows[1].registered = TRUE; + windows[1].to_be_deleted = FALSE; windows[1].edge = ABE_BOTTOM; windows[1].desired_rect.left = 0; windows[1].desired_rect.right = screen_width; @@ -272,6 +281,7 @@ static void test_setpos(void) /* dock windows[2] to the bottom of the screen */ windows[2].registered = TRUE; + windows[2].to_be_deleted = FALSE; windows[2].edge = ABE_BOTTOM; windows[2].desired_rect.left = 0; windows[2].desired_rect.right = screen_width; @@ -328,6 +338,7 @@ static void test_setpos(void) expected_bottom = max(windows[0].allocated_rect.bottom, windows[1].allocated_rect.bottom); abd.hWnd = windows[0].hwnd; + windows[0].to_be_deleted = TRUE; ret = SHAppBarMessage(ABM_REMOVE, &abd); ok(ret == TRUE, "SHAppBarMessage returned %i\n", ret); windows[0].registered = FALSE; @@ -341,12 +352,14 @@ static void test_setpos(void) /* remove the other windows */ abd.hWnd = windows[1].hwnd; + windows[1].to_be_deleted = TRUE; ret = SHAppBarMessage(ABM_REMOVE, &abd); ok(ret == TRUE, "SHAppBarMessage returned %i\n", ret); windows[1].registered = FALSE; DestroyWindow(windows[1].hwnd); abd.hWnd = windows[2].hwnd; + windows[2].to_be_deleted = TRUE; ret = SHAppBarMessage(ABM_REMOVE, &abd); ok(ret == TRUE, "SHAppBarMessage returned %i\n", ret); windows[2].registered = FALSE;

1 0

Alexandre Julliard : ntdll: Handle x86_64 signals on a separate signal stack.
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: a19db6dc11db7fec4f0136f1bff3c1b9355b0de5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a19db6dc11db7fec4f0136f1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 16 15:27:48 2009 +0200 ntdll: Handle x86_64 signals on a separate signal stack. --- dlls/ntdll/signal_x86_64.c | 302 +++++++++++++++++++++++++++++--------------- 1 files changed, 202 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a19db6dc11db7fec4f013…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2009