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

Louis Lenders : kernel32: Add stub for AttachConsole.
by Alexandre Julliard March 23, 2007

March 23, 2007

Module: wine Branch: master Commit: eafbf45fce84395fdb566dc3c5cf45810cbf7a27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eafbf45fce84395fdb566dc3c… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Mar 22 20:32:36 2007 +0000 kernel32: Add stub for AttachConsole. --- dlls/kernel32/console.c | 9 +++++++++ dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 98baebd..66bc796 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -2405,6 +2405,15 @@ BOOL WINAPI ScrollConsoleScreenBufferW(HANDLE hConsoleOutput, LPSMALL_RECT lpScr return TRUE; } +/****************************************************************** + * AttachConsole (KERNEL32.@) + */ +BOOL WINAPI AttachConsole(DWORD dwProcessId) +{ + FIXME("stub %x\n",dwProcessId); + return TRUE; +} + /* ==================================================================== * diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 1e79df6..a675386 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -148,7 +148,7 @@ @ stub AllocateUserPhysicalPages @ stdcall AreFileApisANSI() @ stdcall AssignProcessToJobObject(ptr ptr) -# @ stub AttachConsole +@ stdcall AttachConsole(long) @ stdcall BackupRead(ptr ptr long ptr long long ptr) @ stdcall BackupSeek(ptr long long ptr ptr ptr) @ stdcall BackupWrite(ptr ptr long ptr long long ptr)

1 0

Paul Vriens : netapi32/tests: Use LoadLibrary where needed and skip.
by Alexandre Julliard March 23, 2007

March 23, 2007

Module: wine Branch: master Commit: 87b291a261d143f8629bd995e03a496429582f07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87b291a261d143f8629bd995e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Mar 23 11:32:36 2007 +0100 netapi32/tests: Use LoadLibrary where needed and skip. --- dlls/netapi32/tests/access.c | 35 +++++++++++++---------------------- dlls/netapi32/tests/apibuf.c | 13 +++++++------ dlls/netapi32/tests/ds.c | 18 +++++++++--------- dlls/netapi32/tests/wksta.c | 26 +++++++++++++++----------- 4 files changed, 44 insertions(+), 48 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index 7dd5855..c1bc9d7 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -32,6 +32,7 @@ WCHAR user_name[UNLEN + 1]; WCHAR computer_name[MAX_COMPUTERNAME_LENGTH + 1]; +/* FIXME : Tests should be language independent */ static const WCHAR sAdminUserName[] = {'A','d','m','i','n','i','s','t','r','a','t', 'o','r',0}; static const WCHAR sGuestUserName[] = {'G','u','e','s','t',0}; @@ -64,7 +65,7 @@ static int init_access_tests(void) rc=GetUserNameW(user_name, &dwSize); if (rc==FALSE && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) { - skip("netapi32 functions seem to be missing.\n"); + skip("GetUserNameW is not available.\n"); return 0; } ok(rc, "User Name Retrieved\n"); @@ -82,13 +83,6 @@ static void run_usergetinfo_tests(void) PUSER_INFO_10 ui10 = NULL; DWORD dwSize; - /* If this one is not defined then none of the others will be defined */ - if (!pNetUserGetInfo) - { - skip("netapi32 functions seem to be missing.\n"); - return; - } - /* Level 0 */ rc=pNetUserGetInfo(NULL, sAdminUserName, 0, (LPBYTE *)&ui0); if (rc != NERR_Success) { @@ -145,12 +139,6 @@ static void run_querydisplayinformation1_tests(void) BOOL hasAdmin = FALSE; BOOL hasGuest = FALSE; - if (!pNetQueryDisplayInformation) - { - skip("netapi32 functions seem to be missing.\n"); - return; - } - do { Result = pNetQueryDisplayInformation( @@ -204,12 +192,6 @@ static void run_userhandling_tests(void) NET_API_STATUS ret; USER_INFO_1 usri; - if(!pNetUserAdd || !pNetUserChangePassword || !pNetUserDel) - { - skip("Functions for modifying the user database missing. Skipping test.\n"); - return; - } - usri.usri1_name = (LPWSTR) sTestUserName; usri.usri1_password = (LPWSTR) sTestUserOldPass; usri.usri1_priv = USER_PRIV_USER; @@ -245,6 +227,7 @@ static void run_userhandling_tests(void) START_TEST(access) { HMODULE hnetapi32=LoadLibraryA("netapi32.dll"); + pNetApiBufferFree=(void*)GetProcAddress(hnetapi32,"NetApiBufferFree"); pNetApiBufferSize=(void*)GetProcAddress(hnetapi32,"NetApiBufferSize"); pNetQueryDisplayInformation=(void*)GetProcAddress(hnetapi32,"NetQueryDisplayInformation"); @@ -254,8 +237,14 @@ START_TEST(access) pNetUserChangePassword=(void*)GetProcAddress(hnetapi32, "NetUserChangePassword"); pNetUserDel=(void*)GetProcAddress(hnetapi32, "NetUserDel"); - if (!pNetApiBufferSize) - trace("It appears there is no netapi32 functionality on this platform\n"); + /* These functions were introduced with NT. It's safe to assume that + * if one is not available, none are. + */ + if (!pNetApiBufferFree) { + skip("Needed functions are not available\n"); + FreeLibrary(hnetapi32); + return; + } if (init_access_tests()) { run_usergetinfo_tests(); @@ -263,4 +252,6 @@ START_TEST(access) run_usermodalsget_tests(); run_userhandling_tests(); } + + FreeLibrary(hnetapi32); } diff --git a/dlls/netapi32/tests/apibuf.c b/dlls/netapi32/tests/apibuf.c index 1ec79af..751081e 100644 --- a/dlls/netapi32/tests/apibuf.c +++ b/dlls/netapi32/tests/apibuf.c @@ -41,9 +41,6 @@ static void run_apibuf_tests(void) DWORD dwSize; NET_API_STATUS res; - if (!pNetApiBufferAllocate) - return; - /* test normal logic */ ok(pNetApiBufferAllocate(1024, (LPVOID *)&p) == NERR_Success, "Reserved memory\n"); @@ -96,12 +93,16 @@ static void run_apibuf_tests(void) START_TEST(apibuf) { HMODULE hnetapi32=LoadLibraryA("netapi32.dll"); + pNetApiBufferAllocate=(void*)GetProcAddress(hnetapi32,"NetApiBufferAllocate"); pNetApiBufferFree=(void*)GetProcAddress(hnetapi32,"NetApiBufferFree"); pNetApiBufferReallocate=(void*)GetProcAddress(hnetapi32,"NetApiBufferReallocate"); pNetApiBufferSize=(void*)GetProcAddress(hnetapi32,"NetApiBufferSize"); - if (!pNetApiBufferSize) - trace("It appears there is no netapi32 functionality on this platform\n"); - run_apibuf_tests(); + if (pNetApiBufferAllocate && pNetApiBufferFree && pNetApiBufferReallocate && pNetApiBufferSize) + run_apibuf_tests(); + else + skip("Needed functions are not available\n"); + + FreeLibrary(hnetapi32); } diff --git a/dlls/netapi32/tests/ds.c b/dlls/netapi32/tests/ds.c index 7ee8a73..9111915 100644 --- a/dlls/netapi32/tests/ds.c +++ b/dlls/netapi32/tests/ds.c @@ -76,18 +76,18 @@ static void test_get(void) START_TEST(ds) { - HMODULE hnetapi32; - - hnetapi32 = GetModuleHandleA("netapi32.dll"); + HMODULE hnetapi32 = LoadLibrary("netapi32.dll"); pDsRoleGetPrimaryDomainInformation=(void*)GetProcAddress(hnetapi32,"DsRoleGetPrimaryDomainInformation"); - if (!pDsRoleGetPrimaryDomainInformation) + if (pDsRoleGetPrimaryDomainInformation) { - skip("DsRoleGetPrimaryDomainInformation is not available\n"); - return; + pDsRoleFreeMemory=(void*)GetProcAddress(hnetapi32,"DsRoleFreeMemory"); + + test_params(); + test_get(); } - pDsRoleFreeMemory=(void*)GetProcAddress(hnetapi32,"DsRoleFreeMemory"); + else + skip("DsRoleGetPrimaryDomainInformation is not available\n"); - test_params(); - test_get(); + FreeLibrary(hnetapi32); } diff --git a/dlls/netapi32/tests/wksta.c b/dlls/netapi32/tests/wksta.c index f8e9bb0..ba68eb4 100644 --- a/dlls/netapi32/tests/wksta.c +++ b/dlls/netapi32/tests/wksta.c @@ -50,8 +50,10 @@ static int init_wksta_tests(void) user_name[0] = 0; dwSize = sizeof(user_name); rc=GetUserNameW(user_name, &dwSize); - if (rc==FALSE && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) + if (rc==FALSE && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) { + skip("GetUserNameW is not implemented\n"); return 0; + } ok(rc, "User Name Retrieved\n"); computer_name[0] = 0; @@ -63,8 +65,6 @@ static int init_wksta_tests(void) static void run_get_comp_name_tests(void) { LPWSTR ws = NULL; - if (!pNetpGetComputerName) - return; ok(pNetpGetComputerName(&ws) == NERR_Success, "Computer name is retrieved\n"); ok(!lstrcmpW(computer_name, ws), "This is really computer name\n"); @@ -78,9 +78,6 @@ static void run_wkstausergetinfo_tests(void) LPWKSTA_USER_INFO_1101 ui1101 = NULL; DWORD dwSize; - if (!pNetWkstaUserGetInfo) - return; - /* Level 0 */ ok(pNetWkstaUserGetInfo(NULL, 0, (LPBYTE *)&ui0) == NERR_Success, "NetWkstaUserGetInfo is successful\n"); @@ -128,9 +125,6 @@ static void run_wkstatransportenum_tests(void) NET_API_STATUS apiReturn; DWORD entriesRead, totalEntries; - if (!pNetWkstaTransportEnum) - return; - /* 1st check: is param 2 (level) correct? (only if param 5 passed?) */ apiReturn = pNetWkstaTransportEnum(NULL, 1, NULL, MAX_PREFERRED_LENGTH, NULL, &totalEntries, NULL); @@ -177,17 +171,27 @@ static void run_wkstatransportenum_tests(void) START_TEST(wksta) { HMODULE hnetapi32=LoadLibraryA("netapi32.dll"); + pNetApiBufferFree=(void*)GetProcAddress(hnetapi32,"NetApiBufferFree"); pNetApiBufferSize=(void*)GetProcAddress(hnetapi32,"NetApiBufferSize"); pNetpGetComputerName=(void*)GetProcAddress(hnetapi32,"NetpGetComputerName"); pNetWkstaUserGetInfo=(void*)GetProcAddress(hnetapi32,"NetWkstaUserGetInfo"); pNetWkstaTransportEnum=(void*)GetProcAddress(hnetapi32,"NetWkstaTransportEnum"); - if (!pNetApiBufferSize) - trace("It appears there is no netapi32 functionality on this platform\n"); + + /* These functions were introduced with NT. It's safe to assume that + * if one is not available, none are. + */ + if (!pNetApiBufferFree) { + skip("Needed functions are not available\n"); + FreeLibrary(hnetapi32); + return; + } if (init_wksta_tests()) { run_get_comp_name_tests(); run_wkstausergetinfo_tests(); run_wkstatransportenum_tests(); } + + FreeLibrary(hnetapi32); }

1 0

Fabian Bieler : wined3d: Fix arb texbem instruction for projective textures .
by Alexandre Julliard March 23, 2007

March 23, 2007

Module: wine Branch: master Commit: e617c91f2294cb8882f08f72777fc9a7d26c48ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=e617c91f2294cb8882f08f727… Author: Fabian Bieler <der.fabe(a)gmx.net> Date: Thu Mar 22 17:43:50 2007 +0100 wined3d: Fix arb texbem instruction for projective textures. --- dlls/wined3d/arb_program_shader.c | 38 +++++++++++++++++++++++------------- 1 files changed, 24 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index bffc2a4..2185455 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -379,7 +379,7 @@ static void vshader_program_add_param(SHADER_OPCODE_ARG *arg, const DWORD param, } } -static void shader_hw_sample(SHADER_OPCODE_ARG* arg, DWORD sampler_idx, const char *dst_str, const char *coord_reg) { +static void shader_hw_sample(SHADER_OPCODE_ARG* arg, DWORD sampler_idx, const char *dst_str, const char *coord_reg, BOOL projective) { IWineD3DPixelShaderImpl* This = (IWineD3DPixelShaderImpl*) arg->shader; IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *) deviceImpl->stateBlock->textures[sampler_idx]; @@ -411,7 +411,7 @@ static void shader_hw_sample(SHADER_OPCODE_ARG* arg, DWORD sampler_idx, const ch tex_type = ""; } - if (deviceImpl->stateBlock->textureState[sampler_idx][WINED3DTSS_TEXTURETRANSFORMFLAGS] & WINED3DTTFF_PROJECTED) { + if (projective && deviceImpl->stateBlock->textureState[sampler_idx][WINED3DTSS_TEXTURETRANSFORMFLAGS] & WINED3DTTFF_PROJECTED) { shader_addline(buffer, "TXP %s, %s, texture[%u], %s;\n", dst_str, coord_reg, sampler_idx, tex_type); } else { shader_addline(buffer, "TEX %s, %s, texture[%u], %s;\n", dst_str, coord_reg, sampler_idx, tex_type); @@ -656,7 +656,7 @@ void pshader_hw_tex(SHADER_OPCODE_ARG* arg) { else reg_sampler_code = src[1] & WINED3DSP_REGNUM_MASK; - shader_hw_sample(arg, reg_sampler_code, reg_dest, reg_coord); + shader_hw_sample(arg, reg_sampler_code, reg_dest, reg_coord, TRUE); } void pshader_hw_texcoord(SHADER_OPCODE_ARG* arg) { @@ -690,7 +690,7 @@ void pshader_hw_texreg2ar(SHADER_OPCODE_ARG* arg) { sprintf(dst_str, "T%u", reg1); shader_addline(buffer, "MOV TMP.r, T%u.a;\n", reg2); shader_addline(buffer, "MOV TMP.g, T%u.r;\n", reg2); - shader_hw_sample(arg, reg1, dst_str, "TMP"); + shader_hw_sample(arg, reg1, dst_str, "TMP", TRUE); } void pshader_hw_texreg2gb(SHADER_OPCODE_ARG* arg) { @@ -704,7 +704,7 @@ void pshader_hw_texreg2gb(SHADER_OPCODE_ARG* arg) { sprintf(dst_str, "T%u", reg1); shader_addline(buffer, "MOV TMP.r, T%u.g;\n", reg2); shader_addline(buffer, "MOV TMP.g, T%u.b;\n", reg2); - shader_hw_sample(arg, reg1, dst_str, "TMP"); + shader_hw_sample(arg, reg1, dst_str, "TMP", TRUE); } void pshader_hw_texbem(SHADER_OPCODE_ARG* arg) { @@ -729,13 +729,23 @@ void pshader_hw_texbem(SHADER_OPCODE_ARG* arg) { shader_addline(buffer, "DP3 TMP.r, TMP2, T%u;\n", src); shader_addline(buffer, "SWZ TMP2, bumpenvmat, y, w, 0, 0;\n"); shader_addline(buffer, "DP3 TMP.g, TMP2, T%u;\n", src); - shader_addline(buffer, "ADD TMP.rg, TMP, %s;\n", reg_coord); - /* Not sure about this, but hl2 needs it. It uses a projected texture with texbem and depends on the 4th coordinate */ - shader_addline(buffer, "MOV TMP.a, %s;\n", reg_coord); - shader_hw_sample(arg, reg_dest_code, reg_coord, "TMP"); + + /* with projective textures, texbem only divides the static texture coord, not the displacement, + * so we can't let the GL handle this. + */ + if (((IWineD3DDeviceImpl*) This->baseShader.device)->stateBlock->textureState[reg_dest_code][WINED3DTSS_TEXTURETRANSFORMFLAGS] + & WINED3DTTFF_PROJECTED) { + shader_addline(buffer, "RCP TMP2.a, %s.a;\n", reg_coord); + shader_addline(buffer, "MUL TMP2.rg, %s, TMP2.a;\n", reg_coord); + shader_addline(buffer, "ADD TMP.rg, TMP, TMP2;\n"); + } else { + shader_addline(buffer, "ADD TMP.rg, TMP, %s;\n", reg_coord); + } + + shader_hw_sample(arg, reg_dest_code, reg_coord, "TMP", FALSE); } else { /* Without a bump matrix loaded, just sample with the unmodified coordinates */ - shader_hw_sample(arg, reg_dest_code, reg_coord, reg_coord); + shader_hw_sample(arg, reg_dest_code, reg_coord, reg_coord, TRUE); } } @@ -759,7 +769,7 @@ void pshader_hw_texm3x2tex(SHADER_OPCODE_ARG* arg) { sprintf(dst_str, "T%u", reg); pshader_gen_input_modifier_line(buffer, arg->src[0], 0, src0_name); shader_addline(buffer, "DP3 TMP.y, T%u, %s;\n", reg, src0_name); - shader_hw_sample(arg, reg, dst_str, "TMP"); + shader_hw_sample(arg, reg, dst_str, "TMP", TRUE); } void pshader_hw_texm3x3pad(SHADER_OPCODE_ARG* arg) { @@ -789,7 +799,7 @@ void pshader_hw_texm3x3tex(SHADER_OPCODE_ARG* arg) { /* Sample the texture using the calculated coordinates */ sprintf(dst_str, "T%u", reg); - shader_hw_sample(arg, reg, dst_str, "TMP"); + shader_hw_sample(arg, reg, dst_str, "TMP", TRUE); current_state->current_row = 0; } @@ -817,7 +827,7 @@ void pshader_hw_texm3x3vspec(SHADER_OPCODE_ARG* arg) { /* Sample the texture using the calculated coordinates */ sprintf(dst_str, "T%u", reg); - shader_hw_sample(arg, reg, dst_str, "TMP"); + shader_hw_sample(arg, reg, dst_str, "TMP", TRUE); current_state->current_row = 0; } @@ -841,7 +851,7 @@ void pshader_hw_texm3x3spec(SHADER_OPCODE_ARG* arg) { /* Sample the texture using the calculated coordinates */ sprintf(dst_str, "T%u", reg); - shader_hw_sample(arg, reg, dst_str, "TMP"); + shader_hw_sample(arg, reg, dst_str, "TMP", TRUE); current_state->current_row = 0; }

1 0

Fabian Bieler : d3d9/tests: Add test for texbem instruction.
by Alexandre Julliard March 23, 2007

March 23, 2007

Module: wine Branch: master Commit: 76d153144fb0b7948d9edb32b6f3b89124730b18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76d153144fb0b7948d9edb32b… Author: Fabian Bieler <der.fabe(a)gmx.net> Date: Thu Mar 22 17:44:17 2007 +0100 d3d9/tests: Add test for texbem instruction. --- dlls/d3d9/tests/visual.c | 198 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 198 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 5f62edf..33c4231 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -923,6 +923,198 @@ static void fog_with_shader_test(IDirect3DDevice9 *device) IDirect3DVertexDeclaration9_Release(vertex_declaration); } +/* test the behavior of the texbem instruction + * with normal 2D and projective 2D textures + */ +static void texbem_test(IDirect3DDevice9 *device) +{ + HRESULT hr; + DWORD color; + unsigned int i, x, y; + + static const DWORD pixel_shader_code[] = { + 0xffff0101, /* ps_1_1*/ + 0x00000042, 0xb00f0000, /* tex t0*/ + 0x00000043, 0xb00f0001, 0xb0e40000, /* texbem t1, t0*/ + 0x00000001, 0x800f0000, 0xb0e40001, /* mov r0, t1*/ + 0x0000ffff + }; + + static const float quad[][7] = { + {-128.0f/640.0f, -128.0f/480.0f, 0.1f, 0.0f, 0.0f, 0.0f, 0.0f}, + {-128.0f/640.0f, 128.0f/480.0f, 0.1f, 0.0f, 1.0f, 0.0f, 1.0f}, + { 128.0f/640.0f, -128.0f/480.0f, 0.1f, 1.0f, 0.0f, 1.0f, 0.0f}, + { 128.0f/640.0f, 128.0f/480.0f, 0.1f, 1.0f, 1.0f, 1.0f, 1.0f}, + }; + static const float quad_proj[][9] = { + {-128.0f/640.0f, -128.0f/480.0f, 0.1f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 128.0f}, + {-128.0f/640.0f, 128.0f/480.0f, 0.1f, 0.0f, 1.0f, 0.0f, 128.0f, 0.0f, 128.0f}, + { 128.0f/640.0f, -128.0f/480.0f, 0.1f, 1.0f, 0.0f, 128.0f, 0.0f, 0.0f, 128.0f}, + { 128.0f/640.0f, 128.0f/480.0f, 0.1f, 1.0f, 1.0f, 128.0f, 128.0f, 0.0f, 128.0f}, + }; + + static const D3DVERTEXELEMENT9 decl_elements[][4] = { { + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {0, 12, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0}, + {0, 20, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 1}, + D3DDECL_END() + },{ + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {0, 12, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0}, + {0, 20, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 1}, + D3DDECL_END() + } }; + + /* use assymetric matrix to test loading */ + float bumpenvmat[4] = {0.0,0.5,-0.5,0.0}; + + IDirect3DVertexDeclaration9 *vertex_declaration = NULL; + IDirect3DPixelShader9 *pixel_shader = NULL; + IDirect3DTexture9 *texture[2] = {NULL, NULL}; + D3DLOCKED_RECT locked_rect; + + /* Generate the textures */ + for(i=0; i<2; i++) + { + hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1, 0, i?D3DFMT_A8R8G8B8:D3DFMT_V8U8, + D3DPOOL_MANAGED, &texture[i], NULL); + ok(SUCCEEDED(hr), "CreateTexture failed (0x%08x)\n", hr); + + hr = IDirect3DTexture9_LockRect(texture[i], 0, &locked_rect, NULL, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "LockRect failed (0x%08x)\n", hr); + for (y = 0; y < 128; ++y) + { + if(i) + { /* Set up black texture with 2x2 texel white spot in the middle */ + DWORD *ptr = (DWORD *)(((BYTE *)locked_rect.pBits) + (y * locked_rect.Pitch)); + for (x = 0; x < 128; ++x) + { + if(y>62 && y<66 && x>62 && x<66) + *ptr++ = 0xffffffff; + else + *ptr++ = 0xff000000; + } + } + else + { /* Set up a displacement map which points away from the center parallel to the closest axis. + * (if multiplied with bumpenvmat) + */ + WORD *ptr = (WORD *)(((BYTE *)locked_rect.pBits) + (y * locked_rect.Pitch)); + for (x = 0; x < 128; ++x) + { + if(abs(x-64)>abs(y-64)) + { + if(x < 64) + *ptr++ = 0xc000; + else + *ptr++ = 0x4000; + } + else + { + if(y < 64) + *ptr++ = 0x0040; + else + *ptr++ = 0x00c0; + } + } + } + } + hr = IDirect3DTexture9_UnlockRect(texture[i], 0); + ok(SUCCEEDED(hr), "UnlockRect failed (0x%08x)\n", hr); + + hr = IDirect3DDevice9_SetTexture(device, i, (IDirect3DBaseTexture9 *)texture[i]); + ok(SUCCEEDED(hr), "SetTexture failed (0x%08x)\n", hr); + + /* Disable texture filtering */ + hr = IDirect3DDevice9_SetSamplerState(device, i, D3DSAMP_MINFILTER, D3DTEXF_POINT); + ok(SUCCEEDED(hr), "SetSamplerState D3DSAMP_MINFILTER failed (0x%08x)\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, i, D3DSAMP_MAGFILTER, D3DTEXF_POINT); + ok(SUCCEEDED(hr), "SetSamplerState D3DSAMP_MAGFILTER failed (0x%08x)\n", hr); + + hr = IDirect3DDevice9_SetSamplerState(device, i, D3DSAMP_ADDRESSU, D3DTADDRESS_CLAMP); + ok(SUCCEEDED(hr), "SetSamplerState D3DSAMP_ADDRESSU failed (0x%08x)\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, i, D3DSAMP_ADDRESSV, D3DTADDRESS_CLAMP); + ok(SUCCEEDED(hr), "SetSamplerState D3DSAMP_ADDRESSV failed (0x%08x)\n", hr); + } + + IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_BUMPENVMAT00, *(LPDWORD)&bumpenvmat[0]); + IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_BUMPENVMAT01, *(LPDWORD)&bumpenvmat[1]); + IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_BUMPENVMAT10, *(LPDWORD)&bumpenvmat[2]); + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_BUMPENVMAT11, *(LPDWORD)&bumpenvmat[3]); + ok(SUCCEEDED(hr), "SetTextureStageState failed (%08x)\n", hr); + + hr = IDirect3DDevice9_SetVertexShader(device, NULL); + ok(SUCCEEDED(hr), "SetVertexShader failed (%08x)\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff00ff, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed (%08x)\n", hr); + + for(i=0; i<2; i++) + { + if(i) + { + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT4|D3DTTFF_PROJECTED); + ok(SUCCEEDED(hr), "SetTextureStageState D3DTSS_TEXTURETRANSFORMFLAGS failed (0x%08x)\n", hr); + } + + hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements[i], &vertex_declaration); + ok(SUCCEEDED(hr), "CreateVertexDeclaration failed (0x%08x)\n", hr); + hr = IDirect3DDevice9_SetVertexDeclaration(device, vertex_declaration); + ok(SUCCEEDED(hr), "SetVertexDeclaration failed (0x%08x)\n", hr); + + hr = IDirect3DDevice9_CreatePixelShader(device, pixel_shader_code, &pixel_shader); + ok(SUCCEEDED(hr), "CreatePixelShader failed (%08x)\n", hr); + hr = IDirect3DDevice9_SetPixelShader(device, pixel_shader); + ok(SUCCEEDED(hr), "SetPixelShader failed (%08x)\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed (0x%08x)\n", hr); + + if(!i) + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quad[0], sizeof(quad[0])); + else + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quad_proj[0], sizeof(quad_proj[0])); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed (0x%08x)\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed (0x%08x)\n", hr); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); + + color = getPixelColor(device, 320-32, 240); + ok(color == 0x00ffffff, "texbem failed: Got color 0x%08x, expected 0x00ffffff.\n", color); + color = getPixelColor(device, 320+32, 240); + ok(color == 0x00ffffff, "texbem failed: Got color 0x%08x, expected 0x00ffffff.\n", color); + color = getPixelColor(device, 320, 240-32); + ok(color == 0x00ffffff, "texbem failed: Got color 0x%08x, expected 0x00ffffff.\n", color); + color = getPixelColor(device, 320, 240+32); + ok(color == 0x00ffffff, "texbem failed: Got color 0x%08x, expected 0x00ffffff.\n", color); + + hr = IDirect3DDevice9_SetPixelShader(device, NULL); + ok(SUCCEEDED(hr), "SetPixelShader failed (%08x)\n", hr); + IDirect3DPixelShader9_Release(pixel_shader); + + hr = IDirect3DDevice9_SetVertexDeclaration(device, NULL); + ok(SUCCEEDED(hr), "SetVertexDeclaration failed (%08x)\n", hr); + IDirect3DVertexDeclaration9_Release(vertex_declaration); + } + + /* clean up */ + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0, 0.0f, 0); + ok(SUCCEEDED(hr), "Clear failed (0x%08x)\n", hr); + + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2); + ok(SUCCEEDED(hr), "SetTextureStageState D3DTSS_TEXTURETRANSFORMFLAGS failed (0x%08x)\n", hr); + + for(i=0; i<2; i++) + { + hr = IDirect3DDevice9_SetTexture(device, i, NULL); + ok(SUCCEEDED(hr), "SetTexture failed (0x%08x)\n", hr); + IDirect3DCubeTexture9_Release(texture[i]); + } +} + START_TEST(visual) { IDirect3DDevice9 *device_ptr; @@ -991,6 +1183,12 @@ START_TEST(visual) } else skip("No vs_1_1 and ps_1_1 support\n"); + if (caps.PixelShaderVersion >= D3DVS_VERSION(1, 1)) + { + texbem_test(device_ptr); + } + else skip("No ps_1_1 support\n"); + cleanup: if(device_ptr) IDirect3DDevice9_Release(device_ptr); }

1 0

Fabian Bieler : wined3d: Fix glsl texbem instruction for projective textures.
by Alexandre Julliard March 23, 2007

March 23, 2007

Module: wine Branch: master Commit: 97967d367112c80caadf820a9332a64b44e80ebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=97967d367112c80caadf820a9… Author: Fabian Bieler <der.fabe(a)gmx.net> Date: Thu Mar 22 17:42:41 2007 +0100 wined3d: Fix glsl texbem instruction for projective textures. --- dlls/wined3d/glsl_shader.c | 39 ++++++++++++++++++++------------------- 1 files changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5771ae5..598f589 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1786,38 +1786,39 @@ void pshader_glsl_texbem(SHADER_OPCODE_ARG* arg) { glsl_src_param_t coord_param; DWORD sampler_type; DWORD sampler_idx; - BOOL projected; - DWORD mask = 0; + DWORD mask; DWORD flags; char coord_mask[6]; - /* All versions have a destination register */ - shader_glsl_append_dst(arg->buffer, arg); - sampler_idx = arg->dst & WINED3DSP_REGNUM_MASK; flags = deviceImpl->stateBlock->textureState[sampler_idx][WINED3DTSS_TEXTURETRANSFORMFLAGS]; - /* TODO: Does texbem even support projected textures? half-life 2 uses it */ + sampler_type = arg->reg_maps->samplers[sampler_idx] & WINED3DSP_TEXTURETYPE_MASK; + shader_glsl_get_sample_function(sampler_type, FALSE, &sample_function); + mask = sample_function.coord_mask; + + shader_glsl_get_write_mask(arg->dst, dst_swizzle); + + shader_glsl_get_write_mask(mask, coord_mask); + + /* with projective textures, texbem only divides the static texture coord, not the displacement, + * so we can't let the GL handle this. + */ if (flags & WINED3DTTFF_PROJECTED) { - projected = TRUE; + DWORD div_mask=0; + char coord_div_mask[3]; switch (flags & ~WINED3DTTFF_PROJECTED) { case WINED3DTTFF_COUNT1: FIXME("WINED3DTTFF_PROJECTED with WINED3DTTFF_COUNT1?\n"); break; - case WINED3DTTFF_COUNT2: mask = WINED3DSP_WRITEMASK_1; break; - case WINED3DTTFF_COUNT3: mask = WINED3DSP_WRITEMASK_2; break; + case WINED3DTTFF_COUNT2: div_mask = WINED3DSP_WRITEMASK_1; break; + case WINED3DTTFF_COUNT3: div_mask = WINED3DSP_WRITEMASK_2; break; case WINED3DTTFF_COUNT4: - case WINED3DTTFF_DISABLE: mask = WINED3DSP_WRITEMASK_3; break; + case WINED3DTTFF_DISABLE: div_mask = WINED3DSP_WRITEMASK_3; break; } - } else { - projected = FALSE; + shader_glsl_get_write_mask(div_mask, coord_div_mask); + shader_addline(arg->buffer, "T%u%s /= T%u%s;\n", sampler_idx, coord_mask, sampler_idx, coord_div_mask); } - sampler_type = arg->reg_maps->samplers[sampler_idx] & WINED3DSP_TEXTURETYPE_MASK; - shader_glsl_get_sample_function(sampler_type, projected, &sample_function); - mask |= sample_function.coord_mask; - - shader_glsl_get_write_mask(arg->dst, dst_swizzle); - - shader_glsl_get_write_mask(mask, coord_mask); + shader_glsl_append_dst(arg->buffer, arg); shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], WINED3DSP_WRITEMASK_0|WINED3DSP_WRITEMASK_1, &coord_param); shader_addline(arg->buffer, "%s(Psampler%u, T%u%s + vec4(bumpenvmat * %s, 0.0, 0.0)%s )%s);\n", sample_function.name, sampler_idx, sampler_idx, coord_mask, coord_param.param_str, coord_mask, dst_swizzle);

1 0

Fabian Bieler : wined3d: Implemented bump map transform for texbem in GLSL with native signed textures .
by Alexandre Julliard March 23, 2007

March 23, 2007

Module: wine Branch: master Commit: 4b3ac837aa53b7659425e0f0c3baff06ac411205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b3ac837aa53b7659425e0f0c… Author: Fabian Bieler <der.fabe(a)gmx.net> Date: Thu Mar 22 17:42:03 2007 +0100 wined3d: Implemented bump map transform for texbem in GLSL with native signed textures. --- dlls/wined3d/glsl_shader.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5403ddf..5771ae5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -359,7 +359,7 @@ void shader_glsl_load_constants( float *data = (float *) &stateBlock->textureState[(int) ((IWineD3DPixelShaderImpl *) pshader)->needsbumpmat][WINED3DTSS_BUMPENVMAT00]; pos = GL_EXTCALL(glGetUniformLocationARB(programId, "bumpenvmat")); checkGLcall("glGetUniformLocationARB"); - GL_EXTCALL(glUniform4fvARB(pos, 1, data)); + GL_EXTCALL(glUniformMatrix2fvARB(pos, 1, 0, data)); checkGLcall("glUniform4fvARB"); } } @@ -401,7 +401,7 @@ void shader_generate_glsl_declarations( if(!pshader) shader_addline(buffer, "uniform vec4 posFixup;\n"); else if(reg_maps->bumpmat) - shader_addline(buffer, "uniform vec4 bumpenvmat;\n"); + shader_addline(buffer, "uniform mat2 bumpenvmat;\n"); /* Declare texture samplers */ for (i = 0; i < This->baseShader.limits.sampler; i++) { @@ -1783,6 +1783,7 @@ void pshader_glsl_texbem(SHADER_OPCODE_ARG* arg) { IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; char dst_swizzle[6]; glsl_sample_function_t sample_function; + glsl_src_param_t coord_param; DWORD sampler_type; DWORD sampler_idx; BOOL projected; @@ -1817,9 +1818,9 @@ void pshader_glsl_texbem(SHADER_OPCODE_ARG* arg) { shader_glsl_get_write_mask(arg->dst, dst_swizzle); shader_glsl_get_write_mask(mask, coord_mask); - FIXME("Bump map transform not handled yet\n"); - shader_addline(arg->buffer, "%s(Psampler%u, T%u%s)%s);\n", - sample_function.name, sampler_idx, sampler_idx, coord_mask, dst_swizzle); + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], WINED3DSP_WRITEMASK_0|WINED3DSP_WRITEMASK_1, &coord_param); + shader_addline(arg->buffer, "%s(Psampler%u, T%u%s + vec4(bumpenvmat * %s, 0.0, 0.0)%s )%s);\n", + sample_function.name, sampler_idx, sampler_idx, coord_mask, coord_param.param_str, coord_mask, dst_swizzle); } /** Process the WINED3DSIO_TEXREG2AR instruction in GLSL

1 0

Fabian Bieler : wined3d: Remove fog coordinate clamping in the vertex shader.
by Alexandre Julliard March 23, 2007

March 23, 2007

Module: wine Branch: master Commit: 878e02538e1c2fef0bda00e42b86245685a387aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=878e02538e1c2fef0bda00e42… Author: Fabian Bieler <der.fabe(a)gmx.net> Date: Thu Mar 22 17:34:57 2007 +0100 wined3d: Remove fog coordinate clamping in the vertex shader. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/vertexshader.c | 19 ++++++++----------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d24a5f9..bffc2a4 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -313,7 +313,7 @@ static void vshader_program_add_param(SHADER_OPCODE_ARG *arg, const DWORD param, IWineD3DVertexShaderImpl* This = (IWineD3DVertexShaderImpl*) arg->shader; /* oPos, oFog and oPts in D3D */ - static const char * const hwrastout_reg_names[] = { "TMP_OUT", "TMP_FOG", "result.pointsize" }; + static const char * const hwrastout_reg_names[] = { "TMP_OUT", "result.fogcoord", "result.pointsize" }; DWORD reg = param & WINED3DSP_REGNUM_MASK; DWORD regtype = shader_get_regtype(param); diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 5d3a506..22c49c2 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -336,11 +336,11 @@ static VOID IWineD3DVertexShaderImpl_GenerateShader( if (This->baseShader.hex_version >= WINED3DVS_VERSION(3,0)) vshader_glsl_output_unpack(&buffer, This->semantics_out); - /* Clamp the fog from 0 to 1 if it's used */ - if (reg_maps->fog) { + /* If this shader doesn't use fog copy the z coord to the fog coord so that we can use table fog */ + if (reg_maps->fog) This->usesFog = 1; - shader_addline(&buffer, "gl_FogFragCoord = clamp(gl_FogFragCoord, 0.0, 1.0);\n"); - } + else + shader_addline(&buffer, "gl_FogFragCoord = gl_Position.z;\n"); /* Write the final position. * @@ -382,17 +382,14 @@ static VOID IWineD3DVertexShaderImpl_GenerateShader( /* We need a constant to fixup the final position */ shader_addline(&buffer, "PARAM posFixup = program.env[%d];\n", ARB_SHADER_PRIVCONST_POS); - if (reg_maps->fog) { - This->usesFog = 1; - shader_addline(&buffer, "TEMP TMP_FOG;\n"); - } - /* Base Shader Body */ shader_generate_main( (IWineD3DBaseShader*) This, &buffer, reg_maps, pFunction); - /* Make sure the fog value is positive - values above 1.0 are ignored */ + /* If this shader doesn't use fog copy the z coord to the fog coord so that we can use table fog */ if (reg_maps->fog) - shader_addline(&buffer, "MAX result.fogcoord, TMP_FOG, 0.0;\n"); + This->usesFog = 1; + else + shader_addline(&buffer, "MOV result.fogcoord, TMP_OUT.z;\n"); /* Write the final position. *

1 0

Fabian Bieler : wined3d: Implement linear fog with pixel shader.
by Alexandre Julliard March 23, 2007

March 23, 2007

Module: wine Branch: master Commit: 7cedd56d24b8bc1935b3d187adeadd0963ce4303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cedd56d24b8bc1935b3d187a… Author: Fabian Bieler <der.fabe(a)gmx.net> Date: Thu Mar 22 17:32:48 2007 +0100 wined3d: Implement linear fog with pixel shader. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/directx.c | 8 ++-- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/pixelshader.c | 36 ++++++++++++- dlls/wined3d/state.c | 101 +++++++++++++++++++++++++++++++++++-- 5 files changed, 136 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7cedd56d24b8bc1935b3d…

1 0

Fabian Bieler : d3d9/tests: Add test for fog with shader.
by Alexandre Julliard March 23, 2007

March 23, 2007

Module: wine Branch: master Commit: 7b31e91291ae14f11548594a87b288e029cc9c86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b31e91291ae14f11548594a8… Author: Fabian Bieler <der.fabe(a)gmx.net> Date: Thu Mar 22 17:41:22 2007 +0100 d3d9/tests: Add test for fog with shader. --- dlls/d3d9/tests/visual.c | 243 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 243 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7b31e91291ae14f115485…

1 0

Andrew Talbot : rpcrt4: Replace inline static with static inline.
by Alexandre Julliard March 23, 2007

March 23, 2007

Module: wine Branch: master Commit: 67813450b938bd0f11f6343d59839ab94e38d59a URL: http://source.winehq.org/git/wine.git/?a=commit;h=67813450b938bd0f11f6343d5… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Mar 22 18:26:46 2007 +0000 rpcrt4: Replace inline static with static inline. --- dlls/rpcrt4/ndr_marshall.c | 2 +- dlls/rpcrt4/rpc_server.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 7fce001..ad95b53 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -532,7 +532,7 @@ finish_conf: /* multiply two numbers together, raising an RPC_S_INVALID_BOUND exception if * the result overflows 32-bits */ -inline static ULONG safe_multiply(ULONG a, ULONG b) +static inline ULONG safe_multiply(ULONG a, ULONG b) { ULONGLONG ret = (ULONGLONG)a * b; if (ret > 0xffffffff) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index d9285d2..7152453 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -97,7 +97,7 @@ static LONG listen_count; static UUID uuid_nil; -inline static RpcObjTypeMap *LookupObjTypeMap(UUID *ObjUuid) +static inline RpcObjTypeMap *LookupObjTypeMap(UUID *ObjUuid) { RpcObjTypeMap *rslt = RpcObjTypeMaps; RPC_STATUS dummy; @@ -110,7 +110,7 @@ inline static RpcObjTypeMap *LookupObjTypeMap(UUID *ObjUuid) return rslt; } -inline static UUID *LookupObjType(UUID *ObjUuid) +static inline UUID *LookupObjType(UUID *ObjUuid) { RpcObjTypeMap *map = LookupObjTypeMap(ObjUuid); if (map)

1 0