wine-commits March 2011

wine-commits@winehq.org

2 participants
849 discussions

Hans Leidekker : wine.inf: Pretend that the .NET 4. 0 Client and Full profiles are installed.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 5dbf6359d2657807cb4de4e452a78f425677127b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dbf6359d2657807cb4de4e45… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 30 12:29:28 2011 +0200 wine.inf: Pretend that the .NET 4.0 Client and Full profiles are installed. --- tools/wine.inf.in | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 5c09faf..cb130e6 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -511,6 +511,12 @@ HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5,Install,0x10003,1 HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5,SP,0x10003,1 HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5,Version,2,3.5.30729.01 HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5\1033,Install,0x10003,1 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Client,Install,0x10003,1 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Client,Version,2,4.0.30319 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Client,TargetVersion,2,4.0.0 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Full,Install,0x10003,1 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Full,Version,2,4.0.30319 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Full,TargetVersion,2,4.0.0 [Metrics] HKCU,%Metrics%,"ScrollWidth",2,"16"

1 0

Jörg Höhle : user32/tests: Add a few IsWindow checks.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 8d387f06eb7df5ad42b1b0b012cfa356f34f5510 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d387f06eb7df5ad42b1b0b01… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Mar 15 22:58:39 2011 +0100 user32/tests: Add a few IsWindow checks. --- dlls/user32/tests/win.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 603e93e..b1d77c6 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3936,6 +3936,10 @@ static void test_params(void) HWND hwnd; INT rc; + ok(!IsWindow(0), "IsWindow(0)\n"); + ok(!IsWindow(HWND_BROADCAST), "IsWindow(HWND_BROADCAST)\n"); + ok(!IsWindow(HWND_TOPMOST), "IsWindow(HWND_TOPMOST)\n"); + /* Just a param check */ if (pGetMonitorInfoA) {

1 0

Jörg Höhle : winmm: PlaySound concurrency cleanup .
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: e0dcc2cd7d4495b7056a47ada1af74cc7c318ef2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0dcc2cd7d4495b7056a47ada… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Mon Mar 28 22:34:02 2011 +0200 winmm: PlaySound concurrency cleanup. --- dlls/winmm/playsound.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index 3624124..02e24e8 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -44,7 +44,6 @@ typedef struct tagWINE_PLAYSOUND LPCWSTR pszSound; HMODULE hMod; DWORD fdwSound; - HANDLE hThread; struct tagWINE_PLAYSOUND* lpNext; } WINE_PLAYSOUND; @@ -215,7 +214,6 @@ static void PlaySound_Free(WINE_PLAYSOUND* wps) if (PlaySoundList == NULL) SetEvent(psLastEvent); LeaveCriticalSection(&WINMM_cs); if (wps->bAlloc) HeapFree(GetProcessHeap(), 0, (void*)wps->pszSound); - if (wps->hThread) CloseHandle(wps->hThread); HeapFree(GetProcessHeap(), 0, wps); } @@ -258,7 +256,8 @@ static WINE_PLAYSOUND* PlaySound_Alloc(const void* pszSound, HMODULE hmod, return wps; oom_error: - PlaySound_Free(wps); + if (wps->bAlloc) HeapFree(GetProcessHeap(), 0, (void*)wps->pszSound); + HeapFree(GetProcessHeap(), 0, wps); return NULL; } @@ -377,6 +376,8 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) (LPSTR)&mmckInfo.ckid, mmckInfo.fccType, mmckInfo.cksize); lpWaveFormat = HeapAlloc(GetProcessHeap(), 0, mmckInfo.cksize); + if (!lpWaveFormat) + goto errCleanUp; if (mmioRead(hmmio, (HPSTR)lpWaveFormat, mmckInfo.cksize) < sizeof(PCMWAVEFORMAT)) goto errCleanUp; @@ -398,6 +399,8 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) (LPSTR)&mmckInfo.ckid, mmckInfo.fccType, mmckInfo.cksize); s.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + if (!s.hEvent) + goto errCleanUp; if (waveOutOpen(&hWave, WAVE_MAPPER, lpWaveFormat, (DWORD_PTR)PlaySound_Callback, (DWORD_PTR)&s, CALLBACK_FUNCTION) != MMSYSERR_NOERROR) @@ -407,6 +410,8 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) bufsize = (((lpWaveFormat->nAvgBytesPerSec / 3) - 1) / lpWaveFormat->nBlockAlign + 1) * lpWaveFormat->nBlockAlign; waveHdr = HeapAlloc(GetProcessHeap(), 0, 2 * sizeof(WAVEHDR) + 2 * bufsize); + if (!waveHdr) + goto errCleanUp; waveHdr[0].lpData = (char*)waveHdr + 2 * sizeof(WAVEHDR); waveHdr[1].lpData = (char*)waveHdr + 2 * sizeof(WAVEHDR) + bufsize; waveHdr[0].dwUser = waveHdr[1].dwUser = 0L; @@ -458,10 +463,10 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) errCleanUp: TRACE("Done playing=%s => %s!\n", debugstr_w(wps->pszSound), bRet ? "ok" : "ko"); - CloseHandle(s.hEvent); - HeapFree(GetProcessHeap(), 0, waveHdr); HeapFree(GetProcessHeap(), 0, lpWaveFormat); if (hWave) while (waveOutClose(hWave) == WAVERR_STILLPLAYING) Sleep(100); + CloseHandle(s.hEvent); + HeapFree(GetProcessHeap(), 0, waveHdr); if (hmmio) mmioClose(hmmio, 0); PlaySound_Free(wps); @@ -509,16 +514,15 @@ static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSo PlaySoundList = wps; LeaveCriticalSection(&WINMM_cs); - if (!pszSound || (fdwSound & SND_PURGE)) return TRUE; + if (!wps) return TRUE; if (fdwSound & SND_ASYNC) { - DWORD id; HANDLE handle; wps->bLoop = (fdwSound & SND_LOOP) ? TRUE : FALSE; - if ((handle = CreateThread(NULL, 0, proc_PlaySound, wps, 0, &id)) != 0) { - wps->hThread = handle; + if ((handle = CreateThread(NULL, 0, proc_PlaySound, wps, 0, NULL)) != 0) { SetThreadPriority(handle, THREAD_PRIORITY_TIME_CRITICAL); + CloseHandle(handle); return TRUE; } }

1 0

Jörg Höhle : winmm: Get rid of psStopEvent which was never used like an event.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: a0dbd846c6cf111d20718170e9de2f7681d8fadf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0dbd846c6cf111d20718170e… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Mar 26 12:36:49 2011 +0100 winmm: Get rid of psStopEvent which was never used like an event. --- dlls/winmm/playsound.c | 7 ++++--- dlls/winmm/winmm.c | 3 --- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index a6a3c87..3624124 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -49,6 +49,7 @@ typedef struct tagWINE_PLAYSOUND } WINE_PLAYSOUND; static WINE_PLAYSOUND *PlaySoundList; +static BOOL bPlaySoundStop; static HMMIO get_mmioFromFile(LPCWSTR lpszName) { @@ -426,7 +427,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) mmioSeek(hmmio, mmckInfo.dwDataOffset, SEEK_SET); while (left) { - if (WaitForSingleObject(psStopEvent, 0) == WAIT_OBJECT_0) + if (bPlaySoundStop) { waveOutReset(hWave); wps->bLoop = FALSE; @@ -495,13 +496,13 @@ static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSo ResetEvent(psLastEvent); /* FIXME: doc says we have to stop all instances of pszSound if it's non * NULL... as of today, we stop all playing instances */ - SetEvent(psStopEvent); + bPlaySoundStop = TRUE; LeaveCriticalSection(&WINMM_cs); WaitForSingleObject(psLastEvent, INFINITE); EnterCriticalSection(&WINMM_cs); - ResetEvent(psStopEvent); + bPlaySoundStop = FALSE; } if (wps) wps->lpNext = PlaySoundList; diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 029a1c9..6d5950b 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -63,7 +63,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(winmm); HINSTANCE hWinMM32Instance; HANDLE psLastEvent; -HANDLE psStopEvent; static CRITICAL_SECTION_DEBUG critsect_debug = { @@ -79,7 +78,6 @@ CRITICAL_SECTION WINMM_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; static BOOL WINMM_CreateIData(HINSTANCE hInstDLL) { hWinMM32Instance = hInstDLL; - psStopEvent = CreateEventW(NULL, TRUE, FALSE, NULL); psLastEvent = CreateEventW(NULL, TRUE, FALSE, NULL); return TRUE; } @@ -93,7 +91,6 @@ static void WINMM_DeleteIData(void) /* FIXME: should also free content and resources allocated * inside WINMM_IData */ - CloseHandle(psStopEvent); CloseHandle(psLastEvent); DeleteCriticalSection(&WINMM_cs); }

1 0

Jörg Höhle : winmm: Abort PlaySound in case of audio error.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: ca37dbcfe6309fd7caad1f53f3b76773cd0278fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca37dbcfe6309fd7caad1f53f… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Mar 26 07:36:47 2011 +0100 winmm: Abort PlaySound in case of audio error. --- dlls/winmm/playsound.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index 58c833a..a6a3c87 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -179,7 +179,6 @@ static void CALLBACK PlaySound_Callback(HWAVEOUT hwo, UINT uMsg, static void PlaySound_WaitDone(struct playsound_data* s) { for (;;) { - ResetEvent(s->hEvent); if (InterlockedDecrement(&s->dwEventCount) >= 0) break; InterlockedIncrement(&s->dwEventCount); @@ -437,17 +436,20 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) if (count < 1) break; left -= count; waveHdr[index].dwBufferLength = count; - waveHdr[index].dwFlags &= ~WHDR_DONE; if (waveOutWrite(hWave, &waveHdr[index], sizeof(WAVEHDR)) == MMSYSERR_NOERROR) { index ^= 1; PlaySound_WaitDone(&s); } - else FIXME("Couldn't play header\n"); + else { + ERR("Aborting play loop, waveOutWrite error\n"); + wps->bLoop = FALSE; + break; + } } bRet = TRUE; } while (wps->bLoop); - PlaySound_WaitDone(&s); /* for last buffer */ + PlaySound_WaitDone(&s); /* to balance first buffer */ waveOutReset(hWave); waveOutUnprepareHeader(hWave, &waveHdr[0], sizeof(WAVEHDR));

1 0

Jörg Höhle : Revert "winmm: Fix PlaySound so it doesn't block when another sound is already playing.".
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 15ad749eced53e0c33454970bfc2bdb58b64f92b URL: http://source.winehq.org/git/wine.git/?a=commit;h=15ad749eced53e0c33454970b… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Mar 26 07:44:22 2011 +0100 Revert "winmm: Fix PlaySound so it doesn't block when another sound is already playing.". This reverts commit f44bc89bc41b2b8d75eeb4fc02f5aa587d84c13c. Let the player thread call waveOutReset itself instead. --- dlls/winmm/playsound.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index f6416ed..58c833a 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -45,7 +45,6 @@ typedef struct tagWINE_PLAYSOUND HMODULE hMod; DWORD fdwSound; HANDLE hThread; - HWAVEOUT hWave; struct tagWINE_PLAYSOUND* lpNext; } WINE_PLAYSOUND; @@ -271,6 +270,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) MMCKINFO ckMainRIFF; MMCKINFO mmckInfo; LPWAVEFORMATEX lpWaveFormat = NULL; + HWAVEOUT hWave = 0; LPWAVEHDR waveHdr = NULL; INT count, bufsize, left, index; struct playsound_data s; @@ -399,7 +399,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) s.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - if (waveOutOpen(&wps->hWave, WAVE_MAPPER, lpWaveFormat, (DWORD_PTR)PlaySound_Callback, + if (waveOutOpen(&hWave, WAVE_MAPPER, lpWaveFormat, (DWORD_PTR)PlaySound_Callback, (DWORD_PTR)&s, CALLBACK_FUNCTION) != MMSYSERR_NOERROR) goto errCleanUp; @@ -413,8 +413,8 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) waveHdr[0].dwLoops = waveHdr[1].dwLoops = 0L; waveHdr[0].dwFlags = waveHdr[1].dwFlags = 0L; waveHdr[0].dwBufferLength = waveHdr[1].dwBufferLength = bufsize; - if (waveOutPrepareHeader(wps->hWave, &waveHdr[0], sizeof(WAVEHDR)) || - waveOutPrepareHeader(wps->hWave, &waveHdr[1], sizeof(WAVEHDR))) { + if (waveOutPrepareHeader(hWave, &waveHdr[0], sizeof(WAVEHDR)) || + waveOutPrepareHeader(hWave, &waveHdr[1], sizeof(WAVEHDR))) { goto errCleanUp; } @@ -429,6 +429,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) { if (WaitForSingleObject(psStopEvent, 0) == WAIT_OBJECT_0) { + waveOutReset(hWave); wps->bLoop = FALSE; break; } @@ -437,7 +438,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) left -= count; waveHdr[index].dwBufferLength = count; waveHdr[index].dwFlags &= ~WHDR_DONE; - if (waveOutWrite(wps->hWave, &waveHdr[index], sizeof(WAVEHDR)) == MMSYSERR_NOERROR) { + if (waveOutWrite(hWave, &waveHdr[index], sizeof(WAVEHDR)) == MMSYSERR_NOERROR) { index ^= 1; PlaySound_WaitDone(&s); } @@ -447,17 +448,17 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) } while (wps->bLoop); PlaySound_WaitDone(&s); /* for last buffer */ - waveOutReset(wps->hWave); + waveOutReset(hWave); - waveOutUnprepareHeader(wps->hWave, &waveHdr[0], sizeof(WAVEHDR)); - waveOutUnprepareHeader(wps->hWave, &waveHdr[1], sizeof(WAVEHDR)); + waveOutUnprepareHeader(hWave, &waveHdr[0], sizeof(WAVEHDR)); + waveOutUnprepareHeader(hWave, &waveHdr[1], sizeof(WAVEHDR)); errCleanUp: TRACE("Done playing=%s => %s!\n", debugstr_w(wps->pszSound), bRet ? "ok" : "ko"); CloseHandle(s.hEvent); HeapFree(GetProcessHeap(), 0, waveHdr); HeapFree(GetProcessHeap(), 0, lpWaveFormat); - if (wps->hWave) while (waveOutClose(wps->hWave) == WAVERR_STILLPLAYING) Sleep(100); + if (hWave) while (waveOutClose(hWave) == WAVERR_STILLPLAYING) Sleep(100); if (hmmio) mmioClose(hmmio, 0); PlaySound_Free(wps); @@ -494,7 +495,6 @@ static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSo * NULL... as of today, we stop all playing instances */ SetEvent(psStopEvent); - waveOutReset(PlaySoundList->hWave); LeaveCriticalSection(&WINMM_cs); WaitForSingleObject(psLastEvent, INFINITE); EnterCriticalSection(&WINMM_cs);

1 0

Alexandre Julliard : user32: Reset the cursor clip rectangle before moving a window.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 2f368cfad284014396813533821754acf8e4bc70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f368cfad2840143968135338… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 30 12:34:45 2011 +0200 user32: Reset the cursor clip rectangle before moving a window. --- dlls/user32/winpos.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index a8324e8..789238f 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2491,6 +2491,7 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) pt.x = (short)LOWORD(dwPoint); pt.y = (short)HIWORD(dwPoint); capturePoint = pt; + ClipCursor( NULL ); TRACE("hwnd %p command %04lx, hittest %d, pos %d,%d\n", hwnd, syscommand, hittest, pt.x, pt.y);

1 0

Alexandre Julliard : server: Reset the cursor clip rectangle when the foreground thread changes.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 2b96875b6af708895006570b74b6254d7ac9b34e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b96875b6af708895006570b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 30 12:34:32 2011 +0200 server: Reset the cursor clip rectangle when the foreground thread changes. --- server/queue.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/server/queue.c b/server/queue.c index 7d25afa..2e1168d 100644 --- a/server/queue.c +++ b/server/queue.c @@ -318,6 +318,14 @@ static int assign_thread_input( struct thread *thread, struct thread_input *new_ return 1; } +/* change the foreground input and reset the cursor clip rect */ +static void set_foreground_input( struct desktop *desktop, struct thread_input *input ) +{ + if (desktop->foreground_input == input) return; + get_top_window_rectangle( desktop, &desktop->cursor_clip ); + desktop->foreground_input = input; +} + /* get the hook table for a given thread */ struct hook_table *get_queue_hooks( struct thread *thread ) { @@ -901,7 +909,7 @@ static void thread_input_destroy( struct object *obj ) empty_msg_list( &input->msg_list ); if (input->desktop) { - if (input->desktop->foreground_input == input) input->desktop->foreground_input = NULL; + if (input->desktop->foreground_input == input) set_foreground_input( input->desktop, NULL ); release_object( input->desktop ); } } @@ -2445,7 +2453,7 @@ DECL_HANDLER(set_foreground_window) ((thread = get_window_thread( req->handle ))) && (thread->queue->input->desktop == desktop)) { - desktop->foreground_input = thread->queue->input; + set_foreground_input( desktop, thread->queue->input ); reply->send_msg_new = (desktop->foreground_input != queue->input); } else set_win32_error( ERROR_INVALID_WINDOW_HANDLE );

1 0

Matteo Bruni : winex11.drv: Make wglMakeCurrent return the correct error when the drawable is invalid.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 716df1c2d246a35f11622044d2816260ba2ffdef URL: http://source.winehq.org/git/wine.git/?a=commit;h=716df1c2d246a35f11622044d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 17 22:49:23 2011 +0100 winex11.drv: Make wglMakeCurrent return the correct error when the drawable is invalid. --- dlls/opengl32/tests/opengl.c | 6 +++--- dlls/winex11.drv/opengl.c | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 8c81ba2..9834c6d 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -956,7 +956,7 @@ static void test_destroy(HDC oldhdc) SetLastError(0xdeadbeef); ret = wglMakeCurrent(dc, ctx); err = GetLastError(); - todo_wine ok(!ret && err == ERROR_INVALID_HANDLE, + ok(!ret && err == ERROR_INVALID_HANDLE, "Unexpected behavior when making context current, ret %d, last error %#x.\n", ret, err); ok(wglGetCurrentContext() == ctx, "Wrong current context.\n"); @@ -977,7 +977,7 @@ static void test_destroy(HDC oldhdc) SetLastError(0xdeadbeef); ret = wglMakeCurrent(dc, ctx); err = GetLastError(); - todo_wine ok(!ret && err == ERROR_INVALID_HANDLE, + ok(!ret && err == ERROR_INVALID_HANDLE, "Unexpected behavior when making context current, ret %d, last error %#x.\n", ret, err); ok(wglGetCurrentContext() == NULL, "Wrong current context.\n"); @@ -989,7 +989,7 @@ static void test_destroy(HDC oldhdc) SetLastError(0xdeadbeef); ret = wglMakeCurrent(dc, ctx); err = GetLastError(); - todo_wine ok(!ret && err == ERROR_INVALID_HANDLE, + ok(!ret && err == ERROR_INVALID_HANDLE, "Unexpected behavior when making context current, ret %d, last error %#x.\n", ret, err); ok(wglGetCurrentContext() == oldctx, "Wrong current context.\n"); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index c5796a4..0a23e44 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1896,6 +1896,12 @@ BOOL CDECL X11DRV_wglMakeCurrent(X11DRV_PDEVICE *physDev, HGLRC hglrc) { ret = pglXMakeCurrent(gdi_display, None, NULL); NtCurrentTeb()->glContext = NULL; } + else if (!physDev->current_pf) + { + WARN("Trying to use an invalid drawable\n"); + SetLastError(ERROR_INVALID_HANDLE); + ret = FALSE; + } else if (ctx->fmt->iPixelFormat != physDev->current_pf) { WARN( "mismatched pixel format hdc %p %u ctx %p %u\n",

1 0

Matteo Bruni : winex11.drv: Don' t modify current state if glXMakeCurrent fails.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 77679c4e9cde852b366d1039fb30b4e7995b44c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77679c4e9cde852b366d1039f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 3 21:06:33 2011 +0100 winex11.drv: Don't modify current state if glXMakeCurrent fails. --- dlls/winex11.drv/opengl.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index b74bc0a..c5796a4 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1907,7 +1907,6 @@ BOOL CDECL X11DRV_wglMakeCurrent(X11DRV_PDEVICE *physDev, HGLRC hglrc) { { Drawable drawable = get_glxdrawable(physDev); Wine_GLContext *prev_ctx = NtCurrentTeb()->glContext; - if (prev_ctx) prev_ctx->tid = 0; /* The describe lines below are for debugging purposes only */ if (TRACE_ON(wgl)) { @@ -1917,10 +1916,12 @@ BOOL CDECL X11DRV_wglMakeCurrent(X11DRV_PDEVICE *physDev, HGLRC hglrc) { TRACE(" make current for dis %p, drawable %p, ctx %p\n", gdi_display, (void*) drawable, ctx->ctx); ret = pglXMakeCurrent(gdi_display, drawable, ctx->ctx); - NtCurrentTeb()->glContext = ctx; - if(ret) + if (ret) { + if (prev_ctx) prev_ctx->tid = 0; + NtCurrentTeb()->glContext = ctx; + ctx->has_been_current = TRUE; ctx->tid = GetCurrentThreadId(); ctx->hdc = hdc; @@ -1935,6 +1936,8 @@ BOOL CDECL X11DRV_wglMakeCurrent(X11DRV_PDEVICE *physDev, HGLRC hglrc) { pglDrawBuffer(GL_FRONT_LEFT); } } + else + SetLastError(ERROR_INVALID_HANDLE); } wine_tsx11_unlock(); TRACE(" returning %s\n", (ret ? "True" : "False"));

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
85
Older →

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 March 2011