September 2010 - Wine-commits

Matej Spindler : jscript: Update Slovenian translation.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: ef65b6c30185a0d439e6a477e422aa2ed7e59aae URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef65b6c30185a0d439e6a477e… Author: Matej Spindler <spindler.matej(a)gmail.com> Date: Mon Sep 13 09:24:55 2010 +0200 jscript: Update Slovenian translation. --- dlls/jscript/jscript_Si.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Si.rc b/dlls/jscript/jscript_Si.rc index 1f282dd..b38ec21 100644 --- a/dlls/jscript/jscript_Si.rc +++ b/dlls/jscript/jscript_Si.rc @@ -28,6 +28,7 @@ STRINGTABLE IDS_INVALID_CALL_ARG "Napačen klic postopka ali argument" IDS_CREATE_OBJ_ERROR "Avtomatizacijski server ne more ustvariti objekta" IDS_NO_PROPERTY "Objekt ne podpira atributa ali metode" + IDS_UNSUPPORTED_ACTION "Objekt ne podpira akcije" IDS_ARG_NOT_OPT "Argument je obvezen" IDS_SYNTAX_ERROR "Napačna sintaksa" IDS_SEMICOLON "Pričakujem ';'"

1 0

Stefan Leichter : setupapi: Added tests for SetupDiGetINFClassA.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: 7e8ab4c8b4642f9952c687c04c1cf259b2bf9192 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e8ab4c8b4642f9952c687c04… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sat Sep 11 23:15:19 2010 +0200 setupapi: Added tests for SetupDiGetINFClassA. --- dlls/setupapi/stubs.c | 1 + dlls/setupapi/tests/devinst.c | 149 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 150 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index fd40343..643d2df 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -236,6 +236,7 @@ BOOL WINAPI SetupDiGetINFClassA(PCSTR inf, LPGUID class_guid, PSTR class_name, DWORD size, PDWORD required_size) { FIXME("%s %p %p %d %p\n", debugstr_a(inf), class_guid, class_name, size, required_size); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 1ae0720..21fbb01 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -40,6 +40,7 @@ static BOOL (WINAPI *pSetupDiCallClassInstaller)(DI_FUNCTION, HDEVINFO, PSP_ static BOOL (WINAPI *pSetupDiDestroyDeviceInfoList)(HDEVINFO); static BOOL (WINAPI *pSetupDiEnumDeviceInfo)(HDEVINFO, DWORD, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiEnumDeviceInterfaces)(HDEVINFO, PSP_DEVINFO_DATA, const GUID *, DWORD, PSP_DEVICE_INTERFACE_DATA); +static BOOL (WINAPI *pSetupDiGetINFClassA)(PCSTR, LPGUID, PSTR, DWORD, PDWORD); static BOOL (WINAPI *pSetupDiInstallClassA)(HWND, PCSTR, DWORD, HSPFILEQ); static HKEY (WINAPI *pSetupDiOpenClassRegKeyExA)(GUID*,REGSAM,DWORD,PCSTR,PVOID); static HKEY (WINAPI *pSetupDiOpenDevRegKey)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, DWORD, DWORD, REGSAM); @@ -83,6 +84,7 @@ static void init_function_pointers(void) pSetupDiRegisterDeviceInfo = (void *)GetProcAddress(hSetupAPI, "SetupDiRegisterDeviceInfo"); pSetupDiGetClassDevsA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetClassDevsA"); pSetupDiGetClassDevsW = (void *)GetProcAddress(hSetupAPI, "SetupDiGetClassDevsW"); + pSetupDiGetINFClassA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetINFClassA"); pSetupDiSetDeviceRegistryPropertyA = (void *)GetProcAddress(hSetupAPI, "SetupDiSetDeviceRegistryPropertyA"); pSetupDiSetDeviceRegistryPropertyW = (void *)GetProcAddress(hSetupAPI, "SetupDiSetDeviceRegistryPropertyW"); pSetupDiGetDeviceRegistryPropertyA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetDeviceRegistryPropertyA"); @@ -1343,6 +1345,152 @@ static void testDeviceRegistryPropertyW(void) } } +static void testSetupDiGetINFClassA(void) +{ + static const char inffile[] = "winetest.inf"; + static const char content[] = "[Version]\r\n\r\n"; + + char cn[MAX_PATH]; + char filename[MAX_PATH]; + DWORD count; + BOOL retval; + GUID guid; + HANDLE h; + + if(!pSetupDiGetINFClassA) + { + win_skip("SetupDiGetINFClassA not present\n"); + return; + } + + count = GetTempPathA(MAX_PATH, filename); + if(!count) + { + win_skip("GetTempPathA failed\n"); + return; + } + + strcat(filename, inffile); + DeleteFileA(filename); + + /* not existing file */ + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + if (ERROR_CALL_NOT_IMPLEMENTED == GetLastError()) + { + skip("SetupDiGetINFClassA is not implemented\n"); + return; + } + ok(ERROR_FILE_NOT_FOUND == GetLastError(), + "expected error ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); + + /* missing file wins against other invalid parameter */ + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, NULL, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_FILE_NOT_FOUND == GetLastError(), + "expected error ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, NULL, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_FILE_NOT_FOUND == GetLastError(), + "expected error ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, cn, 0, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_FILE_NOT_FOUND == GetLastError(), + "expected error ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, NULL); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_FILE_NOT_FOUND == GetLastError(), + "expected error ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); + + /* test file content */ + h = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + if(h == INVALID_HANDLE_VALUE) + { + win_skip("failed to create file %s (error %u)\n", filename, GetLastError()); + return; + } + CloseHandle( h); + + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + + h = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + if(h == INVALID_HANDLE_VALUE) + { + win_skip("failed to create file %s (error %u)\n", filename, GetLastError()); + return; + } + WriteFile( h, content, sizeof(content), &count, NULL); + CloseHandle( h); + + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + + WritePrivateProfileStringA("Version", "Signature", "\"$CHICAGO$\"", filename); + + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + + WritePrivateProfileStringA("Version", "Class", "WINE", filename); + + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); + + /* invalid parameter */ + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, NULL, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, NULL, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, cn, 0, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INSUFFICIENT_BUFFER == GetLastError() || + ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INSUFFICIENT_BUFFER or ERROR_INVALID_PARAMETER, " + "got %u\n", GetLastError()); + + DeleteFileA(filename); + + WritePrivateProfileStringA("Version", "Signature", "\"$CHICAGO$\"", filename); + WritePrivateProfileStringA("Version", "ClassGUID", "WINE", filename); + + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(RPC_S_INVALID_STRING_UUID == GetLastError() || + ERROR_INVALID_PARAMETER == GetLastError(), + "expected error RPC_S_INVALID_STRING_UUID or ERROR_INVALID_PARAMETER, " + "got %u\n", GetLastError()); + + /* network adapter guid */ + WritePrivateProfileStringA("Version", "ClassGUID", + "{4d36e972-e325-11ce-bfc1-08002be10318}", filename); + + /* this test succeeds only if the guid is known to the system */ + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); + + DeleteFileA(filename); +} + START_TEST(devinst) { HDEVINFO set; @@ -1381,4 +1529,5 @@ START_TEST(devinst) testRegisterAndGetDetail(); testDeviceRegistryPropertyA(); testDeviceRegistryPropertyW(); + testSetupDiGetINFClassA(); }

1 0

Rico Schüller : wined3d: Add argument check for Type to Get/SetTextureStageState().
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: e6d52c0c8bd7f70fd0046508e0e76c66b525daf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6d52c0c8bd7f70fd0046508e… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Sep 12 10:34:20 2010 +0200 wined3d: Add argument check for Type to Get/SetTextureStageState(). --- dlls/d3d8/device.c | 26 ++++++++++++++++++++++---- dlls/d3d9/device.c | 18 ++++++++++++++++-- dlls/ddraw/device.c | 9 ++++++--- dlls/wined3d/device.c | 23 ++++++++++++++++++++--- 4 files changed, 64 insertions(+), 12 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index c547da4..f54f043 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1575,13 +1575,22 @@ tss_lookup[] = {FALSE, WINED3DTSS_RESULTARG}, /* 28, D3DTSS_RESULTARG */ }; -static HRESULT WINAPI IDirect3DDevice8Impl_GetTextureStageState(LPDIRECT3DDEVICE8 iface, DWORD Stage,D3DTEXTURESTAGESTATETYPE Type,DWORD* pValue) { +static HRESULT WINAPI IDirect3DDevice8Impl_GetTextureStageState(LPDIRECT3DDEVICE8 iface, DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD *pValue) +{ IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; - const struct tss_lookup *l = &tss_lookup[Type]; + const struct tss_lookup *l; HRESULT hr; TRACE("iface %p, stage %u, state %#x, value %p.\n", iface, Stage, Type, pValue); + if (Type >= sizeof(tss_lookup) / sizeof(*tss_lookup)) + { + WARN("Invalid Type %#x passed.\n", Type); + return D3D_OK; + } + + l = &tss_lookup[Type]; + wined3d_mutex_lock(); if (l->sampler_state) hr = IWineD3DDevice_GetSamplerState(This->WineD3DDevice, Stage, l->state, pValue); else hr = IWineD3DDevice_GetTextureStageState(This->WineD3DDevice, Stage, l->state, pValue); @@ -1590,13 +1599,22 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetTextureStageState(LPDIRECT3DDEVI return hr; } -static HRESULT WINAPI IDirect3DDevice8Impl_SetTextureStageState(LPDIRECT3DDEVICE8 iface, DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD Value) { +static HRESULT WINAPI IDirect3DDevice8Impl_SetTextureStageState(LPDIRECT3DDEVICE8 iface, DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD Value) +{ IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; - const struct tss_lookup *l = &tss_lookup[Type]; + const struct tss_lookup *l; HRESULT hr; TRACE("iface %p, stage %u, state %#x, value %#x.\n", iface, Stage, Type, Value); + if (Type >= sizeof(tss_lookup) / sizeof(*tss_lookup)) + { + WARN("Invalid Type %#x passed.\n", Type); + return D3D_OK; + } + + l = &tss_lookup[Type]; + wined3d_mutex_lock(); if (l->sampler_state) hr = IWineD3DDevice_SetSamplerState(This->WineD3DDevice, Stage, l->state, Value); else hr = IWineD3DDevice_SetTextureStageState(This->WineD3DDevice, Stage, l->state, Value); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index af9cc48..c788b98 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1681,12 +1681,19 @@ static const WINED3DTEXTURESTAGESTATETYPE tss_lookup[] = WINED3DTSS_CONSTANT, /* 32, D3DTSS_CONSTANT */ }; -static HRESULT WINAPI IDirect3DDevice9Impl_GetTextureStageState(LPDIRECT3DDEVICE9EX iface, DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD* pValue) { +static HRESULT WINAPI IDirect3DDevice9Impl_GetTextureStageState(LPDIRECT3DDEVICE9EX iface, DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD *pValue) +{ IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; TRACE("iface %p, stage %u, state %#x, value %p.\n", iface, Stage, Type, pValue); + if (Type >= sizeof(tss_lookup) / sizeof(*tss_lookup)) + { + WARN("Invalid Type %#x passed.\n", Type); + return D3D_OK; + } + wined3d_mutex_lock(); hr = IWineD3DDevice_GetTextureStageState(This->WineD3DDevice, Stage, tss_lookup[Type], pValue); wined3d_mutex_unlock(); @@ -1694,12 +1701,19 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetTextureStageState(LPDIRECT3DDEVI return hr; } -static HRESULT WINAPI IDirect3DDevice9Impl_SetTextureStageState(LPDIRECT3DDEVICE9EX iface, DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD Value) { +static HRESULT WINAPI IDirect3DDevice9Impl_SetTextureStageState(LPDIRECT3DDEVICE9EX iface, DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD Value) +{ IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; TRACE("iface %p, stage %u, state %#x, value %#x.\n", iface, Stage, Type, Value); + if (Type >= sizeof(tss_lookup) / sizeof(*tss_lookup)) + { + WARN("Invalid Type %#x passed.\n", Type); + return D3D_OK; + } + wined3d_mutex_lock(); hr = IWineD3DDevice_SetTextureStageState(This->WineD3DDevice, Stage, tss_lookup[Type], Value); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 8e25543..30109e9 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4870,7 +4870,7 @@ IDirect3DDeviceImpl_7_GetTextureStageState(IDirect3DDevice7 *iface, { IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface; HRESULT hr; - const struct tss_lookup *l = &tss_lookup[TexStageStateType]; + const struct tss_lookup *l; TRACE("iface %p, stage %u, state %#x, value %p.\n", iface, Stage, TexStageStateType, State); @@ -4881,10 +4881,11 @@ IDirect3DDeviceImpl_7_GetTextureStageState(IDirect3DDevice7 *iface, if (TexStageStateType > D3DTSS_TEXTURETRANSFORMFLAGS) { WARN("Invalid TexStageStateType %#x passed.\n", TexStageStateType); - *State = 0; return DD_OK; } + l = &tss_lookup[TexStageStateType]; + EnterCriticalSection(&ddraw_cs); if (l->sampler_state) @@ -5003,7 +5004,7 @@ IDirect3DDeviceImpl_7_SetTextureStageState(IDirect3DDevice7 *iface, DWORD State) { IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface; - const struct tss_lookup *l = &tss_lookup[TexStageStateType]; + const struct tss_lookup *l; HRESULT hr; TRACE("iface %p, stage %u, state %#x, value %#x.\n", @@ -5015,6 +5016,8 @@ IDirect3DDeviceImpl_7_SetTextureStageState(IDirect3DDevice7 *iface, return DD_OK; } + l = &tss_lookup[TexStageStateType]; + EnterCriticalSection(&ddraw_cs); if (l->sampler_state) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7c75309..0be7e03 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4199,13 +4199,20 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ProcessVertices(IWineD3DDevice *iface, * Get / Set Texture Stage States * TODO: Verify against dx9 definitions *****/ -static HRESULT WINAPI IWineD3DDeviceImpl_SetTextureStageState(IWineD3DDevice *iface, DWORD Stage, WINED3DTEXTURESTAGESTATETYPE Type, DWORD Value) { +static HRESULT WINAPI IWineD3DDeviceImpl_SetTextureStageState(IWineD3DDevice *iface, DWORD Stage, WINED3DTEXTURESTAGESTATETYPE Type, DWORD Value) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - DWORD oldValue = This->updateStateBlock->textureState[Stage][Type]; const struct wined3d_gl_info *gl_info = &This->adapter->gl_info; + DWORD oldValue; TRACE("(%p) : Stage=%d, Type=%s(%d), Value=%d\n", This, Stage, debug_d3dtexturestate(Type), Type, Value); + if (Type > WINED3D_HIGHEST_TEXTURE_STATE) + { + WARN("Invalid Type %d passed.\n", Type); + return WINED3D_OK; + } + if (Stage >= gl_info->limits.texture_stages) { WARN("Attempting to set stage %u which is higher than the max stage %u, ignoring.\n", @@ -4213,6 +4220,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetTextureStageState(IWineD3DDevice *if return WINED3D_OK; } + oldValue = This->updateStateBlock->textureState[Stage][Type]; This->updateStateBlock->changed.textureState[Stage] |= 1 << Type; This->updateStateBlock->textureState[Stage][Type] = Value; @@ -4276,9 +4284,18 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetTextureStageState(IWineD3DDevice *if return WINED3D_OK; } -static HRESULT WINAPI IWineD3DDeviceImpl_GetTextureStageState(IWineD3DDevice *iface, DWORD Stage, WINED3DTEXTURESTAGESTATETYPE Type, DWORD* pValue) { +static HRESULT WINAPI IWineD3DDeviceImpl_GetTextureStageState(IWineD3DDevice *iface, DWORD Stage, WINED3DTEXTURESTAGESTATETYPE Type, DWORD *pValue) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + + if (Type > WINED3D_HIGHEST_TEXTURE_STATE) + { + WARN("Invalid Type %d passed.\n", Type); + return WINED3D_OK; + } + TRACE("(%p) : requesting Stage %d, Type %d getting %d\n", This, Stage, Type, This->updateStateBlock->textureState[Stage][Type]); + *pValue = This->updateStateBlock->textureState[Stage][Type]; return WINED3D_OK; }

1 0

Luca Bennati : shell32: Update Italian translation.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: 1be7bbf538c8fc25a174e4573c7a0fcff6901538 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1be7bbf538c8fc25a174e4573… Author: Luca Bennati <lucak3(a)gmail.com> Date: Fri Sep 10 19:57:54 2010 +0200 shell32: Update Italian translation. --- dlls/shell32/shell32_It.rc | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/shell32_It.rc b/dlls/shell32/shell32_It.rc index 2252fc8..a4db90a 100644 --- a/dlls/shell32/shell32_It.rc +++ b/dlls/shell32/shell32_It.rc @@ -83,15 +83,15 @@ MENU_SHV_FILE MENU BEGIN POPUP "" BEGIN - MENUITEM "&Select" FCIDM_SHVIEW_OPEN - MENUITEM "E&splora", FCIDM_SHVIEW_EXPLORE + MENUITEM "&Seleziona" FCIDM_SHVIEW_OPEN + MENUITEM "&Esplora", FCIDM_SHVIEW_EXPLORE MENUITEM "&Apri", FCIDM_SHVIEW_OPEN MENUITEM SEPARATOR MENUITEM "&Taglia", FCIDM_SHVIEW_CUT MENUITEM "&Copia", FCIDM_SHVIEW_COPY MENUITEM SEPARATOR MENUITEM "Crea Co&llegamento", FCIDM_SHVIEW_CREATELINK - MENUITEM "&Cancella", FCIDM_SHVIEW_DELETE + MENUITEM "Ca&ncella", FCIDM_SHVIEW_DELETE MENUITEM "&Rinomina", FCIDM_SHVIEW_RENAME MENUITEM SEPARATOR MENUITEM "&Proprietà", FCIDM_SHVIEW_PROPERTIES @@ -270,7 +270,9 @@ STRINGTABLE IDS_LOCAL_APPDATA "Settaggi Locali\\Applicazioni" IDS_CDBURN_AREA "Settaggi Locali\\Applicazioni\\Microsoft\\CD Burning" IDS_PROGRAM_FILES "Programmi" + IDS_PROGRAM_FILESX86 "Programmi (x86)" IDS_PROGRAM_FILES_COMMON "Programmi\\File Comuni" + IDS_PROGRAM_FILES_COMMONX86 "Programmi (x86)\\File Comuni" IDS_COMMON_DOCUMENTS "Documenti" IDS_COMMON_MUSIC "Documenti\\Musica" IDS_COMMON_PICTURES "Documenti\\Immagini" @@ -281,13 +283,13 @@ STRINGTABLE IDS_MYPICTURES "Immagini" IDS_FAVORITES "Favoriti" IDS_RECENT "Recenti" - IDS_SENDTO "SendTo" + IDS_SENDTO "Invia A" IDS_DESKTOPDIRECTORY "Desktop" - IDS_NETHOOD "NetHood" + IDS_NETHOOD "Reti condivise" IDS_TEMPLATES "Modelli" IDS_APPDATA "Applicazioni" - IDS_PRINTHOOD "PrintHood" - IDS_COOKIES "Cookies" + IDS_PRINTHOOD "Stampanti condivise" + IDS_COOKIES "Cookie" IDS_NEWFOLDER "Nuova cartella"

1 0

Oldřich Jedlička : ddraw/tests: New attachment tests for 3D back buffers.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: 7085a3f85b62bb3532164908b47640750e665572 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7085a3f85b62bb3532164908b… Author: Oldřich Jedlička <oldium.pro(a)seznam.cz> Date: Tue Sep 14 18:51:59 2010 +0200 ddraw/tests: New attachment tests for 3D back buffers. --- dlls/ddraw/tests/d3d.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 98 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 3427563..d291705 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3618,6 +3618,103 @@ static void BackBuffer3DCreateSurfaceTest(void) IDirectDraw7_Release(dd7); } +static void BackBuffer3DAttachmentTest(void) +{ + HRESULT hr; + IDirectDrawSurface *surface1, *surface2, *surface3, *surface4; + DDSURFACEDESC ddsd; + HWND window = CreateWindow( "static", "ddraw_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + + hr = IDirectDraw_SetCooperativeLevel(DirectDraw1, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(hr == DD_OK, "SetCooperativeLevel returned %08x\n", hr); + + /* Perform attachment tests on a back-buffer */ + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd.ddsCaps.dwCaps = DDSCAPS_BACKBUFFER | DDSCAPS_3DDEVICE; + ddsd.dwWidth = GetSystemMetrics(SM_CXSCREEN); + ddsd.dwHeight = GetSystemMetrics(SM_CYSCREEN); + hr = IDirectDraw_CreateSurface(DirectDraw1, &ddsd, &surface2, NULL); + todo_wine ok(SUCCEEDED(hr), "CreateSurface returned: %x\n",hr); + + if (surface2 != NULL) + { + /* Try a single primary and a two back buffers */ + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS; + ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + hr = IDirectDraw_CreateSurface(DirectDraw1, &ddsd, &surface1, NULL); + ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd.ddsCaps.dwCaps = DDSCAPS_BACKBUFFER | DDSCAPS_3DDEVICE; + ddsd.dwWidth = GetSystemMetrics(SM_CXSCREEN); + ddsd.dwHeight = GetSystemMetrics(SM_CYSCREEN); + hr = IDirectDraw_CreateSurface(DirectDraw1, &ddsd, &surface3, NULL); + ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); + + /* This one has a different size */ + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd.ddsCaps.dwCaps = DDSCAPS_BACKBUFFER | DDSCAPS_3DDEVICE; + ddsd.dwWidth = 128; + ddsd.dwHeight = 128; + hr = IDirectDraw_CreateSurface(DirectDraw1, &ddsd, &surface4, NULL); + ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); + + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2); + todo_wine ok(hr == DD_OK || broken(hr == DDERR_CANNOTATTACHSURFACE), + "Attaching a back buffer to a front buffer returned %08x\n", hr); + if(SUCCEEDED(hr)) + { + /* Try the reverse without detaching first */ + hr = IDirectDrawSurface_AddAttachedSurface(surface2, surface1); + ok(hr == DDERR_SURFACEALREADYATTACHED, "Attaching an attached surface to its attachee returned %08x\n", hr); + hr = IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface2); + ok(hr == DD_OK, "DeleteAttachedSurface failed with %08x\n", hr); + } + hr = IDirectDrawSurface_AddAttachedSurface(surface2, surface1); + todo_wine ok(hr == DD_OK || broken(hr == DDERR_CANNOTATTACHSURFACE), + "Attaching a front buffer to a back buffer returned %08x\n", hr); + if(SUCCEEDED(hr)) + { + /* Try to detach reversed */ + hr = IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface2); + ok(hr == DDERR_CANNOTDETACHSURFACE, "DeleteAttachedSurface returned %08x\n", hr); + /* Now the proper detach */ + hr = IDirectDrawSurface_DeleteAttachedSurface(surface2, 0, surface1); + ok(hr == DD_OK, "DeleteAttachedSurface failed with %08x\n", hr); + } + hr = IDirectDrawSurface_AddAttachedSurface(surface2, surface3); + todo_wine ok(hr == DD_OK || broken(hr == DDERR_CANNOTATTACHSURFACE), + "Attaching a back buffer to another back buffer returned %08x\n", hr); + if(SUCCEEDED(hr)) + { + hr = IDirectDrawSurface_DeleteAttachedSurface(surface2, 0, surface3); + ok(hr == DD_OK, "DeleteAttachedSurface failed with %08x\n", hr); + } + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface4); + ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a back buffer to a front buffer of different size returned %08x\n", hr); + hr = IDirectDrawSurface_AddAttachedSurface(surface4, surface1); + ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a front buffer to a back buffer of different size returned %08x\n", hr); + + IDirectDrawSurface_Release(surface4); + IDirectDrawSurface_Release(surface3); + IDirectDrawSurface_Release(surface2); + IDirectDrawSurface_Release(surface1); + } + + hr =IDirectDraw_SetCooperativeLevel(DirectDraw1, NULL, DDSCL_NORMAL); + ok(hr == DD_OK, "SetCooperativeLevel returned %08x\n", hr); + + DestroyWindow(window); +} + START_TEST(d3d) { init_function_pointers(); @@ -3654,6 +3751,7 @@ START_TEST(d3d) ViewportTest(); FindDevice(); BackBuffer3DCreateSurfaceTest(); + BackBuffer3DAttachmentTest(); D3D1_releaseObjects(); }

1 0

Matej Spindler : mshtml: Update Slovenian translation.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: fd60c013ff89646ccdaf89730f46b6ac14e58fc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd60c013ff89646ccdaf89730… Author: Matej Spindler <spindler.matej(a)gmail.com> Date: Mon Sep 13 09:19:00 2010 +0200 mshtml: Update Slovenian translation. --- dlls/mshtml/Si.rc | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/Si.rc b/dlls/mshtml/Si.rc index 0d6ee5f..7e40100 100644 --- a/dlls/mshtml/Si.rc +++ b/dlls/mshtml/Si.rc @@ -24,24 +24,31 @@ LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT STRINGTABLE { + IDS_STATUS_DONE "Končano" + IDS_STATUS_DOWNLOADINGFROM "Prenašam iz %s..." +} + +STRINGTABLE +{ IDS_HTMLDISABLED "Prikazovanje HTML dokumentov je trenutno onemogočeno." IDS_HTMLDOCUMENT "HTML dokument" IDS_DOWNLOADING "Nalagam ..." IDS_INSTALLING "Nameščam ..." } -ID_DWL_DIALOG DIALOG 0, 0, 260, 95 +ID_DWL_DIALOG DIALOG 0, 0, 260, 105 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Namestitev Wine Gecko" FONT 8, "MS Shell Dlg" { - LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML " \ - "to work correctly. Wine can automatically download and install it for you.\n\n" \ - "Note: it's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.", + LTEXT "Wine ni našel paketa Gecko, ki ga aplikacije, ki uporabljajo HTML potrebujejo," \ + "da delujejo pravilno. Wine ga lahko avtomatsko prenese in namesti.\n\n" \ + "Opomba: priporočljivo je uporabiti Gecko paket od distribucije. Poglej\n "\ + "http://wiki.winehq.org/Gecko za podrobnost.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT - CONTROL "Napredek", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 - DEFPUSHBUTTON "&Namesti", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Prekliči", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP + CONTROL "Napredek", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 60, 240, 12 + DEFPUSHBUTTON "&Namesti", ID_DWL_INSTALL, 200, 80, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Prekliči", IDCANCEL, 140, 80, 50, 15, WS_GROUP | WS_TABSTOP } IDD_HYPERLINK DIALOG 0, 0, 250, 65

1 0

André Hentschel : shell32: Update German translation.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: 20acd72643f5631763ed2a743758454578c1ed4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=20acd72643f5631763ed2a743… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 14 20:20:48 2010 +0200 shell32: Update German translation. --- dlls/shell32/shell32_De.rc | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_De.rc b/dlls/shell32/shell32_De.rc index a52992e..018b977 100644 --- a/dlls/shell32/shell32_De.rc +++ b/dlls/shell32/shell32_De.rc @@ -1,6 +1,7 @@ /* * Copyright 1998 Juergen Schmied * Copyright 2004 Henning Gerhardt + * Copyright 2010 André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -276,8 +277,10 @@ STRINGTABLE IDS_COOKIES "Cookies" IDS_HISTORY "Lokale Einstellungen\\Verlauf" IDS_PROGRAM_FILES "Programme" + IDS_PROGRAM_FILESX86 "Programme (x86)" IDS_MYPICTURES "Eigene Bilder" IDS_PROGRAM_FILES_COMMON "Programme\\Gemeinsame Dateien" + IDS_PROGRAM_FILES_COMMONX86 "Programme (x86)\\Gemeinsame Dateien" IDS_COMMON_DOCUMENTS "Dokumente" IDS_ADMINTOOLS "Startmenü\\Programme\\Verwaltung" IDS_COMMON_MUSIC "Musik"

1 0

André Hentschel : shdocvw: Update German translation.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: a418f2572d1aafc7212a375e05839a0435179d66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a418f2572d1aafc7212a375e0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 14 20:21:08 2010 +0200 shdocvw: Update German translation. --- dlls/shdocvw/De.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/De.rc b/dlls/shdocvw/De.rc index 14559a3..560d93d 100644 --- a/dlls/shdocvw/De.rc +++ b/dlls/shdocvw/De.rc @@ -51,6 +51,7 @@ IDR_BROWSE_MAIN_MENU MENU MENUITEM "Seiten&vorschau...", ID_BROWSE_PRINT_PREVIEW MENUITEM SEPARATOR MENUITEM "Ei&genschaften...", ID_BROWSE_PROPERTIES + MENUITEM "&Beenden", ID_BROWSE_QUIT } POPUP "&Ansicht" {

1 0

Dmitry Timoshkov : gdi32: Add a trace for GetClipBox.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: cec1686cedf99967b4657d8d3815338461bc9979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cec1686cedf99967b4657d8d3… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Sep 14 16:41:44 2010 +0900 gdi32: Add a trace for GetClipBox. --- dlls/gdi32/clipping.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 7be7650..8717da7 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -408,6 +408,7 @@ INT WINAPI GetClipBox( HDC hdc, LPRECT rect ) } DPtoLP( hdc, (LPPOINT)rect, 2 ); release_dc_ptr( dc ); + TRACE("%p => %d %s\n", hdc, ret, wine_dbgstr_rect( rect )); return ret; }

1 0

Jesse Litton : wined3d: Recognize GeForce GTX 465.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: ad917d366c24ea078aca26982e4411d54f36ce10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad917d366c24ea078aca26982… Author: Jesse Litton <wine(a)eternaldusk.com> Date: Mon Sep 13 21:42:12 2010 -0500 wined3d: Recognize GeForce GTX 465. --- dlls/wined3d/directx.c | 7 +++++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b6369bb..95e7322 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1079,6 +1079,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT325M, "NVIDIA GeForce GT 325M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTS350M, "NVIDIA GeForce GTS 350M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX460, "NVIDIA GeForce GTX 460", DRIVER_NVIDIA_GEFORCE6, 768 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX465, "NVIDIA GeForce GTX 465", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX470, "NVIDIA GeForce GTX 470", DRIVER_NVIDIA_GEFORCE6, 1280}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX480, "NVIDIA GeForce GTX 480", DRIVER_NVIDIA_GEFORCE6, 1536}, /* ATI cards */ @@ -1410,6 +1411,12 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl } /* Geforce 400 - midend */ + if (strstr(gl_renderer, "GTX 465")) + { + return CARD_NVIDIA_GEFORCE_GTX465; + } + + /* Geforce 400 - midend */ if (strstr(gl_renderer, "GTX 460")) { return CARD_NVIDIA_GEFORCE_GTX460; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e152dc3..23706c3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1357,6 +1357,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GT325M = 0x0a35, CARD_NVIDIA_GEFORCE_GTS350M = 0x0cb0, CARD_NVIDIA_GEFORCE_GTX460 = 0x0e22, + CARD_NVIDIA_GEFORCE_GTX465 = 0x06c4, CARD_NVIDIA_GEFORCE_GTX470 = 0x06cd, CARD_NVIDIA_GEFORCE_GTX480 = 0x06c0,

1 0