January 2012 - Wine-Commits

Alexandre Julliard : winetest: Avoid Unicode macros.
by Alexandre Julliard Jan. 19, 2012

Jan. 19, 2012

Module: wine Branch: master Commit: 7175324992f250eca138e2a8b2397920333866e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7175324992f250eca138e2a8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 19 21:05:28 2012 +0100 winetest: Avoid Unicode macros. --- programs/winetest/Makefile.in | 1 + programs/winetest/gui.c | 57 ++++++++++++++++++----------------------- programs/winetest/main.c | 57 ++++++++++++++++++++--------------------- programs/winetest/send.c | 2 +- programs/winetest/util.c | 2 +- programs/winetest/winetest.rc | 8 +++--- 6 files changed, 60 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7175324992f250eca138e…

1 0

Frédéric Delanoy : po: Remove English strings from the French translation.
by Alexandre Julliard Jan. 19, 2012

Jan. 19, 2012

Module: wine Branch: master Commit: 273b88100ca9af7e2cdb606ac4689ea065bbabce URL: http://source.winehq.org/git/wine.git/?a=commit;h=273b88100ca9af7e2cdb606ac… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jan 19 17:22:45 2012 +0100 po: Remove English strings from the French translation. --- po/fr.po | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 35e1c8c..02e308e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1324,9 +1324,8 @@ msgid "Certificate Type" msgstr "Type de certificat" #: crypt32.rc:59 -#, fuzzy msgid "Certificate Manifold" -msgstr "Certificate Manifold" +msgstr "" #: crypt32.rc:60 msgid "Netscape Cert Type"

1 0

Alexandre Julliard : winemine: Convert to Unicode.
by Alexandre Julliard Jan. 19, 2012

Jan. 19, 2012

Module: wine Branch: master Commit: 020faceaae650fd899ae0c11a78bae20f029ce72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=020faceaae650fd899ae0c11a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 19 20:24:31 2012 +0100 winemine: Convert to Unicode. --- programs/winemine/Makefile.in | 3 +- programs/winemine/dialog.c | 11 ++-- programs/winemine/main.c | 135 ++++++++++++++++++++++------------------- programs/winemine/main.h | 2 +- programs/winemine/resource.h | 11 +++ programs/winemine/winemine.rc | 10 ++-- 6 files changed, 96 insertions(+), 76 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=020faceaae650fd899ae0…

1 0

Luca Bennati : po: Update Italian translation.
by Alexandre Julliard Jan. 19, 2012

Jan. 19, 2012

Module: wine Branch: master Commit: 6dd16ec1f0ca01800090b0c9b9aa1a189fdd49a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dd16ec1f0ca01800090b0c9b… Author: Luca Bennati <lucak3(a)gmail.com> Date: Thu Jan 19 09:52:05 2012 +0100 po: Update Italian translation. --- po/it.po | 41 +++++++++++++++-------------------------- 1 files changed, 15 insertions(+), 26 deletions(-) diff --git a/po/it.po b/po/it.po index 4eddc86..84a40b2 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-01-13 12:10+0100\n" +"PO-Revision-Date: 2012-01-19 09:43+0100\n" "Last-Translator: Luca Bennati <lucak3(a)gmail.com>\n" "Language-Team: none\n" "Language: Italian\n" @@ -40,9 +40,8 @@ msgstr "" "lista e clicca Cambia/Rimuovi." #: appwiz.rc:64 -#, fuzzy msgid "&Support Information" -msgstr "Informazioni di supporto" +msgstr "Informazioni di &supporto" #: appwiz.rc:65 regedit.rc:42 regedit.rc:87 msgid "&Modify..." @@ -3488,12 +3487,11 @@ msgstr "Impossibile avere 'continue' fuori dal ciclo" #: jscript.rc:40 msgid "Label redefined" -msgstr "" +msgstr "Etichetta ridefinita" #: jscript.rc:41 -#, fuzzy msgid "Label not found" -msgstr "File non trovato" +msgstr "Etichetta non trovata" #: jscript.rc:42 msgid "Conditional compilation is turned off" @@ -7504,9 +7502,8 @@ msgid "Resource Failures" msgstr "Fallimenti della risorsa" #: shdoclc.rc:198 -#, fuzzy msgid "Dump Tracking Info" -msgstr "Informazioni di Dump Tracking" +msgstr "" #: shdoclc.rc:199 msgid "Debug Break" @@ -13073,9 +13070,8 @@ msgid "Command history" msgstr "Cronologia" #: wineconsole.rc:73 -#, fuzzy msgid "&Number of recalled commands:" -msgstr "&Numero di comandi richiamati :" +msgstr "&Numero di comandi richiamati:" #: wineconsole.rc:76 msgid "&Remove doubles" @@ -13098,12 +13094,10 @@ msgid "Buffer zone" msgstr "Zona del buffer" #: wineconsole.rc:101 -#, fuzzy msgid "&Width:" msgstr "&Larghezza:" #: wineconsole.rc:104 -#, fuzzy msgid "&Height:" msgstr "&Altezza:" @@ -13112,12 +13106,10 @@ msgid "Window size" msgstr "Dimensione della finestra" #: wineconsole.rc:109 -#, fuzzy msgid "W&idth:" msgstr "&Larghezza:" #: wineconsole.rc:112 -#, fuzzy msgid "H&eight:" msgstr "&Altezza:" @@ -13274,7 +13266,6 @@ msgstr "" "spiacenti per l'inconveniente." #: winedbg.rc:55 -#, fuzzy msgid "" "This can be caused by a problem in the program or a deficiency in Wine. You " "may want to check the <a href=\"http://appdb.winehq.org\">Application " @@ -13282,20 +13273,15 @@ msgid "" msgstr "" "Ciò può essere causato da un problema nel programma o da una mancanza di " "Wine. Potresti voler consultare il <a href=\"http://appdb.winehq.org" -"\">Database delle applicazioni</a> per consigli su questa applicazione.\n" -"\n" -"Se questo problema non è presente sotto Windows e non è stato ancora " -"segnalato, puoi <a href=\"http://wiki.winehq.org/Bugs\">segnalarlo</a>." +"\">Database delle applicazioni</a> per consigli su questa applicazione." #: winedbg.rc:58 -#, fuzzy msgid "Show &Details" -msgstr "&Dettagli" +msgstr "Mostra i &dettagli" #: winedbg.rc:63 -#, fuzzy msgid "Program Error Details" -msgstr "Errore del programma" +msgstr "Dettagli dell'errore del programma" #: winedbg.rc:70 msgid "" @@ -13304,6 +13290,10 @@ msgid "" "button, then <a href=\"http://wiki.winehq.org/Bugs\">file a bug report</a> " "and attach that file to the report." msgstr "" +"Se questo problema non è presente sotto Windows e non è stato ancora " +"riportato, puoi salvare le informazioni dettagliate su un file usando il " +"pulsante \"Salva con nome\", poi <a href=\"http://wiki.winehq.org/Bugs" +"\">segnalalo</a> e allega quel file al report del bug." #: winedbg.rc:35 msgid "Wine program crash" @@ -13318,13 +13308,12 @@ msgid "(unidentified)" msgstr "(non identificato)" #: winedbg.rc:40 -#, fuzzy msgid "Saving failed" -msgstr "Creazione fallita\n" +msgstr "Salvataggio fallito" #: winedbg.rc:41 msgid "Loading detailed information, please wait..." -msgstr "" +msgstr "Caricamento delle informazioni dettagliate, aspetta un momento..." #: winefile.rc:26 msgid "&Open\tEnter"

1 0

Alexandre Julliard : view: Convert to Unicode.
by Alexandre Julliard Jan. 19, 2012

Jan. 19, 2012

Module: wine Branch: master Commit: be91790988e49a003eb6c5ab214d2b620e4fdc9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=be91790988e49a003eb6c5ab2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 19 20:04:00 2012 +0100 view: Convert to Unicode. --- programs/view/Makefile.in | 3 +- programs/view/view.c | 162 +++++++++++++++++++++++---------------------- 2 files changed, 85 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be91790988e49a003eb6c…

1 0

Frédéric Delanoy : setupapi: Correctly handle errors in fake_dlls_callback (Coverity).
by Alexandre Julliard Jan. 19, 2012

Jan. 19, 2012

Module: wine Branch: master Commit: edd9066d5b676104c036cb621574f36ea055951b URL: http://source.winehq.org/git/wine.git/?a=commit;h=edd9066d5b676104c036cb621… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jan 19 17:14:21 2012 +0100 setupapi: Correctly handle errors in fake_dlls_callback (Coverity). --- dlls/setupapi/install.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 947a512..96eb914 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -701,7 +701,6 @@ static BOOL register_dlls_callback( HINF hinf, PCWSTR field, void *arg ) static BOOL fake_dlls_callback( HINF hinf, PCWSTR field, void *arg ) { INFCONTEXT context; - BOOL ret = TRUE; BOOL ok = SetupFindFirstLineW( hinf, field, NULL, &context ); for (; ok; ok = SetupFindNextLine( &context, &context )) @@ -730,9 +729,8 @@ static BOOL fake_dlls_callback( HINF hinf, PCWSTR field, void *arg ) done: HeapFree( GetProcessHeap(), 0, path ); - if (!ret) break; } - return ret; + return TRUE; } /***********************************************************************

1 0

Austin English : kernel32: Add stubs for GetConsoleCommandHistoryLengthA/W.
by Alexandre Julliard Jan. 19, 2012

Jan. 19, 2012

Module: wine Branch: master Commit: 2bc08d7f35228cd2dcbb552fdce2f941a4ac6e29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bc08d7f35228cd2dcbb552fd… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 18 02:27:33 2012 -0600 kernel32: Add stubs for GetConsoleCommandHistoryLengthA/W. --- dlls/kernel32/console.c | 20 ++++++++++++++++++-- dlls/kernel32/kernel32.spec | 4 ++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index fdc4552..b50bce1 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -2934,8 +2934,6 @@ BOOL WINAPI SetConsoleDisplayMode(HANDLE hConsoleOutput, DWORD dwFlags, /* some missing functions... * FIXME: those are likely to be defined as undocumented function in kernel32 (or part of them) * should get the right API and implement them - * GetConsoleCommandHistory[AW] (dword dword dword) - * GetConsoleCommandHistoryLength[AW] * SetConsoleCommandHistoryMode * SetConsoleNumberOfCommands[AW] */ @@ -3141,3 +3139,21 @@ BOOL CONSOLE_Exit(void) /* the console is in raw mode, put it back in cooked mode */ return restore_console_mode(GetStdHandle(STD_INPUT_HANDLE)); } + +/* Undocumented, called by native doskey.exe */ +/* FIXME: Should use CONSOLE_GetHistory() above for full implementation */ +DWORD WINAPI GetConsoleCommandHistoryA(DWORD unknown1, DWORD unknown2, DWORD unknown3) +{ + FIXME(": (0x%x, 0x%x, 0x%x) stub!\n", unknown1, unknown2, unknown3); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* Undocumented, called by native doskey.exe */ +/* FIXME: Should use CONSOLE_GetHistory() above for full implementation */ +DWORD WINAPI GetConsoleCommandHistoryW(DWORD unknown1, DWORD unknown2, DWORD unknown3) +{ + FIXME(": (0x%x, 0x%x, 0x%x) stub!\n", unknown1, unknown2, unknown3); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f1ec4f3..9be4f00 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -465,10 +465,10 @@ @ stub GetConsoleAliasesW @ stdcall GetConsoleCP() @ stub GetConsoleCharType -@ stub GetConsoleCommandHistoryA +@ stdcall GetConsoleCommandHistoryA(long long long) @ stub GetConsoleCommandHistoryLengthA @ stub GetConsoleCommandHistoryLengthW -@ stub GetConsoleCommandHistoryW +@ stdcall GetConsoleCommandHistoryW(long long long) @ stdcall GetConsoleCursorInfo(long ptr) @ stub GetConsoleCursorMode @ stdcall GetConsoleDisplayMode(ptr)

1 0

Jörg Höhle : winmm/tests: Properly recover from the WAVERR_STILLPLAYING case.
by Alexandre Julliard Jan. 19, 2012

Jan. 19, 2012

Module: wine Branch: master Commit: 32c23cbc80a3ce9690e255f0fb31e1d27114b99d URL: http://source.winehq.org/git/wine.git/?a=commit;h=32c23cbc80a3ce9690e255f0f… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jan 18 20:30:31 2012 +0100 winmm/tests: Properly recover from the WAVERR_STILLPLAYING case. --- dlls/winmm/tests/wave.c | 43 +++++++++++++++++++++++++++++++------------ 1 files changed, 31 insertions(+), 12 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index a7614a5..a96d088 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -684,7 +684,8 @@ static void wave_out_test_deviceOut(int device, double duration, if (rc!=MMSYSERR_NOERROR) goto EXIT; - WaitForSingleObject(hevent,10000); + rc=WaitForSingleObject(hevent,9000); + ok(rc==WAIT_OBJECT_0, "missing WOM_OPEN notification\n"); ok(pwfx->nChannels==nChannels && pwfx->wBitsPerSample==wBitsPerSample && @@ -787,7 +788,8 @@ static void wave_out_test_deviceOut(int device, double duration, ok(rc==MMSYSERR_NOERROR,"waveOutWrite(%s, header[%d]): rc=%s\n", dev_name(device),(i+1)%headers,wave_out_error(rc)); } - WaitForSingleObject(hevent,10000); + rc=WaitForSingleObject(hevent,8000); + ok(rc==WAIT_OBJECT_0, "missing WOM_DONE notification\n"); } } @@ -807,12 +809,29 @@ static void wave_out_test_deviceOut(int device, double duration, "waveOutUnprepareHeader(%s): rc=%s\n",dev_name(device), wave_out_error(rc)); } - HeapFree(GetProcessHeap(), 0, buffer); - rc=waveOutClose(wout); ok(rc==MMSYSERR_NOERROR,"waveOutClose(%s): rc=%s\n",dev_name(device), wave_out_error(rc)); - WaitForSingleObject(hevent,10000); + if (rc==WAVERR_STILLPLAYING) { + /* waveOutReset ought to return all buffers s.t. waveOutClose succeeds */ + rc=waveOutReset(wout); + ok(rc==MMSYSERR_NOERROR,"waveOutReset(%s): rc=%s\n",dev_name(device), + wave_out_error(rc)); + + for (i = 0; i < headers; i++) { + rc=waveOutUnprepareHeader(wout, &frags[i], sizeof(frags[0])); + ok(rc==MMSYSERR_NOERROR, + "waveOutUnprepareHeader(%s): rc=%s\n",dev_name(device), + wave_out_error(rc)); + } + rc=waveOutClose(wout); + ok(rc==MMSYSERR_NOERROR,"waveOutClose(%s): rc=%s\n",dev_name(device), + wave_out_error(rc)); + } + rc=WaitForSingleObject(hevent,1500); + ok(rc==WAIT_OBJECT_0, "missing WOM_CLOSE notification\n"); + + HeapFree(GetProcessHeap(), 0, buffer); EXIT: if ((flags & CALLBACK_TYPEMASK) == CALLBACK_THREAD) { PostThreadMessage(thread_id, WM_APP, 0, 0); @@ -970,20 +989,20 @@ static void wave_out_test_device(UINT_PTR device) format.nBlockAlign=format.nChannels*format.wBitsPerSample/8; format.nAvgBytesPerSec=format.nSamplesPerSec*format.nBlockAlign; format.cbSize=0; - wave_out_test_deviceOut(device,1.0,1,0,&format,WAVE_FORMAT_2M08, + wave_out_test_deviceOut(device,0.6,1,0,&format,WAVE_FORMAT_2M08, CALLBACK_EVENT,&capsA,TRUE,FALSE,FALSE); - wave_out_test_deviceOut(device,1.0,1,0,&format,WAVE_FORMAT_2M08, + wave_out_test_deviceOut(device,0.6,1,0,&format,WAVE_FORMAT_2M08, CALLBACK_EVENT,&capsA,TRUE,FALSE,TRUE); - wave_out_test_deviceOut(device,1.0,1,0,&format,WAVE_FORMAT_2M08, + wave_out_test_deviceOut(device,0.6,1,0,&format,WAVE_FORMAT_2M08, CALLBACK_FUNCTION,&capsA,TRUE,FALSE,FALSE); - wave_out_test_deviceOut(device,1.0,1,0,&format,WAVE_FORMAT_2M08, + wave_out_test_deviceOut(device,0.6,1,0,&format,WAVE_FORMAT_2M08, CALLBACK_FUNCTION,&capsA,TRUE,FALSE,TRUE); - wave_out_test_deviceOut(device,1.0,1,0,&format,WAVE_FORMAT_2M08, + wave_out_test_deviceOut(device,0.6,1,0,&format,WAVE_FORMAT_2M08, CALLBACK_THREAD,&capsA,TRUE,FALSE,FALSE); - wave_out_test_deviceOut(device,1.0,1,0,&format,WAVE_FORMAT_2M08, + wave_out_test_deviceOut(device,0.6,1,0,&format,WAVE_FORMAT_2M08, CALLBACK_THREAD,&capsA,TRUE,FALSE,TRUE); - wave_out_test_deviceOut(device,1.0,10,0,&format,WAVE_FORMAT_2M08, + wave_out_test_deviceOut(device,0.8,10,0,&format,WAVE_FORMAT_2M08, CALLBACK_EVENT,&capsA,TRUE,FALSE,FALSE); wave_out_test_deviceOut(device,1.0,5,1,&format,WAVE_FORMAT_2M08, CALLBACK_EVENT,&capsA,TRUE,FALSE,FALSE);

1 0

Aric Stewart : wineqtdecoder: Implement QTSplitter_ChangeStart.
by Alexandre Julliard Jan. 19, 2012

Jan. 19, 2012

Module: wine Branch: master Commit: 676754d11a08afa29426bdd481a105803aa9559c URL: http://source.winehq.org/git/wine.git/?a=commit;h=676754d11a08afa29426bdd48… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jan 19 09:42:42 2012 -0600 wineqtdecoder: Implement QTSplitter_ChangeStart. --- dlls/wineqtdecoder/qtsplitter.c | 37 +++++++++++++++++---------- include/tlogstg.idl | 52 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 14 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index aab9fc1..9f01094 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -166,6 +166,9 @@ typedef struct QTSplitter { CRITICAL_SECTION csReceive; SourceSeeking sourceSeeking; + TimeValue movie_time; + TimeValue movie_start; + TimeScale movie_scale; } QTSplitter; static const IPinVtbl QT_OutputPin_Vtbl; @@ -468,7 +471,7 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) { QTSplitter *This = (QTSplitter *)data; HRESULT hr = S_OK; - TimeValue movie_time=0, next_time; + TimeValue next_time; CVPixelBufferRef pixelBuffer = NULL; OSStatus err; TimeRecord tr; @@ -486,11 +489,13 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) WaitForSingleObject(This->runEvent, -1); + EnterCriticalSection(&This->csReceive); This->state = State_Running; /* Prime the pump: Needed for MPEG streams */ - GetMovieNextInterestingTime(This->pQTMovie, nextTimeEdgeOK | nextTimeStep, 0, NULL, movie_time, 1, &next_time, NULL); + GetMovieNextInterestingTime(This->pQTMovie, nextTimeEdgeOK | nextTimeStep, 0, NULL, This->movie_time, 1, &next_time, NULL); GetMovieTime(This->pQTMovie, &tr); + LeaveCriticalSection(&This->csReceive); do { LONGLONG tStart=0, tStop=0; @@ -498,7 +503,7 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) float time; EnterCriticalSection(&This->csReceive); - GetMovieNextInterestingTime(This->pQTMovie, nextTimeStep, 0, NULL, movie_time, 1, &next_time, NULL); + GetMovieNextInterestingTime(This->pQTMovie, nextTimeStep, 0, NULL, This->movie_time, 1, &next_time, NULL); if (next_time == -1) { @@ -512,15 +517,15 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) MoviesTask(This->pQTMovie,0); QTVisualContextTask(This->vContext); - TRACE("In loop at time %ld\n",movie_time); + TRACE("In loop at time %ld\n",This->movie_time); TRACE("In Next time %ld\n",next_time); - mStart = movie_time; + mStart = This->movie_time; mStop = next_time; - time = (float)movie_time / tr.scale; + time = (float)(This->movie_time - This->movie_start) / This->movie_scale; tStart = time * 10000000; - time = (float)next_time / tr.scale; + time = (float)(next_time - This->movie_start) / This->movie_scale; tStop = time * 10000000; /* Deliver Audio */ @@ -552,8 +557,8 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) goto audio_error; } - duration = (float)next_time / tr.scale; - time = (float)movie_time / tr.scale; + duration = (float)next_time / This->movie_scale; + time = (float)This->movie_time / This->movie_scale; duration -= time; frames = pvi->nSamplesPerSec * duration; TRACE("Need audio for %f seconds (%li frames)\n",duration,frames); @@ -643,7 +648,7 @@ audio_error: else TRACE("No video to deliver\n"); - movie_time = next_time; + This->movie_time = next_time; LeaveCriticalSection(&This->csReceive); } while (hr == S_OK); @@ -923,7 +928,6 @@ static HRESULT QT_Process_Movie(QTSplitter* filter) DWORD tid; HANDLE thread; LONGLONG time; - TimeScale scale; TRACE("Trying movie connect\n"); @@ -963,8 +967,8 @@ static HRESULT QT_Process_Movie(QTSplitter* filter) hr = QT_Process_Audio_Track(filter, trk); time = GetMovieDuration(filter->pQTMovie); - scale = GetMovieTimeScale(filter->pQTMovie); - filter->sourceSeeking.llDuration = ((double)time / scale) * 10000000; + filter->movie_scale = GetMovieTimeScale(filter->pQTMovie); + filter->sourceSeeking.llDuration = ((double)time / filter->movie_scale) * 10000000; filter->sourceSeeking.llStop = filter->sourceSeeking.llDuration; TRACE("Movie duration is %s\n",wine_dbgstr_longlong(filter->sourceSeeking.llDuration)); @@ -1364,7 +1368,12 @@ static HRESULT QT_AddPin(QTSplitter *This, const PIN_INFO *piOutput, const AM_ME static HRESULT WINAPI QTSplitter_ChangeStart(IMediaSeeking *iface) { - FIXME("(%p) filter hasn't implemented start position change!\n", iface); + QTSplitter *This = impl_from_IMediaSeeking(iface); + TRACE("(%p)\n", iface); + EnterCriticalSection(&This->csReceive); + This->movie_time = (This->sourceSeeking.llCurrent * This->movie_scale)/10000000; + This->movie_start = This->movie_time; + LeaveCriticalSection(&This->csReceive); return S_OK; } diff --git a/include/tlogstg.idl b/include/tlogstg.idl new file mode 100644 index 0000000..ff82ffc --- /dev/null +++ b/include/tlogstg.idl @@ -0,0 +1,52 @@ +/* + * Copyright 2012 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "objidl.idl"; +import "oleidl.idl"; +import "shtypes.idl"; + +typedef struct _WINDOWDATA { + DWORD dwWindowID; + UINT uiCP; + PIDLIST_ABSOLUTE pidl; + [string] LPWSTR lpszUrl; + [string] LPWSTR lpszUrlLocation; + [string] LPWSTR lpszTitle; +} WINDOWDATA; + +typedef WINDOWDATA *LPWINDOWDATA; +typedef const WINDOWDATA *LPCWINDOWDATA; + +[ + uuid(241c033e-e659-43da-aa4d-4086dbc4758d), + object +] +interface ITravelLogClient : IUnknown +{ + HRESULT FindWindowByIndex( + [in] DWORD dwID, + [out] IUnknown **ppunk); + + HRESULT GetWindowData( + [in] IStream *pStream, + [out] LPWINDOWDATA pWinData); + + HRESULT LoadHistoryPosition( + [in] LPWSTR pszUrlLocation, + [in] DWORD dwPosition); +}

1 0

Alexandre Julliard : dinput: Clip the mouse to the entire window instead of a 1x1 rectangle in exclusive mode .
by Alexandre Julliard Jan. 19, 2012

Jan. 19, 2012

Module: wine Branch: master Commit: f6368c4202afd47685d2d727c728a2e62dbe9735 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6368c4202afd47685d2d727c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 19 13:34:55 2012 +0100 dinput: Clip the mouse to the entire window instead of a 1x1 rectangle in exclusive mode. --- dlls/dinput/mouse.c | 32 +++++++++++++++----------------- 1 files changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 06403e1..20de328 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -65,7 +65,6 @@ struct SysMouseImpl /* SysMouseAImpl */ /* These are used in case of relative -> absolute transitions */ POINT org_coords; - POINT mapped_center; BOOL clipped; /* warping: whether we need to move mouse back to middle once we * reach window borders (for e.g. shooters, "surface movement" games) */ @@ -320,20 +319,18 @@ static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM { MSLLHOOKSTRUCT *hook = (MSLLHOOKSTRUCT *)lparam; SysMouseImpl* This = impl_from_IDirectInputDevice8A(iface); - int wdata = 0, inst_id = -1, ret; + int wdata = 0, inst_id = -1; TRACE("msg %lx @ (%d %d)\n", wparam, hook->pt.x, hook->pt.y); EnterCriticalSection(&This->base.crit); - ret = This->clipped; switch(wparam) { case WM_MOUSEMOVE: { POINT pt, pt1; - if (This->clipped) pt = This->mapped_center; - else GetCursorPos(&pt); + GetCursorPos(&pt); This->m_state.lX += pt.x = hook->pt.x - pt.x; This->m_state.lY += pt.y = hook->pt.y - pt.y; @@ -403,8 +400,6 @@ static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM inst_id = DIDFT_MAKEINSTANCE(WINE_MOUSE_BUTTONS_INSTANCE + 2 + HIWORD(hook->mouseData)) | DIDFT_PSHBUTTON; This->m_state.rgbButtons[2 + HIWORD(hook->mouseData)] = wdata = 0x00; break; - default: - ret = 0; } @@ -416,7 +411,7 @@ static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM } LeaveCriticalSection(&This->base.crit); - return ret; + return 0; } static void warp_check( SysMouseImpl* This, BOOL force ) @@ -426,25 +421,28 @@ static void warp_check( SysMouseImpl* This, BOOL force ) if (force || (This->need_warp && (now - This->last_warped > interval))) { - RECT rect, new_rect; + RECT rect; + POINT mapped_center; This->last_warped = now; This->need_warp = FALSE; if (!GetWindowRect(This->base.win, &rect)) return; - This->mapped_center.x = (rect.left + rect.right) / 2; - This->mapped_center.y = (rect.top + rect.bottom) / 2; if (!This->clipped) { - TRACE("Warping mouse to %d - %d\n", This->mapped_center.x, This->mapped_center.y); - SetCursorPos( This->mapped_center.x, This->mapped_center.y ); + mapped_center.x = (rect.left + rect.right) / 2; + mapped_center.y = (rect.top + rect.bottom) / 2; + TRACE("Warping mouse to %d - %d\n", mapped_center.x, mapped_center.y); + SetCursorPos( mapped_center.x, mapped_center.y ); } if (This->base.dwCoopLevel & DISCL_EXCLUSIVE) { - SetRect( &rect, This->mapped_center.x, This->mapped_center.y, - This->mapped_center.x + 1, This->mapped_center.y + 1 ); + /* make sure we clip even if the window covers the whole screen */ + rect.left = max( rect.left, GetSystemMetrics( SM_XVIRTUALSCREEN ) + 1 ); + rect.top = max( rect.top, GetSystemMetrics( SM_YVIRTUALSCREEN ) + 1 ); + rect.right = min( rect.right, rect.left + GetSystemMetrics( SM_CXVIRTUALSCREEN ) - 2 ); + rect.bottom = min( rect.bottom, rect.top + GetSystemMetrics( SM_CYVIRTUALSCREEN ) - 2 ); TRACE("Clipping mouse to %s\n", wine_dbgstr_rect( &rect )); - ClipCursor( &rect ); - This->clipped = GetClipCursor( &new_rect ) && EqualRect( &rect, &new_rect ); + This->clipped = ClipCursor( &rect ); } } }

1 0