March 2013 - Wine-Commits - list.winehq.org

Alexandre Julliard : winhttp: Always pass a ULONG variable to ioctlsocket.
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: 847a29375c42433dbd70701d59d250f1a390ce0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=847a29375c42433dbd70701d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 6 13:32:44 2013 +0100 winhttp: Always pass a ULONG variable to ioctlsocket. --- dlls/winhttp/net.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 5ce7683..2177416 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -331,7 +331,8 @@ BOOL netconn_close( netconn_t *conn ) BOOL netconn_connect( netconn_t *conn, const struct sockaddr *sockaddr, unsigned int addr_len, int timeout ) { BOOL ret = FALSE; - int res = 0, state; + int res = 0; + ULONG state; if (timeout > 0) { @@ -734,7 +735,8 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd BOOL netconn_query_data_available( netconn_t *conn, DWORD *available ) { #ifdef FIONREAD - int ret, unread; + int ret; + ULONG unread; #endif *available = 0; if (!netconn_connected( conn )) return FALSE;

1 0

Francois Gouget : msvcrt: Remove WINAPI on static functions where not needed.
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: c3913adb9bd5f2ad31cdf6387f315608ca0487b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3913adb9bd5f2ad31cdf6387… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 6 15:07:51 2013 +0100 msvcrt: Remove WINAPI on static functions where not needed. --- dlls/msvcrt/except.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 32cf3b0..b77daa1 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -86,7 +86,7 @@ static const struct { EXCEPTION_FLT_UNDERFLOW, MSVCRT__FPE_UNDERFLOW }, }; -static LONG WINAPI msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except) +static LONG msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except) { LONG ret = EXCEPTION_CONTINUE_SEARCH; MSVCRT___sighandler_t handler;

1 0

Hans Leidekker : wininet: Port resolution doesn't depend on the secure flag .
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: 6a609c21bbee8287b2ee6d027013855843106a43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a609c21bbee8287b2ee6d027… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 6 13:30:49 2013 +0100 wininet: Port resolution doesn't depend on the secure flag. --- dlls/wininet/http.c | 19 +++++++++++-------- dlls/wininet/tests/http.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 468fee6..8fec2a4 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -283,7 +283,7 @@ server_t *get_server(const WCHAR *name, INTERNET_PORT port, BOOL is_https, BOOL server_t *iter, *server = NULL; if(port == INTERNET_INVALID_PORT_NUMBER) - port = is_https ? INTERNET_DEFAULT_HTTPS_PORT : INTERNET_DEFAULT_HTTP_PORT; + port = INTERNET_DEFAULT_HTTP_PORT; EnterCriticalSection(&connection_pool_cs); @@ -1706,6 +1706,9 @@ static WCHAR *build_proxy_path_url(http_request_t *req) */ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_request_t *request) { + static const WCHAR protoHttp[] = { 'h','t','t','p',0 }; + static const WCHAR szHttp[] = { 'h','t','t','p',':','/','/',0 }; + static const WCHAR szFormat[] = { 'h','t','t','p',':','/','/','%','s',0 }; WCHAR buf[INTERNET_MAX_HOST_NAME_LENGTH]; WCHAR protoProxy[INTERNET_MAX_URL_LENGTH]; DWORD protoProxyLen = INTERNET_MAX_URL_LENGTH; @@ -1713,9 +1716,7 @@ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_req static WCHAR szNul[] = { 0 }; URL_COMPONENTSW UrlComponents; server_t *new_server; - static const WCHAR protoHttp[] = { 'h','t','t','p',0 }; - static const WCHAR szHttp[] = { 'h','t','t','p',':','/','/',0 }; - static const WCHAR szFormat[] = { 'h','t','t','p',':','/','/','%','s',0 }; + BOOL is_https; memset( &UrlComponents, 0, sizeof UrlComponents ); UrlComponents.dwStructSize = sizeof UrlComponents; @@ -1737,7 +1738,11 @@ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_req if( !request->path ) request->path = szNul; - new_server = get_server(UrlComponents.lpszHostName, UrlComponents.nPort, UrlComponents.nScheme == INTERNET_SCHEME_HTTPS, TRUE); + is_https = (UrlComponents.nScheme == INTERNET_SCHEME_HTTPS); + if (is_https && UrlComponents.nPort == INTERNET_INVALID_PORT_NUMBER) + UrlComponents.nPort = INTERNET_DEFAULT_HTTPS_PORT; + + new_server = get_server(UrlComponents.lpszHostName, UrlComponents.nPort, is_https, TRUE); if(!new_server) return FALSE; @@ -3160,9 +3165,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, HTTP_ProcessHeader(request, hostW, request->server->canon_host_port, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REQ); if (session->hostPort == INTERNET_INVALID_PORT_NUMBER) - session->hostPort = (dwFlags & INTERNET_FLAG_SECURE ? - INTERNET_DEFAULT_HTTPS_PORT : - INTERNET_DEFAULT_HTTP_PORT); + session->hostPort = INTERNET_DEFAULT_HTTP_PORT; if (hIC->proxy && hIC->proxy[0]) HTTP_DealWithProxy( hIC, session, request ); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 5f7a961..c682930 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4013,6 +4013,34 @@ static void test_connection_failure(void) InternetCloseHandle(session); } +static void test_default_service_port(void) +{ + HINTERNET session, connect, request; + DWORD error; + BOOL ret; + + session = InternetOpen("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(session != NULL, "InternetOpen failed\n"); + + connect = InternetConnect(session, "test.winehq.org", INTERNET_INVALID_PORT_NUMBER, NULL, NULL, + INTERNET_SERVICE_HTTP, 0, 0); + ok(connect != NULL, "InternetConnect failed\n"); + + request = HttpOpenRequest(connect, NULL, "/", NULL, NULL, NULL, INTERNET_FLAG_SECURE, 0); + ok(request != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequest(request, NULL, 0, NULL, 0); + error = GetLastError(); + ok(!ret, "HttpSendRequest succeeded\n"); + ok(error == ERROR_INTERNET_SECURITY_CHANNEL_ERROR || error == ERROR_INTERNET_CANNOT_CONNECT, + "got %u\n", error); + + InternetCloseHandle(request); + InternetCloseHandle(connect); + InternetCloseHandle(session); +} + static void init_status_tests(void) { memset(expect, 0, sizeof(expect)); @@ -4091,4 +4119,5 @@ START_TEST(http) HttpSendRequestEx_test(); InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[3]); test_connection_failure(); + test_default_service_port(); }

1 0

Jacek Caban : jscript: Reimplemented do_attribute_tag_format without direct access to object' s string buffer.
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: 6eaef96dad12fb4aaec5044421941f3cd7ddb44a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eaef96dad12fb4aaec504442… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 6 12:39:38 2013 +0100 jscript: Reimplemented do_attribute_tag_format without direct access to object's string buffer. --- dlls/jscript/string.c | 39 +++++++++++++++++++++++++++++++-------- 1 files changed, 31 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 6235b51..8f38621 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -186,14 +186,11 @@ static HRESULT do_attributeless_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, j } static HRESULT do_attribute_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, unsigned argc, jsval_t *argv, jsval_t *r, - const WCHAR *tagname, const WCHAR *attr) + const WCHAR *tagname, const WCHAR *attrname) { - static const WCHAR tagfmtW[] - = {'<','%','s',' ','%','s','=','\"','%','s','\"','>','%','s','<','/','%','s','>',0}; static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0}; jsstr_t *str, *attr_value = NULL; - const WCHAR *attr_str; unsigned attr_len; HRESULT hres; @@ -207,19 +204,45 @@ static HRESULT do_attribute_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, unsig jsstr_release(str); return hres; } - attr_str = attr_value->str; attr_len = jsstr_length(attr_value); }else { - attr_str = undefinedW; attr_len = sizeof(undefinedW)/sizeof(WCHAR)-1; } if(r) { + unsigned attrname_len = strlenW(attrname); + unsigned tagname_len = strlenW(tagname); jsstr_t *ret; - ret = jsstr_alloc_buf(2*strlenW(tagname) + strlenW(attr) + attr_len + jsstr_length(str) + 9); + ret = jsstr_alloc_buf(2*tagname_len + attrname_len + attr_len + jsstr_length(str) + 9); if(ret) { - sprintfW(ret->str, tagfmtW, tagname, attr, attr_str, str->str, tagname); + WCHAR *ptr = ret->str; + + *ptr++ = '<'; + memcpy(ptr, tagname, tagname_len*sizeof(WCHAR)); + ptr += tagname_len; + *ptr++ = ' '; + memcpy(ptr, attrname, attrname_len*sizeof(WCHAR)); + ptr += attrname_len; + *ptr++ = '='; + *ptr++ = '"'; + + if(attr_value) + jsstr_flush(attr_value, ptr); + else + memcpy(ptr, undefinedW, attr_len*sizeof(WCHAR)); + ptr += attr_len; + + *ptr++ = '"'; + *ptr++ = '>'; + ptr += jsstr_flush(str, ptr); + + *ptr++ = '<'; + *ptr++ = '/'; + memcpy(ptr, tagname, tagname_len*sizeof(WCHAR)); + ptr += tagname_len; + *ptr = '>'; + *r = jsval_string(ret); }else { hres = E_OUTOFMEMORY;

1 0

Jacek Caban : jscript: Reimplemented do_attributeless_tag_format without direct access to object' s string buffer.
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: 25dbf32b5d60937afafe6d2f7be7a910b6bcefc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25dbf32b5d60937afafe6d2f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 6 12:39:27 2013 +0100 jscript: Reimplemented do_attributeless_tag_format without direct access to object's string buffer. --- dlls/jscript/string.c | 39 ++++++++++++++++++++++++++++----------- 1 files changed, 28 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 1d4a188..6235b51 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -144,27 +144,44 @@ static HRESULT String_valueOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un static HRESULT do_attributeless_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t *r, const WCHAR *tagname) { - jsstr_t *str; + unsigned tagname_len; + jsstr_t *str, *ret; + WCHAR *ptr; HRESULT hres; - static const WCHAR tagfmt[] = {'<','%','s','>','%','s','<','/','%','s','>',0}; - hres = get_string_val(ctx, jsthis, &str); if(FAILED(hres)) return hres; - if(r) { - jsstr_t *ret = jsstr_alloc_buf(jsstr_length(str) + 2*strlenW(tagname) + 5); - if(!ret) { - jsstr_release(str); - return E_OUTOFMEMORY; - } + if(!r) { + jsstr_release(str); + return S_OK; + } - sprintfW(ret->str, tagfmt, tagname, str->str, tagname); - *r = jsval_string(ret); + tagname_len = strlenW(tagname); + + ret = jsstr_alloc_buf(jsstr_length(str) + 2*tagname_len + 5); + if(!ret) { + jsstr_release(str); + return E_OUTOFMEMORY; } + ptr = ret->str; + *ptr++ = '<'; + memcpy(ptr, tagname, tagname_len*sizeof(WCHAR)); + ptr += tagname_len; + *ptr++ = '>'; + + ptr += jsstr_flush(str, ptr); jsstr_release(str); + + *ptr++ = '<'; + *ptr++ = '/'; + memcpy(ptr, tagname, tagname_len*sizeof(WCHAR)); + ptr += tagname_len; + *ptr = '>'; + + *r = jsval_string(ret); return S_OK; }

1 0

Alexandre Julliard : vbscript: Return after assert(0) to silence warnings.
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: 72226ea8df753b4432b3a5f4b0d8350b51162624 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72226ea8df753b4432b3a5f4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 6 14:09:47 2013 +0100 vbscript: Return after assert(0) to silence warnings. --- dlls/vbscript/compile.c | 1 + dlls/vbscript/global.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 58494b9..fb1974b 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1400,6 +1400,7 @@ static HRESULT create_class_funcprop(compile_ctx_t *ctx, function_decl_t *func_d break; default: assert(0); + return E_FAIL; } assert(!desc->entries[invoke_type]); diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 9ff1f76..9c9cd41 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1012,6 +1012,7 @@ static HRESULT Global_InStr(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VA return E_NOTIMPL; default: assert(0); + return E_FAIL; } if(startv) {

1 0

Alexandre Julliard : server: Use socklen_t where appropriate.
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: 9fdf7bc7715b9b00846d8f0b451533906a131eaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fdf7bc7715b9b00846d8f0b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 6 13:40:38 2013 +0100 server: Use socklen_t where appropriate. --- server/request.c | 2 +- server/sock.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/request.c b/server/request.c index eeb3476..e075212 100644 --- a/server/request.c +++ b/server/request.c @@ -537,7 +537,7 @@ static void master_socket_poll_event( struct fd *fd, int event ) else if (event & POLLIN) { struct sockaddr_un dummy; - unsigned int len = sizeof(dummy); + socklen_t len = sizeof(dummy); int client = accept( get_unix_fd( master_socket->fd ), (struct sockaddr *) &dummy, &len ); if (client == -1) return; fcntl( client, F_SETFL, O_NONBLOCK ); diff --git a/server/sock.c b/server/sock.c index 7dcc101..ba18a66 100644 --- a/server/sock.c +++ b/server/sock.c @@ -285,9 +285,9 @@ static void sock_wake_up( struct sock *sock ) static inline int sock_error( struct fd *fd ) { - unsigned int optval = 0, optlen; + unsigned int optval = 0; + socklen_t optlen = sizeof(optval); - optlen = sizeof(optval); getsockopt( get_unix_fd(fd), SOL_SOCKET, SO_ERROR, (void *) &optval, &optlen); return optval; } @@ -667,7 +667,7 @@ static int accept_new_fd( struct sock *sock ) */ int acceptfd; struct sockaddr saddr; - unsigned int slen = sizeof(saddr); + socklen_t slen = sizeof(saddr); acceptfd = accept( get_unix_fd(sock->fd), &saddr, &slen); if (acceptfd == -1) {

1 0

Dmitry Timoshkov : windowscodecs: Add a comment to PNG decoder that Windows ignores CRC of the chunks.
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: f18439da5102eafe4ba2b79bf7399e3c7d79d93b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f18439da5102eafe4ba2b79bf… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 6 16:29:20 2013 +0900 windowscodecs: Add a comment to PNG decoder that Windows ignores CRC of the chunks. --- dlls/windowscodecs/pngformat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index e4236e2..fb8bf51 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -76,7 +76,7 @@ static HRESULT read_png_chunk(IStream *stream, BYTE *type, BYTE **data, ULONG *d return hr; } - /* FIXME: Verify the CRC? */ + /* Windows ignores CRC of the chunk */ } return S_OK;

1 0

Dmitry Timoshkov : windowscodecs: Add a test for palette of a PNG image with PLTE and tRNS chunks.
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: b0e8a18a5d09a0e19a662b2e9d606fe172ca8422 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0e8a18a5d09a0e19a662b2e9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 6 16:28:56 2013 +0900 windowscodecs: Add a test for palette of a PNG image with PLTE and tRNS chunks. --- dlls/windowscodecs/tests/pngformat.c | 54 ++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index b21f5f7..61c56b3 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -534,6 +534,59 @@ static void test_color_contexts(void) IWICBitmapDecoder_Release(decoder); } +/* 1 bpp 1x1 pixel PNG image with PLTE and tRNS chunks */ +static const char png_PLTE_tRNS[] = { + 0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a, + 0x00,0x00,0x00,0x0d,'I','H','D','R',0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x01,0x03,0x00,0x00,0x00,0x25,0xdb,0x56,0xca, + 0x00,0x00,0x00,0x06,'P','L','T','E',0x01,0x02,0x03,0x04,0x05,0x06,0x95,0x53,0x6f,0x48, + 0x00,0x00,0x00,0x02,'t','R','N','S',0xff,0x00,0xe5,0xb7,0x30,0x4a, + 0x00,0x00,0x00,0x0a,'I','D','A','T',0x18,0xd3,0x63,0x68,0x00,0x00,0x00,0x82,0x00,0x81,0xa7,0x01,0xba,0x10, + 0x00,0x00,0x00,0x00,'I','E','N','D',0xae,0x42,0x60,0x82 +}; + +static void test_png_palette(void) +{ + HRESULT hr; + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *frame; + IWICPalette *palette; + GUID format; + UINT count, ret; + WICColor color[256]; + + decoder = create_decoder(png_PLTE_tRNS, sizeof(png_PLTE_tRNS)); + ok(decoder != 0, "Failed to load PNG image data\n"); + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + + hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); + ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat1bppIndexed), + "got wrong format %s\n", debugstr_guid(&format)); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#x\n", hr); + hr = IWICBitmapFrameDecode_CopyPalette(frame, palette); + ok(hr == S_OK, "CopyPalette error %#x\n", hr); + + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 2, "expected 2, got %u\n", count); + + hr = IWICPalette_GetColors(palette, 256, color, &ret); + ok(hr == S_OK, "GetColors error %#x\n", hr); + ok(ret == count, "expected %u, got %u\n", count, ret); +todo_wine + ok(color[0] == 0xff010203, "expected 0xff010203, got %#x\n", color[0]); +todo_wine + ok(color[1] == 0x00040506, "expected 0x00040506, got %#x\n", color[1]); + + IWICPalette_Release(palette); + IWICBitmapFrameDecode_Release(frame); + IWICBitmapDecoder_Release(decoder); +} + START_TEST(pngformat) { HRESULT hr; @@ -545,6 +598,7 @@ START_TEST(pngformat) if (FAILED(hr)) return; test_color_contexts(); + test_png_palette(); IWICImagingFactory_Release(factory); CoUninitialize();

1 0

Ken Thomases : winemac: Implement WGL_NV_render_texture_rectangle.
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: 9c29be680c58bc8359d4d72b3f4e30f8dda38c26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c29be680c58bc8359d4d72b3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 6 04:59:30 2013 -0600 winemac: Implement WGL_NV_render_texture_rectangle. --- dlls/winemac.drv/opengl.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 3b60a5c..c62db1a 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1705,10 +1705,13 @@ static BOOL macdrv_wglChoosePixelFormatARB(HDC hdc, const int *piAttribIList, case WGL_DRAW_TO_PBUFFER_ARB: case WGL_BIND_TO_TEXTURE_RGB_ARB: case WGL_BIND_TO_TEXTURE_RGBA_ARB: + case WGL_BIND_TO_TEXTURE_RECTANGLE_RGB_NV: + case WGL_BIND_TO_TEXTURE_RECTANGLE_RGBA_NV: if (valid.pbuffer && (!pf.pbuffer != !value)) goto cant_match; pf.pbuffer = (value != 0); valid.pbuffer = 1; - if (attr == WGL_BIND_TO_TEXTURE_RGBA_ARB && !alpha_bits) + if ((attr == WGL_BIND_TO_TEXTURE_RGBA_ARB || attr == WGL_BIND_TO_TEXTURE_RECTANGLE_RGBA_NV) && + !alpha_bits) alpha_bits = 1; break; @@ -1859,6 +1862,10 @@ static struct wgl_pbuffer *macdrv_wglCreatePbufferARB(HDC hdc, int iPixelFormat, TRACE("WGL_TEXTURE_TARGET_ARB: WGL_TEXTURE_2D_ARB\n"); target = GL_TEXTURE_2D; break; + case WGL_TEXTURE_RECTANGLE_NV: + TRACE("WGL_TEXTURE_TARGET_ARB: WGL_TEXTURE_RECTANGLE_NV\n"); + target = GL_TEXTURE_RECTANGLE; + break; default: WARN("unknown WGL_TEXTURE_TARGET_ARB value 0x%x\n", value); SetLastError(ERROR_INVALID_DATA); @@ -2244,10 +2251,12 @@ static BOOL macdrv_wglGetPixelFormatAttribivARB(HDC hdc, int iPixelFormat, int i case WGL_DRAW_TO_PBUFFER_ARB: case WGL_BIND_TO_TEXTURE_RGB_ARB: + case WGL_BIND_TO_TEXTURE_RECTANGLE_RGB_NV: piValues[i] = pf->pbuffer ? GL_TRUE : GL_FALSE; break; case WGL_BIND_TO_TEXTURE_RGBA_ARB: + case WGL_BIND_TO_TEXTURE_RECTANGLE_RGBA_NV: piValues[i] = (pf->pbuffer && color_modes[pf->color_mode].alpha_bits) ? GL_TRUE : GL_FALSE; break; @@ -2490,9 +2499,11 @@ static BOOL macdrv_wglQueryPbufferARB(struct wgl_pbuffer *pbuffer, int iAttribut *piValue = WGL_TEXTURE_CUBE_MAP_ARB; break; case GL_TEXTURE_2D: + *piValue = WGL_TEXTURE_2D_ARB; + break; case GL_TEXTURE_RECTANGLE: default: - *piValue = WGL_TEXTURE_2D_ARB; + *piValue = WGL_TEXTURE_RECTANGLE_NV; break; } break; @@ -2726,6 +2737,10 @@ static void load_extensions(void) opengl_funcs.ext.p_wglBindTexImageARB = macdrv_wglBindTexImageARB; opengl_funcs.ext.p_wglReleaseTexImageARB = macdrv_wglReleaseTexImageARB; opengl_funcs.ext.p_wglSetPbufferAttribARB = macdrv_wglSetPbufferAttribARB; + + if (gluCheckExtension((GLubyte*)"GL_ARB_texture_rectangle", (GLubyte*)gl_info.glExtensions) || + gluCheckExtension((GLubyte*)"GL_EXT_texture_rectangle", (GLubyte*)gl_info.glExtensions)) + register_extension("WGL_NV_render_texture_rectangle"); } /* TODO:

1 0