wine-commits September 2010

wine-commits@winehq.org

2 participants
852 discussions

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

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

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

Matej Spindler : shdocvw: Add Slovenian translation.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: 29296a17aabc67f4e106f55e441d29f64ea461a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29296a17aabc67f4e106f55e4… Author: Matej Spindler <spindler.matej(a)gmail.com> Date: Mon Sep 13 10:31:29 2010 +0200 shdocvw: Add Slovenian translation. --- dlls/shdocvw/Makefile.in | 1 + dlls/shdocvw/Si.rc | 87 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index 0459c92..5741551 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -39,6 +39,7 @@ RC_SRCS = \ Nl.rc \ Pl.rc \ Ro.rc \ + Si.rc \ Sv.rc \ Uk.rc \ shdocvw.rc diff --git a/dlls/shdocvw/Si.rc b/dlls/shdocvw/Si.rc new file mode 100644 index 0000000..31def14 --- /dev/null +++ b/dlls/shdocvw/Si.rc @@ -0,0 +1,87 @@ +/* + * Copyright 2010 Matej Spindler + * + * 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 + */ + +#include "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT + +IDD_BROWSE_OPEN DIALOG 10, 10, 200, 70 +STYLE DS_MODALFRAME | WS_CAPTION +CAPTION "Open URL" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Vnesite interneti naslov dokumenta, ki ga bo Internet Explorer odpru.",-1,25, 5, 150,15 + LTEXT "Odpri:", -1, 2, 32, 20, 15 + EDITTEXT IDC_BROWSE_OPEN_URL, 25, 30, 160, 13 + DEFPUSHBUTTON "&V redu", IDOK, 25, 50, 50, 15 + PUSHBUTTON "&Prekliči", IDCANCEL, 85, 50, 50, 15 +} + +IDR_BROWSE_MAIN_MENU MENU +{ + POPUP "&Datoteka" + { + POPUP "&Nov" + { + MENUITEM "&Okno" ID_BROWSE_NEW_WINDOW + } + MENUITEM "&Odpri...", ID_BROWSE_OPEN + MENUITEM "&Shrani", ID_BROWSE_SAVE + MENUITEM "Shrani &kot...", ID_BROWSE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Nastavitve tiskanja...", ID_BROWSE_PRINT_FORMAT + MENUITEM "Na&tisni...", ID_BROWSE_PRINT + MENUITEM "Predo&gled tiskanja...", ID_BROWSE_PRINT_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Lastnosti...", ID_BROWSE_PROPERTIES + } + POPUP "Pogl&ed" + { + POPUP "Oro&dne vrstice" + { + MENUITEM "&Statusna vrstica" ID_BROWSE_BAR_STD + MENUITEM "&Naslovna vrstica" ID_BROWSE_BAR_ADDR + } + } + POPUP "&Priljubljene" + { + MENUITEM "&Dodaj med priljubljene..." ID_BROWSE_ADDFAV + MENUITEM SEPARATOR + } + POPUP "&Pomoč" + { + MENUITEM "O programu Internet Explorer...", ID_BROWSE_ABOUT + } +} + +STRINGTABLE +{ + IDS_TB_BACK "Nazaj" + IDS_TB_FORWARD "Naprej" + IDS_TB_STOP "Stop" + IDS_TB_REFRESH "Osveži" + IDS_TB_HOME "Domov" + IDS_TB_PRINT "Natisni" +} + +STRINGTABLE +{ + IDS_ADDRESS "Naslov" +}

1 0

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

14 Sep '10

Module: wine Branch: master Commit: 9977b50475d3eff832eec9f98d29babe9fdda2d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9977b50475d3eff832eec9f98… Author: Matej Spindler <spindler.matej(a)gmail.com> Date: Tue Sep 14 18:28:26 2010 +0200 shell32: Update Slovenian translation. --- dlls/shell32/shell32_Si.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_Si.rc b/dlls/shell32/shell32_Si.rc index aaa8d2d..2b37c6d 100644 --- a/dlls/shell32/shell32_Si.rc +++ b/dlls/shell32/shell32_Si.rc @@ -275,8 +275,10 @@ STRINGTABLE IDS_COOKIES "Piškotki" IDS_HISTORY "Lokalne nastavitve\\Zgodovina" IDS_PROGRAM_FILES "Programi" + IDS_PROGRAM_FILESX86 "Programi (x86)" IDS_MYPICTURES "Slike" IDS_PROGRAM_FILES_COMMON "Programi\\Skupne datoteke" + IDS_PROGRAM_FILES_COMMONX86 "Programi (x86)\\Skupne datoteke" IDS_COMMON_DOCUMENTS "Dokumenti" IDS_ADMINTOOLS "Meni start\\Programi\\Administrativna orodja" IDS_COMMON_MUSIC "Dokumenti\\Glasba"

1 0

Aurimas Fišeras : shdocvw: Update Lithuanian translation.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: 18200565a93f528db34e320a8905cad1274341a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18200565a93f528db34e320a8… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Sep 14 19:29:29 2010 +0300 shdocvw: Update Lithuanian translation. --- dlls/shdocvw/Lt.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Lt.rc b/dlls/shdocvw/Lt.rc index d2a5640..b9c0b04 100644 --- a/dlls/shdocvw/Lt.rc +++ b/dlls/shdocvw/Lt.rc @@ -52,6 +52,7 @@ IDR_BROWSE_MAIN_MENU MENU MENUITEM "Spaudinio pe&ržiūra...", ID_BROWSE_PRINT_PREVIEW MENUITEM SEPARATOR MENUITEM "&Savybės...", ID_BROWSE_PROPERTIES + MENUITEM "&Užverti", ID_BROWSE_QUIT } POPUP "&Rodymas" {

1 0

Aurimas Fišeras : shell32: Update Lithuanian translation.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: 099cf92a7122bbeae3fb13e9db0bf1deb0d8b417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=099cf92a7122bbeae3fb13e9d… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Sep 14 19:31:34 2010 +0300 shell32: Update Lithuanian translation. --- dlls/shell32/shell32_Lt.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_Lt.rc b/dlls/shell32/shell32_Lt.rc index f74e67e..504a39f 100644 --- a/dlls/shell32/shell32_Lt.rc +++ b/dlls/shell32/shell32_Lt.rc @@ -277,8 +277,10 @@ STRINGTABLE IDS_COOKIES "Slapukai" IDS_HISTORY "Vietinės nuostatos\\Istorija" IDS_PROGRAM_FILES "Programų failai" + IDS_PROGRAM_FILESX86 "Programų failai (x86)" IDS_MYPICTURES "Paveikslai" IDS_PROGRAM_FILES_COMMON "Programų failai\\Bendrieji failai" + IDS_PROGRAM_FILES_COMMONX86 "Programų failai (x86)\\Bendrieji failai" IDS_COMMON_DOCUMENTS "Dokumentai" IDS_ADMINTOOLS "Pradžios meniu\\Programos\\Administravimo įrankiai" IDS_COMMON_MUSIC "Dokumentai\\Muzika"

1 0

André Hentschel : winedbg: Only add ContextFlags which are defined.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: ab873c0d25576f89e3e1deb4371aac711b78010b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab873c0d25576f89e3e1deb43… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 8 21:55:37 2010 +0200 winedbg: Only add ContextFlags which are defined. --- programs/winedbg/tgt_active.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 5434624..eb25329 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -92,7 +92,10 @@ BOOL dbg_attach_debuggee(DWORD pid, BOOL cofe) static unsigned dbg_fetch_context(void) { dbg_context.ContextFlags = CONTEXT_CONTROL - | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT + | CONTEXT_INTEGER +#ifdef CONTEXT_FLOATING_POINT + | CONTEXT_FLOATING_POINT +#endif #ifdef CONTEXT_SEGMENTS | CONTEXT_SEGMENTS #endif

1 0

Hans Leidekker : shell32: Implement SHGetFolderPathEx.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: 859a1d0d44e33b9705dc8578d78b13b270d70708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=859a1d0d44e33b9705dc8578d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 14 17:01:44 2010 +0200 shell32: Implement SHGetFolderPathEx. --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shellpath.c | 26 ++++++++++++++++++++ dlls/shell32/tests/shellpath.c | 51 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 961e1af..034f640 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -356,6 +356,7 @@ @ stdcall SHGetFileInfoW(ptr long ptr long long) @ stdcall SHGetFolderLocation(long long long long ptr) @ stdcall SHGetFolderPathA(long long long long ptr) +@ stdcall SHGetFolderPathEx(ptr long ptr ptr long) @ stdcall SHGetFolderPathAndSubDirA(long long long long str ptr) @ stdcall SHGetFolderPathAndSubDirW(long long long long wstr ptr) @ stdcall SHGetFolderPathW(long long long long ptr) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 0eafdc1..ec66699 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -2937,3 +2937,29 @@ HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE t } return hr; } + +/************************************************************************* + * SHGetFolderPathEx [SHELL32.@] + */ +HRESULT WINAPI SHGetFolderPathEx(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE token, LPWSTR path, DWORD len) +{ + HRESULT hr; + WCHAR *buffer; + + TRACE("%s, 0x%08x, %p, %p, %u\n", debugstr_guid(rfid), flags, token, path, len); + + if (!path || !len) return E_INVALIDARG; + + hr = SHGetKnownFolderPath( rfid, flags, token, &buffer ); + if (SUCCEEDED( hr )) + { + if (strlenW( buffer ) + 1 > len) + { + CoTaskMemFree( buffer ); + return HRESULT_FROM_WIN32( ERROR_INSUFFICIENT_BUFFER ); + } + strcpyW( path, buffer ); + CoTaskMemFree( buffer ); + } + return hr; +} diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index b874b5a..2a86eac 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -31,6 +31,7 @@ #include "shlobj.h" #include "shlwapi.h" #include "initguid.h" +#include "knownfolders.h" #include "wine/test.h" /* CSIDL_MYDOCUMENTS is now the same as CSIDL_PERSONAL, but what we want @@ -93,6 +94,9 @@ static LPITEMIDLIST (WINAPI *pILFindLastID)(LPCITEMIDLIST); static int (WINAPI *pSHFileOperationA)(LPSHFILEOPSTRUCTA); static HRESULT (WINAPI *pSHGetMalloc)(LPMALLOC *); static UINT (WINAPI *pGetSystemWow64DirectoryA)(LPSTR,UINT); +static HRESULT (WINAPI *pSHGetKnownFolderPath)(REFKNOWNFOLDERID, DWORD, HANDLE, PWSTR *); +static HRESULT (WINAPI *pSHGetFolderPathEx)(REFKNOWNFOLDERID, DWORD, HANDLE, LPWSTR, DWORD); + static DLLVERSIONINFO shellVersion = { 0 }; static LPMALLOC pMalloc; static const BYTE guidType[] = { PT_GUID }; @@ -187,7 +191,9 @@ static void loadShell32(void) GET_PROC(DllGetVersion) GET_PROC(SHGetFolderPathA) + GET_PROC(SHGetFolderPathEx) GET_PROC(SHGetFolderLocation) + GET_PROC(SHGetKnownFolderPath) GET_PROC(SHGetSpecialFolderPathA) GET_PROC(SHGetSpecialFolderLocation) GET_PROC(ILFindLastID) @@ -833,6 +839,50 @@ static void test_NonExistentPath(void) else skip("RegOpenKeyExA(HKEY_CURRENT_USER, %s, ...) failed\n", userShellFolders); } +static void test_SHGetFolderPathEx(void) +{ + HRESULT hr; + WCHAR buffer[MAX_PATH], *path; + DWORD len; + + if (!pSHGetKnownFolderPath || !pSHGetFolderPathEx) + { + win_skip("SHGetKnownFolderPath or SHGetFolderPathEx not available\n"); + return; + } + +if (0) { /* crashes */ + hr = pSHGetKnownFolderPath(&FOLDERID_Desktop, 0, NULL, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); +} + path = NULL; + hr = pSHGetKnownFolderPath(&FOLDERID_Desktop, 0, NULL, &path); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(path != NULL, "expected path != NULL\n"); + + hr = pSHGetFolderPathEx(&FOLDERID_Desktop, 0, NULL, buffer, MAX_PATH); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(!lstrcmpiW(path, buffer), "expected equal paths\n"); + len = lstrlenW(buffer); + CoTaskMemFree(path); + + hr = pSHGetFolderPathEx(&FOLDERID_Desktop, 0, NULL, buffer, 0); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); + +if (0) { /* crashes */ + hr = pSHGetFolderPathEx(&FOLDERID_Desktop, 0, NULL, NULL, len + 1); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); + + hr = pSHGetFolderPathEx(NULL, 0, NULL, buffer, MAX_PATH); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); +} + hr = pSHGetFolderPathEx(&FOLDERID_Desktop, 0, NULL, buffer, len); + ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "expected 0x8007007a, got 0x%08x\n", hr); + + hr = pSHGetFolderPathEx(&FOLDERID_Desktop, 0, NULL, buffer, len + 1); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); +} + START_TEST(shellpath) { if (!init()) return; @@ -858,5 +908,6 @@ START_TEST(shellpath) testWinDir(); testSystemDir(); test_NonExistentPath(); + test_SHGetFolderPathEx(); } }

1 0

Hans Leidekker : shell32: Implement SHGetKnownFolderPath.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: 678c6776901425654c05988202ed53f7e9a68334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=678c6776901425654c0598820… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 14 17:01:14 2010 +0200 shell32: Implement SHGetKnownFolderPath. --- dlls/shell32/shell32_En.rc | 18 ++ dlls/shell32/shellpath.c | 431 +++++++++++++++++++++++++++++++++++++++++++- dlls/shell32/shresdef.h | 19 ++ 3 files changed, 464 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=678c6776901425654c059…

1 0

← Newer
1
...
51
52
53
54
55
56
57
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2010