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

Dmitry Timoshkov : advapi32: Thunk GetFileSecurityW to NtQuerySecurityObject.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: 481de9d82de559426eb8909eac9535cfe1e1712f URL: http://source.winehq.org/git/wine.git/?a=commit;h=481de9d82de559426eb8909ea… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sat Apr 21 18:12:36 2007 +0900 advapi32: Thunk GetFileSecurityW to NtQuerySecurityObject. --- dlls/advapi32/security.c | 64 ++++++--------------------------------------- 1 files changed, 9 insertions(+), 55 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 1dbc5e3..80dd89f 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1746,64 +1746,18 @@ GetFileSecurityW( LPCWSTR lpFileName, PSECURITY_DESCRIPTOR pSecurityDescriptor, DWORD nLength, LPDWORD lpnLengthNeeded ) { - DWORD nNeeded; - LPBYTE pBuffer; - DWORD iLocNow; - SECURITY_DESCRIPTOR_RELATIVE *pSDRelative; + HANDLE hfile; + NTSTATUS status; - if(INVALID_FILE_ATTRIBUTES == GetFileAttributesW(lpFileName)) + hfile = CreateFileW( lpFileName, GENERIC_READ, FILE_SHARE_READ, + NULL, OPEN_EXISTING, 0, 0 ); + if ( hfile == INVALID_HANDLE_VALUE ) return FALSE; - FIXME("(%s) : returns fake SECURITY_DESCRIPTOR\n", debugstr_w(lpFileName) ); - - nNeeded = sizeof(SECURITY_DESCRIPTOR_RELATIVE); - if (RequestedInformation & OWNER_SECURITY_INFORMATION) - nNeeded += sizeof(sidWorld); - if (RequestedInformation & GROUP_SECURITY_INFORMATION) - nNeeded += sizeof(sidWorld); - if (RequestedInformation & DACL_SECURITY_INFORMATION) - nNeeded += WINE_SIZE_OF_WORLD_ACCESS_ACL; - if (RequestedInformation & SACL_SECURITY_INFORMATION) - nNeeded += WINE_SIZE_OF_WORLD_ACCESS_ACL; - - *lpnLengthNeeded = nNeeded; - - if (nNeeded > nLength) - return TRUE; - - if (!InitializeSecurityDescriptor(pSecurityDescriptor, SECURITY_DESCRIPTOR_REVISION)) - return FALSE; - - pSDRelative = (PISECURITY_DESCRIPTOR_RELATIVE) pSecurityDescriptor; - pSDRelative->Control |= SE_SELF_RELATIVE; - pBuffer = (LPBYTE) pSDRelative; - iLocNow = sizeof(SECURITY_DESCRIPTOR_RELATIVE); - - if (RequestedInformation & OWNER_SECURITY_INFORMATION) - { - memcpy(pBuffer + iLocNow, &sidWorld, sizeof(sidWorld)); - pSDRelative->Owner = iLocNow; - iLocNow += sizeof(sidWorld); - } - if (RequestedInformation & GROUP_SECURITY_INFORMATION) - { - memcpy(pBuffer + iLocNow, &sidWorld, sizeof(sidWorld)); - pSDRelative->Group = iLocNow; - iLocNow += sizeof(sidWorld); - } - if (RequestedInformation & DACL_SECURITY_INFORMATION) - { - GetWorldAccessACL((PACL) (pBuffer + iLocNow)); - pSDRelative->Dacl = iLocNow; - iLocNow += WINE_SIZE_OF_WORLD_ACCESS_ACL; - } - if (RequestedInformation & SACL_SECURITY_INFORMATION) - { - GetWorldAccessACL((PACL) (pBuffer + iLocNow)); - pSDRelative->Sacl = iLocNow; - /* iLocNow += WINE_SIZE_OF_WORLD_ACCESS_ACL; */ - } - return TRUE; + status = NtQuerySecurityObject( hfile, RequestedInformation, pSecurityDescriptor, + nLength, lpnLengthNeeded ); + CloseHandle( hfile ); + return set_ntstatus( status ); }

1 0

Yuval Fledel : userenv: Make GetProfileType report a normal (non-roaming) profile.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: ec16e6323edcb033eaa15727c296066ae1fc3725 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec16e6323edcb033eaa15727c… Author: Yuval Fledel <yuvalfl(a)gmail.com> Date: Fri Apr 20 22:59:06 2007 +0300 userenv: Make GetProfileType report a normal (non-roaming) profile. --- dlls/userenv/userenv_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 4965fc3..8fd00c7 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -111,7 +111,7 @@ BOOL WINAPI GetProfilesDirectoryW( LPWSTR lpProfilesDir, LPDWORD lpcchSize ) BOOL WINAPI GetProfileType( LPDWORD pdwFlags ) { FIXME("%p\n", pdwFlags ); - *pdwFlags = PT_MANDATORY | PT_ROAMING | PT_TEMPORARY; + *pdwFlags = 0; return TRUE; }

1 0

Lei Zhang : wineshelllink: Fall back to $HOME if $HOME/ Desktop does not exist.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: d0c83654f8a9928be13539714c723d2ec9cfe0a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0c83654f8a9928be13539714… Author: Lei Zhang <thestig(a)google.com> Date: Fri Apr 20 16:58:49 2007 -0700 wineshelllink: Fall back to $HOME if $HOME/Desktop does not exist. --- tools/wineshelllink | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/tools/wineshelllink b/tools/wineshelllink index e4c0fb2..b4d76d8 100755 --- a/tools/wineshelllink +++ b/tools/wineshelllink @@ -220,7 +220,13 @@ if [ $mode = "menu" ] ; then desktop_entry > "$xdg_data_dir/applications/wine/$link.desktop" write_menu_file "wine$linkpath" "wine$linkpath/$linkname.desktop" else - desktop_entry > "$HOME/Desktop/$linkname.desktop" + if [ -d "$HOME/Desktop" ] + then + desktop_target="$HOME/Desktop/$linkname.desktop" + else + desktop_target="$HOME/$linkname.desktop" + fi + desktop_entry > "$desktop_target" fi exit 0

1 0

Maarten Lankhorst : winecfg: Update Dutch resources.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: db6d0d1e9f6b6399a04421de5077cdc783ec1f49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db6d0d1e9f6b6399a04421de5… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 20 21:52:40 2007 +0200 winecfg: Update Dutch resources. --- programs/winecfg/Nl.rc | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc index 92e112e..5f25052 100644 --- a/programs/winecfg/Nl.rc +++ b/programs/winecfg/Nl.rc @@ -4,6 +4,7 @@ * * Copyright 2004 Rein Klazes * Copyright 2005-2006 Paul Vriens + * Copyright 2007 Maarten Lankhorst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -27,7 +28,7 @@ IDR_WINECFG MENU DISCARDABLE BEGIN POPUP "" BEGIN - MENUITEM "Configure", IDC_AUDIO_CONFIGURE + MENUITEM "Instellen", IDC_AUDIO_CONFIGURE END END @@ -159,10 +160,11 @@ IDD_AUDIOCFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Stuurprograma selectie ",IDC_STATIC,8,4,244,195 + GROUPBOX " Stuurprogramma selectie ",IDC_STATIC,8,4,244,195 LTEXT "Selecteer een geluids-stuurprogramma door het aanvinken van het gewenste stuurprogramma. Zet het geluid uit door geen stuurprogramma te selecteren. Het selecteren van meerdere stuurprogramma's wordt niet aanbevolen. Configureer een stuurprogramma d.m.v. een rechter muisklik hierop.",IDC_STATIC,15,20,227,45 CONTROL "Apparaten",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,65,140,125 PUSHBUTTON "Configuratiescherm",IDC_AUDIO_CONTROL_PANEL,170,65,79,14 + PUSHBUTTON "Geluidstest",IDC_AUDIO_TEST,170,85,79,14 GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 LTEXT "Hardwareversnelling: ",IDC_STATIC,15,215,90,10 COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -211,17 +213,17 @@ BEGIN IDS_HIDE_ADVANCED "Verberg uitgebreid" IDS_SHOW_ADVANCED "Toon uitgebreid" IDS_NOTHEME "(Geen Thema)" - IDS_TAB_GRAPHICS "Graphics" /* FIXME */ + IDS_TAB_GRAPHICS "Grafisch" IDS_TAB_DESKTOP_INTEGRATION "Desktop Integratie" - IDS_TAB_AUDIO "Audio" - IDS_TAB_ABOUT "Info" + IDS_TAB_AUDIO "Geluid" + IDS_TAB_ABOUT "Over wine" IDS_WINECFG_TITLE "Wine configuratie" IDS_WINECFG_TITLE_APP "Wine configuratie voor %s" IDS_THEMEFILE "Thema-bestanden" IDS_THEMEFILE_SELECT "Thema-bestanden kiezen" - IDS_AUDIO_MISSING "Op dit moment is er geen audio stuurbestand gespecificeerd in de registry.\n\nEen aanbevolen stuurbestand is voor u geselecteerd.\nU kunt dit stuurbestand gebruiken of (indien beschikbaar) een ander selecteren.\n\nKlik op 'Toepassen' om deze selectie te activeren." - IDS_SHELL_FOLDER "Shell Folder" - IDS_LINKS_TO "Links to" + IDS_AUDIO_MISSING "Op dit moment is er geen stuurprogramma voor geluid gespecificeerd in de registry.\n\nEen aanbevolen stuurbestand is voor u geselecteerd.\nU kunt dit stuurbestand gebruiken of (indien beschikbaar) een ander selecteren.\n\nKlik op 'Toepassen' om deze selectie te activeren." + IDS_SHELL_FOLDER "Persoonlijke map" + IDS_LINKS_TO "Verwijst naar" END STRINGTABLE DISCARDABLE @@ -250,7 +252,7 @@ BEGIN IDS_DRIVE_UNKNOWN "Automatisch detecteren" IDS_DRIVE_FIXED "Lokaal station" IDS_DRIVE_REMOTE "Netwerkverbinding" - IDS_DRIVE_REMOVABLE "Floppy disk" + IDS_DRIVE_REMOVABLE "Diskettestation" IDS_DRIVE_CDROM "CD-ROM" IDS_DRIVE_LETTERS_EXCEEDED "U kunt geen stations meer toevoegen.\n\nElk station moet een letter, van A tot Z, hebben zodat er niet meer dan 26 kunnen zijn" IDS_SYSTEM_DRIVE_LABEL "Systeem station"

1 0

Yuval Fledel : include: Fix a typo in wincrypt.h.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: 355d3c7e47054ff269ee6a0d41a8a16127665262 URL: http://source.winehq.org/git/wine.git/?a=commit;h=355d3c7e47054ff269ee6a0d4… Author: Yuval Fledel <yuvalfl(a)gmail.com> Date: Fri Apr 20 23:10:24 2007 +0300 include: Fix a typo in wincrypt.h. --- include/wincrypt.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 6554376..90fc1c8 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -781,7 +781,7 @@ struct _CERT_CHAIN_CONTEXT { DWORD cChain; PCERT_SIMPLE_CHAIN *rgpChain; DWORD cLowerQualityChainContext; - PCCERT_CHAIN_CONTEXT *rgbLowerQualityChainContext; + PCCERT_CHAIN_CONTEXT *rgpLowerQualityChainContext; BOOL fHasRevocationFreshnessTime; DWORD dwRevocationFreshnessTime; };

1 0

Fabian Bieler : d3d9/tests: Fix fog with shader test.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: 71fe9ae7da09023baeb3c5b391c73cd28283bf05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71fe9ae7da09023baeb3c5b39… Author: Fabian Bieler <der.fabe(a)gmx.net> Date: Fri Apr 20 15:25:35 2007 +0200 d3d9/tests: Fix fog with shader test. --- dlls/d3d9/tests/visual.c | 58 +++++++++++++++++++++++----------------------- 1 files changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index bde2a5b..1e1368e 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -753,19 +753,19 @@ static void fog_with_shader_test(IDirect3DDevice9 *device) /* only pixel shader: */ {0, 1, 0, 3, {0x0000ff00, 0x0000ff00, 0x0020df00, 0x0040bf00, 0x005fa000, 0x007f8000, - 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00df2000}}, + 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00ff0000}}, {0, 1, 1, 3, {0x0000ff00, 0x0000ff00, 0x0020df00, 0x0040bf00, 0x005fa000, 0x007f8000, - 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00df2000}}, + 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00ff0000}}, {0, 1, 2, 3, {0x0000ff00, 0x0000ff00, 0x0020df00, 0x0040bf00, 0x005fa000, 0x007f8000, - 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00df2000}}, + 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00ff0000}}, {0, 1, 3, 0, {0x0000ff00, 0x0000ff00, 0x0020df00, 0x0040bf00, 0x005fa000, 0x007f8000, - 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00df2000}}, + 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00ff0000}}, {0, 1, 3, 3, {0x0000ff00, 0x0000ff00, 0x0020df00, 0x0040bf00, 0x005fa000, 0x007f8000, - 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00df2000}}, + 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00ff0000}}, /* vertex shader */ {1, 0, 0, 0, @@ -773,58 +773,58 @@ static void fog_with_shader_test(IDirect3DDevice9 *device) 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00}}, {1, 0, 0, 3, {0x0000ff00, 0x0000ff00, 0x0020df00, 0x0040bf00, 0x005fa000, 0x007f8000, - 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00df2000}}, + 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00ff0000}}, {1, 0, 1, 3, {0x0000ff00, 0x0000ff00, 0x0020df00, 0x0040bf00, 0x005fa000, 0x007f8000, - 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00df2000}}, + 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00ff0000}}, {1, 0, 2, 3, {0x0000ff00, 0x0000ff00, 0x0020df00, 0x0040bf00, 0x005fa000, 0x007f8000, - 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00df2000}}, + 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00ff0000}}, {1, 0, 3, 3, {0x0000ff00, 0x0000ff00, 0x0020df00, 0x0040bf00, 0x005fa000, 0x007f8000, - 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00df2000}}, + 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00ff0000}}, /* vertex shader and pixel shader */ {1, 1, 0, 3, {0x0000ff00, 0x0000ff00, 0x0020df00, 0x0040bf00, 0x005fa000, 0x007f8000, - 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00df2000}}, + 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00ff0000}}, {1, 1, 1, 3, {0x0000ff00, 0x0000ff00, 0x0020df00, 0x0040bf00, 0x005fa000, 0x007f8000, - 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00df2000}}, + 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00ff0000}}, {1, 1, 2, 3, {0x0000ff00, 0x0000ff00, 0x0020df00, 0x0040bf00, 0x005fa000, 0x007f8000, - 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00df2000}}, + 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00ff0000}}, {1, 1, 3, 3, {0x0000ff00, 0x0000ff00, 0x0020df00, 0x0040bf00, 0x005fa000, 0x007f8000, - 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00df2000}}, + 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00ff0000}}, /* foggy vertex shader */ {2, 0, 0, 0, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, - 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x001fe000}}, + 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, {2, 0, 1, 0, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, - 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x001fe000}}, + 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, {2, 0, 2, 0, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, - 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x001fe000}}, + 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, {2, 0, 3, 0, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, - 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x001fe000}}, + 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, /* foggy vertex shader and pixel shader */ {2, 1, 0, 0, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, - 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x001fe000}}, + 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, {2, 1, 1, 0, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, - 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x001fe000}}, + 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, {2, 1, 2, 0, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, - 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x001fe000}}, + 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, {2, 1, 3, 0, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, - 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x001fe000}}, + 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, }; @@ -837,9 +837,6 @@ static void fog_with_shader_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &vertex_declaration); ok(SUCCEEDED(hr), "CreateVertexDeclaration 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); - /* Setup initial states: No lighting, fog on, fog color */ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); ok(hr == D3D_OK, "Turning off lighting failed (%08x)\n", hr); @@ -875,10 +872,13 @@ static void fog_with_shader_test(IDirect3DDevice9 *device) for(j=0; j < 11; j++) { /* Don't use the whole zrange to prevent rounding errors */ - quad[0].z = 0.001f + (float)j / 10.001f; - quad[1].z = 0.001f + (float)j / 10.001f; - quad[2].z = 0.001f + (float)j / 10.001f; - quad[3].z = 0.001f + (float)j / 10.001f; + quad[0].z = 0.001f + (float)j / 10.02f; + quad[1].z = 0.001f + (float)j / 10.02f; + quad[2].z = 0.001f + (float)j / 10.02f; + quad[3].z = 0.001f + (float)j / 10.02f; + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff00ff, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed (%08x)\n", hr); hr = IDirect3DDevice9_BeginScene(device); ok( hr == D3D_OK, "BeginScene returned failed (%08x)\n", hr); @@ -896,7 +896,7 @@ static void fog_with_shader_test(IDirect3DDevice9 *device) ok((unsigned char)(color) == ((unsigned char)test_data[i].color[j]) && abs( ((unsigned char)(color>>8)) - (unsigned char)(test_data[i].color[j]>>8) ) < 13 && abs( ((unsigned char)(color>>16)) - (unsigned char)(test_data[i].color[j]>>16) ) < 13, - "fog ps%i vs%i fvm%i ftm%i: got color %08x, expected %08x +-5%%\n", test_data[i].vshader, test_data[i].pshader, test_data[i].vfog, test_data[i].tfog, color, test_data[i].color[j]); + "fog ps%i vs%i fvm%i ftm%i %d: got color %08x, expected %08x +-5%%\n", test_data[i].vshader, test_data[i].pshader, test_data[i].vfog, test_data[i].tfog, j, color, test_data[i].color[j]); } }

1 0

Maarten Lankhorst : winmm: Pass the right message to hwnd from mixer callback.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: 0c6a63a062b6dd8edad3d21b43cf18e6360b8591 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c6a63a062b6dd8edad3d21b4… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 20 20:19:05 2007 +0200 winmm: Pass the right message to hwnd from mixer callback. --- dlls/winmm/winmm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index f17ad7c..0881f16 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -313,7 +313,7 @@ static void CALLBACK MIXER_WCallback(HMIXEROBJ hmx, UINT uMsg, DWORD_PTR dwInsta if (!dwInstance) return; - PostMessageW(hWnd, MM_MIXM_CONTROL_CHANGE, (WPARAM)hmx, (LPARAM)dwParam); + PostMessageW(hWnd, uMsg, (WPARAM)hmx, (LPARAM)dwParam); } UINT MIXER_Open(LPHMIXER lphMix, UINT uDeviceID, DWORD_PTR dwCallback,

1 0

Gerald Pfeifer : server: Silence compiler warning in fd_queue_async().
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: d529c63ced9a4b0dfecdcf9191b5d82512541937 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d529c63ced9a4b0dfecdcf919… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Apr 20 13:11:54 2007 +0200 server: Silence compiler warning in fd_queue_async(). --- server/fd.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/server/fd.c b/server/fd.c index 656042f..4ad4da5 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1735,6 +1735,7 @@ struct async *fd_queue_async( struct fd *fd, const async_data_t *data, int type, queue = fd->wait_q; break; default: + queue = NULL; assert(0); }

1 0

Fabian Bieler : wined3d: Remove usesFog flag from IWineD3DVertexShaderImpl.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: e28630bc32f972ed5daa7f7deef54337b3013200 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e28630bc32f972ed5daa7f7de… Author: Fabian Bieler <der.fabe(a)gmx.net> Date: Fri Apr 20 21:49:21 2007 +0200 wined3d: Remove usesFog flag from IWineD3DVertexShaderImpl. --- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/vertexshader.c | 8 ++------ dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c8a3150..1a0bcdd 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -765,7 +765,7 @@ static void state_fog(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo } if (use_vs(stateblock->wineD3DDevice) - && ((IWineD3DVertexShaderImpl *)stateblock->vertexShader)->usesFog) { + && ((IWineD3DVertexShaderImpl *)stateblock->vertexShader)->baseShader.reg_maps.fog) { if( stateblock->renderState[WINED3DRS_FOGTABLEMODE] != WINED3DFOG_NONE ) { if(!is_ps3) FIXME("Implement table fog for foggy vertex shader\n"); /* Disable fog */ @@ -3018,7 +3018,7 @@ static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, W ((IWineD3DVertexShaderImpl *)stateblock->vertexShader)->baseShader.function != NULL) { useVertexShaderFunction = TRUE; - if(((IWineD3DVertexShaderImpl *)stateblock->vertexShader)->usesFog != context->last_was_foggy_shader) { + if(((IWineD3DVertexShaderImpl *)stateblock->vertexShader)->baseShader.reg_maps.fog != context->last_was_foggy_shader) { updateFog = TRUE; } } else if(context->last_was_foggy_shader) { diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index f02dcdb..56a4354 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -337,9 +337,7 @@ static VOID IWineD3DVertexShaderImpl_GenerateShader( vshader_glsl_output_unpack(&buffer, This->semantics_out); /* 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; - else + if (!reg_maps->fog) shader_addline(&buffer, "gl_FogFragCoord = gl_Position.z;\n"); /* Write the final position. @@ -386,9 +384,7 @@ static VOID IWineD3DVertexShaderImpl_GenerateShader( shader_generate_main( (IWineD3DBaseShader*) This, &buffer, reg_maps, pFunction); /* 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; - else + if (!reg_maps->fog) shader_addline(&buffer, "MOV result.fogcoord, TMP_OUT.z;\n"); /* Write the final position. diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3de938a..d51e15c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1892,7 +1892,6 @@ typedef struct IWineD3DVertexShaderImpl { /* IWineD3DVertexShaderImpl */ IUnknown *parent; - char usesFog; DWORD usage; /* Vertex shader input and output semantics */

1 0

Kirill K. Smirnov : xcopy: Add Russian resource.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: 9a973408a050a91da2ad0cd64304dcdc11205144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a973408a050a91da2ad0cd64… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Fri Apr 20 17:25:39 2007 +0400 xcopy: Add Russian resource. --- programs/xcopy/Ru.rc | 82 ++++++++++++++++++++++++++++++++++++++++++++++++ programs/xcopy/rsrc.rc | 1 + 2 files changed, 83 insertions(+), 0 deletions(-) diff --git a/programs/xcopy/Ru.rc b/programs/xcopy/Ru.rc new file mode 100644 index 0000000..9c4d4e2 --- /dev/null +++ b/programs/xcopy/Ru.rc @@ -0,0 +1,82 @@ +/* + * XCOPY - Wine-compatible xcopy program + * Russian language support + * + * Copyright (C) 2007 J. Edmeades + * Copyright (C) 2007 Kirill K. Smirnov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_INVPARMS, +"�� - �� 'xcopy /?' �� \n\ +�� .\n" + STRING_INVPARM, +"�� '%s' - �� 'xcopy /?' �� \n\ +��.\n" + STRING_PAUSE, "�� <enter>, �� .\n" + STRING_SIMCOPY, "%d ��(��) �� .\n" + STRING_COPY, "%d ��(��) ��.\n" + STRING_QISDIR, "'%s' �� ?\n" \ + "(F - ��, D - ��)\n" + STRING_SRCPROMPT,"%s? (Yes|No)\n" + STRING_OVERWRITE,"�� %s? (Yes|No|All)\n" + STRING_COPYFAIL, "�� '%s' � '%s' �� : %d\n" + STRING_OPENFAIL, "�� '%s'\n" + STRING_READFAIL, "�� '%s' �� \n" + STRING_YES_CHAR, "Y" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "A" + STRING_FILE_CHAR,"F" + STRING_DIR_CHAR, "D" + + STRING_HELP, +"XCOPY - �� \n\ +\n\ +��:\n\ +XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +��:\n\ +\n\ +[/I] �� , \n\ + �� .\n\ +[/S] �� .\n\ +[/E] �� , �� .\n\ +[/Q] �� .\n\ +[/F] �� .\n\ +[/L] �� , �� .\n\ +[/W] �� .\n\ +[/T] �� , �� .\n\ +[/Y] �� .\n\ +[/-Y] �� .\n\ +[/P] �� .\n\ +[/N] �� .\n\ +[/U] �� , �� .\n\ +[/R] �� , �� .\n\ +[/H] �� .\n\ +[/C] �� , �� .\n\ +[/A] �� , �� \"��\". \n\ +[/M] �� , �� \"��\",\n\ + �� .\n\ +[/D | /D:m-d-y] �� , �� \n\ + �� . �� , �� \n\ + �� , �� .\n" +} diff --git a/programs/xcopy/rsrc.rc b/programs/xcopy/rsrc.rc index 8315316..2742d8f 100644 --- a/programs/xcopy/rsrc.rc +++ b/programs/xcopy/rsrc.rc @@ -22,3 +22,4 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "En.rc" +#include "Ru.rc"

1 0