May 2010 - Wine-Commits - list.winehq.org

Damjan Jovanovic : winemenubuilder: Store menu paths in Unicode.
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: 21f75386ec3de52c8001bd72dfdb8e47619b0a0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=21f75386ec3de52c8001bd72d… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Apr 30 13:41:40 2010 +0200 winemenubuilder: Store menu paths in Unicode. --- programs/winemenubuilder/winemenubuilder.c | 61 ++++++++++++++++++++------- 1 files changed, 45 insertions(+), 16 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 0ab3639..9532a2e 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -883,11 +883,52 @@ static HKEY open_menus_reg_key(void) static const WCHAR Software_Wine_FileOpenAssociationsW[] = { 'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\','M','e','n','u','F','i','l','e','s',0}; HKEY assocKey; - if (RegCreateKeyW(HKEY_CURRENT_USER, Software_Wine_FileOpenAssociationsW, &assocKey) == ERROR_SUCCESS) + DWORD ret; + ret = RegCreateKeyW(HKEY_CURRENT_USER, Software_Wine_FileOpenAssociationsW, &assocKey); + if (ret == ERROR_SUCCESS) return assocKey; + SetLastError(ret); return NULL; } +static DWORD register_menus_entry(const char *unix_file, const char *windows_file) +{ + WCHAR *unix_fileW; + WCHAR *windows_fileW; + INT size; + DWORD ret; + + size = MultiByteToWideChar(CP_UNIXCP, 0, unix_file, -1, NULL, 0); + unix_fileW = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + if (unix_fileW) + { + MultiByteToWideChar(CP_UNIXCP, 0, unix_file, -1, unix_fileW, size); + size = MultiByteToWideChar(CP_UNIXCP, 0, windows_file, -1, NULL, 0); + windows_fileW = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + if (windows_fileW) + { + HKEY hkey; + MultiByteToWideChar(CP_UNIXCP, 0, windows_file, -1, windows_fileW, size); + hkey = open_menus_reg_key(); + if (hkey) + { + ret = RegSetValueExW(hkey, unix_fileW, 0, REG_SZ, (const BYTE*)windows_fileW, + (strlenW(windows_fileW) + 1) * sizeof(WCHAR)); + RegCloseKey(hkey); + } + else + ret = GetLastError(); + HeapFree(GetProcessHeap(), 0, windows_fileW); + } + else + ret = ERROR_NOT_ENOUGH_MEMORY; + HeapFree(GetProcessHeap(), 0, unix_fileW); + } + else + ret = ERROR_NOT_ENOUGH_MEMORY; + return ret; +} + static BOOL write_desktop_entry(const char *unix_link, const char *location, const char *linkname, const char *path, const char *args, const char *descr, const char *workdir, const char *icon) @@ -919,13 +960,8 @@ static BOOL write_desktop_entry(const char *unix_link, const char *location, con if (unix_link) { - HKEY hkey = open_menus_reg_key(); - if (hkey) - { - RegSetValueExA(hkey, location, 0, REG_SZ, (const BYTE*) unix_link, lstrlenA(unix_link) + 1); - RegCloseKey(hkey); - } - else + DWORD ret = register_menus_entry(location, unix_link); + if (ret != ERROR_SUCCESS) return FALSE; } @@ -1057,14 +1093,7 @@ end: remove(tempfilename); HeapFree(GetProcessHeap(), 0, tempfilename); if (ret) - { - HKEY hkey = open_menus_reg_key(); - if (hkey) - { - RegSetValueExA(hkey, menuPath, 0, REG_SZ, (const BYTE*) unix_link, lstrlenA(unix_link) + 1); - RegCloseKey(hkey); - } - } + register_menus_entry(menuPath, unix_link); HeapFree(GetProcessHeap(), 0, name); HeapFree(GetProcessHeap(), 0, menuPath); return ret;

1 0

Detlef Riekenberg : msvcr100: Add VS2010 C/ C++ runtime library with forwards to msvcrt.
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: 1434ef4e743763e5e7c15350a20655a285154e6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1434ef4e743763e5e7c15350a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Apr 30 14:07:34 2010 +0200 msvcr100: Add VS2010 C/C++ runtime library with forwards to msvcrt. --- configure | 1 + configure.ac | 1 + dlls/msvcr100/Makefile.in | 13 + dlls/msvcr100/msvcr100.c | 44 ++ dlls/msvcr100/msvcr100.spec | 1623 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 1682 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1434ef4e743763e5e7c15…

1 0

Vincent Pelletier : ddraw: Fix discrepancy in alpha mask for WINED3DFMT_B2G3R3A8_UNORM.
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: 40cd9a7ff0b0d9af6e118df1a3cd8fea34979cb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40cd9a7ff0b0d9af6e118df1a… Author: Vincent Pelletier <plr.vincent(a)gmail.com> Date: Sun May 2 08:26:21 2010 +0200 ddraw: Fix discrepancy in alpha mask for WINED3DFMT_B2G3R3A8_UNORM. --- dlls/ddraw/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index f9fd00f..7641f51 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -171,7 +171,7 @@ PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat, DDPixelFormat->u2.dwRBitMask = 0x00E0; DDPixelFormat->u3.dwGBitMask = 0x001C; DDPixelFormat->u4.dwBBitMask = 0x0003; - DDPixelFormat->u5.dwRGBAlphaBitMask = 0xF000; + DDPixelFormat->u5.dwRGBAlphaBitMask = 0xFF00; break; case WINED3DFMT_B4G4R4X4_UNORM:

1 0

Nikolay Sivov : ole32/tests: Move tests to a separate function.
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: a37dfe3584394c1afa2e66daa45aa26b273e84da URL: http://source.winehq.org/git/wine.git/?a=commit;h=a37dfe3584394c1afa2e66daa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 1 13:37:42 2010 +0400 ole32/tests: Move tests to a separate function. --- dlls/ole32/tests/dragdrop.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c index b28a831..ce08bc3 100644 --- a/dlls/ole32/tests/dragdrop.c +++ b/dlls/ole32/tests/dragdrop.c @@ -124,7 +124,7 @@ static ATOM register_dummy_class(void) return RegisterClass(&wc); } -START_TEST(dragdrop) +static void test_Register_Revoke(void) { HRESULT hr; HWND hwnd; @@ -172,3 +172,8 @@ START_TEST(dragdrop) DestroyWindow(hwnd); } + +START_TEST(dragdrop) +{ + test_Register_Revoke(); +}

1 0

Nikolay Sivov : ole32/ole2: Fix simple parameter handling for DoDragDrop().
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: 5426320d82201a16fa0a9fe1d30ff8279368575b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5426320d82201a16fa0a9fe1d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 1 21:37:46 2010 +0400 ole32/ole2: Fix simple parameter handling for DoDragDrop(). --- dlls/ole32/ole2.c | 7 +- dlls/ole32/tests/dragdrop.c | 213 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 216 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 45f2220..e21f0ac 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -490,13 +490,14 @@ HRESULT WINAPI DoDragDrop ( HWND hwndTrackWindow; MSG msg; - TRACE("(DataObject %p, DropSource %p)\n", pDataObject, pDropSource); + TRACE("(%p, %p, %d, %p)\n", pDataObject, pDropSource, dwOKEffect, pdwEffect); + + if (!pDataObject || !pDropSource || !pdwEffect) + return E_INVALIDARG; /* * Setup the drag n drop tracking window. */ - if (!IsValidInterface((LPUNKNOWN)pDropSource)) - return E_INVALIDARG; trackerInfo.dataObject = pDataObject; trackerInfo.dropSource = pDropSource; diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c index ce08bc3..ce60978 100644 --- a/dlls/ole32/tests/dragdrop.c +++ b/dlls/ole32/tests/dragdrop.c @@ -105,6 +105,170 @@ static const IDropTargetVtbl DropTarget_VTbl = static IDropTarget DropTarget = { &DropTarget_VTbl }; +/** stub IDropSource **/ +static HRESULT WINAPI DropSource_QueryInterface(IDropSource *iface, REFIID riid, void **ppObj) +{ + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDropSource)) + { + *ppObj = iface; + IDropSource_AddRef(iface); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI DropSource_AddRef(IDropSource *iface) +{ + return 2; +} + +static ULONG WINAPI DropSource_Release(IDropSource *iface) +{ + return 1; +} + +static HRESULT WINAPI DropSource_QueryContinueDrag( + IDropSource *iface, + BOOL fEscapePressed, + DWORD grfKeyState) +{ + /* always drop */ + return DRAGDROP_S_DROP; +} + +static HRESULT WINAPI DropSource_GiveFeedback( + IDropSource *iface, + DWORD dwEffect) +{ + return DRAGDROP_S_USEDEFAULTCURSORS; +} + +static const IDropSourceVtbl dropsource_vtbl = { + DropSource_QueryInterface, + DropSource_AddRef, + DropSource_Release, + DropSource_QueryContinueDrag, + DropSource_GiveFeedback +}; + +static IDropSource DropSource = { &dropsource_vtbl }; + +/** IDataObject stub **/ +static HRESULT WINAPI DataObject_QueryInterface( + IDataObject *iface, + REFIID riid, + void **pObj) +{ + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDataObject)) + { + *pObj = iface; + IDataObject_AddRef(iface); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI DataObject_AddRef(IDataObject *iface) +{ + return 2; +} + +static ULONG WINAPI DataObject_Release(IDataObject *iface) +{ + return 1; +} + +static HRESULT WINAPI DataObject_GetData( + IDataObject *iface, + FORMATETC *pformatetcIn, + STGMEDIUM *pmedium) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_GetDataHere( + IDataObject *iface, + FORMATETC *pformatetc, + STGMEDIUM *pmedium) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_QueryGetData( + IDataObject *iface, + FORMATETC *pformatetc) +{ + return S_OK; +} + +static HRESULT WINAPI DataObject_GetCanonicalFormatEtc( + IDataObject *iface, + FORMATETC *pformatectIn, + FORMATETC *pformatetcOut) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_SetData( + IDataObject *iface, + FORMATETC *pformatetc, + STGMEDIUM *pmedium, + BOOL fRelease) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_EnumFormatEtc( + IDataObject *iface, + DWORD dwDirection, + IEnumFORMATETC **ppenumFormatEtc) +{ + return S_OK; +} + +static HRESULT WINAPI DataObject_DAdvise( + IDataObject *iface, + FORMATETC *pformatetc, + DWORD advf, + IAdviseSink *pAdvSink, + DWORD *pdwConnection) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_DUnadvise( + IDataObject *iface, + DWORD dwConnection) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_EnumDAdvise( + IDataObject *iface, + IEnumSTATDATA **ppenumAdvise) +{ + return E_NOTIMPL; +} + +static const IDataObjectVtbl dataobject_vtbl = { + DataObject_QueryInterface, + DataObject_AddRef, + DataObject_Release, + DataObject_GetData, + DataObject_GetDataHere, + DataObject_QueryGetData, + DataObject_GetCanonicalFormatEtc, + DataObject_SetData, + DataObject_EnumFormatEtc, + DataObject_DAdvise, + DataObject_DUnadvise, + DataObject_EnumDAdvise +}; + +static IDataObject DataObject = { &dataobject_vtbl }; + static ATOM register_dummy_class(void) { WNDCLASS wc = @@ -129,7 +293,7 @@ static void test_Register_Revoke(void) HRESULT hr; HWND hwnd; - hwnd = CreateWindow(MAKEINTATOM(register_dummy_class()), "Test", 0, + hwnd = CreateWindowA("WineOleTestClass", "Test", 0, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, NULL, NULL); @@ -173,7 +337,54 @@ static void test_Register_Revoke(void) DestroyWindow(hwnd); } +static void test_DoDragDrop(void) +{ + DWORD effect; + HRESULT hr; + HWND hwnd; + + hwnd = CreateWindowA("WineOleTestClass", "Test", 0, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, + NULL, NULL, NULL); + ok(IsWindow(hwnd), "failed to create window\n"); + + hr = OleInitialize(NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = RegisterDragDrop(hwnd, &DropTarget); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* incomplete arguments set */ + hr = DoDragDrop(NULL, NULL, 0, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = DoDragDrop(NULL, &DropSource, 0, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = DoDragDrop(&DataObject, NULL, 0, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = DoDragDrop(NULL, NULL, 0, &effect); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = DoDragDrop(&DataObject, &DropSource, 0, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = DoDragDrop(NULL, &DropSource, 0, &effect); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = DoDragDrop(&DataObject, NULL, 0, &effect); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + OleUninitialize(); + + DestroyWindow(hwnd); +} + START_TEST(dragdrop) { + register_dummy_class(); + test_Register_Revoke(); + test_DoDragDrop(); }

1 0

Jacek Caban : shdocvw: Set IE version to IE8.
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: 961145a7d18d66bd4defbcd5fcad7f72a8b97e2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=961145a7d18d66bd4defbcd5f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 30 18:45:33 2010 +0200 shdocvw: Set IE version to IE8. --- dlls/shdocvw/shdocvw.inf | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shdocvw/shdocvw.inf b/dlls/shdocvw/shdocvw.inf index 97891fb..a612952 100644 --- a/dlls/shdocvw/shdocvw.inf +++ b/dlls/shdocvw/shdocvw.inf @@ -149,9 +149,9 @@ HKLM,"Software\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe","Path",, [IE.Reg] -HKLM,"Software\Microsoft\Internet Explorer","Build",,"62900.2180" -HKLM,"Software\Microsoft\Internet Explorer","IVer",,"103" -HKLM,"Software\Microsoft\Internet Explorer","Version",,"6.0.2900.2180" +HKLM,"Software\Microsoft\Internet Explorer","Build",,"86001" +HKLM,"Software\Microsoft\Internet Explorer","Version",,"8.0.6001.18702" +HKLM,"Software\Microsoft\Internet Explorer","W2kVersion",,"8.0.6001.18702" [Strings]

1 0

Henri Verbeet : wined3d: Allow the ARB shader backend to work with GL implementations with low amounts of native parameters .
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: 87f34ce5f9ca98d5c767cc4d5eeac3c33eb25b81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87f34ce5f9ca98d5c767cc4d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 29 23:41:31 2010 +0200 wined3d: Allow the ARB shader backend to work with GL implementations with low amounts of native parameters. --- dlls/wined3d/arb_program_shader.c | 37 ++++++++++++++++++++++++++++++++----- 1 files changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3852847..fd719c2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -671,12 +671,23 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const s if (pshader) { max_constantsF = gl_info->limits.arb_ps_native_constants; + /* 24 is the minimum MAX_PROGRAM_ENV_PARAMETERS_ARB value. */ + if (max_constantsF < 24) + max_constantsF = gl_info->limits.arb_ps_float_constants; } else { + max_constantsF = gl_info->limits.arb_vs_native_constants; + /* 96 is the minimum MAX_PROGRAM_ENV_PARAMETERS_ARB value. + * Also prevents max_constantsF from becoming less than 0 and + * wrapping . */ + if (max_constantsF < 96) + max_constantsF = gl_info->limits.arb_vs_float_constants; + if(This->baseShader.reg_maps.usesrelconstF) { DWORD highest_constf = 0, clip_limit; - max_constantsF = gl_info->limits.arb_vs_native_constants - reserved_vs_const(iface, gl_info); + + max_constantsF -= reserved_vs_const(iface, gl_info); max_constantsF -= count_bits(This->baseShader.reg_maps.integer_constants); for(i = 0; i < This->baseShader.limits.constant_float; i++) @@ -709,7 +720,6 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const s { if (ctx->target_version >= NV2) *num_clipplanes = gl_info->limits.clipplanes; else *num_clipplanes = min(gl_info->limits.clipplanes, 4); - max_constantsF = gl_info->limits.arb_vs_native_constants; } } @@ -4664,11 +4674,19 @@ static BOOL shader_arb_dirty_const(IWineD3DDevice *iface) { static void shader_arb_get_caps(const struct wined3d_gl_info *gl_info, struct shader_caps *pCaps) { - DWORD vs_consts = min(gl_info->limits.arb_vs_float_constants, gl_info->limits.arb_vs_native_constants); - DWORD ps_consts = min(gl_info->limits.arb_ps_float_constants, gl_info->limits.arb_ps_native_constants); - if (gl_info->supported[ARB_VERTEX_PROGRAM]) { + DWORD vs_consts; + + /* 96 is the minimum allowed value of MAX_PROGRAM_ENV_PARAMETERS_ARB + * for vertex programs. If the native limit is less than that it's + * not very useful, and e.g. Mesa swrast returns 0, probably to + * indicate it's a software implementation. */ + if (gl_info->limits.arb_vs_native_constants < 96) + vs_consts = gl_info->limits.arb_vs_float_constants; + else + vs_consts = min(gl_info->limits.arb_vs_float_constants, gl_info->limits.arb_vs_native_constants); + if (gl_info->supported[NV_VERTEX_PROGRAM3]) { pCaps->VertexShaderVersion = WINED3DVS_VERSION(3,0); @@ -4695,6 +4713,15 @@ static void shader_arb_get_caps(const struct wined3d_gl_info *gl_info, struct sh if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) { + DWORD ps_consts; + + /* Similar as above for vertex programs, but the minimum for fragment + * programs is 24. */ + if (gl_info->limits.arb_ps_native_constants < 24) + ps_consts = gl_info->limits.arb_ps_float_constants; + else + ps_consts = min(gl_info->limits.arb_ps_float_constants, gl_info->limits.arb_ps_native_constants); + if (gl_info->supported[NV_FRAGMENT_PROGRAM2]) { pCaps->PixelShaderVersion = WINED3DPS_VERSION(3,0);

1 0

Paul Vriens : msi: Update Dutch translation.
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: 1cc32247e07ed5a52a961bea275af6c038a9dc94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cc32247e07ed5a52a961bea2… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Apr 30 14:34:51 2010 +0200 msi: Update Dutch translation. --- dlls/msi/msi_Nl.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi_Nl.rc b/dlls/msi/msi_Nl.rc index da30430..70af83e 100644 --- a/dlls/msi/msi_Nl.rc +++ b/dlls/msi/msi_Nl.rc @@ -24,7 +24,7 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { - 4 "The specified installation package could not be opened. Please check the file path and try again." + 4 "Het opgegeven installatie pakket kon niet worden geopend. Verifieer het bestandspad en probeer opnieuw." 5 "Pad %s niet gevonden" 9 "Plaats disk %s" 10 "Ongeldige parameters"

1 0

Sven Baars : msi: Fix Dutch translation.
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: 2d2823ae44a69097b7d4e814d02e5d2a7e2d3bd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d2823ae44a69097b7d4e814d… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Apr 30 15:24:33 2010 +0200 msi: Fix Dutch translation. --- dlls/msi/msi_Nl.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi_Nl.rc b/dlls/msi/msi_Nl.rc index 70af83e..c028240 100644 --- a/dlls/msi/msi_Nl.rc +++ b/dlls/msi/msi_Nl.rc @@ -29,8 +29,8 @@ STRINGTABLE DISCARDABLE 9 "Plaats disk %s" 10 "Ongeldige parameters" 11 "Voer de map in die %s bevat" - 12 "De installatiebron van het feature ontbreekt" - 13 "De netwerkschijf met het feature ontbreekt" + 12 "De installatiebron van de feature ontbreekt" + 13 "De netwerkschijf met de feature ontbreekt" 14 "Feature van:" 15 "Kies de map die %s bevat" }

1 0

Henri Verbeet : wined3d: Make sure all fields of the shader backend caps are always initialized.
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: 0122cee51f1ab01601abf2b2b4e15d6f54fdaffe URL: http://source.winehq.org/git/wine.git/?a=commit;h=0122cee51f1ab01601abf2b2b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 29 23:41:30 2010 +0200 wined3d: Make sure all fields of the shader backend caps are always initialized. --- dlls/wined3d/arb_program_shader.c | 16 +++++++++++----- dlls/wined3d/device.c | 1 - dlls/wined3d/directx.c | 1 - dlls/wined3d/shader.c | 3 +++ 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5529f92..3852847 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4667,11 +4667,6 @@ static void shader_arb_get_caps(const struct wined3d_gl_info *gl_info, struct sh DWORD vs_consts = min(gl_info->limits.arb_vs_float_constants, gl_info->limits.arb_vs_native_constants); DWORD ps_consts = min(gl_info->limits.arb_ps_float_constants, gl_info->limits.arb_ps_native_constants); - /* We don't have an ARB fixed function pipeline yet, so let the none backend set its caps, - * then overwrite the shader specific ones - */ - none_shader_backend.shader_get_caps(gl_info, pCaps); - if (gl_info->supported[ARB_VERTEX_PROGRAM]) { if (gl_info->supported[NV_VERTEX_PROGRAM3]) @@ -4692,6 +4687,11 @@ static void shader_arb_get_caps(const struct wined3d_gl_info *gl_info, struct sh } pCaps->MaxVertexShaderConst = vs_consts; } + else + { + pCaps->VertexShaderVersion = 0; + pCaps->MaxVertexShaderConst = 0; + } if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) { @@ -4714,6 +4714,12 @@ static void shader_arb_get_caps(const struct wined3d_gl_info *gl_info, struct sh pCaps->PixelShader1xMaxValue = 8.0f; pCaps->MaxPixelShaderConst = ps_consts; } + else + { + pCaps->PixelShaderVersion = 0; + pCaps->PixelShader1xMaxValue = 0.0f; + pCaps->MaxPixelShaderConst = 0; + } pCaps->VSClipping = use_nv_clip(gl_info); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 463ccbf..0c7b4a1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7086,7 +7086,6 @@ HRESULT device_init(IWineD3DDeviceImpl *device, IWineD3DImpl *wined3d, select_shader_mode(&adapter->gl_info, &device->ps_selected_mode, &device->vs_selected_mode); device->shader_backend = adapter->shader_backend; - memset(&shader_caps, 0, sizeof(shader_caps)); device->shader_backend->shader_get_caps(&adapter->gl_info, &shader_caps); device->d3d_vshader_constantF = shader_caps.MaxVertexShaderConst; device->d3d_pshader_constantF = shader_caps.MaxPixelShaderConst; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 08dcafd..b884a01 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4542,7 +4542,6 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, WINED3DPTFILTERCAPS_MAGFLINEAR; pCaps->VertexTextureFilterCaps = 0; - memset(&shader_caps, 0, sizeof(shader_caps)); adapter->shader_backend->shader_get_caps(&adapter->gl_info, &shader_caps); adapter->fragment_pipe->get_caps(&adapter->gl_info, &fragment_caps); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index b015178..28228e1 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1418,8 +1418,11 @@ static void shader_none_get_caps(const struct wined3d_gl_info *gl_info, struct s { /* Set the shader caps to 0 for the none shader backend */ caps->VertexShaderVersion = 0; + caps->MaxVertexShaderConst = 0; caps->PixelShaderVersion = 0; caps->PixelShader1xMaxValue = 0.0f; + caps->MaxPixelShaderConst = 0; + caps->VSClipping = FALSE; } static BOOL shader_none_color_fixup_supported(struct color_fixup_desc fixup)

1 0