April 2013 - Wine-commits - list.winehq.org

Hans Leidekker : msi: Don't overwrite verstr in set_installer_properties.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: ca025a525d50f253a7e450b8ac01898f1f02eba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca025a525d50f253a7e450b8a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 15 10:25:34 2013 +0200 msi: Don't overwrite verstr in set_installer_properties. --- dlls/msi/package.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index bcda102..6b3d16c 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -873,10 +873,10 @@ static VOID set_installer_properties(MSIPACKAGE *package) msi_set_property( package->db, szMsiNTProductType, verstr, len ); break; } - len = sprintfW( verstr, szFormat, OSVersion.dwBuildNumber ); - msi_set_property( package->db, szWindowsBuild, verstr, len ); - len = sprintfW( verstr, szFormat, OSVersion.wServicePackMajor ); - msi_set_property( package->db, szServicePackLevel, verstr, len ); + len = sprintfW( bufstr, szFormat, OSVersion.dwBuildNumber ); + msi_set_property( package->db, szWindowsBuild, bufstr, len ); + len = sprintfW( bufstr, szFormat, OSVersion.wServicePackMajor ); + msi_set_property( package->db, szServicePackLevel, bufstr, len ); len = sprintfW( bufstr, szFormat2, MSI_MAJORVERSION, MSI_MINORVERSION ); msi_set_property( package->db, szVersionMsi, bufstr, len );

1 0

Piotr Caban : wininet: Fixed Cache-Content: no-cache tests.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: 0d50e86f6abb27e5de643b2de4ece28489374000 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d50e86f6abb27e5de643b2de… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 15 14:58:25 2013 +0200 wininet: Fixed Cache-Content: no-cache tests. --- dlls/wininet/tests/http.c | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 968f9e4..031efb1 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1826,6 +1826,7 @@ static DWORD CALLBACK server_thread(LPVOID param) int last_request = 0; char host_header[22]; static int test_b = 0; + static int test_no_cache = 0; WSAStartup(MAKEWORD(1,1), &wsaData); @@ -2018,7 +2019,10 @@ static DWORD CALLBACK server_thread(LPVOID param) if (strstr(buffer, "GET /test_cache_control_no_cache")) { static const char no_cache_response[] = "HTTP/1.1 200 OK\r\nCache-Control: no-cache\r\n\r\nsome content"; - send(c, no_cache_response, sizeof(no_cache_response)-1, 0); + if(!test_no_cache++) + send(c, no_cache_response, sizeof(no_cache_response)-1, 0); + else + send(c, okmsg, sizeof(okmsg)-1, 0); } if (strstr(buffer, "GET /test_cache_control_no_store")) { @@ -2517,8 +2521,17 @@ static void test_no_cache(int port) ok(size == 12, "read %d bytes of data\n", size); InternetCloseHandle(req); - ret = DeleteUrlCacheEntry(cache_url); - ok(!ret && GetLastError()==ERROR_FILE_NOT_FOUND, "cache entry should not exist\n"); + req = HttpOpenRequest(con, NULL, cache_control_no_cache, NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequest(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); + size = 0; + while(InternetReadFile(req, buf, sizeof(buf), &read) && read) + size += read; + ok(size == 0, "read %d bytes of data\n", size); + InternetCloseHandle(req); + DeleteUrlCacheEntry(cache_url); req = HttpOpenRequest(con, NULL, cache_control_no_store, NULL, NULL, NULL, 0, 0); ok(req != NULL, "HttpOpenRequest failed\n");

1 0

Dmitry Timoshkov : kernel32: Make the ExitProcess test work on x86_64.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: c5fbb4a780b856ab7281d675d3ccd141287ceb6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5fbb4a780b856ab7281d675d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 15 18:10:00 2013 +0900 kernel32: Make the ExitProcess test work on x86_64. --- dlls/kernel32/tests/loader.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 61ec904..c88a995 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -408,7 +408,6 @@ static void test_Loader(void) if (nt_header.OptionalHeader.SectionAlignment >= si.dwPageSize) { const char *start; - int size; start = (const char *)hlib + nt_header.OptionalHeader.SizeOfHeaders; size = ALIGN_SIZE((ULONG_PTR)start, si.dwPageSize) - (ULONG_PTR)start; @@ -449,7 +448,6 @@ static void test_Loader(void) if (nt_header.OptionalHeader.SectionAlignment >= si.dwPageSize) { const char *start; - int size; start = (const char *)hlib + section.VirtualAddress + section.PointerToRawData + section.SizeOfRawData; size = ALIGN_SIZE((ULONG_PTR)start, si.dwPageSize) - (ULONG_PTR)start; @@ -1302,20 +1300,20 @@ static void child_process(const char *dll_name, DWORD target_offset) static void test_ExitProcess(void) { #include "pshpack1.h" -#ifdef JMP_EAX +#ifdef __x86_64__ static struct section_data { - BYTE mov_eax; + BYTE mov_rax[2]; void *target; - BYTE jmp_eax[2]; - } section_data = { 0xb8, dll_entry_point, { 0xff,0xe0 } }; + BYTE jmp_rax[2]; + } section_data = { { 0x48,0xb8 }, dll_entry_point, { 0xff,0xe0 } }; #else static struct section_data { - BYTE push; + BYTE mov_eax; void *target; - BYTE ret; - } section_data = { 0x68, dll_entry_point, 0xc3 }; + BYTE jmp_eax[2]; + } section_data = { 0xb8, dll_entry_point, { 0xff,0xe0 } }; #endif #include "poppack.h" static const char filler[0x1000]; @@ -1327,7 +1325,7 @@ static void test_ExitProcess(void) PROCESS_INFORMATION pi; STARTUPINFO si = { sizeof(si) }; -#ifndef __i386__ +#if !defined(__i386__) && !defined(__x86_64__) skip("x86 specific ExitProcess test\n"); return; #endif

1 0

Dmitry Timoshkov : server: Add support for NtTerminateProcess(0).
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: b92c82c9426c3315ef156027429c8c0a15e3a521 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b92c82c9426c3315ef1560274… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 15 18:21:21 2013 +0900 server: Add support for NtTerminateProcess(0). --- dlls/kernel32/tests/loader.c | 17 +++-------------- dlls/ntdll/process.c | 2 +- server/process.c | 12 ++++++++---- 3 files changed, 12 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index c88a995..ddf6fb3 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1105,12 +1105,7 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) ret = GetExitCodeThread(attached_thread[i], &code); trace("dll: GetExitCodeThread(%u) => %d,%u\n", i, ret, code); ok(ret == 1, "GetExitCodeThread returned %d, expected 1\n", ret); - /* FIXME: remove once Wine is fixed */ - if (expected_code == STILL_ACTIVE || expected_code == 196) - ok(code == expected_code, "expected thread exit code %u, got %u\n", expected_code, code); - else - todo_wine - ok(code == expected_code, "expected thread exit code %u, got %u\n", expected_code, code); + ok(code == expected_code, "expected thread exit code %u, got %u\n", expected_code, code); } if (test_dll_phase == 2) @@ -1230,7 +1225,6 @@ static void child_process(const char *dll_name, DWORD target_offset) ok(!ret, "RtlDllShutdownInProgress returned %d\n", ret); status = pNtTerminateProcess(0, 195); - todo_wine ok(!status, "NtTerminateProcess error %#x\n", status); ret = pRtlDllShutdownInProgress(); @@ -1239,7 +1233,7 @@ static void child_process(const char *dll_name, DWORD target_offset) break; case 1: - case 2: /* ExitProcces will be called by PROCESS_DETACH handler */ + case 2: /* ExitProcess will be called by PROCESS_DETACH handler */ ret = pRtlDllShutdownInProgress(); ok(!ret, "RtlDllShutdownInProgress returned %d\n", ret); @@ -1283,12 +1277,7 @@ static void child_process(const char *dll_name, DWORD target_offset) ret = GetExitCodeThread(attached_thread[i], &code); trace("child: GetExitCodeThread(%u) => %d,%u\n", i, ret, code); ok(ret == 1, "GetExitCodeThread returned %d, expected 1\n", ret); - /* FIXME: remove once Wine is fixed */ - if (expected_code == STILL_ACTIVE || expected_code == 196) - ok(code == expected_code, "expected thread exit code %u, got %u\n", expected_code, code); - else - todo_wine - ok(code == expected_code, "expected thread exit code %u, got %u\n", expected_code, code); + ok(code == expected_code, "expected thread exit code %u, got %u\n", expected_code, code); } *child_failures = winetest_get_failures(); diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index a39f5d0..88a9e41 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -60,7 +60,7 @@ NTSTATUS WINAPI NtTerminateProcess( HANDLE handle, LONG exit_code ) self = !ret && reply->self; } SERVER_END_REQ; - if (self) exit( exit_code ); + if (self && handle) exit( exit_code ); return ret; } diff --git a/server/process.c b/server/process.c index 4f04a23..74a289a 100644 --- a/server/process.c +++ b/server/process.c @@ -1082,12 +1082,16 @@ DECL_HANDLER(terminate_process) { struct process *process; - if ((process = get_process_from_handle( req->handle, PROCESS_TERMINATE ))) + if (req->handle) { - reply->self = (current->process == process); - terminate_process( process, current, req->exit_code ); - release_object( process ); + process = get_process_from_handle( req->handle, PROCESS_TERMINATE ); + if (!process) return; } + else process = (struct process *)grab_object( current->process ); + + reply->self = (current->process == process); + terminate_process( process, current, req->exit_code ); + release_object( process ); } /* fetch information about a process */

1 0

Alexandre Julliard : Remove empty DLL_PROCESS_DETACH case statements.
by Alexandre Julliard 15 Apr '13

15 Apr '13

1 0

Daniel Lehman : msvcr100: Implement _get_daylight.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: 3f39f377c82b04c3074098b6f61518ebc6ad6bcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f39f377c82b04c3074098b6f… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Apr 12 12:57:49 2013 -0700 msvcr100: Implement _get_daylight. --- dlls/msvcr100/msvcr100.c | 11 +++++++++++ dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.c b/dlls/msvcr100/msvcr100.c index 2735d17..d43cbbf 100644 --- a/dlls/msvcr100/msvcr100.c +++ b/dlls/msvcr100/msvcr100.c @@ -473,6 +473,17 @@ int CDECL _get_timezone(LONG *timezone) return 0; } +/********************************************************************* + * _get_daylight (MSVCR100.@) + */ +int CDECL _get_daylight(int *hours) +{ + if(!CHECK_PMT(hours != NULL)) return EINVAL; + + *hours = *(int*)GetProcAddress(GetModuleHandleA("msvcrt.dll"), "_daylight"); + return 0; +} + /* copied from dlls/msvcrt/heap.c */ #define SAVED_PTR(x) ((void *)((DWORD_PTR)((char *)x - sizeof(void *)) & \ ~(sizeof(void *) - 1))) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 1982668..de346c4 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -866,7 +866,7 @@ @ cdecl _gcvt(double long str) msvcrt._gcvt @ cdecl _gcvt_s(ptr long double long) msvcrt._gcvt_s @ cdecl _get_current_locale() msvcrt._get_current_locale -@ stub _get_daylight +@ cdecl _get_daylight(ptr) @ cdecl _get_doserrno(ptr) msvcrt._get_doserrno @ stub _get_dstbias @ cdecl _get_errno(ptr) msvcrt._get_errno diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 62631f7..29c7186 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1218,7 +1218,7 @@ @ cdecl _gcvt(double long str) msvcrt._gcvt @ cdecl _gcvt_s(ptr long double long) msvcrt._gcvt_s @ cdecl _get_current_locale() msvcrt._get_current_locale -@ stub _get_daylight +@ cdecl _get_daylight(ptr) msvcr100._get_daylight @ cdecl _get_doserrno(ptr) msvcrt._get_doserrno @ stub _get_dstbias @ cdecl _get_errno(ptr) msvcrt._get_errno diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index fb76449..30e3fa5 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -520,7 +520,7 @@ @ cdecl _gcvt_s(ptr long double long) msvcrt._gcvt_s @ stub _get_amblksiz @ cdecl _get_current_locale() msvcrt._get_current_locale -@ stub _get_daylight +@ cdecl _get_daylight(ptr) msvcr100._get_daylight @ cdecl _get_doserrno(ptr) msvcrt._get_doserrno @ stub _get_dstbias @ cdecl _get_errno(ptr) msvcrt._get_errno diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index aec46f7..2db3042 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -515,7 +515,7 @@ @ cdecl _gcvt_s(ptr long double long) msvcrt._gcvt_s @ stub _get_amblksiz @ cdecl _get_current_locale() msvcrt._get_current_locale -@ stub _get_daylight +@ cdecl _get_daylight(ptr) msvcr100._get_daylight @ cdecl _get_doserrno(ptr) msvcrt._get_doserrno @ stub _get_dstbias @ cdecl _get_errno(ptr) msvcrt._get_errno

1 0

André Hentschel : ntdll: Respect the 8-bit part in the ARM relocation.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: e187c4aec2f8c5d3720fcfa5d2d7c52f8c7a417f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e187c4aec2f8c5d3720fcfa5d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 12 23:19:46 2013 +0200 ntdll: Respect the 8-bit part in the ARM relocation. --- dlls/ntdll/loader.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 271907f..9642f62 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2180,7 +2180,7 @@ IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock( void *page, UINT count { DWORD inst = *(INT_PTR *)((char *)page + offset); DWORD imm16 = ((inst << 1) & 0x0800) + ((inst << 12) & 0xf000) + - ((inst >> 20) & 0x0700) + ((inst >> 16) & 0x000f); + ((inst >> 20) & 0x0700) + ((inst >> 16) & 0x00ff); if ((inst & 0x8000fbf0) != 0x0000f240) ERR("wrong Thumb2 instruction %08x, expected MOVW\n", inst); @@ -2191,13 +2191,13 @@ IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock( void *page, UINT count *(INT_PTR *)((char *)page + offset) = (inst & 0x8f00fbf0) + ((imm16 >> 1) & 0x0400) + ((imm16 >> 12) & 0x000f) + ((imm16 << 20) & 0x70000000) + - ((imm16 << 16) & 0x0f0000); + ((imm16 << 16) & 0xff0000); if (delta > 0xffff) { inst = *(INT_PTR *)((char *)page + offset + 4); imm16 = ((inst << 1) & 0x0800) + ((inst << 12) & 0xf000) + - ((inst >> 20) & 0x0700) + ((inst >> 16) & 0x000f); + ((inst >> 20) & 0x0700) + ((inst >> 16) & 0x00ff); if ((inst & 0x8000fbf0) != 0x0000f2c0) ERR("wrong Thumb2 instruction %08x, expected MOVT\n", inst); @@ -2209,7 +2209,7 @@ IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock( void *page, UINT count ((imm16 >> 1) & 0x0400) + ((imm16 >> 12) & 0x000f) + ((imm16 << 20) & 0x70000000) + - ((imm16 << 16) & 0x0f0000); + ((imm16 << 16) & 0xff0000); } } break;

1 0

Rico Schüller : d3d8: Don' t assert on invalid IDirect3DBaseTexture8 interfaces.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: 1486bdd99ff0d0d7fa39042517736d645ce02675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1486bdd99ff0d0d7fa3904251… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Apr 14 16:53:37 2013 +0200 d3d8: Don't assert on invalid IDirect3DBaseTexture8 interfaces. --- dlls/d3d8/texture.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index f139d4e..07695f9 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1155,9 +1155,20 @@ struct d3d8_texture *unsafe_impl_from_IDirect3DBaseTexture8(IDirect3DBaseTexture { if (!iface) return NULL; - assert(iface->lpVtbl == (const IDirect3DBaseTexture8Vtbl *)&Direct3DTexture8_Vtbl - || iface->lpVtbl == (const IDirect3DBaseTexture8Vtbl *)&Direct3DCubeTexture8_Vtbl - || iface->lpVtbl == (const IDirect3DBaseTexture8Vtbl *)&Direct3DVolumeTexture8_Vtbl); + + /* SetTexture() in particular doesn't do a lot of validation on the pointer + * that gets passed in, and passing an invalid pointer works as long as the + * application doesn't try to actually render anything with it, so we print + * a WARN and return NULL instead of having the usual assert() here. + * One application affected by this is Fishdom 2. */ + if (iface->lpVtbl != (const IDirect3DBaseTexture8Vtbl *)&Direct3DTexture8_Vtbl + && iface->lpVtbl != (const IDirect3DBaseTexture8Vtbl *)&Direct3DCubeTexture8_Vtbl + && iface->lpVtbl != (const IDirect3DBaseTexture8Vtbl *)&Direct3DVolumeTexture8_Vtbl) + { + WARN("%p is not a valid IDirect3DBaseTexture8 interface.\n", iface); + return NULL; + } + return CONTAINING_RECORD(iface, struct d3d8_texture, IDirect3DBaseTexture8_iface); }

1 0

Stefan Dösinger : wined3d: 1x1 texures have a power of two size.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: 196c88cfc4ad4d14a8e6091aa59111aa511ee31b URL: http://source.winehq.org/git/wine.git/?a=commit;h=196c88cfc4ad4d14a8e6091aa… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 12 14:12:40 2013 +0200 wined3d: 1x1 texures have a power of two size. --- dlls/wined3d/texture.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 9bf4c2e..5b83d4a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -965,15 +965,13 @@ static HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT he && !(format->id == WINED3DFMT_P8_UINT && gl_info->supported[EXT_PALETTED_TEXTURE] && wined3d_settings.rendertargetlock_mode == RTL_READTEX)) { - if (width != 1 || height != 1) - texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT; - texture->pow2_matrix[0] = (float)width; texture->pow2_matrix[5] = (float)height; texture->pow2_matrix[10] = 1.0f; texture->pow2_matrix[15] = 1.0f; texture->target = GL_TEXTURE_RECTANGLE_ARB; texture->flags |= WINED3D_TEXTURE_COND_NP2; + texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT; if (texture->resource.format->flags & WINED3DFMT_FLAG_FILTERING) texture->min_mip_lookup = minMipLookup_noMip;

1 0

Stefan Dösinger : wined3d: Use the np2_fixup to find out if a RECT texture is used.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: 547be26d90575a5013ea67025e940cb6f32119f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=547be26d90575a5013ea67025… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Apr 13 16:37:15 2013 +0200 wined3d: Use the np2_fixup to find out if a RECT texture is used. --- dlls/wined3d/arb_program_shader.c | 18 ++++++++++-------- dlls/wined3d/glsl_shader.c | 9 +++++---- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7e695fd..c3313ec 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1368,14 +1368,14 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD { struct wined3d_shader_buffer *buffer = ins->ctx->buffer; DWORD sampler_type = ins->ctx->reg_maps->sampler_type[sampler_idx]; - const struct wined3d_shader *shader = ins->ctx->shader; - const struct wined3d_texture *texture; const char *tex_type; BOOL np2_fixup = FALSE; - struct wined3d_device *device = shader->device; struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; const char *mod; BOOL pshader = shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type); + const struct wined3d_shader *shader; + const struct wined3d_device *device; + const struct wined3d_gl_info *gl_info; /* D3D vertex shader sampler IDs are vertex samplers(0-3), not global d3d samplers */ if(!pshader) sampler_idx += MAX_FRAGMENT_SAMPLERS; @@ -1386,13 +1386,15 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD break; case WINED3DSTT_2D: - texture = device->stateBlock->state.textures[sampler_idx]; - if (texture && texture->target == GL_TEXTURE_RECTANGLE_ARB) - { + shader = ins->ctx->shader; + device = shader->device; + gl_info = &device->adapter->gl_info; + + if (pshader && priv->cur_ps_args->super.np2_fixup & (1 << sampler_idx) + && gl_info->supported[ARB_TEXTURE_RECTANGLE]) tex_type = "RECT"; - } else { + else tex_type = "2D"; - } if (shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type)) { if (priv->cur_np2fixup_info->super.active & (1 << sampler_idx)) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a840a5d..ab32abe 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1058,7 +1058,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont if (reg_maps->sampler_type[i]) { BOOL shadow_sampler = version->type == WINED3D_SHADER_TYPE_PIXEL && (ps_args->shadow & (1 << i)); - const struct wined3d_texture *texture; + BOOL tex_rect; switch (reg_maps->sampler_type[i]) { @@ -1069,17 +1069,18 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont shader_addline(buffer, "uniform sampler1D %s_sampler%u;\n", prefix, i); break; case WINED3DSTT_2D: - texture = state->textures[i]; + tex_rect = version->type == WINED3D_SHADER_TYPE_PIXEL && (ps_args->np2_fixup & (1 << i)); + tex_rect = tex_rect && gl_info->supported[ARB_TEXTURE_RECTANGLE]; if (shadow_sampler) { - if (texture && texture->target == GL_TEXTURE_RECTANGLE_ARB) + if (tex_rect) shader_addline(buffer, "uniform sampler2DRectShadow %s_sampler%u;\n", prefix, i); else shader_addline(buffer, "uniform sampler2DShadow %s_sampler%u;\n", prefix, i); } else { - if (texture && texture->target == GL_TEXTURE_RECTANGLE_ARB) + if (tex_rect) shader_addline(buffer, "uniform sampler2DRect %s_sampler%u;\n", prefix, i); else shader_addline(buffer, "uniform sampler2D %s_sampler%u;\n", prefix, i);

1 0