July 2008 - Wine-Commits - list.winehq.org

Detlef Riekenberg : shlwapi/tests: Fix a buffer overflow that results in a crash on Win9x.
by Alexandre Julliard July 28, 2008

July 28, 2008

Module: wine Branch: master Commit: 63b8624a05ac8b554655ff36c718c9ade2d0a31f URL: http://source.winehq.org/git/wine.git/?a=commit;h=63b8624a05ac8b554655ff36c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jul 27 22:21:22 2008 +0200 shlwapi/tests: Fix a buffer overflow that results in a crash on Win9x. --- dlls/shlwapi/tests/path.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index e6b6548..07257d7 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -799,7 +799,7 @@ static void test_PathAppendA(void) static void test_PathCanonicalizeA(void) { - char dest[MAX_PATH]; + char dest[LONG_LEN + MAX_PATH]; char too_long[LONG_LEN]; BOOL res;

1 0

Vladimir Pankratov : shell32: Update Russian translation.
by Alexandre Julliard July 28, 2008

July 28, 2008

Module: wine Branch: master Commit: 75d186f85f8f63e95826d01d3c34bbdb7149b0d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75d186f85f8f63e95826d01d3… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Mon Jul 28 14:19:31 2008 +0500 shell32: Update Russian translation. --- dlls/shell32/shell32_Ru.rc | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/shell32_Ru.rc b/dlls/shell32/shell32_Ru.rc index b643cac..795be24 100644 --- a/dlls/shell32/shell32_Ru.rc +++ b/dlls/shell32/shell32_Ru.rc @@ -93,13 +93,13 @@ END MENU_CPANEL MENU BEGIN - POPUP "&File" + POPUP "&��" BEGIN MENUITEM SEPARATOR - MENUITEM "E&xit", IDM_CPANEL_EXIT + MENUITEM "�&��", IDM_CPANEL_EXIT END - POPUP "&View" + POPUP "&��" BEGIN MENUITEM "&�� ", FCIDM_SHVIEW_BIGICON MENUITEM "&�� ", FCIDM_SHVIEW_SMALLICON @@ -107,9 +107,9 @@ BEGIN MENUITEM "&��", FCIDM_SHVIEW_REPORTVIEW END - POPUP "&Help" + POPUP "&��" BEGIN - MENUITEM "&About Control Panel...", IDM_CPANEL_ABOUT + MENUITEM "&� �� ...", IDM_CPANEL_ABOUT END END @@ -209,7 +209,7 @@ STRINGTABLE IDS_DESKTOP "�� " IDS_MYCOMPUTER "�� " IDS_RECYCLEBIN_FOLDER_NAME "��" - IDS_CONTROLPANEL "Control Panel" + IDS_CONTROLPANEL "�� " /* context menus */ IDS_VIEW_LARGE "&�� " @@ -272,9 +272,9 @@ STRINGTABLE IDS_COMMON_VIDEO "�� \\�� " IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" - IDS_NEWFOLDER "New Folder" + IDS_NEWFOLDER "�� " - IDS_CPANEL_TITLE "Wine Control Panel" - IDS_CPANEL_NAME "Name" - IDS_CPANEL_DESCRIPTION "Description" + IDS_CPANEL_TITLE "�� Wine" + IDS_CPANEL_NAME "��" + IDS_CPANEL_DESCRIPTION "��" }

1 0

Tobias Jakobi : ddraw: Fix typo in copy_mipmap_chain.
by Alexandre Julliard July 28, 2008

July 28, 2008

Module: wine Branch: master Commit: 69797d7f3d7c590be0686ac3ccfb366f05073176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69797d7f3d7c590be0686ac3c… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Sun Jul 27 22:05:11 2008 +0200 ddraw: Fix typo in copy_mipmap_chain. --- dlls/ddraw/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 6a3ecfc..b154ce4 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6289,7 +6289,7 @@ static void copy_mipmap_chain(IDirect3DDeviceImpl *device, if (src_level->surface_desc.dwWidth == dest_level->surface_desc.dwWidth && src_level->surface_desc.dwHeight == dest_level->surface_desc.dwHeight) { - /* Try UpdateSurface that may perform a more direct opengl loading. But skip this is destination is paletted texture and has no palette. + /* Try UpdateSurface that may perform a more direct opengl loading. But skip this if destination is paletted texture and has no palette. * Some games like Sacrifice set palette after Load, and it is a waste of effort to try to load texture without palette and generates * warnings in wined3d. */ if (!palette_missing)

1 0

Hwang YunSong(황윤성) : shell32: Updated Korean resource.
by Alexandre Julliard July 28, 2008

July 28, 2008

Module: wine Branch: master Commit: f6ccbf6e4a402530d42ec96e9e879d2f87bb9912 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6ccbf6e4a402530d42ec96e9… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Jul 28 09:43:34 2008 +0900 shell32: Updated Korean resource. --- dlls/shell32/shell32_Ko.rc | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/shell32_Ko.rc b/dlls/shell32/shell32_Ko.rc index de3cf61..c688c0c 100644 --- a/dlls/shell32/shell32_Ko.rc +++ b/dlls/shell32/shell32_Ko.rc @@ -93,13 +93,13 @@ END MENU_CPANEL MENU BEGIN - POPUP "&File" + POPUP "��(&F)" BEGIN MENUITEM SEPARATOR - MENUITEM "E&xit", IDM_CPANEL_EXIT + MENUITEM "��(&X)", IDM_CPANEL_EXIT END - POPUP "&View" + POPUP "��(&V)" BEGIN MENUITEM "ū ��(&G)", FCIDM_SHVIEW_BIGICON MENUITEM "�� (&M)", FCIDM_SHVIEW_SMALLICON @@ -107,9 +107,9 @@ BEGIN MENUITEM "�ڼ��(&D)", FCIDM_SHVIEW_REPORTVIEW END - POPUP "&Help" + POPUP "��(&H)" BEGIN - MENUITEM "&About Control Panel...", IDM_CPANEL_ABOUT + MENUITEM "�� (&A)...", IDM_CPANEL_ABOUT END END @@ -284,9 +284,9 @@ IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Bur IDS_NEWFOLDER "�� " -IDS_CPANEL_TITLE "Wine Control Panel" -IDS_CPANEL_NAME "Name" -IDS_CPANEL_DESCRIPTION "Description" +IDS_CPANEL_TITLE "Wine ��" +IDS_CPANEL_NAME "�̸�" +IDS_CPANEL_DESCRIPTION "��" } STRINGTABLE

1 0

Alexander Nicolaysen Sørnes : dpnet: Add basic DirectPlay8ThreadPool implementation.
by Alexandre Julliard July 28, 2008

July 28, 2008

Module: wine Branch: master Commit: c10087c11a500f3f20da9f108568a8b1307c3ee5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c10087c11a500f3f20da9f108… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Jul 22 18:50:14 2008 +0200 dpnet: Add basic DirectPlay8ThreadPool implementation. --- dlls/dpnet/Makefile.in | 3 +- dlls/dpnet/dpnet_main.c | 1 + dlls/dpnet/dpnet_private.h | 12 ++++ dlls/dpnet/threadpool.c | 143 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 158 insertions(+), 1 deletions(-) diff --git a/dlls/dpnet/Makefile.in b/dlls/dpnet/Makefile.in index 044eaba..8d6b319 100644 --- a/dlls/dpnet/Makefile.in +++ b/dlls/dpnet/Makefile.in @@ -13,7 +13,8 @@ C_SRCS = \ lobbiedapp.c \ peer.c \ regsvr.c \ - server.c + server.c \ + threadpool.c RC_SRCS = version.rc diff --git a/dlls/dpnet/dpnet_main.c b/dlls/dpnet/dpnet_main.c index 1a2a90c..3c8e2c5 100644 --- a/dlls/dpnet/dpnet_main.c +++ b/dlls/dpnet/dpnet_main.c @@ -115,6 +115,7 @@ static IClassFactoryImpl DPNET_CFS[] = { { &DICF_Vtbl, 1, &CLSID_DirectPlay8Peer, DPNET_CreateDirectPlay8Peer }, { &DICF_Vtbl, 1, &CLSID_DirectPlay8Address, DPNET_CreateDirectPlay8Address }, { &DICF_Vtbl, 1, &CLSID_DirectPlay8LobbiedApplication, (void *)DPNET_CreateDirectPlay8LobbiedApp }, + { &DICF_Vtbl, 1, &CLSID_DirectPlay8ThreadPool, DPNET_CreateDirectPlay8ThreadPool}, { NULL, 0, NULL, NULL } }; diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 40cd671..deaee60 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -35,6 +35,7 @@ typedef struct IDirectPlay8ClientImpl IDirectPlay8ClientImpl; typedef struct IDirectPlay8AddressImpl IDirectPlay8AddressImpl; typedef struct IDirectPlay8LobbiedApplicationImpl IDirectPlay8LobbiedApplicationImpl; +typedef struct IDirectPlay8ThreadPoolImpl IDirectPlay8ThreadPoolImpl; /* ------------------ */ /* IDirectPlay8Client */ @@ -79,6 +80,16 @@ struct IDirectPlay8LobbiedApplicationImpl /* IDirectPlay8LobbiedApplication fields */ }; +/***************************************************************************** + * IDirectPlay8ThreadPool implementation structure + */ +struct IDirectPlay8ThreadPoolImpl +{ + /* IUnknown fields */ + const IDirectPlay8ThreadPoolVtbl *lpVtbl; + LONG ref; +}; + /** * factories */ @@ -87,6 +98,7 @@ extern HRESULT DPNET_CreateDirectPlay8Server(LPCLASSFACTORY iface, LPUNKNOWN pun extern HRESULT DPNET_CreateDirectPlay8Peer(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj); extern HRESULT DPNET_CreateDirectPlay8Address(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj); extern HRESULT DPNET_CreateDirectPlay8LobbiedApp(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj); +extern HRESULT DPNET_CreateDirectPlay8ThreadPool(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj); /** * debug diff --git a/dlls/dpnet/threadpool.c b/dlls/dpnet/threadpool.c new file mode 100644 index 0000000..1c53050 --- /dev/null +++ b/dlls/dpnet/threadpool.c @@ -0,0 +1,143 @@ +/* + * DirectPlay8 ThreadPool + * + * Copyright 2004 Raphael Junqueira + * Copyright 2008 Alexander N. S�rnes <alex(a)thehandofagony.com> + * + * 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 "config.h" + +#include <stdarg.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "objbase.h" +#include "wine/debug.h" + +#include "dplay8.h" +#include "dpnet_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dpnet); + +/* IUnknown interface follows */ + +static HRESULT WINAPI IDirectPlay8ThreadPoolImpl_QueryInterface(PDIRECTPLAY8THREADPOOL iface, REFIID riid, LPVOID *ppobj) +{ + IDirectPlay8ThreadPoolImpl *This = (IDirectPlay8ThreadPoolImpl*)iface; + + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IDirectPlay8ThreadPool)) + { + IUnknown_AddRef(iface); + *ppobj = This; + return DPN_OK; + } + + WARN("(%p)->(%s,%p): not found\n", This, debugstr_guid(riid), ppobj); + return E_NOINTERFACE; +} + +static ULONG WINAPI IDirectPlay8ThreadPoolImpl_AddRef(PDIRECTPLAY8THREADPOOL iface) +{ + IDirectPlay8ThreadPoolImpl* This = (IDirectPlay8ThreadPoolImpl*)iface; + ULONG RefCount = InterlockedIncrement(&This->ref); + + return RefCount; +} + +static ULONG WINAPI IDirectPlay8ThreadPoolImpl_Release(PDIRECTPLAY8THREADPOOL iface) +{ + IDirectPlay8ThreadPoolImpl* This = (IDirectPlay8ThreadPoolImpl*)This; + ULONG RefCount = InterlockedDecrement(&This->ref); + + if(!RefCount) + HeapFree(GetProcessHeap(), 0, This); + + return RefCount; +} + +/* IDirectPlay8ThreadPool interface follows */ +static HRESULT WINAPI IDirectPlay8ThreadPoolImpl_Initialize(PDIRECTPLAY8THREADPOOL iface, PVOID CONST pvUserContext, CONST PFNDPNMESSAGEHANDLER pfn, CONST DWORD dwFlags) +{ + FIXME("(%p)->(%p,%p,%x): stub\n", iface, pvUserContext, pfn, dwFlags); + return DPN_OK; +} + +static HRESULT WINAPI IDirectPlay8ThreadPoolImpl_Close(PDIRECTPLAY8THREADPOOL iface, CONST DWORD dwFlags) +{ + return DPN_OK; +} + +static HRESULT WINAPI IDirectPlay8ThreadPoolImpl_GetThreadCount(PDIRECTPLAY8THREADPOOL iface, CONST DWORD dwProcessorNum, DWORD* CONST pdwNumThreads, CONST DWORD dwFlags) +{ + FIXME("(%p)->(%x,%p,%x): stub\n", iface, dwProcessorNum, pdwNumThreads, dwFlags); + *pdwNumThreads = 0; + return DPN_OK; +} + +static HRESULT WINAPI IDirectPlay8ThreadPoolImpl_SetThreadCount(PDIRECTPLAY8THREADPOOL iface, CONST DWORD dwProcessorNum, CONST DWORD dwNumThreads, CONST DWORD dwFlags) +{ + FIXME("(%p)->(%x,%x,%x): stub\n", iface, dwProcessorNum, dwNumThreads, dwFlags); + return DPN_OK; +} + +static HRESULT WINAPI IDirectPlay8ThreadPoolImpl_DoWork(PDIRECTPLAY8THREADPOOL iface, CONST DWORD dwAllowedTimeSlice, CONST DWORD dwFlags) +{ + static BOOL Run = FALSE; + + if(!Run) + FIXME("(%p)->(%x,%x): stub\n", iface, dwAllowedTimeSlice, dwFlags); + + Run = TRUE; + + return DPN_OK; +} + +static const IDirectPlay8ThreadPoolVtbl DirectPlay8ThreadPool_Vtbl = +{ + IDirectPlay8ThreadPoolImpl_QueryInterface, + IDirectPlay8ThreadPoolImpl_AddRef, + IDirectPlay8ThreadPoolImpl_Release, + IDirectPlay8ThreadPoolImpl_Initialize, + IDirectPlay8ThreadPoolImpl_Close, + IDirectPlay8ThreadPoolImpl_GetThreadCount, + IDirectPlay8ThreadPoolImpl_SetThreadCount, + IDirectPlay8ThreadPoolImpl_DoWork +}; + +HRESULT DPNET_CreateDirectPlay8ThreadPool(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) +{ + IDirectPlay8ThreadPoolImpl* Client; + + Client = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectPlay8ThreadPoolImpl)); + + if(Client == NULL) + { + *ppobj = NULL; + WARN("Not enough memory\n"); + return E_OUTOFMEMORY; + } + + Client->lpVtbl = &DirectPlay8ThreadPool_Vtbl; + Client->ref = 0; + + return IDirectPlay8ThreadPoolImpl_QueryInterface((PDIRECTPLAY8THREADPOOL)Client, riid, ppobj); +}

1 0

Vladimir Pankratov : taskmgr: Update Russian translation.
by Alexandre Julliard July 28, 2008

July 28, 2008

Module: wine Branch: master Commit: 78e59637bde73a9aeb67150a8cffb07a511f55d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78e59637bde73a9aeb67150a8… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Sun Jul 27 14:24:45 2008 +0500 taskmgr: Update Russian translation. --- programs/taskmgr/Ru.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/taskmgr/Ru.rc b/programs/taskmgr/Ru.rc index 10b8cae..5098389 100644 --- a/programs/taskmgr/Ru.rc +++ b/programs/taskmgr/Ru.rc @@ -433,7 +433,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_APP_TITLE "�� " IDC_TASKMGR "�� " - IDS_RUNDLG_CAPTION "Create New Task" + IDS_RUNDLG_CAPTION "�� " END STRINGTABLE DISCARDABLE

1 0

Vitaliy Margolen : dinput: Zero the out buffer.
by Alexandre Julliard July 28, 2008

July 28, 2008

Module: wine Branch: master Commit: aa0188cd6fb9ebe033d35c4808a7b47a70a9da57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa0188cd6fb9ebe033d35c480… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jul 27 09:53:34 2008 -0600 dinput: Zero the out buffer. --- dlls/dinput/device.c | 4 +++- dlls/dinput/device_private.h | 2 +- dlls/dinput/joystick_linux.c | 2 +- dlls/dinput/joystick_linuxinput.c | 2 +- dlls/dinput/keyboard.c | 2 +- dlls/dinput/mouse.c | 2 +- dlls/dinput/tests/keyboard.c | 18 ++++++++++++------ 7 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 54fefbe..7d9f728 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -265,11 +265,13 @@ DWORD get_config_key( HKEY defkey, HKEY appkey, const char *name, } /* Conversion between internal data buffer and external data buffer */ -void fill_DataFormat(void *out, const void *in, const DataFormat *df) { +void fill_DataFormat(void *out, DWORD size, const void *in, const DataFormat *df) +{ int i; const char *in_c = in; char *out_c = (char *) out; + memset(out, 0, size); if (df->dt == NULL) { /* This means that the app uses Wine's internal data format */ memcpy(out, in, df->internal_format_size); diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 9321250..7b62a50 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -76,7 +76,7 @@ extern BOOL get_app_key(HKEY*, HKEY*); extern DWORD get_config_key(HKEY, HKEY, const char*, char*, DWORD); /* Routines to do DataFormat / WineFormat conversions */ -extern void fill_DataFormat(void *out, const void *in, const DataFormat *df) ; +extern void fill_DataFormat(void *out, DWORD size, const void *in, const DataFormat *df) ; extern HRESULT create_DataFormat(LPCDIDATAFORMAT asked_format, DataFormat *format); extern void release_DataFormat(DataFormat *df) ; extern void queue_event(LPDIRECTINPUTDEVICE8A iface, int ofs, DWORD data, DWORD time, DWORD seq); diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 9dead0a..bcac66a 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -767,7 +767,7 @@ static HRESULT WINAPI JoystickAImpl_GetDeviceState( joy_polldev(This); /* convert and copy data to user supplied buffer */ - fill_DataFormat(ptr, &This->js, &This->base.data_format); + fill_DataFormat(ptr, len, &This->js, &This->base.data_format); return DI_OK; } diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index d3f7dc0..a7c9c63 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -802,7 +802,7 @@ static HRESULT WINAPI JoystickAImpl_GetDeviceState( joy_polldev(This); /* convert and copy data to user supplied buffer */ - fill_DataFormat(ptr, &This->js, &This->base.data_format); + fill_DataFormat(ptr, len, &This->js, &This->base.data_format); return DI_OK; } diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index cb290f6..b2c4942 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -283,7 +283,7 @@ static HRESULT WINAPI SysKeyboardAImpl_GetDeviceState( } } - fill_DataFormat(ptr, This->DInputKeyState, &This->base.data_format); + fill_DataFormat(ptr, len, This->DInputKeyState, &This->base.data_format); LeaveCriticalSection(&This->base.crit); return DI_OK; diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 1dc6a03..a361057 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -490,7 +490,7 @@ static HRESULT WINAPI SysMouseAImpl_GetDeviceState( EnterCriticalSection(&This->base.crit); /* Copy the current mouse state */ - fill_DataFormat(ptr, &(This->m_state), &This->base.data_format); + fill_DataFormat(ptr, len, &This->m_state, &This->base.data_format); /* Initialize the buffer when in relative mode */ if (!(This->base.data_format.user_df->dwFlags & DIDF_ABSAXIS)) diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index d427e65..de55d32 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -70,20 +70,21 @@ static void acquire_tests(LPDIRECTINPUT pDI, HWND hwnd) HRESULT hr; LPDIRECTINPUTDEVICE pKeyboard; BYTE kbd_state[256]; - BYTE custom_state[4]; + LONG custom_state[6]; + int i; DIOBJECTDATAFORMAT dodf[] = { - { &GUID_Key, 0, DIDFT_MAKEINSTANCE(DIK_Q)|DIDFT_BUTTON, 0 }, - { &GUID_Key, 1, DIDFT_MAKEINSTANCE(DIK_W)|DIDFT_BUTTON, 0 }, - { &GUID_Key, 2, DIDFT_MAKEINSTANCE(DIK_E)|DIDFT_BUTTON, 0 }, - { &GUID_Key, 3, DIDFT_MAKEINSTANCE(DIK_R)|DIDFT_BUTTON, 0 }, + { &GUID_Key, sizeof(LONG) * 0, DIDFT_MAKEINSTANCE(DIK_Q)|DIDFT_BUTTON, 0 }, + { &GUID_Key, sizeof(LONG) * 1, DIDFT_MAKEINSTANCE(DIK_W)|DIDFT_BUTTON, 0 }, + { &GUID_Key, sizeof(LONG) * 2, DIDFT_MAKEINSTANCE(DIK_E)|DIDFT_BUTTON, 0 }, + { &GUID_Key, sizeof(LONG) * 4, DIDFT_MAKEINSTANCE(DIK_R)|DIDFT_BUTTON, 0 }, }; DIDATAFORMAT df; df.dwSize = sizeof( df ); df.dwObjSize = sizeof( DIOBJECTDATAFORMAT ); df.dwFlags = DIDF_RELAXIS; - df.dwDataSize = sizeof( dodf )/sizeof( dodf[0] ); + df.dwDataSize = sizeof( custom_state ); df.dwNumObjs = sizeof( dodf )/sizeof( dodf[0] ); df.rgodf = dodf; @@ -120,6 +121,11 @@ static void acquire_tests(LPDIRECTINPUT pDI, HWND hwnd) hr = IDirectInputDevice_GetDeviceState(pKeyboard, sizeof(kbd_state), kbd_state); ok(hr == DIERR_INVALIDPARAM, "IDirectInputDevice_GetDeviceState(256,) should have failed: %08x\n", hr); + memset(custom_state, 0x56, sizeof(custom_state)); + IDirectInputDevice_GetDeviceState(pKeyboard, sizeof(custom_state), custom_state); + for (i = 0; i < sizeof(custom_state) / sizeof(custom_state[0]); i++) + ok(custom_state[i] == 0, "Should be zeroed, got 0x%08x\n", custom_state[i]); + if (pKeyboard) IUnknown_Release(pKeyboard); }

1 0

Andrew Talbot : appwiz.cpl: Sign-compare warning fix.
by Alexandre Julliard July 28, 2008

July 28, 2008

Module: wine Branch: master Commit: 0fb6e308388351942b418221b2f60416eeac15b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fb6e308388351942b418221b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jul 26 21:46:45 2008 +0100 appwiz.cpl: Sign-compare warning fix. --- dlls/appwiz.cpl/appwiz.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 6da1a77..7312a27 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -507,7 +507,7 @@ static BOOL AddListViewColumns(HWND hWnd) { WCHAR buf[MAX_STRING_LEN]; LVCOLUMNW lvc; - int i; + UINT i; lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_SUBITEM | LVCF_WIDTH;

1 0

Andrew Talbot : browseui: Sign-compare warning fix.
by Alexandre Julliard July 28, 2008

July 28, 2008

Module: wine Branch: master Commit: ba36068c92aeb8b0f241bc40a401455574d9e90b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba36068c92aeb8b0f241bc40a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jul 26 21:46:42 2008 +0100 browseui: Sign-compare warning fix. --- dlls/browseui/progressdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 3cd522c..307ca28 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -78,7 +78,7 @@ static void set_buffer(LPWSTR *buffer, LPCWSTR string) { static const WCHAR empty_string[] = {0}; IMalloc *malloc; - int cb; + ULONG cb; if (string == NULL) string = empty_string;

1 0

Alexander Nicolaysen Sørnes : shell32: Update Norwegian Bokmål translation.
by Alexandre Julliard July 28, 2008

July 28, 2008

Module: wine Branch: master Commit: 580d0001ab127fe01f148577d05289649e1ee090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=580d0001ab127fe01f148577d… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Jul 28 02:24:49 2008 +0200 shell32: Update Norwegian Bokmål translation. --- dlls/shell32/shell32_No.rc | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/shell32_No.rc b/dlls/shell32/shell32_No.rc index 0a8fc20..82facc0 100644 --- a/dlls/shell32/shell32_No.rc +++ b/dlls/shell32/shell32_No.rc @@ -92,13 +92,13 @@ END MENU_CPANEL MENU BEGIN - POPUP "&File" + POPUP "&Fil" BEGIN MENUITEM SEPARATOR - MENUITEM "E&xit", IDM_CPANEL_EXIT + MENUITEM "&Avslutt", IDM_CPANEL_EXIT END - POPUP "&View" + POPUP "&Vis" BEGIN MENUITEM "&Store ikoner", FCIDM_SHVIEW_BIGICON MENUITEM "&Sm� ikoner", FCIDM_SHVIEW_SMALLICON @@ -106,9 +106,9 @@ BEGIN MENUITEM "&Detaljer", FCIDM_SHVIEW_REPORTVIEW END - POPUP "&Help" + POPUP "&Hjelp" BEGIN - MENUITEM "&About Control Panel...", IDM_CPANEL_ABOUT + MENUITEM "&Om Kontrollpanel...", IDM_CPANEL_ABOUT END END @@ -279,9 +279,9 @@ STRINGTABLE IDS_NEWFOLDER "Ny mappe" - IDS_CPANEL_TITLE "Wine Control Panel" - IDS_CPANEL_NAME "Name" - IDS_CPANEL_DESCRIPTION "Description" + IDS_CPANEL_TITLE "Wine Kontrollpanel" + IDS_CPANEL_NAME "Navn" + IDS_CPANEL_DESCRIPTION "Beskrivelse" } STRINGTABLE

1 0