wine-commits November 2009

wine-commits@winehq.org

3 participants
910 discussions

Austin Lund : ddraw/tests: Fix test failure for D3DFMT_A2R10G10B10 pixel format in GetDC tests.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 38d44e0a5295a43ab8b997c9459b79662389fed5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38d44e0a5295a43ab8b997c94… Author: Austin Lund <austin.lund(a)gmail.com> Date: Tue Nov 17 19:33:51 2009 +1000 ddraw/tests: Fix test failure for D3DFMT_A2R10G10B10 pixel format in GetDC tests. --- dlls/ddraw/tests/dsurface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index e05c967..f6f1258 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -3136,7 +3136,7 @@ static void GetDCFormatTest(void) sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, {32}, {0xC0000000}, {0x3FF00000}, {0x000FFC00}, {0x000003FF} }, - FALSE + TRUE }, /* * GetDC on a P8 surface fails unless the display mode is 8 bpp. This is not

1 0

Andrew Eikum : jscript: Implement decodeURIComponent.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: d4b670ad6a31c92dbf2f416faa1168be9e8d5060 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4b670ad6a31c92dbf2f416fa… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Nov 16 15:39:08 2009 -0600 jscript: Implement decodeURIComponent. --- dlls/jscript/global.c | 120 ++++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/api.js | 20 ++++++++ 2 files changed, 138 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 8f6080d..501da79 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -930,11 +930,127 @@ static HRESULT JSGlobal_encodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W return S_OK; } +/* ECMA-262 3rd Edition 15.1.3.2 */ static HRESULT JSGlobal_decodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + BSTR str, ret; + const WCHAR *ptr; + WCHAR *out_ptr; + DWORD len = 0; + HRESULT hres; + + TRACE("\n"); + + if(!arg_cnt(dp)) { + if(retv) { + ret = SysAllocString(undefinedW); + if(!ret) + return E_OUTOFMEMORY; + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = ret; + } + + return S_OK; + } + + hres = to_string(ctx, get_arg(dp, 0), ei, &str); + if(FAILED(hres)) + return hres; + + ptr = str; + while(*ptr) { + if(*ptr == '%') { + char octets[4]; + unsigned char mask = 0x80; + int i, size, num_bytes = 0; + if(hex_to_int(*(ptr+1)) < 0 || hex_to_int(*(ptr+2)) < 0) { + FIXME("Throw URIError: Invalid hex sequence\n"); + SysFreeString(str); + return E_FAIL; + } + octets[0] = (hex_to_int(*(ptr+1)) << 4) + hex_to_int(*(ptr+2)); + ptr += 3; + while(octets[0] & mask) { + mask = mask >> 1; + ++num_bytes; + } + if(num_bytes == 1 || num_bytes > 4) { + FIXME("Throw URIError: Invalid initial UTF character\n"); + SysFreeString(str); + return E_FAIL; + } + for(i = 1; i < num_bytes; ++i) { + if(*ptr != '%'){ + FIXME("Throw URIError: Incomplete UTF sequence\n"); + SysFreeString(str); + return E_FAIL; + } + if(hex_to_int(*(ptr+1)) < 0 || hex_to_int(*(ptr+2)) < 0) { + FIXME("Throw URIError: Invalid hex sequence\n"); + SysFreeString(str); + return E_FAIL; + } + octets[i] = (hex_to_int(*(ptr+1)) << 4) + hex_to_int(*(ptr+2)); + ptr += 3; + } + size = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, octets, + num_bytes ? num_bytes : 1, NULL, 0); + if(size == 0) { + FIXME("Throw URIError: Invalid UTF sequence\n"); + SysFreeString(str); + return E_FAIL; + } + len += size; + }else { + ++ptr; + ++len; + } + } + + out_ptr = ret = SysAllocStringLen(NULL, len); + if(!ret) { + SysFreeString(str); + return E_OUTOFMEMORY; + } + + ptr = str; + while(*ptr) { + if(*ptr == '%') { + char octets[4]; + unsigned char mask = 0x80; + int i, size, num_bytes = 0; + octets[0] = (hex_to_int(*(ptr+1)) << 4) + hex_to_int(*(ptr+2)); + ptr += 3; + while(octets[0] & mask) { + mask = mask >> 1; + ++num_bytes; + } + for(i = 1; i < num_bytes; ++i) { + octets[i] = (hex_to_int(*(ptr+1)) << 4) + hex_to_int(*(ptr+2)); + ptr += 3; + } + size = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, octets, + num_bytes ? num_bytes : 1, out_ptr, len); + len -= size; + out_ptr += size; + }else { + *out_ptr++ = *ptr++; + --len; + } + } + + SysFreeString(str); + + if(retv) { + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = ret; + }else { + SysFreeString(ret); + } + + return S_OK; } static const builtin_prop_t JSGlobal_props[] = { diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 1fb2f6d..42a79e8 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -60,24 +60,44 @@ ok(tmp === "abc", "encodeURI('abc') = " + tmp); tmp = encodeURIComponent("abc"); ok(tmp === "abc", "encodeURIComponent('abc') = " + tmp); +dec = decodeURIComponent(tmp); +ok(dec === "abc", "decodeURIComponent('" + tmp + "') = " + dec); tmp = encodeURIComponent("{abc}"); ok(tmp === "%7Babc%7D", "encodeURIComponent('{abc}') = " + tmp); +dec = decodeURIComponent(tmp); +ok(dec === "{abc}", "decodeURIComponent('" + tmp + "') = " + dec); tmp = encodeURIComponent(""); ok(tmp === "", "encodeURIComponent('') = " + tmp); +dec = decodeURIComponent(tmp); +ok(dec === "", "decodeURIComponent('" + tmp + "') = " + dec); tmp = encodeURIComponent("\01\02\03\04"); ok(tmp === "%01%02%03%04", "encodeURIComponent('\\01\\02\\03\\04') = " + tmp); +dec = decodeURIComponent(tmp); +ok(dec === "\01\02\03\04", "decodeURIComponent('" + tmp + "') = " + dec); tmp = encodeURIComponent("{#@}"); ok(tmp === "%7B%23%40%7D", "encodeURIComponent('{#@}') = " + tmp); +dec = decodeURIComponent(tmp); +ok(dec === "{#@}", "decodeURIComponent('" + tmp + "') = " + dec); tmp = encodeURIComponent("\xa1 "); ok(tmp === "%C2%A1%20", "encodeURIComponent(\\xa1 ) = " + tmp); +dec = decodeURIComponent(tmp); +ok(dec === "\xa1 ", "decodeURIComponent('" + tmp + "') = " + dec); tmp = encodeURIComponent("\xffff"); ok(tmp.length === 8, "encodeURIComponent('\\xffff').length = " + tmp.length); +dec = decodeURIComponent(tmp); +ok(dec === "\xffff", "decodeURIComponent('" + tmp + "') = " + dec); tmp = encodeURIComponent("abcABC123;/?:@&=+$,-_.!~*'()"); ok(tmp === "abcABC123%3B%2F%3F%3A%40%26%3D%2B%24%2C-_.!~*'()", "encodeURIComponent('abcABC123;/?:@&=+$,-_.!~*'()') = " + tmp); +dec = decodeURIComponent(tmp); +ok(dec === "abcABC123;/?:@&=+$,-_.!~*'()", "decodeURIComponent('" + tmp + "') = " + dec); tmp = encodeURIComponent(); ok(tmp === "undefined", "encodeURIComponent() = " + tmp); tmp = encodeURIComponent("abc", "test"); ok(tmp === "abc", "encodeURIComponent('abc') = " + tmp); +dec = decodeURIComponent(); +ok(dec === "undefined", "decodeURIComponent() = " + dec); +dec = decodeURIComponent("abc", "test"); +ok(dec === "abc", "decodeURIComponent('abc') = " + dec); tmp = escape("abc"); ok(tmp === "abc", "escape('abc') = " + tmp);

1 0

Paul Vriens : advapi32/tests: Add some extra info to an ok() call.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 6befd9f54ccaf61f3dedbfa7a7620de11f84beaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=6befd9f54ccaf61f3dedbfa7a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 17 13:51:44 2009 +0100 advapi32/tests: Add some extra info to an ok() call. --- dlls/advapi32/tests/eventlog.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index ba9a897..0186f2b 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -1000,7 +1000,8 @@ static void test_autocreation(void) } lstrcpyA(p, eventlogname); - ok(!memcmp(sources, sources_verify, size), "Expected a correct 'Sources' value\n"); + ok(!memcmp(sources, sources_verify, size), + "Expected a correct 'Sources' value (size : %d)\n", size); } RegCloseKey(eventkey);

1 0

Paul Vriens : advapi32/tests: Fix some test failures on Vista without a servicepack.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: e732ca193530d171b1bdcefa7408d02efc1a854a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e732ca193530d171b1bdcefa7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 17 13:23:06 2009 +0100 advapi32/tests: Fix some test failures on Vista without a servicepack. --- dlls/advapi32/tests/eventlog.c | 31 ++++++++++++++++++++++++++++--- 1 files changed, 28 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index f94b0a7..ba9a897 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -707,7 +707,7 @@ static void test_readwrite(void) PSID user; DWORD sidsize, count; BOOL ret, sidavailable; - BOOL on_vista = FALSE; /* Used to indicate Vista or higher */ + BOOL on_vista = FALSE; /* Used to indicate Vista, W2K8 or Win7 */ int i; char localcomputer[MAX_COMPUTERNAME_LENGTH + 1]; DWORD len = sizeof(localcomputer); @@ -741,6 +741,31 @@ static void test_readwrite(void) win_skip("Win7 fails when using incorrect event types\n"); ret = ReportEvent(handle, 0, 0, 0, NULL, 0, 0, NULL, NULL); } + else + { + void *buf; + DWORD read, needed; + EVENTLOGRECORD *record; + + /* Needed to catch earlier Vista (with no ServicePack for example) */ + buf = HeapAlloc(GetProcessHeap(), 0, sizeof(EVENTLOGRECORD)); + ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, + 0, buf, sizeof(EVENTLOGRECORD), &read, &needed); + + buf = HeapReAlloc(GetProcessHeap(), 0, buf, needed); + ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, + 0, buf, needed, &read, &needed); + + record = (EVENTLOGRECORD *)buf; + + /* Vista and W2K8 return EVENTLOG_SUCCESS, Windows versions before return + * the written eventtype (0x20 in this case). + */ + if (record->EventType == EVENTLOG_SUCCESS) + on_vista = TRUE; + + HeapFree(GetProcessHeap(), 0, buf); + } ok(ret, "Expected success : %d\n", GetLastError()); /* This will clear the eventlog. The record numbering for new @@ -778,7 +803,7 @@ static void test_readwrite(void) ret = GetOldestEventLogRecord(handle, &oldest); ok(ret, "Expected success\n"); ok(oldest == 1 || - oldest == 2, /* Vista+ */ + oldest == 2, /* Vista SP1, W2K8 and Win7 */ "Expected oldest to be 1 or 2, got %d\n", oldest); if (oldest == 2) on_vista = TRUE; @@ -805,7 +830,7 @@ static void test_readwrite(void) /* Report only once */ if (on_vista) - skip("There is no DWORD alignment for UserSid on Vista or higher\n"); + skip("There is no DWORD alignment for UserSid on Vista, W2K8 or Win7\n"); /* Read all events from our created eventlog, one by one */ handle = OpenEventLogA(NULL, eventlogname);

1 0

Henri Verbeet : d3d8: Make convert_to_wined3d_declaration() static.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 2ac74fa511be59b2eee79a8d47e48356fe842aca URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ac74fa511be59b2eee79a8d4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 17 09:43:16 2009 +0100 d3d8: Make convert_to_wined3d_declaration() static. --- dlls/d3d8/d3d8_private.h | 2 -- dlls/d3d8/vertexdeclaration.c | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 141aa92..f6ceeed 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -618,8 +618,6 @@ HRESULT pixelshader_init(IDirect3DPixelShader8Impl *shader, IDirect3DDevice8Impl D3DFORMAT d3dformat_from_wined3dformat(WINED3DFORMAT format) DECLSPEC_HIDDEN; WINED3DFORMAT wined3dformat_from_d3dformat(D3DFORMAT format) DECLSPEC_HIDDEN; void load_local_constants(const DWORD *d3d8_elements, IWineD3DVertexShader *wined3d_vertex_shader) DECLSPEC_HIDDEN; -UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3d8_elements_size, - WINED3DVERTEXELEMENT **wined3d_elements) DECLSPEC_HIDDEN; size_t parse_token(const DWORD *pToken) DECLSPEC_HIDDEN; #endif /* __WINE_D3DX8_PRIVATE_H */ diff --git a/dlls/d3d8/vertexdeclaration.c b/dlls/d3d8/vertexdeclaration.c index bcc9991..b876b66 100644 --- a/dlls/d3d8/vertexdeclaration.c +++ b/dlls/d3d8/vertexdeclaration.c @@ -301,7 +301,8 @@ static const wined3d_usage_t wined3d_usage_lookup[] = { }; /* TODO: find out where rhw (or positionT) is for declaration8 */ -UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3d8_elements_size, WINED3DVERTEXELEMENT **wined3d_elements) +static UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3d8_elements_size, + WINED3DVERTEXELEMENT **wined3d_elements) { const DWORD *token = d3d8_elements; WINED3DVERTEXELEMENT *element;

1 0

Henri Verbeet : d3d8: Move D3D8CB_DestroySwapChain() to device.c.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: e0525b663ee06d762b6263beecd63dcf38e77855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0525b663ee06d762b6263bee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 17 09:43:15 2009 +0100 d3d8: Move D3D8CB_DestroySwapChain() to device.c. --- dlls/d3d8/d3d8_private.h | 3 --- dlls/d3d8/device.c | 11 +++++++++++ dlls/d3d8/directx.c | 10 ---------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 8464190..141aa92 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -622,7 +622,4 @@ UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3d8_elem WINED3DVERTEXELEMENT **wined3d_elements) DECLSPEC_HIDDEN; size_t parse_token(const DWORD *pToken) DECLSPEC_HIDDEN; -/* Callbacks */ -extern ULONG WINAPI D3D8CB_DestroySwapChain(IWineD3DSwapChain *pSwapChain) DECLSPEC_HIDDEN; - #endif /* __WINE_D3DX8_PRIVATE_H */ diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index a20b9f4..eb26d73 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -253,6 +253,17 @@ static void *d3d8_get_object(struct d3d8_handle_table *t, DWORD handle, enum d3d return entry->object; } +static ULONG WINAPI D3D8CB_DestroySwapChain(IWineD3DSwapChain *swapchain) +{ + IUnknown *parent; + + TRACE("swapchain %p.\n", swapchain); + + IWineD3DSwapChain_GetParent(swapchain, &parent); + IUnknown_Release(parent); + return IUnknown_Release(parent); +} + /* IDirect3D IUnknown parts follow: */ static HRESULT WINAPI IDirect3DDevice8Impl_QueryInterface(LPDIRECT3DDEVICE8 iface,REFIID riid,LPVOID *ppobj) { diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index f9b8c45..8bcd5ab 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -331,16 +331,6 @@ static HMONITOR WINAPI IDirect3D8Impl_GetAdapterMonitor(LPDIRECT3D8 iface, UINT return ret; } -ULONG WINAPI D3D8CB_DestroySwapChain(IWineD3DSwapChain *pSwapChain) { - IUnknown* swapChainParent; - - TRACE("swapchain %p.\n", pSwapChain); - - IWineD3DSwapChain_GetParent(pSwapChain, &swapChainParent); - IUnknown_Release(swapChainParent); - return IUnknown_Release(swapChainParent); -} - static HRESULT WINAPI IDirect3D8Impl_CreateDevice(IDirect3D8 *iface, UINT adapter, D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters, IDirect3DDevice8 **device) {

1 0

Henri Verbeet : d3d8: Add a separate function for device initialization.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: fea466455b0060e8b259c9785ad84b62de1360dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=fea466455b0060e8b259c9785… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 17 09:43:14 2009 +0100 d3d8: Add a separate function for device initialization. --- dlls/d3d8/d3d8_private.h | 13 +---- dlls/d3d8/device.c | 104 ++++++++++++++++++++++++++++++++++++++- dlls/d3d8/directx.c | 121 +++++++--------------------------------------- 3 files changed, 121 insertions(+), 117 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fea466455b0060e8b259c…

1 0

Henri Verbeet : wined3d: WINED3DFMT_FLAG_GETDC is a basic format flag.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 7676c664314665fa4f7caa50e35d660b2ccdcd10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7676c664314665fa4f7caa50e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 17 09:43:13 2009 +0100 wined3d: WINED3DFMT_FLAG_GETDC is a basic format flag. It has nothing to do with OpenGL, so shouldn't be in "gl_formats_template". This fixes a regression introduced by e1469961d42d0eb077d3fa0236de17b56bc51a56. --- dlls/wined3d/utils.c | 42 +++++++++++++++++++++++------------------- 1 files changed, 23 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e2e6cb0..54b0fb7 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -152,6 +152,17 @@ static const struct wined3d_format_base_flags format_base_flags[] = {WINED3DFMT_MULTI2_ARGB8, WINED3DFMT_FLAG_FOURCC}, {WINED3DFMT_G8R8_G8B8, WINED3DFMT_FLAG_FOURCC}, {WINED3DFMT_R8G8_B8G8, WINED3DFMT_FLAG_FOURCC}, + {WINED3DFMT_P8_UINT, WINED3DFMT_FLAG_GETDC}, + {WINED3DFMT_B8G8R8_UNORM, WINED3DFMT_FLAG_GETDC}, + {WINED3DFMT_B8G8R8A8_UNORM, WINED3DFMT_FLAG_GETDC}, + {WINED3DFMT_B8G8R8X8_UNORM, WINED3DFMT_FLAG_GETDC}, + {WINED3DFMT_B5G6R5_UNORM, WINED3DFMT_FLAG_GETDC}, + {WINED3DFMT_B5G5R5X1_UNORM, WINED3DFMT_FLAG_GETDC}, + {WINED3DFMT_B5G5R5A1_UNORM, WINED3DFMT_FLAG_GETDC}, + {WINED3DFMT_B4G4R4A4_UNORM, WINED3DFMT_FLAG_GETDC}, + {WINED3DFMT_B4G4R4X4_UNORM, WINED3DFMT_FLAG_GETDC}, + {WINED3DFMT_R8G8B8A8_UNORM, WINED3DFMT_FLAG_GETDC}, + {WINED3DFMT_R8G8B8X8_UNORM, WINED3DFMT_FLAG_GETDC}, {WINED3DFMT_ATI2N, WINED3DFMT_FLAG_FOURCC}, {WINED3DFMT_NVHU, WINED3DFMT_FLAG_FOURCC}, {WINED3DFMT_NVHS, WINED3DFMT_FLAG_FOURCC}, @@ -317,47 +328,40 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { /* Palettized formats */ {WINED3DFMT_P8_UINT, GL_RGBA, GL_RGBA, 0, GL_RGBA, GL_UNSIGNED_BYTE, - WINED3DFMT_FLAG_GETDC, + 0, ARB_FRAGMENT_PROGRAM}, {WINED3DFMT_P8_UINT, GL_COLOR_INDEX8_EXT, GL_COLOR_INDEX8_EXT, 0, GL_COLOR_INDEX, GL_UNSIGNED_BYTE, - WINED3DFMT_FLAG_GETDC, + 0, EXT_PALETTED_TEXTURE}, /* Standard ARGB formats */ {WINED3DFMT_B8G8R8_UNORM, GL_RGB8, GL_RGB8, 0, GL_BGR, GL_UNSIGNED_BYTE, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET | - WINED3DFMT_FLAG_GETDC, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET, WINED3D_GL_EXT_NONE}, {WINED3DFMT_B8G8R8A8_UNORM, GL_RGBA8, GL_SRGB8_ALPHA8_EXT, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET | - WINED3DFMT_FLAG_GETDC, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET, WINED3D_GL_EXT_NONE}, {WINED3DFMT_B8G8R8X8_UNORM, GL_RGB8, GL_SRGB8_EXT, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET | - WINED3DFMT_FLAG_GETDC, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET, WINED3D_GL_EXT_NONE}, {WINED3DFMT_B5G6R5_UNORM, GL_RGB5, GL_RGB5, GL_RGB8, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET | - WINED3DFMT_FLAG_GETDC, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET, WINED3D_GL_EXT_NONE}, {WINED3DFMT_B5G5R5X1_UNORM, GL_RGB5, GL_RGB5_A1, 0, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | - WINED3DFMT_FLAG_GETDC, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE}, {WINED3DFMT_B5G5R5A1_UNORM, GL_RGB5_A1, GL_RGB5_A1, 0, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | - WINED3DFMT_FLAG_GETDC, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE}, {WINED3DFMT_B4G4R4A4_UNORM, GL_RGBA4, GL_SRGB8_ALPHA8_EXT, 0, GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4_REV, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | - WINED3DFMT_FLAG_GETDC, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE}, {WINED3DFMT_B2G3R3_UNORM, GL_R3_G3_B2, GL_R3_G3_B2, 0, GL_RGB, GL_UNSIGNED_BYTE_3_3_2, @@ -369,7 +373,7 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { WINED3D_GL_EXT_NONE}, {WINED3DFMT_B4G4R4X4_UNORM, GL_RGB4, GL_RGB4, 0, GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4_REV, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_GETDC, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE}, {WINED3DFMT_R10G10B10A2_UNORM, GL_RGB10_A2, GL_RGB10_A2, 0, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, @@ -377,11 +381,11 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { WINED3D_GL_EXT_NONE}, {WINED3DFMT_R8G8B8A8_UNORM, GL_RGBA8, GL_RGBA8, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_GETDC, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE}, {WINED3DFMT_R8G8B8X8_UNORM, GL_RGB8, GL_RGB8, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_GETDC, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE}, {WINED3DFMT_R16G16_UNORM, GL_RGB16_EXT, GL_RGB16_EXT, GL_RGBA16_EXT, GL_RGB, GL_UNSIGNED_SHORT,

1 0

Henri Verbeet : wined3d: Add a format table for basic format flags like WINED3DFMT_FLAG_FOURCC.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: db2273652d114341c61c3896bc5e6030a25687e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db2273652d114341c61c3896b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 17 09:43:12 2009 +0100 wined3d: Add a format table for basic format flags like WINED3DFMT_FLAG_FOURCC. --- dlls/wined3d/utils.c | 185 ++++++++++++++++++++++++++++++-------------------- 1 files changed, 111 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=db2273652d114341c61c3…

1 0

Rob Shearman : server: Extend get_token_user server call to also retrieve SIDs for the token' s owner or primary group.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: bd56916f90e68632993a7275fe30a55a7efa222a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd56916f90e68632993a7275f… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Nov 16 20:11:06 2009 +0000 server: Extend get_token_user server call to also retrieve SIDs for the token's owner or primary group. --- dlls/ntdll/nt.c | 51 ++++++++++++++++++++++------------------ include/wine/server_protocol.h | 17 +++++++------ server/protocol.def | 9 ++++--- server/request.h | 11 ++++---- server/token.c | 42 +++++++++++++++++++++++++------- server/trace.c | 15 ++++++----- 6 files changed, 89 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd56916f90e68632993a7…

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
91
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 November 2009