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

Gerald Pfeifer : oleaut32/tests: Remove variable rValid which is not really used from test_VarMod.
by Alexandre Julliard May 25, 2010

May 25, 2010

Module: wine Branch: master Commit: dbd2e8cb346c1bbd14516a258675e7d16afb8325 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbd2e8cb346c1bbd14516a258… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon May 24 22:09:54 2010 +0200 oleaut32/tests: Remove variable rValid which is not really used from test_VarMod. --- dlls/oleaut32/tests/vartest.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 2374051..8203510 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2347,7 +2347,7 @@ static void test_VarMod(void) static const WCHAR szNum1[] = {'1','0','\0'}; int l, r; BOOL lFound, rFound; - BOOL lValid, rValid; + BOOL lValid; BSTR strNum0, strNum1; CHECKPTR(VarMod); @@ -2531,7 +2531,6 @@ static void test_VarMod(void) } rFound = TRUE; - rValid = TRUE; switch(r) { case VT_EMPTY: @@ -2558,7 +2557,6 @@ static void test_VarMod(void) case VT_VARIANT: case VT_UNKNOWN: case VT_RECORD: - rValid = FALSE; break; default: rFound = FALSE;

1 0

Dylan Smith : richedit: Fix assignment to wrong variable (LLVM/Clang).
by Alexandre Julliard May 25, 2010

May 25, 2010

Module: wine Branch: master Commit: b88b007d95300c320d8533eb078b73f87857c1e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b88b007d95300c320d8533eb0… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon May 24 16:13:55 2010 -0400 richedit: Fix assignment to wrong variable (LLVM/Clang). --- dlls/riched20/wrap.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 790c280..8d75b7f 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -232,7 +232,8 @@ static ME_DisplayItem *ME_MaximizeSplit(ME_WrapContext *wc, ME_DisplayItem *p, i } if (piter->member.run.nFlags & MERF_ENDWHITE) { - j = ME_ReverseFindNonWhitespaceV(piter->member.run.strText, i); + i = ME_ReverseFindNonWhitespaceV(piter->member.run.strText, + piter->member.run.strText->nLen); pp = ME_SplitRun(wc, piter, i); wc->pt = pp->member.run.pt; return pp;

1 0

Alexandre Julliard : msi: Ignore min/max versions if their values are null.
by Alexandre Julliard May 25, 2010

May 25, 2010

Module: wine Branch: master Commit: 598a25de82ca6c86340c8bffbaaef2d8a432cd99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=598a25de82ca6c86340c8bffb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 24 20:33:28 2010 +0200 msi: Ignore min/max versions if their values are null. --- dlls/msi/upgrade.c | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/msi/upgrade.c b/dlls/msi/upgrade.c index f9e35a4..b131d66 100644 --- a/dlls/msi/upgrade.c +++ b/dlls/msi/upgrade.c @@ -151,26 +151,30 @@ static UINT ITERATE_FindRelatedProducts(MSIRECORD *rec, LPVOID param) (LPBYTE)&check, &sz); /* check min */ ver = MSI_RecordGetString(rec,2); - comp_ver = msi_version_str_to_dword(ver); - r = check - comp_ver; - if (r < 0 || (r == 0 && !(attributes & - msidbUpgradeAttributesVersionMinInclusive))) + if (ver) { - RegCloseKey(hukey); - index ++; - continue; + comp_ver = msi_version_str_to_dword(ver); + r = check - comp_ver; + if (r < 0 || (r == 0 && !(attributes & msidbUpgradeAttributesVersionMinInclusive))) + { + RegCloseKey(hukey); + index ++; + continue; + } } /* check max */ ver = MSI_RecordGetString(rec,3); - comp_ver = msi_version_str_to_dword(ver); - r = check - comp_ver; - if (r > 0 || (r == 0 && !(attributes & - msidbUpgradeAttributesVersionMaxInclusive))) + if (ver) { - RegCloseKey(hukey); - index ++; - continue; + comp_ver = msi_version_str_to_dword(ver); + r = check - comp_ver; + if (r > 0 || (r == 0 && !(attributes & msidbUpgradeAttributesVersionMaxInclusive))) + { + RegCloseKey(hukey); + index ++; + continue; + } } /* check language*/

1 0

Alexandre Julliard : user.exe: Make sure 16-bit user and gdi never get unloaded.
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: 5d9801bc7f8404734cee7f505d768e463ff42b4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d9801bc7f8404734cee7f505… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 24 13:43:00 2010 +0200 user.exe: Make sure 16-bit user and gdi never get unloaded. --- dlls/user.exe16/user.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index ba90db4..c536a6d 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -1763,7 +1763,7 @@ WORD WINAPI GetFreeSystemResources16( WORD resType ) HINSTANCE16 gdi_inst; int userPercent, gdiPercent; - if ((gdi_inst = LoadLibrary16( "GDI" )) < 32) return 0; + if ((gdi_inst = GetModuleHandle16( "gdi" )) < 32) return 0; switch(resType) { @@ -1793,7 +1793,6 @@ WORD WINAPI GetFreeSystemResources16( WORD resType ) userPercent = gdiPercent = 0; break; } - FreeLibrary16( gdi_inst ); TRACE("<- userPercent %d, gdiPercent %d\n", userPercent, gdiPercent); return (WORD)min( userPercent, gdiPercent ); } @@ -2061,9 +2060,11 @@ BOOL WINAPI DllEntryPoint( DWORD reason, HINSTANCE16 inst, WORD ds, USER_HeapSel = ds; register_wow_handlers(); + LoadLibrary16( "gdi.exe" ); LoadLibrary16( "display.drv" ); LoadLibrary16( "keyboard.drv" ); LoadLibrary16( "mouse.drv" ); + LoadLibrary16( "user.exe" ); /* make sure it never gets unloaded */ return TRUE; }

1 0

Alexandre Julliard : winex11: Unmap zero-size windows also while processing a PropertyNotify event.
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: 2cf9cdd3d81af3f26dc6b81d86c3fd094aa6aae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cf9cdd3d81af3f26dc6b81d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 24 16:41:20 2010 +0200 winex11: Unmap zero-size windows also while processing a PropertyNotify event. --- dlls/winex11.drv/window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index fa72ada..ef6c442 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2330,7 +2330,7 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags if (data->mapped) { if (((swp_flags & SWP_HIDEWINDOW) && !(new_style & WS_VISIBLE)) || - (!event_type && !is_window_rect_mapped( rectWindow ))) + (event_type != ConfigureNotify && !is_window_rect_mapped( rectWindow ))) unmap_window( display, data ); }

1 0

Alexandre Julliard : winex11: Don't send minimize/ maximize sys commands to windows that are not supposed to get them.
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: ab111025c03e7e2a93bb61a6b3607e4bf8f83561 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab111025c03e7e2a93bb61a6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 24 16:54:59 2010 +0200 winex11: Don't send minimize/maximize sys commands to windows that are not supposed to get them. --- dlls/winex11.drv/event.c | 24 +++++++++++++++++++----- 1 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 7d84b63..da45fe2 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -941,6 +941,8 @@ static int get_window_wm_state( Display *display, struct x11drv_win_data *data ) static void handle_wm_state_notify( struct x11drv_win_data *data, XPropertyEvent *event, BOOL update_window ) { + DWORD style; + switch(event->state) { case PropertyDelete: @@ -966,25 +968,37 @@ static void handle_wm_state_notify( struct x11drv_win_data *data, XPropertyEvent if (!update_window || !data->managed || !data->mapped) return; + style = GetWindowLongW( data->hwnd, GWL_STYLE ); + if (data->iconic && data->wm_state == NormalState) /* restore window */ { data->iconic = FALSE; if (is_net_wm_state_maximized( event->display, data )) { - TRACE( "restoring to max %p/%lx\n", data->hwnd, data->whole_window ); - SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_MAXIMIZE, 0 ); + if ((style & WS_MAXIMIZEBOX) && !(style & WS_DISABLED)) + { + TRACE( "restoring to max %p/%lx\n", data->hwnd, data->whole_window ); + SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_MAXIMIZE, 0 ); + } + else TRACE( "not restoring to max win %p/%lx style %08x\n", + data->hwnd, data->whole_window, style ); } - else + else if (style & (WS_MINIMIZE | WS_MAXIMIZE)) { TRACE( "restoring win %p/%lx\n", data->hwnd, data->whole_window ); SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_RESTORE, 0 ); } + else TRACE( "not restoring win %p/%lx style %08x\n", data->hwnd, data->whole_window, style ); } else if (!data->iconic && data->wm_state == IconicState) { - TRACE( "minimizing win %p/%lx\n", data->hwnd, data->whole_window ); data->iconic = TRUE; - SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_MINIMIZE, 0 ); + if ((style & WS_MINIMIZEBOX) && !(style & WS_DISABLED)) + { + TRACE( "minimizing win %p/%lx\n", data->hwnd, data->whole_window ); + SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_MINIMIZE, 0 ); + } + else TRACE( "not minimizing win %p/%lx style %08x\n", data->hwnd, data->whole_window, style ); } }

1 0

Michael Stefaniuc : mapi32: Add the Romanian translation.
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: 6db1531ad756df23196544753e397e1430236d56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6db1531ad756df23196544753… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 24 11:16:01 2010 +0200 mapi32: Add the Romanian translation. --- dlls/mapi32/Makefile.in | 1 + dlls/mapi32/Ro.rc | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in index 5f334d3..ba38288 100644 --- a/dlls/mapi32/Makefile.in +++ b/dlls/mapi32/Makefile.in @@ -20,6 +20,7 @@ RC_SRCS = \ Fr.rc \ Lt.rc \ Nl.rc \ + Ro.rc \ Ru.rc \ Si.rc \ version.rc diff --git a/dlls/mapi32/Ro.rc b/dlls/mapi32/Ro.rc new file mode 100644 index 0000000..84ad35f --- /dev/null +++ b/dlls/mapi32/Ro.rc @@ -0,0 +1,31 @@ +/* +* Copyright 2009 Owen Rudge for CodeWeavers +* Copyright 2010 Michael Stefaniuc +* +* 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 "res.h" + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +STRINGTABLE +{ + IDS_NO_MAPI_CLIENT, "Eroare la trimiterea emailului. Nu aveți un client de email MAPI instalat." + IDS_SEND_MAIL, "Trimite emailul" +}

1 0

David Adam : d3drm: Do not redefine already defined guids.
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: c042f935b1a2defdc2c2dedda64a32ddcc87f8b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c042f935b1a2defdc2c2dedda… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sun May 23 05:27:28 2010 +0200 d3drm: Do not redefine already defined guids. --- dlls/d3drm/meshbuilder.c | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index a2013f4..c1874bd 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -28,9 +28,9 @@ #include "winbase.h" #include "wingdi.h" #include "dxfile.h" +#include "rmxfguid.h" #include "d3drm_private.h" -#include "d3drm.h" WINE_DEFAULT_DEBUG_CHANNEL(d3drm); @@ -61,12 +61,6 @@ typedef struct { static const struct IDirect3DRMMeshBuilderVtbl Direct3DRMMeshBuilder_Vtbl; -static const GUID GUID_Header = { 0x3D82AB43, 0x62DA, 0x11CF, { 0xAB, 0x39, 0x00, 0x20, 0xAF, 0x71, 0xE4, 0x33 } }; -static const GUID GUID_Mesh = { 0x3D82AB44, 0x62DA, 0x11CF, { 0xAB, 0x39, 0x00, 0x20, 0xAF, 0x71, 0xE4, 0x33 } }; -static const GUID GUID_MeshTextureCoords = { 0xF6F23F40, 0x7686, 0x11CF, { 0x8F, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xA3 } }; -static const GUID GUID_MeshMaterialList = { 0xF6F23F42, 0x7686, 0x11CF, { 0x8F, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xA3 } }; -static const GUID GUID_MeshNormals = { 0xF6F23F43, 0x7686, 0x11CF, { 0x8F, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xA3 } }; - static char templates[] = { "xof 0302txt 0064" "template Header" @@ -489,7 +483,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilderImpl_Load(IDirect3DRMMeshBuilder* if TRACE("Found object type whose GUID = %s\n", debugstr_guid(pGuid)); - if (!IsEqualGUID(pGuid, &GUID_Header)) + if (!IsEqualGUID(pGuid, &TID_DXFILEHeader)) { ret = D3DRMERR_BADFILE; goto end; @@ -524,7 +518,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilderImpl_Load(IDirect3DRMMeshBuilder* if TRACE("Found object type whose GUID = %s\n", debugstr_guid(pGuid)); - if (!IsEqualGUID(pGuid, &GUID_Mesh)) + if (!IsEqualGUID(pGuid, &TID_D3DRMMesh)) { ret = D3DRMERR_NOTFOUND; goto end; @@ -571,7 +565,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilderImpl_Load(IDirect3DRMMeshBuilder* if FIXME("toto: Found object type whose GUID = %s\n", debugstr_guid(pGuid)); - if (!IsEqualGUID(pGuid, &GUID_MeshNormals)) + if (!IsEqualGUID(pGuid, &TID_D3DRMMeshNormals)) { DWORD tmp; @@ -587,7 +581,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilderImpl_Load(IDirect3DRMMeshBuilder* if This->pNormals = HeapAlloc(GetProcessHeap(), 0, This->nb_normals * sizeof(D3DVECTOR)); memcpy(This->pNormals, ptr + sizeof(DWORD), This->nb_normals * sizeof(D3DVECTOR)); } - else if(!IsEqualGUID(pGuid, &GUID_MeshTextureCoords)) + else if(!IsEqualGUID(pGuid, &TID_D3DRMMeshTextureCoords)) { hr = IDirectXFileData_GetData(pData, NULL, &size, (void**)&ptr); if (hr != DXFILE_OK) @@ -601,7 +595,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilderImpl_Load(IDirect3DRMMeshBuilder* if memcpy(This->pCoords2d, ptr + sizeof(DWORD), This->nb_coords2d * sizeof(Coords2d)); } - else if(!IsEqualGUID(pGuid, &GUID_MeshMaterialList)) + else if(!IsEqualGUID(pGuid, &TID_D3DRMMeshMaterialList)) { FIXME("MeshMaterialList not supported yet, ignoring...\n"); }

1 0

Sven Baars : sane.ds: Fix Dutch translation.
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: 54132d97e324b486c0341f6e10cf7d02643539fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=54132d97e324b486c0341f6e1… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun May 23 12:23:10 2010 +0200 sane.ds: Fix Dutch translation. --- dlls/sane.ds/sane_Nl.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/sane.ds/sane_Nl.rc b/dlls/sane.ds/sane_Nl.rc index ded7061..8f3f347 100644 --- a/dlls/sane.ds/sane_Nl.rc +++ b/dlls/sane.ds/sane_Nl.rc @@ -27,7 +27,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTE CAPTION "Scannen" FONT 8, "MS Sans Serif" BEGIN - LTEXT "SCANNEN... Even geduld",IDC_STATIC,5,19,176,8, SS_CENTER + LTEXT "SCANNEN... Even geduld a.u.b.",IDC_STATIC,5,19,176,8, SS_CENTER END STRINGTABLE DISCARDABLE

1 0

David Adam : d3drm: Remove a useless comment.
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: 668ddfba33091891b16c49ab0eb10038229c8f18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=668ddfba33091891b16c49ab0… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sun May 23 05:29:06 2010 +0200 d3drm: Remove a useless comment. --- dlls/d3drm/meshbuilder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index c1874bd..bd5af1b 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -563,7 +563,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilderImpl_Load(IDirect3DRMMeshBuilder* if goto end; } - FIXME("toto: Found object type whose GUID = %s\n", debugstr_guid(pGuid)); + FIXME("Found object type whose GUID = %s\n", debugstr_guid(pGuid)); if (!IsEqualGUID(pGuid, &TID_D3DRMMeshNormals)) {

1 0