June 2012 - Wine-commits - list.winehq.org

Vincent Povirk : appwiz: Update text to match button names.
by Alexandre Julliard 26 Jun '12

26 Jun '12

1 0

Michael Stefaniuc : usp10: Remove unreachable break after return (Smatch).
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: f596c747ef6dda58bb69bcdce335de5bcc7206f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f596c747ef6dda58bb69bcdce… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 25 23:11:51 2012 +0200 usp10: Remove unreachable break after return (Smatch). --- dlls/usp10/shape.c | 114 ++++++++++++++++++++++++++-------------------------- 1 files changed, 57 insertions(+), 57 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index a99614e..b574a85 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -898,11 +898,11 @@ static int combining_lexical_Arabic(WCHAR c) case 0x0652: case 0x0657: case 0x0658: - case 0x06E1: return Arab_DIAC1; break; + case 0x06E1: return Arab_DIAC1; case 0x064D: case 0x0650: - case 0x0656: return Arab_DIAC2; break; - case 0x0651: return Arab_DIAC3; break; + case 0x0656: return Arab_DIAC2; + case 0x0651: return Arab_DIAC3; case 0x0610: case 0x0611: case 0x0612: @@ -918,14 +918,14 @@ static int combining_lexical_Arabic(WCHAR c) case 0x06E7: case 0x06E8: case 0x06EB: - case 0x06EC: return Arab_DIAC4; break; + case 0x06EC: return Arab_DIAC4; case 0x06E3: case 0x06EA: - case 0x06ED: return Arab_DIAC5; break; - case 0x0670: return Arab_DIAC6; break; - case 0x0653: return Arab_DIAC7; break; + case 0x06ED: return Arab_DIAC5; + case 0x0670: return Arab_DIAC6; + case 0x0653: return Arab_DIAC7; case 0x0655: - case 0x0654: return Arab_DIAC8; break; + case 0x0654: return Arab_DIAC8; default: return Arab_Norm; } } @@ -1037,46 +1037,46 @@ static int combining_lexical_Hebrew(WCHAR c) case 0x05B4: case 0x05B5: case 0x05B6: - case 0x05BB: return Hebr_DIAC; break; + case 0x05BB: return Hebr_DIAC; case 0x0599: case 0x05A1: case 0x05A9: - case 0x05AE: return Hebr_CANT1; break; + case 0x05AE: return Hebr_CANT1; case 0x0597: case 0x05A8: - case 0x05AC: return Hebr_CANT2; break; + case 0x05AC: return Hebr_CANT2; case 0x0592: case 0x0593: case 0x0594: case 0x0595: case 0x05A7: - case 0x05AB: return Hebr_CANT3; break; + case 0x05AB: return Hebr_CANT3; case 0x0598: case 0x059C: case 0x059E: - case 0x059F: return Hebr_CANT4; break; + case 0x059F: return Hebr_CANT4; case 0x059D: - case 0x05A0: return Hebr_CANT5; break; + case 0x05A0: return Hebr_CANT5; case 0x059B: - case 0x05A5: return Hebr_CANT6; break; + case 0x05A5: return Hebr_CANT6; case 0x0591: case 0x05A3: - case 0x05A6: return Hebr_CANT7; break; + case 0x05A6: return Hebr_CANT7; case 0x0596: case 0x05A4: - case 0x05AA: return Hebr_CANT8; break; + case 0x05AA: return Hebr_CANT8; case 0x059A: - case 0x05AD: return Hebr_CANT9; break; - case 0x05AF: return Hebr_CANT10; break; - case 0x05BC: return Hebr_DAGESH; break; - case 0x05C4: return Hebr_DOTABV; break; - case 0x05B9: return Hebr_HOLAM; break; - case 0x05BD: return Hebr_METEG; break; - case 0x05B7: return Hebr_PATAH; break; - case 0x05B8: return Hebr_QAMATS; break; - case 0x05BF: return Hebr_RAFE; break; + case 0x05AD: return Hebr_CANT9; + case 0x05AF: return Hebr_CANT10; + case 0x05BC: return Hebr_DAGESH; + case 0x05C4: return Hebr_DOTABV; + case 0x05B9: return Hebr_HOLAM; + case 0x05BD: return Hebr_METEG; + case 0x05B7: return Hebr_PATAH; + case 0x05B8: return Hebr_QAMATS; + case 0x05BF: return Hebr_RAFE; case 0x05C1: - case 0x05C2: return Hebr_SHINSIN; break; + case 0x05C2: return Hebr_SHINSIN; default: return Hebr_Norm; } } @@ -1113,40 +1113,40 @@ static int combining_lexical_Syriac(WCHAR c) case 0x733: case 0x736: case 0x73A: - case 0x73D: return Syriac_DIAC1; break; + case 0x73D: return Syriac_DIAC1; case 0x731: case 0x734: case 0x737: case 0x73B: - case 0x73E: return Syriac_DIAC2; break; + case 0x73E: return Syriac_DIAC2; case 0x740: case 0x749: - case 0x74A: return Syriac_DIAC3; break; + case 0x74A: return Syriac_DIAC3; case 0x732: case 0x735: - case 0x73F: return Syriac_DIAC4; break; + case 0x73F: return Syriac_DIAC4; case 0x738: case 0x739: - case 0x73C: return Syriac_DIAC5; break; + case 0x73C: return Syriac_DIAC5; case 0x741: - case 0x30A: return Syriac_DIAC6; break; + case 0x30A: return Syriac_DIAC6; case 0x742: - case 0x325: return Syriac_DIAC7; break; + case 0x325: return Syriac_DIAC7; case 0x747: - case 0x303: return Syriac_DIAC8; break; + case 0x303: return Syriac_DIAC8; case 0x748: case 0x32D: case 0x32E: case 0x330: - case 0x331: return Syriac_DIAC9; break; - case 0x308: return Syriac_DIAC10; break; - case 0x304: return Syriac_DIAC11; break; - case 0x307: return Syriac_DIAC12; break; - case 0x323: return Syriac_DIAC13; break; - case 0x743: return Syriac_DIAC14; break; - case 0x744: return Syriac_DIAC15; break; - case 0x745: return Syriac_DIAC16; break; - case 0x746: return Syriac_DIAC17; break; + case 0x331: return Syriac_DIAC9; + case 0x308: return Syriac_DIAC10; + case 0x304: return Syriac_DIAC11; + case 0x307: return Syriac_DIAC12; + case 0x323: return Syriac_DIAC13; + case 0x743: return Syriac_DIAC14; + case 0x744: return Syriac_DIAC15; + case 0x745: return Syriac_DIAC16; + case 0x746: return Syriac_DIAC17; default: return Syriac_Norm; } } @@ -1260,7 +1260,7 @@ static int combining_lexical_Thaana(WCHAR c) case 0x7AC: case 0x7AD: case 0x7AE: - case 0x7AF: return Thaana_FILI; break; + case 0x7AF: return Thaana_FILI; default: return Thaana_Norm; } } @@ -1378,19 +1378,19 @@ static int combining_lexical_Thai(WCHAR c) case 0xE34: case 0xE35: case 0xE36: - case 0xE37: return Thai_ABOVE1; break; + case 0xE37: return Thai_ABOVE1; case 0xE47: - case 0xE4D: return Thai_ABOVE2; break; + case 0xE4D: return Thai_ABOVE2; case 0xE48: case 0xE49: case 0xE4A: - case 0xE4B: return Thai_ABOVE3; break; + case 0xE4B: return Thai_ABOVE3; case 0xE4C: - case 0xE4E: return Thai_ABOVE4; break; + case 0xE4E: return Thai_ABOVE4; case 0xE38: - case 0xE39: return Thai_BELOW1; break; - case 0xE3A: return Thai_BELOW2; break; - case 0xE33: return Thai_AM; break; + case 0xE39: return Thai_BELOW1; + case 0xE3A: return Thai_BELOW2; + case 0xE33: return Thai_AM; default: return Thai_Norm; } } @@ -1425,16 +1425,16 @@ static int combining_lexical_Lao(WCHAR c) case 0xEB6: case 0xEB7: case 0xEBB: - case 0xECD: return Lao_ABOVE1; break; + case 0xECD: return Lao_ABOVE1; case 0xEC8: case 0xEC9: case 0xECA: case 0xECB: - case 0xECC: return Lao_ABOVE2; break; - case 0xEBC: return Lao_BELOW1; break; + case 0xECC: return Lao_ABOVE2; + case 0xEBC: return Lao_BELOW1; case 0xEB8: - case 0xEB9: return Lao_BELOW2; break; - case 0xEB3: return Lao_AM; break; + case 0xEB9: return Lao_BELOW2; + case 0xEB3: return Lao_AM; default: return Lao_Norm; } }

1 0

Chris Robinson : quartz: Remove the seek position table from the MPEG splitter.
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: 2ccc5bd2c7b90009a967ba63ab3babc6e6d92386 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ccc5bd2c7b90009a967ba63a… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Mon Jun 25 19:41:13 2012 -0700 quartz: Remove the seek position table from the MPEG splitter. It takes a good 0.5 seconds for MPEGSplitter_pre_connect to iterate over the file and build the table for a standard 2 or 3 minute MP3. This causes unsightly hiccups when an app tries to play a new file, particularly in games, as the pre-connect needs to happen synchronously to tell whether it can succeed or not. --- dlls/quartz/mpegsplit.c | 109 ++++++++--------------------------------------- 1 files changed, 18 insertions(+), 91 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 934238e..de03d17 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -52,28 +52,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); #define MPEG_AUDIO_HEADER 1 #define MPEG_NO_HEADER 0 -#define SEEK_INTERVAL (ULONGLONG)(10 * 10000000) /* Add an entry every 10 seconds */ - -struct seek_entry { - ULONGLONG bytepos; - ULONGLONG timepos; -}; - typedef struct MPEGSplitterImpl { ParserImpl Parser; LONGLONG EndOfFile; - LONGLONG duration; LONGLONG position; DWORD begin_offset; BYTE header[4]; /* Whether we just seeked (or started playing) */ BOOL seek; - - /* Seeking cache */ - ULONG seek_entries; - struct seek_entry *seektable; } MPEGSplitterImpl; static inline MPEGSplitterImpl *impl_from_IMediaSeeking( IMediaSeeking *iface ) @@ -545,22 +533,17 @@ static HRESULT MPEGSplitter_pre_connect(IPin *iface, IPin *pConnectPin, ALLOCATO This->begin_offset = pos; memcpy(This->header, header, 4); - This->seektable[0].bytepos = pos; - This->seektable[0].timepos = 0; - switch(streamtype) { case MPEG_AUDIO_HEADER: { LONGLONG duration = 0; - DWORD last_entry = 0; - - DWORD ticks = GetTickCount(); + WAVEFORMATEX *format; hr = MPEGSplitter_init_audio(This, header, &piOutput, &amt); if (SUCCEEDED(hr)) { - WAVEFORMATEX *format = (WAVEFORMATEX*)amt.pbFormat; + format = (WAVEFORMATEX*)amt.pbFormat; props->cbAlign = 1; props->cbPrefix = 0; @@ -580,58 +563,16 @@ static HRESULT MPEGSplitter_pre_connect(IPin *iface, IPin *pConnectPin, ALLOCATO } /* Check for idv1 tag, and remove it from stream if found */ - hr = IAsyncReader_SyncRead(pPin->pReader, This->EndOfFile-128, 3, header+4); + hr = IAsyncReader_SyncRead(pPin->pReader, This->EndOfFile-128, 3, header); if (FAILED(hr)) break; - if (!strncmp((char*)header+4, "TAG", 3)) + if (!strncmp((char*)header, "TAG", 3)) This->EndOfFile -= 128; This->Parser.pInputPin->rtStop = MEDIATIME_FROM_BYTES(This->EndOfFile); This->Parser.pInputPin->rtStart = This->Parser.pInputPin->rtCurrent = MEDIATIME_FROM_BYTES(This->begin_offset); - /* http://mpgedit.org/mpgedit/mpeg_format/mpeghdr.htm has a whole read up on audio headers */ - while (pos + 3 < This->EndOfFile) - { - LONGLONG length = 0; - hr = IAsyncReader_SyncRead(pPin->pReader, pos, 4, header); - if (hr != S_OK) - break; - while ((hr=parse_header(header, &length, &duration)) != S_OK && - pos + 4 < This->EndOfFile) - { - /* No valid header yet; shift by a byte and check again */ - memmove(header, header+1, 3); - hr = IAsyncReader_SyncRead(pPin->pReader, ++pos + 3, 1, header + 3); - if (hr != S_OK) - break; - } - if (hr != S_OK) - break; - pos += length; - - if (This->seektable && (duration / SEEK_INTERVAL) > last_entry) - { - if (last_entry + 1 > duration / SEEK_INTERVAL) - { - ERR("Somehow skipped %d interval lengths instead of 1\n", (DWORD)(duration/SEEK_INTERVAL) - (last_entry + 1)); - } - ++last_entry; - - TRACE("Entry: %u\n", last_entry); - if (last_entry >= This->seek_entries) - { - This->seek_entries += 64; - This->seektable = CoTaskMemRealloc(This->seektable, (This->seek_entries)*sizeof(struct seek_entry)); - } - This->seektable[last_entry].bytepos = pos; - This->seektable[last_entry].timepos = duration; - } - - TRACE("Pos: %x%08x/%x%08x\n", (DWORD)(pos >> 32), (DWORD)pos, (DWORD)(This->EndOfFile>>32), (DWORD)This->EndOfFile); - } - hr = S_OK; + duration = (This->EndOfFile-This->begin_offset) * 10000000 / format->nAvgBytesPerSec; TRACE("Duration: %d seconds\n", (DWORD)(duration / 10000000)); - TRACE("Parsing took %u ms\n", GetTickCount() - ticks); - This->duration = duration; This->Parser.sourceSeeking.llCurrent = 0; This->Parser.sourceSeeking.llDuration = duration; @@ -669,45 +610,39 @@ static HRESULT WINAPI MPEGSplitter_seek(IMediaSeeking *iface) MPEGSplitterImpl *This = impl_from_IMediaSeeking(iface); PullPin *pPin = This->Parser.pInputPin; LONGLONG newpos, timepos, bytepos; - HRESULT hr = S_OK; + HRESULT hr = E_INVALIDARG; BYTE header[4]; newpos = This->Parser.sourceSeeking.llCurrent; - - if (newpos > This->duration) - { - WARN("Requesting position %x%08x beyond end of stream %x%08x\n", (DWORD)(newpos>>32), (DWORD)newpos, (DWORD)(This->duration>>32), (DWORD)This->duration); - return E_INVALIDARG; - } - if (This->position/1000000 == newpos/1000000) { TRACE("Requesting position %x%08x same as current position %x%08x\n", (DWORD)(newpos>>32), (DWORD)newpos, (DWORD)(This->position>>32), (DWORD)This->position); return S_OK; } - /* Position, cached */ - bytepos = This->seektable[newpos / SEEK_INTERVAL].bytepos; - timepos = This->seektable[newpos / SEEK_INTERVAL].timepos; - - hr = IAsyncReader_SyncRead(pPin->pReader, bytepos, 4, header); + bytepos = This->begin_offset; + timepos = 0; + /* http://mpgedit.org/mpgedit/mpeg_format/mpeghdr.htm has a whole read up on audio headers */ while (bytepos + 3 < This->EndOfFile) { + LONGLONG duration = timepos; LONGLONG length = 0; hr = IAsyncReader_SyncRead(pPin->pReader, bytepos, 4, header); - if (hr != S_OK || timepos >= newpos) + if (hr != S_OK) break; - - while (parse_header(header, &length, &timepos) && bytepos + 4 < This->EndOfFile) + while ((hr=parse_header(header, &length, &duration)) != S_OK && + bytepos + 4 < This->EndOfFile) { /* No valid header yet; shift by a byte and check again */ memmove(header, header+1, 3); hr = IAsyncReader_SyncRead(pPin->pReader, ++bytepos + 3, 1, header + 3); if (hr != S_OK) break; - } - bytepos += length; - TRACE("Pos: %x%08x/%x%08x\n", (DWORD)(bytepos >> 32), (DWORD)bytepos, (DWORD)(This->EndOfFile>>32), (DWORD)This->EndOfFile); + } + if (hr != S_OK || duration > newpos) + break; + bytepos += length; + timepos = duration; } if (SUCCEEDED(hr)) @@ -832,14 +767,6 @@ HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) return E_OUTOFMEMORY; ZeroMemory(This, sizeof(MPEGSplitterImpl)); - This->seektable = CoTaskMemAlloc(sizeof(struct seek_entry) * 64); - if (!This->seektable) - { - CoTaskMemFree(This); - return E_OUTOFMEMORY; - } - This->seek_entries = 64; - hr = Parser_Create(&(This->Parser), &MPEGSplitter_Vtbl, &CLSID_MPEG1Splitter, MPEGSplitter_process_sample, MPEGSplitter_query_accept, MPEGSplitter_pre_connect, MPEGSplitter_cleanup, MPEGSplitter_disconnect, MPEGSplitter_first_request, NULL, NULL, MPEGSplitter_seek, NULL); if (FAILED(hr)) {

1 0

Roderick Colenbrander : opengl32: Disable wglGetProcAddress for core GL 1.0 /1.1 functions.
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: 71faef0f503c248c4d9c94c2be2fcbc3c9c93741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71faef0f503c248c4d9c94c2b… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Jun 25 22:37:30 2012 -0700 opengl32: Disable wglGetProcAddress for core GL 1.0/1.1 functions. --- dlls/opengl32/tests/opengl.c | 10 ++++++++++ dlls/opengl32/wgl.c | 8 +------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index c18b0ad..a2aa358 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -779,6 +779,16 @@ static void test_getprocaddress(HDC hdc) return; } + /* Core GL 1.0/1.1 functions should not be loadable through wglGetProcAddress. + * Try to load the function with and without a context. + */ + func = wglGetProcAddress("glEnable"); + ok(func == NULL, "Lookup of function glEnable with a context passed, expected a failure\n"); + wglMakeCurrent(hdc, NULL); + func = wglGetProcAddress("glEnable"); + ok(func == NULL, "Lookup of function glEnable without a context passed, expected a failure\n"); + wglMakeCurrent(hdc, ctx); + /* The goal of the test will be to test behavior of wglGetProcAddress when * no WGL context is active. Before the test we pick an extension (GL_ARB_multitexture) * which any GL >=1.2.1 implementation supports. Unfortunately the GDI renderer doesn't diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 79aefcd..eca42e2 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -467,13 +467,7 @@ PROC WINAPI wglGetProcAddress(LPCSTR lpszProc) { return NULL; } - /* First, look if it's not already defined in the 'standard' OpenGL functions */ - if ((local_func = GetProcAddress(opengl32_handle, lpszProc)) != NULL) { - TRACE(" found function in 'standard' OpenGL functions (%p)\n", local_func); - return local_func; - } - - /* After that, search in the thunks to find the real name of the extension */ + /* Search in the thunks to find the real name of the extension */ ext.name = lpszProc; ext_ret = bsearch(&ext, extension_registry, extension_registry_size, sizeof(OpenGL_extension), compar);

1 0

Francois Gouget : msvcp90: Add a space between the spec entry name the implementation function.
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: 6bacd9559f08b53c3dea6b3b51f0fdeb1ac9b5fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bacd9559f08b53c3dea6b3b5… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 26 12:32:44 2012 +0200 msvcp90: Add a space between the spec entry name the implementation function. --- dlls/msvcp90/msvcp90.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index e2d31d7..4f6faca 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -1591,7 +1591,7 @@ @ thiscall -arch=win32 ??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV01(a)N@Z(ptr double) basic_ostream_char_print_double @ cdecl -arch=win64 ??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV01(a)N@Z(ptr double) basic_ostream_char_print_double @ thiscall -arch=win32 ??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV01(a)O@Z(ptr double) basic_ostream_char_print_ldouble -@ cdecl -arch=win64 ??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV01(a)O@Z(ptr double)basic_ostream_char_print_ldouble +@ cdecl -arch=win64 ??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV01(a)O@Z(ptr double) basic_ostream_char_print_ldouble @ thiscall -arch=win32 ??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV01(a)P6AAAV01@AAV01@@Z(a)Z(ptr ptr) basic_ostream_char_print_func @ cdecl -arch=win64 ??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV01(a)P6AAEAV01@AEAV01@@Z(a)Z(ptr ptr) basic_ostream_char_print_func @ thiscall -arch=win32 ??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV01(a)P6AAAV?$basic_ios(a)DU?$char_traits(a)D@std@@@1(a)AAV21@@Z(a)Z(ptr ptr) basic_ostream_char_print_func_basic_ios

1 0

Alexandre Julliard : winex11: Move ChoosePixelFormat implementation to opengl32 and base it on DescribePixelFormat .
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: 81cd178ae1baea33212acf7d7e8e65d354e50492 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81cd178ae1baea33212acf7d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 25 21:51:16 2012 +0200 winex11: Move ChoosePixelFormat implementation to opengl32 and base it on DescribePixelFormat. --- dlls/gdi32/opengl.c | 18 ++++ dlls/gdi32/painting.c | 29 ------- dlls/opengl32/wgl.c | 159 +++++++++++++++++++++++++++++++++++- dlls/winex11.drv/opengl.c | 200 +-------------------------------------------- 4 files changed, 175 insertions(+), 231 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=81cd178ae1baea33212ac…

1 0

Alexandre Julliard : gdi32: Forward DescribePixelFormat to opengl32 which in turn calls GdiDescribePixelFormat .
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: e9f270bd412ad8dae6645c5cf726b74e6397281c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9f270bd412ad8dae6645c5cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 25 21:59:11 2012 +0200 gdi32: Forward DescribePixelFormat to opengl32 which in turn calls GdiDescribePixelFormat. --- dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/opengl.c | 15 +++++++++++++++ dlls/gdi32/painting.c | 17 ++++------------- dlls/opengl32/wgl.c | 11 ++++++----- 4 files changed, 26 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index c723af3..60988da 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -169,7 +169,7 @@ @ stub GdiDeleteLocalDC @ stub GdiDeleteLocalObject # @ stub GdiDeleteSpoolFileHandle -# @ stub GdiDescribePixelFormat +@ stdcall GdiDescribePixelFormat(long long long ptr) @ stub GdiDllInitialize @ stdcall GdiDrawStream(long long ptr) # @ stub GdiEndDocEMF diff --git a/dlls/gdi32/opengl.c b/dlls/gdi32/opengl.c index 11f7395..f021502 100644 --- a/dlls/gdi32/opengl.c +++ b/dlls/gdi32/opengl.c @@ -41,6 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wgl); static const WCHAR opengl32W[] = {'o','p','e','n','g','l','3','2','.','d','l','l',0}; static HMODULE opengl32; static INT (WINAPI *wglChoosePixelFormat)(HDC,const PIXELFORMATDESCRIPTOR *); +static INT (WINAPI *wglDescribePixelFormat)(HDC,INT,UINT,PIXELFORMATDESCRIPTOR*); static HDC default_hdc = 0; @@ -237,3 +238,17 @@ INT WINAPI ChoosePixelFormat( HDC hdc, const PIXELFORMATDESCRIPTOR *pfd ) } return wglChoosePixelFormat( hdc, pfd ); } + +/****************************************************************************** + * DescribePixelFormat (GDI32.@) + */ +INT WINAPI DescribePixelFormat( HDC hdc, INT fmt, UINT size, PIXELFORMATDESCRIPTOR *pfd ) +{ + if (!wglDescribePixelFormat) + { + if (!opengl32) opengl32 = LoadLibraryW( opengl32W ); + if (!(wglDescribePixelFormat = (void *)GetProcAddress( opengl32, "wglDescribePixelFormat" ))) + return 0; + } + return wglDescribePixelFormat( hdc, fmt, size, pfd ); +} diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 7f98e25..e8c2882 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -547,21 +547,12 @@ INT WINAPI GetPixelFormat( HDC hdc ) /****************************************************************************** - * DescribePixelFormat [GDI32.@] - * Gets info about pixel format from DC + * GdiDescribePixelFormat [GDI32.@] * - * PARAMS - * hdc [I] Device context - * iPixelFormat [I] Pixel format selector - * nBytes [I] Size of buffer - * ppfd [O] Pointer to structure to receive pixel format data - * - * RETURNS - * Success: Maximum pixel format index of the device context - * Failure: 0 + * Probably not the correct semantics, it's supposed to be an internal backend for DescribePixelFormat. */ -INT WINAPI DescribePixelFormat( HDC hdc, INT iPixelFormat, UINT nBytes, - LPPIXELFORMATDESCRIPTOR ppfd ) +INT WINAPI GdiDescribePixelFormat( HDC hdc, INT iPixelFormat, UINT nBytes, + LPPIXELFORMATDESCRIPTOR ppfd ) { INT ret = 0; DC * dc = get_dc_ptr( hdc ); diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index cd4c6ff..2a59e04 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -51,7 +51,6 @@ static struct BOOL (WINAPI *p_SetPixelFormat)(HDC hdc, INT iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd); BOOL (WINAPI *p_wglMakeCurrent)(HDC hdc, HGLRC hglrc); HGLRC (WINAPI *p_wglCreateContext)(HDC hdc); - INT (WINAPI *p_DescribePixelFormat)(HDC hdc, INT iPixelFormat, UINT nBytes, LPPIXELFORMATDESCRIPTOR ppfd); INT (WINAPI *p_GetPixelFormat)(HDC hdc); /* internal WGL functions */ @@ -89,6 +88,8 @@ static char* internal_gl_extensions = NULL; const GLubyte * WINAPI wine_glGetString( GLenum name ); +extern INT WINAPI GdiDescribePixelFormat( HDC hdc, INT fmt, UINT size, PIXELFORMATDESCRIPTOR *pfd ); + /*********************************************************************** * wglSetPixelFormat(OPENGL32.@) */ @@ -184,7 +185,7 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd) ppfd->cColorBits, ppfd->cRedBits, ppfd->cGreenBits, ppfd->cBlueBits, ppfd->cAlphaBits, ppfd->cAccumBits, ppfd->cDepthBits, ppfd->cStencilBits, ppfd->cAuxBuffers ); - count = wine_wgl.p_DescribePixelFormat( hdc, 0, 0, NULL ); + count = GdiDescribePixelFormat( hdc, 0, 0, NULL ); if (!count) return 0; best_format = 0; @@ -197,7 +198,7 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd) for (i = 1; i <= count; i++) { - if (!wine_wgl.p_DescribePixelFormat( hdc, i, sizeof(format), &format )) continue; + if (!GdiDescribePixelFormat( hdc, i, sizeof(format), &format )) continue; if (ppfd->iPixelType != format.iPixelType) { @@ -338,8 +339,9 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd) INT WINAPI wglDescribePixelFormat(HDC hdc, INT iPixelFormat, UINT nBytes, LPPIXELFORMATDESCRIPTOR ppfd) { - return wine_wgl.p_DescribePixelFormat(hdc, iPixelFormat, nBytes, ppfd); + return GdiDescribePixelFormat(hdc, iPixelFormat, nBytes, ppfd); } + /*********************************************************************** * wglGetPixelFormat (OPENGL32.@) */ @@ -1087,7 +1089,6 @@ static BOOL process_attach(void) wine_wgl.p_SetPixelFormat = (void *)GetProcAddress(mod_gdi32, "SetPixelFormat"); wine_wgl.p_wglMakeCurrent = (void *)GetProcAddress(mod_gdi32, "wglMakeCurrent"); wine_wgl.p_wglCreateContext = (void *)GetProcAddress(mod_gdi32, "wglCreateContext"); - wine_wgl.p_DescribePixelFormat = (void *)GetProcAddress(mod_gdi32, "DescribePixelFormat"); wine_wgl.p_GetPixelFormat = (void *)GetProcAddress(mod_gdi32, "GetPixelFormat"); /* internal WGL functions */

1 0

Alexandre Julliard : gdi32: Forward SetPixelFormat to opengl32 which in turn calls GdiSetPixelFormat.
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: c0139457285251f7ded38e9b9df48daebe8c58d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0139457285251f7ded38e9b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 25 22:03:59 2012 +0200 gdi32: Forward SetPixelFormat to opengl32 which in turn calls GdiSetPixelFormat. --- dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/opengl.c | 15 +++++++++++++++ dlls/gdi32/painting.c | 15 +++------------ dlls/opengl32/wgl.c | 6 +++--- 4 files changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 60988da..98fe5c6 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -214,7 +214,7 @@ @ stub GdiSetAttrs @ stdcall GdiSetBatchLimit(long) # @ stub GdiSetLastError -# @ stub GdiSetPixelFormat +@ stdcall GdiSetPixelFormat(long long ptr) @ stub GdiSetServerAttr # @ stub GdiStartDocEMF # @ stub GdiStartPageEMF diff --git a/dlls/gdi32/opengl.c b/dlls/gdi32/opengl.c index f021502..18b5fcb 100644 --- a/dlls/gdi32/opengl.c +++ b/dlls/gdi32/opengl.c @@ -42,6 +42,7 @@ static const WCHAR opengl32W[] = {'o','p','e','n','g','l','3','2','.','d','l','l static HMODULE opengl32; static INT (WINAPI *wglChoosePixelFormat)(HDC,const PIXELFORMATDESCRIPTOR *); static INT (WINAPI *wglDescribePixelFormat)(HDC,INT,UINT,PIXELFORMATDESCRIPTOR*); +static BOOL (WINAPI *wglSetPixelFormat)(HDC,INT,const PIXELFORMATDESCRIPTOR*); static HDC default_hdc = 0; @@ -252,3 +253,17 @@ INT WINAPI DescribePixelFormat( HDC hdc, INT fmt, UINT size, PIXELFORMATDESCRIPT } return wglDescribePixelFormat( hdc, fmt, size, pfd ); } + +/****************************************************************************** + * SetPixelFormat (GDI32.@) + */ +BOOL WINAPI SetPixelFormat( HDC hdc, INT fmt, const PIXELFORMATDESCRIPTOR *pfd ) +{ + if (!wglSetPixelFormat) + { + if (!opengl32) opengl32 = LoadLibraryW( opengl32W ); + if (!(wglSetPixelFormat = (void *)GetProcAddress( opengl32, "wglSetPixelFormat" ))) + return 0; + } + return wglSetPixelFormat( hdc, fmt, pfd ); +} diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index e8c2882..4be8cb3 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -486,20 +486,11 @@ COLORREF WINAPI GetPixel( HDC hdc, INT x, INT y ) /****************************************************************************** - * SetPixelFormat [GDI32.@] - * Sets pixel format of device context + * GdiSetPixelFormat [GDI32.@] * - * PARAMS - * hdc [I] Device context to search for best pixel match - * iPixelFormat [I] Pixel format index - * ppfd [I] Pixel format for which a match is sought - * - * RETURNS - * Success: TRUE - * Failure: FALSE + * Probably not the correct semantics, it's supposed to be an internal backend for SetPixelFormat. */ -BOOL WINAPI SetPixelFormat( HDC hdc, INT iPixelFormat, - const PIXELFORMATDESCRIPTOR *ppfd) +BOOL WINAPI GdiSetPixelFormat( HDC hdc, INT iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd) { INT bRet = FALSE; DC * dc = get_dc_ptr( hdc ); diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 2a59e04..328cb63 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -48,7 +48,6 @@ WINE_DECLARE_DEBUG_CHANNEL(opengl); static struct { PROC (WINAPI *p_wglGetProcAddress)(LPCSTR lpszProc); - BOOL (WINAPI *p_SetPixelFormat)(HDC hdc, INT iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd); BOOL (WINAPI *p_wglMakeCurrent)(HDC hdc, HGLRC hglrc); HGLRC (WINAPI *p_wglCreateContext)(HDC hdc); INT (WINAPI *p_GetPixelFormat)(HDC hdc); @@ -88,7 +87,9 @@ static char* internal_gl_extensions = NULL; const GLubyte * WINAPI wine_glGetString( GLenum name ); +/* internal GDI functions */ extern INT WINAPI GdiDescribePixelFormat( HDC hdc, INT fmt, UINT size, PIXELFORMATDESCRIPTOR *pfd ); +extern BOOL WINAPI GdiSetPixelFormat( HDC hdc, INT fmt, const PIXELFORMATDESCRIPTOR *pfd ); /*********************************************************************** * wglSetPixelFormat(OPENGL32.@) @@ -96,7 +97,7 @@ extern INT WINAPI GdiDescribePixelFormat( HDC hdc, INT fmt, UINT size, PIXELFORM BOOL WINAPI wglSetPixelFormat( HDC hdc, INT iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd) { - return wine_wgl.p_SetPixelFormat(hdc, iPixelFormat, ppfd); + return GdiSetPixelFormat(hdc, iPixelFormat, ppfd); } /*********************************************************************** @@ -1086,7 +1087,6 @@ static BOOL process_attach(void) wine_tsx11_unlock_ptr = (void *)GetProcAddress( mod_x11, "wine_tsx11_unlock" ); wine_wgl.p_wglGetProcAddress = (void *)GetProcAddress(mod_gdi32, "wglGetProcAddress"); - wine_wgl.p_SetPixelFormat = (void *)GetProcAddress(mod_gdi32, "SetPixelFormat"); wine_wgl.p_wglMakeCurrent = (void *)GetProcAddress(mod_gdi32, "wglMakeCurrent"); wine_wgl.p_wglCreateContext = (void *)GetProcAddress(mod_gdi32, "wglCreateContext"); wine_wgl.p_GetPixelFormat = (void *)GetProcAddress(mod_gdi32, "GetPixelFormat");

1 0

Alexandre Julliard : gdi32: Forward SwapBuffers to opengl32 which in turn calls GdiSwapBuffers.
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: 67e7eda96c16417526e9659be0eeecf2b6edd4c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67e7eda96c16417526e9659be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 25 22:45:28 2012 +0200 gdi32: Forward SwapBuffers to opengl32 which in turn calls GdiSwapBuffers. --- dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/opengl.c | 15 +++++++++++++++ dlls/gdi32/painting.c | 12 +++--------- dlls/opengl32/wgl.c | 5 +++-- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 98fe5c6..2a7edc3 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -218,7 +218,7 @@ @ stub GdiSetServerAttr # @ stub GdiStartDocEMF # @ stub GdiStartPageEMF -# @ stub GdiSwapBuffers +@ stdcall GdiSwapBuffers(long) @ stdcall GdiTransparentBlt(long long long long long long long long long long long) # @ stub GdiValidateHandle @ stub GdiWinWatchClose diff --git a/dlls/gdi32/opengl.c b/dlls/gdi32/opengl.c index 18b5fcb..d2ab2aa 100644 --- a/dlls/gdi32/opengl.c +++ b/dlls/gdi32/opengl.c @@ -43,6 +43,7 @@ static HMODULE opengl32; static INT (WINAPI *wglChoosePixelFormat)(HDC,const PIXELFORMATDESCRIPTOR *); static INT (WINAPI *wglDescribePixelFormat)(HDC,INT,UINT,PIXELFORMATDESCRIPTOR*); static BOOL (WINAPI *wglSetPixelFormat)(HDC,INT,const PIXELFORMATDESCRIPTOR*); +static BOOL (WINAPI *wglSwapBuffers)(HDC); static HDC default_hdc = 0; @@ -267,3 +268,17 @@ BOOL WINAPI SetPixelFormat( HDC hdc, INT fmt, const PIXELFORMATDESCRIPTOR *pfd ) } return wglSetPixelFormat( hdc, fmt, pfd ); } + +/****************************************************************************** + * SwapBuffers (GDI32.@) + */ +BOOL WINAPI SwapBuffers( HDC hdc ) +{ + if (!wglSwapBuffers) + { + if (!opengl32) opengl32 = LoadLibraryW( opengl32W ); + if (!(wglSwapBuffers = (void *)GetProcAddress( opengl32, "wglSwapBuffers" ))) + return 0; + } + return wglSwapBuffers( hdc ); +} diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 4be8cb3..571a96b 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -562,17 +562,11 @@ INT WINAPI GdiDescribePixelFormat( HDC hdc, INT iPixelFormat, UINT nBytes, /****************************************************************************** - * SwapBuffers [GDI32.@] - * Exchanges front and back buffers of window + * GdiSwapBuffers [GDI32.@] * - * PARAMS - * hdc [I] Device context whose buffers get swapped - * - * RETURNS - * Success: TRUE - * Failure: FALSE + * Probably not the correct semantics, it's supposed to be an internal backend for SwapBuffers. */ -BOOL WINAPI SwapBuffers( HDC hdc ) +BOOL WINAPI GdiSwapBuffers( HDC hdc ) { INT bRet = FALSE; DC * dc = get_dc_ptr( hdc ); diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 328cb63..79aefcd 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -90,6 +90,7 @@ const GLubyte * WINAPI wine_glGetString( GLenum name ); /* internal GDI functions */ extern INT WINAPI GdiDescribePixelFormat( HDC hdc, INT fmt, UINT size, PIXELFORMATDESCRIPTOR *pfd ); extern BOOL WINAPI GdiSetPixelFormat( HDC hdc, INT fmt, const PIXELFORMATDESCRIPTOR *pfd ); +extern BOOL WINAPI GdiSwapBuffers( HDC hdc ); /*********************************************************************** * wglSetPixelFormat(OPENGL32.@) @@ -560,7 +561,7 @@ BOOL WINAPI wglSwapLayerBuffers(HDC hdc, TRACE_(opengl)("(%p, %08x)\n", hdc, fuPlanes); if (fuPlanes & WGL_SWAP_MAIN_PLANE) { - if (!SwapBuffers(hdc)) return FALSE; + if (!GdiSwapBuffers(hdc)) return FALSE; fuPlanes &= ~WGL_SWAP_MAIN_PLANE; } @@ -1062,7 +1063,7 @@ void WINAPI wine_glGetIntegerv( GLenum pname, GLint* params ) */ BOOL WINAPI DECLSPEC_HOTPATCH wglSwapBuffers( HDC hdc ) { - return SwapBuffers(hdc); + return GdiSwapBuffers(hdc); } /* This is for brain-dead applications that use OpenGL functions before even

1 0

Dmitry Timoshkov : windowscodecs: TiffDecoder_GetThumbnail should return NULL interface.
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: f07829da5750949ad9e7a9c5a370c65b0f6076f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f07829da5750949ad9e7a9c5a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 25 12:26:56 2012 +0900 windowscodecs: TiffDecoder_GetThumbnail should return NULL interface. --- dlls/windowscodecs/tiffformat.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index cd3703f..d12729f 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -643,6 +643,10 @@ static HRESULT WINAPI TiffDecoder_GetThumbnail(IWICBitmapDecoder *iface, IWICBitmapSource **ppIThumbnail) { TRACE("(%p,%p)\n", iface, ppIThumbnail); + + if (!ppIThumbnail) return E_INVALIDARG; + + *ppIThumbnail = NULL; return WINCODEC_ERR_CODECNOTHUMBNAIL; }

1 0