wine-commits March 2008

wine-commits@winehq.org

4 participants
1001 discussions

Alexandre Julliard : winex11: Add support for merging redundant events, and use it for ConfigureNotify and MotionNotify.
by Alexandre Julliard 11 Mar '08

11 Mar '08

Module: wine Branch: master Commit: 0118e0d0f10fb61abcfeb5100b206b94594d4493 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0118e0d0f10fb61abcfeb5100… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 11 12:11:35 2008 +0100 winex11: Add support for merging redundant events, and use it for ConfigureNotify and MotionNotify. --- dlls/winex11.drv/event.c | 100 ++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 83 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index cdd0853..c531410 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -241,39 +241,105 @@ static Bool filter_event( Display *display, XEvent *event, char *arg ) } +enum event_merge_action +{ + MERGE_DISCARD, /* discard the old event */ + MERGE_HANDLE, /* handle the old event */ + MERGE_KEEP /* keep the old event for future merging */ +}; + +/*********************************************************************** + * merge_events + * + * Try to merge 2 consecutive events. + */ +static enum event_merge_action merge_events( XEvent *prev, XEvent *next ) +{ + if (prev->xany.window != next->xany.window) return MERGE_HANDLE; + switch (prev->type) + { + case ConfigureNotify: + if (prev->xany.window != next->xany.window) break; + switch (next->type) + { + case ConfigureNotify: + TRACE( "discarding duplicate ConfigureNotify for window %lx\n", prev->xany.window ); + return MERGE_DISCARD; + case Expose: + case PropertyNotify: + return MERGE_KEEP; + } + break; + case MotionNotify: + if (next->type == MotionNotify) + { + TRACE( "discarding duplicate MotionNotify for window %lx\n", prev->xany.window ); + return MERGE_DISCARD; + } + break; + } + return MERGE_HANDLE; +} + + +/*********************************************************************** + * call_event_handler + */ +static inline void call_event_handler( Display *display, XEvent *event ) +{ + HWND hwnd; + x11drv_event_handler handler; + + if (!(handler = find_handler( event->type ))) + { + TRACE( "%s for win %lx, ignoring\n", dbgstr_event( event->type ), event->xany.window ); + return; /* no handler, ignore it */ + } + + if (XFindContext( display, event->xany.window, winContext, (char **)&hwnd ) != 0) + hwnd = 0; /* not for a registered window */ + if (!hwnd && event->xany.window == root_window) hwnd = GetDesktopWindow(); + + TRACE( "%s for hwnd/window %p/%lx\n", + dbgstr_event( event->type ), hwnd, event->xany.window ); + wine_tsx11_unlock(); + handler( hwnd, event ); + wine_tsx11_lock(); +} + + /*********************************************************************** * process_events */ static int process_events( Display *display, Bool (*filter)(), ULONG_PTR arg ) { - XEvent event; - HWND hwnd; + XEvent event, prev_event; int count = 0; - x11drv_event_handler handler; + enum event_merge_action action = MERGE_DISCARD; + prev_event.type = 0; wine_tsx11_lock(); while (XCheckIfEvent( display, &event, filter, (char *)arg )) { count++; if (XFilterEvent( &event, None )) continue; /* filtered, ignore it */ - - if (!(handler = find_handler( event.type ))) + if (prev_event.type) action = merge_events( &prev_event, &event ); + switch( action ) { - TRACE( "%s for win %lx, ignoring\n", dbgstr_event( event.type ), event.xany.window ); - continue; /* no handler, ignore it */ + case MERGE_DISCARD: /* discard prev, keep new */ + prev_event = event; + break; + case MERGE_HANDLE: /* handle prev, keep new */ + call_event_handler( display, &prev_event ); + prev_event = event; + break; + case MERGE_KEEP: /* handle new, keep prev for future merging */ + call_event_handler( display, &event ); + break; } - - if (XFindContext( display, event.xany.window, winContext, (char **)&hwnd ) != 0) - hwnd = 0; /* not for a registered window */ - if (!hwnd && event.xany.window == root_window) hwnd = GetDesktopWindow(); - - wine_tsx11_unlock(); - TRACE( "%s for hwnd/window %p/%lx\n", - dbgstr_event( event.type ), hwnd, event.xany.window ); - handler( hwnd, &event ); - wine_tsx11_lock(); } XFlush( gdi_display ); + if (prev_event.type) call_event_handler( display, &prev_event ); wine_tsx11_unlock(); if (count) TRACE( "processed %d events\n", count ); return count;

1 0

James Hawkins : msi: Optimize MsiSourceListAddSourceEx for adding to the end of the list.
by Alexandre Julliard 11 Mar '08

11 Mar '08

Module: wine Branch: master Commit: 5871bee8c76add5c085924ee5686194fa593fd17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5871bee8c76add5c085924ee5… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Mar 10 23:02:02 2008 -0500 msi: Optimize MsiSourceListAddSourceEx for adding to the end of the list. --- dlls/msi/source.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 37a0b8b..36fcc80 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -934,12 +934,15 @@ static void free_source_list(struct list *sourcelist) } } -static void add_source_to_list(struct list *sourcelist, media_info *info) +static void add_source_to_list(struct list *sourcelist, media_info *info, + DWORD *index) { media_info *iter; BOOL found = FALSE; static const WCHAR fmt[] = {'%','i',0}; + if (index) *index = 0; + if (list_empty(sourcelist)) { list_add_head(sourcelist, &info->entry); @@ -957,6 +960,8 @@ static void add_source_to_list(struct list *sourcelist, media_info *info) /* update the rest of the list */ if (found) sprintfW(iter->szIndex, fmt, ++iter->index); + else if (index) + (*index)++; } if (!found) @@ -1005,7 +1010,7 @@ static UINT fill_source_list(struct list *sourcelist, HKEY sourcekey, DWORD *cou } index = ++(*count); - add_source_to_list(sourcelist, entry); + add_source_to_list(sourcelist, entry, NULL); } error: @@ -1031,6 +1036,7 @@ UINT WINAPI MsiSourceListAddSourceExW( LPCWSTR szProduct, LPCWSTR szUserSid, LPWSTR source; LPCWSTR postfix; DWORD size, count; + DWORD index; static const WCHAR fmt[] = {'%','i',0}; static const WCHAR one[] = {'1',0}; @@ -1098,7 +1104,7 @@ UINT WINAPI MsiSourceListAddSourceExW( LPCWSTR szProduct, LPCWSTR szUserSid, rc = RegSetValueExW(typekey, one, 0, REG_EXPAND_SZ, (LPBYTE)source, size); goto done; } - else if (dwIndex > count) + else if (dwIndex > count || dwIndex == 0) { sprintfW(name, fmt, count + 1); rc = RegSetValueExW(typekey, name, 0, REG_EXPAND_SZ, (LPBYTE)source, size); @@ -1106,10 +1112,6 @@ UINT WINAPI MsiSourceListAddSourceExW( LPCWSTR szProduct, LPCWSTR szUserSid, } else { - /* add to the end of the list */ - if (dwIndex == 0) - dwIndex = count + 1; - sprintfW(name, fmt, dwIndex); info = msi_alloc(sizeof(media_info)); if (!info) @@ -1121,10 +1123,13 @@ UINT WINAPI MsiSourceListAddSourceExW( LPCWSTR szProduct, LPCWSTR szUserSid, info->path = strdupW(source); lstrcpyW(info->szIndex, name); info->index = dwIndex; - add_source_to_list(&sourcelist, info); + add_source_to_list(&sourcelist, info, &index); LIST_FOR_EACH_ENTRY(info, &sourcelist, media_info, entry) { + if (info->index < index) + continue; + size = (lstrlenW(info->path) + 1) * sizeof(WCHAR); rc = RegSetValueExW(typekey, info->szIndex, 0, REG_EXPAND_SZ, (LPBYTE)info->path, size);

1 0

Paul Vriens : kernel32: Fix/change tests for systems with no ServicePack.
by Alexandre Julliard 11 Mar '08

11 Mar '08

Module: wine Branch: master Commit: 4ca754d9a996e7a1536eff1da2ac64610aca8943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ca754d9a996e7a1536eff1da… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Mar 11 11:09:38 2008 +0100 kernel32: Fix/change tests for systems with no ServicePack. --- dlls/kernel32/tests/version.c | 44 +++++++++++++++++++++++++++++----------- 1 files changed, 32 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index 07d35da..5371795 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -101,6 +101,7 @@ static void test_VerifyVersionInfo(void) { OSVERSIONINFOEX info = { sizeof(info) }; BOOL ret; + DWORD servicepack; if(!pVerifyVersionInfoA || !pVerSetConditionMask) { @@ -108,6 +109,14 @@ static void test_VerifyVersionInfo(void) return; } + /* Before we start doing some tests we should check what the version of + * the ServicePack is. Tests on a box with no ServicePack will fail otherwise. + */ + GetVersionEx((OSVERSIONINFO *)&info); + servicepack = info.wServicePackMajor; + memset(&info, 0, sizeof(info)); + info.dwOSVersionInfoSize = sizeof(info); + ret = pVerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION, pVerSetConditionMask(0, VER_MAJORVERSION, VER_GREATER_EQUAL)); ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError()); @@ -152,7 +161,11 @@ static void test_VerifyVersionInfo(void) ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, pVerSetConditionMask(pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL), VER_MAJORVERSION, VER_GREATER_EQUAL)); - ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError()); + if (servicepack == 0) + ok(!ret && (GetLastError() == ERROR_OLD_WIN_VERSION), + "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %d\n", GetLastError()); + else + ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError()); GetVersionEx((OSVERSIONINFO *)&info); info.wServicePackMinor++; @@ -161,17 +174,24 @@ static void test_VerifyVersionInfo(void) ok(!ret && (GetLastError() == ERROR_OLD_WIN_VERSION), "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %d\n", GetLastError()); - GetVersionEx((OSVERSIONINFO *)&info); - info.wServicePackMajor--; - ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, - pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER)); - ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError()); - - GetVersionEx((OSVERSIONINFO *)&info); - info.wServicePackMajor--; - ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, - pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL)); - ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError()); + if (servicepack == 0) + { + skip("There is no ServicePack on this system\n"); + } + else + { + GetVersionEx((OSVERSIONINFO *)&info); + info.wServicePackMajor--; + ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER)); + ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError()); + + GetVersionEx((OSVERSIONINFO *)&info); + info.wServicePackMajor--; + ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL)); + ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError()); + } GetVersionEx((OSVERSIONINFO *)&info); info.wServicePackMajor++;

1 0

Aric Stewart : wineboot: Add Japanese resources.
by Alexandre Julliard 11 Mar '08

11 Mar '08

Module: wine Branch: master Commit: da03fc5574488780f766b85e771bbcb9bafd3f20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da03fc5574488780f766b85e7… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Mar 11 11:33:12 2008 +0900 wineboot: Add Japanese resources. --- programs/wineboot/wineboot.rc | 1 + programs/wineboot/wineboot_Ja.rc | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/programs/wineboot/wineboot.rc b/programs/wineboot/wineboot.rc index 377618b..21cf724 100644 --- a/programs/wineboot/wineboot.rc +++ b/programs/wineboot/wineboot.rc @@ -30,6 +30,7 @@ #include "wineboot_En.rc" #include "wineboot_Es.rc" #include "wineboot_Fr.rc" +#include "wineboot_Ja.rc" #include "wineboot_Ko.rc" #include "wineboot_Nl.rc" #include "wineboot_No.rc" diff --git a/programs/wineboot/wineboot_Ja.rc b/programs/wineboot/wineboot_Ja.rc new file mode 100644 index 0000000..f83ef46 --- /dev/null +++ b/programs/wineboot/wineboot_Ja.rc @@ -0,0 +1,35 @@ +/* + * WineBoot resources + * + * Copyright (C) 2008 CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_ENDTASK DIALOG DISCARDABLE 0, 0, 276, 71 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "�ҋ@��" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "�L��Z��",IDCANCEL,129,49,50,15 + PUSHBUTTON "�v��Z�X�̏I��",IDOK,51,49,71,15 + LTEXT "��O�I�t��сA�ċN��̃v��Z�X��V�~��[�g��Ă��܂��A�v��O��͔��Ă��܂��B", + IDC_STATIC,7,7,262,19 + LTEXT "�v��Z�X��I��ƁA�ۑ��Ă��Ȃ��f�[�^�͑S�Ď��܂��B", + IDC_STATIC,7,28,262,15 +END

1 0

Stefan Dösinger : wined3d: Set the fullscreen flag before the display Mode.
by Alexandre Julliard 11 Mar '08

11 Mar '08

Module: wine Branch: master Commit: c5117dab68a75f6687c473424e66189f390b7591 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5117dab68a75f6687c473424… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 10 22:24:13 2008 +0100 wined3d: Set the fullscreen flag before the display Mode. --- dlls/wined3d/device.c | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b4d508e..158791f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7096,18 +7096,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE (swapchain->presentParms.Windowed && !pPresentationParameters->Windowed) || DisplayModeChanged) { - /* Switching to fullscreen? Change to fullscreen mode, THEN change the screen res */ - if(!pPresentationParameters->Windowed) { - IWineD3DDevice_SetFullscreen(iface, TRUE); - } - - IWineD3DDevice_SetDisplayMode(iface, 0, &mode); - - /* Switching out of fullscreen mode? First set the original res, then change the window */ - if(pPresentationParameters->Windowed) { - IWineD3DDevice_SetFullscreen(iface, FALSE); - } + IWineD3DDevice_SetFullscreen(iface, !pPresentationParameters->Windowed); swapchain->presentParms.Windowed = pPresentationParameters->Windowed; + IWineD3DDevice_SetDisplayMode(iface, 0, &mode); } else if(!pPresentationParameters->Windowed) { DWORD style = This->style, exStyle = This->exStyle; /* If we're in fullscreen, and the mode wasn't changed, we have to get the window back into

1 0

Stefan Dösinger : wined3d: Only restore the style and exStyle when it is untouched.
by Alexandre Julliard 11 Mar '08

11 Mar '08

Module: wine Branch: master Commit: c81b114269c2d4a5d1011ffeffebc227b1f9d7a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c81b114269c2d4a5d1011ffef… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 10 22:20:50 2008 +0100 wined3d: Only restore the style and exStyle when it is untouched. --- dlls/wined3d/device.c | 46 ++++++++++++++++++++++++++++++++++++---------- 1 files changed, 36 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 32f6c64..b4d508e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1248,6 +1248,27 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateQuery(IWineD3DDevice *iface, WINE * window: Window to setup * *****************************************************************************/ +static LONG fullscreen_style(LONG orig_style) { + LONG style = orig_style; + style &= ~WS_CAPTION; + style &= ~WS_THICKFRAME; + + /* Make sure the window is managed, otherwise we won't get keyboard input */ + style |= WS_POPUP | WS_SYSMENU; + + return style; +} + +static LONG fullscreen_exStyle(LONG orig_exStyle) { + LONG exStyle = orig_exStyle; + + /* Filter out window decorations */ + exStyle &= ~WS_EX_WINDOWEDGE; + exStyle &= ~WS_EX_CLIENTEDGE; + + return exStyle; +} + static void WINAPI IWineD3DDeviceImpl_SetupFullscreenWindow(IWineD3DDevice *iface, HWND window) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; @@ -1267,14 +1288,8 @@ static void WINAPI IWineD3DDeviceImpl_SetupFullscreenWindow(IWineD3DDevice *ifac This->style = style; This->exStyle = exStyle; - /* Filter out window decorations */ - style &= ~WS_CAPTION; - style &= ~WS_THICKFRAME; - exStyle &= ~WS_EX_WINDOWEDGE; - exStyle &= ~WS_EX_CLIENTEDGE; - - /* Make sure the window is managed, otherwise we won't get keyboard input */ - style |= WS_POPUP | WS_SYSMENU; + style = fullscreen_style(style); + exStyle = fullscreen_exStyle(exStyle); TRACE("Old style was %08x,%08x, setting to %08x,%08x\n", This->style, This->exStyle, style, exStyle); @@ -1301,6 +1316,7 @@ static void WINAPI IWineD3DDeviceImpl_SetupFullscreenWindow(IWineD3DDevice *ifac *****************************************************************************/ static void WINAPI IWineD3DDeviceImpl_RestoreWindow(IWineD3DDevice *iface, HWND window) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + LONG style, exStyle; /* This could be a DDSCL_NORMAL -> DDSCL_NORMAL * switch, do nothing @@ -1310,8 +1326,18 @@ static void WINAPI IWineD3DDeviceImpl_RestoreWindow(IWineD3DDevice *iface, HWND TRACE("(%p): Restoring window settings of window %p to %08x, %08x\n", This, window, This->style, This->exStyle); - SetWindowLongW(window, GWL_STYLE, This->style); - SetWindowLongW(window, GWL_EXSTYLE, This->exStyle); + style = GetWindowLongW(window, GWL_STYLE); + exStyle = GetWindowLongW(window, GWL_EXSTYLE); + + /* Only restore the style if the application didn't modify it during the fullscreen phase. + * Some applications change it before calling Reset() when switching between windowed and + * fullscreen modes(HL2), some depend on the original style(Eve Online) + */ + if(style == fullscreen_style(This->style) && + exStyle == fullscreen_style(This->exStyle)) { + SetWindowLongW(window, GWL_STYLE, This->style); + SetWindowLongW(window, GWL_EXSTYLE, This->exStyle); + } /* Delete the old values */ This->style = 0;

1 0

Stefan Dösinger : wined3d: Only adjust windows in fullscreen mode to the screen.
by Alexandre Julliard 11 Mar '08

11 Mar '08

Module: wine Branch: master Commit: a9fb81b2edceadc58eb84ed9e920d19719a05330 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9fb81b2edceadc58eb84ed9e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 10 22:15:22 2008 +0100 wined3d: Only adjust windows in fullscreen mode to the screen. --- dlls/wined3d/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3f2d57e..32f6c64 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2337,8 +2337,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetDisplayMode(IWineD3DDevice *iface, U This->ddraw_height = pMode->Height; This->ddraw_format = pMode->Format; - /* Only do this with a window of course */ - if(This->ddraw_window) + /* Only do this with a window of course, and only if we're fullscreened */ + if(This->ddraw_window && This->ddraw_fullscreen) MoveWindow(This->ddraw_window, 0, 0, pMode->Width, pMode->Height, TRUE); /* And finally clip mouse to our screen */

1 0

Andrew Talbot : ole32: Assign to structs instead of using memcpy.
by Alexandre Julliard 11 Mar '08

11 Mar '08

Module: wine Branch: master Commit: e7b0f07c3e00ed4bf829ff8beb61948565834aca URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7b0f07c3e00ed4bf829ff8be… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Mar 10 21:58:43 2008 +0000 ole32: Assign to structs instead of using memcpy. --- dlls/ole32/ftmarshal.c | 4 ++-- dlls/ole32/oleobj.c | 2 +- dlls/ole32/rpc.c | 10 +++++----- dlls/ole32/stg_prop.c | 20 ++++++++++---------- dlls/ole32/storage32.c | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/ole32/ftmarshal.c b/dlls/ole32/ftmarshal.c index 9f6ad8c..d71c29a 100644 --- a/dlls/ole32/ftmarshal.c +++ b/dlls/ole32/ftmarshal.c @@ -141,9 +141,9 @@ FTMarshalImpl_GetUnmarshalClass (LPMARSHAL iface, REFIID riid, void *pv, DWORD d TRACE("(%s, %p, 0x%x, %p, 0x%x, %p)\n", debugstr_guid(riid), pv, dwDestContext, pvDestContext, mshlflags, pCid); if (dwDestContext == MSHCTX_INPROC || dwDestContext == MSHCTX_CROSSCTX) - memcpy(pCid, &CLSID_InProcFreeMarshaler, sizeof(CLSID_InProcFreeMarshaler)); + *pCid = CLSID_InProcFreeMarshaler; else - memcpy(pCid, &CLSID_DfMarshal, sizeof(CLSID_InProcFreeMarshaler)); + *pCid = CLSID_DfMarshal; return S_OK; } diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c index 1c88797..217e01d 100644 --- a/dlls/ole32/oleobj.c +++ b/dlls/ole32/oleobj.c @@ -724,7 +724,7 @@ static HRESULT WINAPI DataAdviseHolder_Advise( */ This->Connections[index].sink = pAdvise; This->Connections[index].advf = advf & ~WINE_ADVF_REMOTE; - memcpy(&(This->Connections[index].fmat), pFetc, sizeof(FORMATETC)); + This->Connections[index].fmat = *pFetc; if (pFetc->ptd) { This->Connections[index].fmat.ptd = CoTaskMemAlloc(pFetc->ptd->tdSize); diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 256ec04..7af0b29 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -242,7 +242,7 @@ static unsigned char * ChannelHooks_ClientFillBuffer(SChannelHookCallInfo *info, wire_orpc_extent->conformance = (extension_size+7)&~7; wire_orpc_extent->size = extension_size; - memcpy(&wire_orpc_extent->id, &entry->id, sizeof(wire_orpc_extent->id)); + wire_orpc_extent->id = entry->id; buffer += FIELD_OFFSET(WIRE_ORPC_EXTENT, data[wire_orpc_extent->conformance]); } @@ -362,7 +362,7 @@ static unsigned char * ChannelHooks_ServerFillBuffer(SChannelHookCallInfo *info, wire_orpc_extent->conformance = (extension_size+7)&~7; wire_orpc_extent->size = extension_size; - memcpy(&wire_orpc_extent->id, &entry->id, sizeof(wire_orpc_extent->id)); + wire_orpc_extent->id = entry->id; buffer += FIELD_OFFSET(WIRE_ORPC_EXTENT, data[wire_orpc_extent->conformance]); } @@ -411,7 +411,7 @@ HRESULT RPC_RegisterChannelHook(REFGUID rguid, IChannelHook *hook) if (!entry) return E_OUTOFMEMORY; - memcpy(&entry->id, rguid, sizeof(entry->id)); + entry->id = *rguid; entry->hook = hook; IChannelHook_AddRef(hook); @@ -553,7 +553,7 @@ static HRESULT WINAPI ServerRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, { WIRE_ORPC_EXTENT *wire_orpc_extent = msg->Buffer; wire_orpc_extent->conformance = 0; - memcpy(&wire_orpc_extent->id, &GUID_NULL, sizeof(wire_orpc_extent->id)); + wire_orpc_extent->id = GUID_NULL; wire_orpc_extent->size = 0; msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT, data[0]); } @@ -737,7 +737,7 @@ static HRESULT WINAPI ClientRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, { WIRE_ORPC_EXTENT *wire_orpc_extent = msg->Buffer; wire_orpc_extent->conformance = 0; - memcpy(&wire_orpc_extent->id, &GUID_NULL, sizeof(wire_orpc_extent->id)); + wire_orpc_extent->id = GUID_NULL; wire_orpc_extent->size = 0; msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT, data[0]); } diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index b688855..20d9ec3 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -913,12 +913,12 @@ static HRESULT WINAPI IPropertyStorage_fnStat( hr = IStream_Stat(This->stm, &stat, STATFLAG_NONAME); if (SUCCEEDED(hr)) { - memcpy(&statpsstg->fmtid, &This->fmtid, sizeof(statpsstg->fmtid)); - memcpy(&statpsstg->clsid, &This->clsid, sizeof(statpsstg->clsid)); + statpsstg->fmtid = This->fmtid; + statpsstg->clsid = This->clsid; statpsstg->grfFlags = This->grfFlags; - memcpy(&statpsstg->mtime, &stat.mtime, sizeof(statpsstg->mtime)); - memcpy(&statpsstg->ctime, &stat.ctime, sizeof(statpsstg->ctime)); - memcpy(&statpsstg->atime, &stat.atime, sizeof(statpsstg->atime)); + statpsstg->mtime = stat.mtime; + statpsstg->ctime = stat.ctime; + statpsstg->atime = stat.atime; statpsstg->dwOSVersion = This->originatorOS; } return hr; @@ -1309,7 +1309,7 @@ static HRESULT PropertyStorage_ReadFromStream(PropertyStorage_impl *This) goto end; } This->format = hdr.wFormat; - memcpy(&This->clsid, &hdr.clsid, sizeof(This->clsid)); + This->clsid = hdr.clsid; This->originatorOS = hdr.dwOSVer; if (PROPSETHDR_OSVER_KIND(hdr.dwOSVer) == PROPSETHDR_OSVER_KIND_MAC) WARN("File comes from a Mac, strings will probably be screwed up\n"); @@ -1969,7 +1969,7 @@ static HRESULT PropertyStorage_BaseConstruct(IStream *stm, InitializeCriticalSection(&(*pps)->cs); (*pps)->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PropertyStorage_impl.cs"); (*pps)->stm = stm; - memcpy(&(*pps)->fmtid, rfmtid, sizeof((*pps)->fmtid)); + (*pps)->fmtid = *rfmtid; (*pps)->grfMode = grfMode; hr = PropertyStorage_CreateDictionaries(*pps); @@ -2314,7 +2314,7 @@ static HRESULT create_EnumSTATPROPSETSTG( statpss.atime = stat.atime; statpss.ctime = stat.ctime; statpss.grfFlags = stat.grfMode; - memcpy(&statpss.clsid, &stat.clsid, sizeof stat.clsid); + statpss.clsid = stat.clsid; enumx_add_element(enumx, &statpss); } CoTaskMemFree(stat.pwcsName); @@ -2570,12 +2570,12 @@ HRESULT WINAPI PropStgNameToFmtId(const LPOLESTR str, FMTID *rfmtid) if (!lstrcmpiW(str, szDocSummaryInfo)) { - memcpy(rfmtid, &FMTID_DocSummaryInformation, sizeof(*rfmtid)); + *rfmtid = FMTID_DocSummaryInformation; hr = S_OK; } else if (!lstrcmpiW(str, szSummaryInfo)) { - memcpy(rfmtid, &FMTID_SummaryInformation, sizeof(*rfmtid)); + *rfmtid = FMTID_SummaryInformation; hr = S_OK; } else diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 389b047..2bdad45 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -7908,7 +7908,7 @@ HRESULT WINAPI ReadClassStm(IStream *pStm,CLSID *pclsid) return E_INVALIDARG; /* clear the output args */ - memcpy(pclsid, &CLSID_NULL, sizeof(*pclsid)); + *pclsid = CLSID_NULL; res = IStream_Read(pStm,(void*)pclsid,sizeof(CLSID),&nbByte);

1 0

Andrew Talbot : ole32: Assign to structs instead of using memcpy.
by Alexandre Julliard 11 Mar '08

11 Mar '08

Module: wine Branch: master Commit: 4971f2f687503ee9e879965ffa1f0117be5b3fbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=4971f2f687503ee9e879965ff… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Mar 10 21:58:39 2008 +0000 ole32: Assign to structs instead of using memcpy. --- dlls/ole32/clipboard.c | 2 +- dlls/ole32/compobj.c | 2 +- dlls/ole32/datacache.c | 4 ++-- dlls/ole32/defaulthandler.c | 4 ++-- dlls/ole32/errorinfo.c | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 4e43e38..ad15219 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1365,7 +1365,7 @@ static HRESULT WINAPI OLEClipbrd_IDataObject_GetCanonicalFormatEtc( if ( !pformatectIn || !pformatetcOut ) return E_INVALIDARG; - memcpy(pformatetcOut, pformatectIn, sizeof(FORMATETC)); + *pformatetcOut = *pformatectIn; return DATA_S_SAMEFORMATETC; } diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 1cb8183..25a1629 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2855,7 +2855,7 @@ HRESULT WINAPI CoGetTreatAsClass(REFCLSID clsidOld, LPCLSID clsidNew) LONG len = sizeof(szClsidNew); FIXME("(%s,%p)\n", debugstr_guid(clsidOld), clsidNew); - memcpy(clsidNew,clsidOld,sizeof(CLSID)); /* copy over old value */ + *clsidNew = *clsidOld; /* copy over old value */ res = COM_OpenKeyForCLSID(clsidOld, wszTreatAs, KEY_READ, &hkey); if (FAILED(res)) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index beb6d93..8903506 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -1240,13 +1240,13 @@ static HRESULT WINAPI DataCache_GetClassID( HRESULT hr = IStorage_Stat(cache_entry->storage, &statstg, STATFLAG_NONAME); if (SUCCEEDED(hr)) { - memcpy(pClassID, &statstg.clsid, sizeof(*pClassID)); + *pClassID = statstg.clsid; return S_OK; } } } - memcpy(pClassID, &CLSID_NULL, sizeof(*pClassID)); + *pClassID = CLSID_NULL; return S_OK; } diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 33e80ce..f9f676f 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -672,7 +672,7 @@ static HRESULT WINAPI DefaultHandler_GetUserClassID( if (!pClsid) return E_POINTER; - memcpy(pClsid, &This->clsid, sizeof(CLSID)); + *pClsid = This->clsid; return S_OK; } @@ -1744,7 +1744,7 @@ static DefaultHandler* DefaultHandler_Construct( /* * Initialize the other data members of the class. */ - memcpy(&This->clsid, clsid, sizeof(CLSID)); + This->clsid = *clsid; This->clientSite = NULL; This->oleAdviseHolder = NULL; This->dataAdviseHolder = NULL; diff --git a/dlls/ole32/errorinfo.c b/dlls/ole32/errorinfo.c index 7318a97..e4a1c47 100644 --- a/dlls/ole32/errorinfo.c +++ b/dlls/ole32/errorinfo.c @@ -250,7 +250,7 @@ static HRESULT WINAPI IErrorInfoImpl_GetGUID( ErrorInfoImpl *This = impl_from_IErrorInfo(iface); TRACE("(%p)->(count=%u)\n",This,This->ref); if(!pGUID )return E_INVALIDARG; - memcpy(pGUID, &This->m_Guid, sizeof(GUID)); + *pGUID = This->m_Guid; return S_OK; } @@ -354,7 +354,7 @@ static HRESULT WINAPI ICreateErrorInfoImpl_SetGUID( { ErrorInfoImpl *This = impl_from_ICreateErrorInfo(iface); TRACE("(%p)->(%s)\n", This, debugstr_guid(rguid)); - memcpy(&This->m_Guid, rguid, sizeof(GUID)); + This->m_Guid = *rguid; return S_OK; }

1 0

Mikołaj Zalewski : comdlg32: Move font style names to resources.
by Alexandre Julliard 11 Mar '08

11 Mar '08

Module: wine Branch: master Commit: 89c86dd99485b4031bcbb9d995f4990fe38890ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=89c86dd99485b4031bcbb9d99… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Mar 10 21:36:35 2008 +0100 comdlg32: Move font style names to resources. --- dlls/comdlg32/cdlg.h | 7 +++++++ dlls/comdlg32/cdlg_En.rc | 8 ++++++++ dlls/comdlg32/cdlg_Pl.rc | 8 ++++++++ dlls/comdlg32/fontdlg.c | 18 ++++++++---------- 4 files changed, 31 insertions(+), 10 deletions(-) diff --git a/dlls/comdlg32/cdlg.h b/dlls/comdlg32/cdlg.h index 22cd5a2..f88e2d4 100644 --- a/dlls/comdlg32/cdlg.h +++ b/dlls/comdlg32/cdlg.h @@ -126,6 +126,13 @@ typedef struct { #define IDS_CHARSET_ISO10 223 #define IDS_CHARSET_CELTIC 224 +/* Font styles */ + +#define IDS_FONT_REGULAR 256 +#define IDS_FONT_BOLD 257 +#define IDS_FONT_ITALIC 258 +#define IDS_FONT_BOLD_ITALIC 259 + /* Color names string IDs */ #define IDS_COLOR_BLACK 1040 diff --git a/dlls/comdlg32/cdlg_En.rc b/dlls/comdlg32/cdlg_En.rc index a9be1a9..2021448 100644 --- a/dlls/comdlg32/cdlg_En.rc +++ b/dlls/comdlg32/cdlg_En.rc @@ -443,6 +443,14 @@ Please install one and retry." PD32_PRINTER_STATUS_POWER_SAVE "Power save mode; " } +STRINGTABLE DISCARDABLE /* Font styles */ +{ + IDS_FONT_REGULAR "Regular" + IDS_FONT_BOLD "Bold" + IDS_FONT_ITALIC "Italic" + IDS_FONT_BOLD_ITALIC "Bold Italic" +} + STRINGTABLE DISCARDABLE /* Color names */ { IDS_COLOR_BLACK "Black" diff --git a/dlls/comdlg32/cdlg_Pl.rc b/dlls/comdlg32/cdlg_Pl.rc index 7376fb7..f28b00e 100644 --- a/dlls/comdlg32/cdlg_Pl.rc +++ b/dlls/comdlg32/cdlg_Pl.rc @@ -449,6 +449,14 @@ STRINGTABLE DISCARDABLE IDS_OPEN_FILE "Otw�rz plik" } +STRINGTABLE DISCARDABLE /* Font styles */ +{ + IDS_FONT_REGULAR "Regularny" + IDS_FONT_BOLD "Pogrubiony" + IDS_FONT_ITALIC "Kusywa" + IDS_FONT_BOLD_ITALIC "Pogrubiona kursywa" +} + STRINGTABLE DISCARDABLE /* Color names */ { IDS_COLOR_BLACK "Czarny" diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 899cfe4..2532f2f 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -357,17 +357,13 @@ static int SetFontStylesToCombo2(HWND hwnd, HDC hdc, const LOGFONTW *lplf) { int italic; int weight; - const WCHAR *stname; + UINT resId; }; - static const WCHAR strRegular[] = {'R','e','g','u','l','a','r',0}; - static const WCHAR strItalic[] = {'I','t','a','l','i','c',0}; - static const WCHAR strBold[] = {'B','o','l','d',0}; - static const WCHAR strBoldItalic[] = {'B','o','l','d',' ','I','t','a','l','i','c',0}; static const struct FONTSTYLE fontstyles[FSTYLES]={ - { 0, FW_NORMAL, strRegular }, - { 1, FW_NORMAL, strItalic }, - { 0, FW_BOLD, strBold }, - { 1, FW_BOLD, strBoldItalic } + { 0, FW_NORMAL, IDS_FONT_REGULAR }, + { 1, FW_NORMAL, IDS_FONT_ITALIC }, + { 0, FW_BOLD, IDS_FONT_BOLD }, + { 1, FW_BOLD, IDS_FONT_BOLD_ITALIC } }; HFONT hf; TEXTMETRICW tm; @@ -390,7 +386,9 @@ static int SetFontStylesToCombo2(HWND hwnd, HDC hdc, const LOGFONTW *lplf) (fontstyles[i].weight == FW_BOLD && tm.tmWeight > FW_MEDIUM)) && ((tm.tmItalic != 0)==fontstyles[i].italic)) { - j=SendMessageW(hwnd,CB_ADDSTRING,0,(LPARAM)fontstyles[i].stname ); + WCHAR name[64]; + LoadStringW(COMDLG32_hInstance, fontstyles[i].resId, name, 64); + j=SendMessageW(hwnd,CB_ADDSTRING,0,(LPARAM)name ); if (j==CB_ERR) return 1; j=SendMessageW(hwnd, CB_SETITEMDATA, j, MAKELONG(tm.tmWeight,fontstyles[i].italic));

1 0

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 March 2008