wine-commits March 2010

wine-commits@winehq.org

3 participants
919 discussions

Nikolay Sivov : shlwapi: Fix mask usage in SHSetWindowBits with tests.
by Alexandre Julliard 01 Mar '10

01 Mar '10

Module: wine Branch: master Commit: 5d74e5753f8167da33cc34ee0522ccaece883453 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d74e5753f8167da33cc34ee0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 27 21:56:30 2010 +0300 shlwapi: Fix mask usage in SHSetWindowBits with tests. --- dlls/shlwapi/ordinal.c | 20 +++--- dlls/shlwapi/tests/Makefile.in | 2 +- dlls/shlwapi/tests/ordinal.c | 136 ++++++++++++++++++++++++++++++++------- 3 files changed, 123 insertions(+), 35 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 315208c..99de394 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -1082,23 +1082,25 @@ HRESULT WINAPI IUnknown_Exec(IUnknown* lpUnknown, REFGUID pguidCmdGroup, * PARAMS * hWnd [I] Window to get value from * offset [I] Offset of value - * wMask [I] Mask for uiFlags - * wFlags [I] Bits to set in window value + * mask [I] Mask for flags + * flags [I] Bits to set in window value * * RETURNS * The new value as it was set, or 0 if any parameter is invalid. * * NOTES - * Any bits set in uiMask are cleared from the value, then any bits set in - * uiFlags are set in the value. + * Only bits specified in mask are affected - set if present in flags and + * reset otherwise. */ -LONG WINAPI SHSetWindowBits(HWND hwnd, INT offset, UINT wMask, UINT wFlags) +LONG WINAPI SHSetWindowBits(HWND hwnd, INT offset, UINT mask, UINT flags) { - LONG ret = GetWindowLongA(hwnd, offset); - LONG newFlags = (wFlags & wMask) | (ret & ~wFlags); + LONG ret = GetWindowLongW(hwnd, offset); + LONG new_flags = (flags & mask) | (ret & ~mask); - if (newFlags != ret) - ret = SetWindowLongA(hwnd, offset, newFlags); + TRACE("%p %d %x %x\n", hwnd, offset, mask, flags); + + if (new_flags != ret) + ret = SetWindowLongW(hwnd, offset, new_flags); return ret; } diff --git a/dlls/shlwapi/tests/Makefile.in b/dlls/shlwapi/tests/Makefile.in index b768317..99aac87 100644 --- a/dlls/shlwapi/tests/Makefile.in +++ b/dlls/shlwapi/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = shlwapi.dll -IMPORTS = shlwapi advapi32 ole32 oleaut32 kernel32 +IMPORTS = shlwapi user32 ole32 oleaut32 advapi32 kernel32 C_SRCS = \ assoc.c \ diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 22437e2..b53d81c 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -43,6 +43,7 @@ static HRESULT(WINAPI *pIConnectionPoint_SimpleInvoke)(IConnectionPoint*,DISPID, static HRESULT(WINAPI *pIConnectionPoint_InvokeWithCancel)(IConnectionPoint*,DISPID,DISPPARAMS*,DWORD,DWORD); static HRESULT(WINAPI *pConnectToConnectionPoint)(IUnknown*,REFIID,BOOL,IUnknown*, LPDWORD,IConnectionPoint **); static HRESULT(WINAPI *pSHPropertyBag_ReadLONG)(IPropertyBag *,LPCWSTR,LPLONG); +static LONG (WINAPI *pSHSetWindowBits)(HWND hwnd, INT offset, UINT wMask, UINT wFlags); static HMODULE hmlang; static HRESULT (WINAPI *pLcidToRfc1766A)(LCID, LPSTR, INT); @@ -1397,31 +1398,116 @@ static void test_SHPropertyBag_ReadLONG(void) IUnknown_Release((IUnknown*)pb); } + + +static void test_SHSetWindowBits(void) +{ + HWND hwnd; + DWORD style, styleold; + WNDCLASSA clsA; + + if(!pSHSetWindowBits) + { + win_skip("SHSetWindowBits is not available\n"); + return; + } + + clsA.style = 0; + clsA.lpfnWndProc = DefWindowProcA; + clsA.cbClsExtra = 0; + clsA.cbWndExtra = 0; + clsA.hInstance = GetModuleHandleA(NULL); + clsA.hIcon = 0; + clsA.hCursor = LoadCursorA(0, IDC_ARROW); + clsA.hbrBackground = NULL; + clsA.lpszMenuName = NULL; + clsA.lpszClassName = "Shlwapi test class"; + RegisterClassA(&clsA); + + hwnd = CreateWindowA("Shlwapi test class", "Test", WS_VISIBLE, 0, 0, 100, 100, + NULL, NULL, GetModuleHandle(NULL), 0); + ok(IsWindow(hwnd), "failed to create window\n"); + + /* null window */ + SetLastError(0xdeadbeef); + style = pSHSetWindowBits(NULL, GWL_STYLE, 0, 0); + ok(style == 0, "expected 0 retval, got %d\n", style); + ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, + "expected ERROR_INVALID_WINDOW_HANDLE, got %d\n", GetLastError()); + + /* zero mask, zero flags */ + styleold = GetWindowLongA(hwnd, GWL_STYLE); + style = pSHSetWindowBits(hwnd, GWL_STYLE, 0, 0); + ok(styleold == style, "expected old style\n"); + ok(styleold == GetWindowLongA(hwnd, GWL_STYLE), "expected to keep old style\n"); + + /* test mask */ + styleold = GetWindowLongA(hwnd, GWL_STYLE); + ok(styleold & WS_VISIBLE, "expected WS_VISIBLE\n"); + style = pSHSetWindowBits(hwnd, GWL_STYLE, WS_VISIBLE, 0); + + ok(style == styleold, "expected previous style, got %x\n", style); + ok((GetWindowLongA(hwnd, GWL_STYLE) & WS_VISIBLE) == 0, "expected updated style\n"); + + /* test mask, unset style bit used */ + styleold = GetWindowLongA(hwnd, GWL_STYLE); + style = pSHSetWindowBits(hwnd, GWL_STYLE, WS_VISIBLE, 0); + ok(style == styleold, "expected previous style, got %x\n", style); + ok(styleold == GetWindowLongA(hwnd, GWL_STYLE), "expected to keep old style\n"); + + /* set back with flags */ + styleold = GetWindowLongA(hwnd, GWL_STYLE); + style = pSHSetWindowBits(hwnd, GWL_STYLE, WS_VISIBLE, WS_VISIBLE); + ok(style == styleold, "expected previous style, got %x\n", style); + ok(GetWindowLongA(hwnd, GWL_STYLE) & WS_VISIBLE, "expected updated style\n"); + + /* reset and try to set without a mask */ + pSHSetWindowBits(hwnd, GWL_STYLE, WS_VISIBLE, 0); + ok((GetWindowLongA(hwnd, GWL_STYLE) & WS_VISIBLE) == 0, "expected updated style\n"); + styleold = GetWindowLongA(hwnd, GWL_STYLE); + style = pSHSetWindowBits(hwnd, GWL_STYLE, 0, WS_VISIBLE); + ok(style == styleold, "expected previous style, got %x\n", style); + ok((GetWindowLongA(hwnd, GWL_STYLE) & WS_VISIBLE) == 0, "expected updated style\n"); + + DestroyWindow(hwnd); + + UnregisterClassA("Shlwapi test class", GetModuleHandleA(NULL)); +} + +static void init_pointers(void) +{ +#define MAKEFUNC(f, ord) (p##f = (void*)GetProcAddress(hShlwapi, (LPSTR)(ord))) + MAKEFUNC(SHAllocShared, 7); + MAKEFUNC(SHLockShared, 8); + MAKEFUNC(SHUnlockShared, 9); + MAKEFUNC(SHFreeShared, 10); + MAKEFUNC(GetAcceptLanguagesA, 14); + MAKEFUNC(SHSetWindowBits, 165); + MAKEFUNC(ConnectToConnectionPoint, 168); + MAKEFUNC(SHSearchMapInt, 198); + MAKEFUNC(SHPackDispParams, 282); + MAKEFUNC(IConnectionPoint_InvokeWithCancel, 283); + MAKEFUNC(IConnectionPoint_SimpleInvoke, 284); + MAKEFUNC(SHPropertyBag_ReadLONG, 496); +#undef MAKEFUNC +} + START_TEST(ordinal) { - hShlwapi = GetModuleHandleA("shlwapi.dll"); - - pGetAcceptLanguagesA = (void*)GetProcAddress(hShlwapi, (LPSTR)14); - pSHSearchMapInt = (void*)GetProcAddress(hShlwapi, (LPSTR)198); - pSHAllocShared=(void*)GetProcAddress(hShlwapi,(char*)7); - pSHLockShared=(void*)GetProcAddress(hShlwapi,(char*)8); - pSHUnlockShared=(void*)GetProcAddress(hShlwapi,(char*)9); - pSHFreeShared=(void*)GetProcAddress(hShlwapi,(char*)10); - pSHPackDispParams=(void*)GetProcAddress(hShlwapi,(char*)282); - pIConnectionPoint_SimpleInvoke=(void*)GetProcAddress(hShlwapi,(char*)284); - pIConnectionPoint_InvokeWithCancel=(void*)GetProcAddress(hShlwapi,(char*)283); - pConnectToConnectionPoint=(void*)GetProcAddress(hShlwapi,(char*)168); - pSHPropertyBag_ReadLONG=(void*)GetProcAddress(hShlwapi,(char*)496); - - hmlang = LoadLibraryA("mlang.dll"); - pLcidToRfc1766A = (void *)GetProcAddress(hmlang, "LcidToRfc1766A"); - - test_GetAcceptLanguagesA(); - test_SHSearchMapInt(); - test_alloc_shared(); - test_fdsa(); - test_GetShellSecurityDescriptor(); - test_SHPackDispParams(); - test_IConnectionPoint(); - test_SHPropertyBag_ReadLONG(); + hShlwapi = GetModuleHandleA("shlwapi.dll"); + + init_pointers(); + + hmlang = LoadLibraryA("mlang.dll"); + pLcidToRfc1766A = (void *)GetProcAddress(hmlang, "LcidToRfc1766A"); + + test_GetAcceptLanguagesA(); + test_SHSearchMapInt(); + test_alloc_shared(); + test_fdsa(); + test_GetShellSecurityDescriptor(); + test_SHPackDispParams(); + test_IConnectionPoint(); + test_SHPropertyBag_ReadLONG(); + test_SHSetWindowBits(); }

1 0

Jeff Latimer : usp10: Fix trace to remove an incorrect assignment.
by Alexandre Julliard 01 Mar '10

01 Mar '10

Module: wine Branch: master Commit: d970ea7fd72f729c0203a3c83258e4cb1586480f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d970ea7fd72f729c0203a3c83… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Sun Feb 28 22:58:44 2010 +1100 usp10: Fix trace to remove an incorrect assignment. --- dlls/usp10/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 523bd4f..a8ae4ce 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -604,7 +604,7 @@ HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItem * checks the n+1 structure */ memset(&pItems[index+1].a, 0, sizeof(SCRIPT_ANALYSIS)); - TRACE("index=%d cnt=%d iCharPos=%d\n", index+1, cnt, pItems[index+1].iCharPos = cnt); + TRACE("index=%d cnt=%d iCharPos=%d\n", index+1, cnt, pItems[index+1].iCharPos); /* Set one SCRIPT_STATE item being returned */ if (pcItems) *pcItems = index + 1;

1 0

Maarten Lankhorst : mmdevapi: Implement a stub of MMDevice.
by Alexandre Julliard 01 Mar '10

01 Mar '10

Module: wine Branch: master Commit: 9924b40eb99e13a653f9d2a32d26d97abc5de06c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9924b40eb99e13a653f9d2a32… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Feb 21 13:50:42 2010 +0100 mmdevapi: Implement a stub of MMDevice. --- dlls/mmdevapi/Makefile.in | 2 +- dlls/mmdevapi/devenum.c | 267 ++++++++++++++++++++++++++++++++++++++++++--- dlls/mmdevapi/main.c | 7 + dlls/mmdevapi/mmdevapi.h | 12 ++ 4 files changed, 269 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9924b40eb99e13a653f9d…

1 0

Maarten Lankhorst : include: Add devpkey.h.
by Alexandre Julliard 01 Mar '10

01 Mar '10

Module: wine Branch: master Commit: 63bb47e360ae7f16a66c80b412569b06232b2dfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=63bb47e360ae7f16a66c80b41… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Jan 31 20:28:30 2010 +0100 include: Add devpkey.h. --- include/Makefile.in | 1 + include/devpkey.h | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 8849b52..f809a87 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -204,6 +204,7 @@ SRCDIR_INCLUDES = \ ddrawi.h \ devenum.idl \ devguid.h \ + devpkey.h \ devpropdef.h \ digitalv.h \ dinput.h \ diff --git a/include/devpkey.h b/include/devpkey.h new file mode 100644 index 0000000..04d68de --- /dev/null +++ b/include/devpkey.h @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2010 Maarten Lankhorst for 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 + */ + +#include <devpropdef.h> + +/* TODO: Not all DEVPROPKEYS have been defined here */ + +DEFINE_DEVPROPKEY(DEVPKEY_NAME, 0xb725f130,0x47ef,0x101a,0xa5,0xf1,0x02,0x60,0x8c,0x9e,0xeb,0xac, 10); + +DEFINE_DEVPROPKEY(DEVPKEY_Device_DeviceDesc, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 2); +DEFINE_DEVPROPKEY(DEVPKEY_Device_HardwareIds, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 3); +DEFINE_DEVPROPKEY(DEVPKEY_Device_CompatibleIds, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 4); +DEFINE_DEVPROPKEY(DEVPKEY_Device_Service, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 6); +DEFINE_DEVPROPKEY(DEVPKEY_Device_Class, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 9); +DEFINE_DEVPROPKEY(DEVPKEY_Device_ClassGuid, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 10); +DEFINE_DEVPROPKEY(DEVPKEY_Device_Driver, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 11); +DEFINE_DEVPROPKEY(DEVPKEY_Device_ConfigFlags, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 12); +DEFINE_DEVPROPKEY(DEVPKEY_Device_Manufacturer, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 13); +DEFINE_DEVPROPKEY(DEVPKEY_Device_FriendlyName, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 14); +DEFINE_DEVPROPKEY(DEVPKEY_Device_LocationInfo, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 15); +DEFINE_DEVPROPKEY(DEVPKEY_Device_PDOName, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 16); +DEFINE_DEVPROPKEY(DEVPKEY_Device_Capabilities, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 17); +DEFINE_DEVPROPKEY(DEVPKEY_Device_UINumber, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 18); +DEFINE_DEVPROPKEY(DEVPKEY_Device_UpperFilters, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 19); +DEFINE_DEVPROPKEY(DEVPKEY_Device_LowerFilters, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 20); +DEFINE_DEVPROPKEY(DEVPKEY_Device_BusTypeGuid, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 21); +DEFINE_DEVPROPKEY(DEVPKEY_Device_LegacyBusType, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 22); +DEFINE_DEVPROPKEY(DEVPKEY_Device_BusNumber, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 23); +DEFINE_DEVPROPKEY(DEVPKEY_Device_EnumeratorName, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 24); +DEFINE_DEVPROPKEY(DEVPKEY_Device_Security, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 25); +DEFINE_DEVPROPKEY(DEVPKEY_Device_SecuritySDS, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 26); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DevType, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 27); +DEFINE_DEVPROPKEY(DEVPKEY_Device_Exclusive, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 28); +DEFINE_DEVPROPKEY(DEVPKEY_Device_Characteristics, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 29); +DEFINE_DEVPROPKEY(DEVPKEY_Device_Address, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 30); +DEFINE_DEVPROPKEY(DEVPKEY_Device_UINumberDescFormat, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 31); +DEFINE_DEVPROPKEY(DEVPKEY_Device_PowerData, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 32); +DEFINE_DEVPROPKEY(DEVPKEY_Device_RemovalPolicy, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 33); +DEFINE_DEVPROPKEY(DEVPKEY_Device_RemovalPolicyDefault, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 34); +DEFINE_DEVPROPKEY(DEVPKEY_Device_RemovalPolicyOverride, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 35); +DEFINE_DEVPROPKEY(DEVPKEY_Device_InstallState, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 36); +DEFINE_DEVPROPKEY(DEVPKEY_Device_LocationPaths, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 37); +DEFINE_DEVPROPKEY(DEVPKEY_Device_BaseContainerId, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 38);

1 0

Maarten Lankhorst : include: Add devpropdev.h.
by Alexandre Julliard 01 Mar '10

01 Mar '10

Module: wine Branch: master Commit: ae9f9fa25ea1e1a600bfb059fc6b04c8306151e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae9f9fa25ea1e1a600bfb059f… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Jan 31 20:27:46 2010 +0100 include: Add devpropdev.h. --- include/Makefile.in | 1 + include/devpropdef.h | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 514cebe..8849b52 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -204,6 +204,7 @@ SRCDIR_INCLUDES = \ ddrawi.h \ devenum.idl \ devguid.h \ + devpropdef.h \ digitalv.h \ dinput.h \ dispdib.h \ diff --git a/include/devpropdef.h b/include/devpropdef.h new file mode 100644 index 0000000..5eed9e7 --- /dev/null +++ b/include/devpropdef.h @@ -0,0 +1,105 @@ +/* + * Copyright (C) 2010 Maarten Lankhorst for 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 + */ + +#ifndef _DEVPROPDEF_H_ +#define _DEVPROPDEF_H_ + +typedef ULONG DEVPROPTYPE, *PDEVPROPTYPE; + +#define DEVPROP_TYPEMOD_ARRAY 0x1000 +#define DEVPROP_TYPEMOD_LIST 0x2000 +#define MAX_DEVPROP_TYPEMOD DEVPROP_TYPEMOD_LIST + +#define DEVPROP_TYPE_EMPTY 0x00 +#define DEVPROP_TYPE_NULL 0x01 +#define DEVPROP_TYPE_SBYTE 0x02 +#define DEVPROP_TYPE_BYTE 0x03 +#define DEVPROP_TYPE_INT16 0x04 +#define DEVPROP_TYPE_UINT16 0x05 +#define DEVPROP_TYPE_INT32 0x06 +#define DEVPROP_TYPE_UINT32 0x07 +#define DEVPROP_TYPE_INT64 0x08 +#define DEVPROP_TYPE_UINT64 0x09 +#define DEVPROP_TYPE_FLOAT 0x0a +#define DEVPROP_TYPE_DOUBLE 0x0b +#define DEVPROP_TYPE_DECIMAL 0x0c +#define DEVPROP_TYPE_GUID 0x0d +#define DEVPROP_TYPE_CURRENCY 0x0e +#define DEVPROP_TYPE_DATE 0x0f +#define DEVPROP_TYPE_FILETIME 0x10 +#define DEVPROP_TYPE_BOOLEAN 0x11 +#define DEVPROP_TYPE_STRING 0x12 +#define DEVPROP_TYPE_STRING_LIST (DEVPROP_TYPE_STRING|DEVPROP_TYPEMOD_LIST) +#define DEVPROP_TYPE_SECURITY_DESCRIPTOR 0x13 +#define DEVPROP_TYPE_SECURITY_DESCRIPTOR_STRING 0x14 +#define DEVPROP_TYPE_DEVPROPKEY 0x15 +#define DEVPROP_TYPE_DEVPROPTYPE 0x16 +#define DEVPROP_TYPE_BINARY (DEVPROP_TYPE_BYTE|DEVPROP_TYPEMOD_ARRAY) +#define DEVPROP_TYPE_ERROR 0x17 +#define DEVPROP_TYPE_NTSTATUS 0x18 +#define DEVPROP_TYPE_STRING_INDIRECT 0x19 +#define MAX_DEVPROP_TYPE DEVPROP_TYPE_STRING_INDIRECT + +#define DEVPROP_MASK_TYPE 0x0fff +#define DEVPROP_MASK_TYPEMOD 0xf000 + +typedef CHAR DEVPROP_BOOLEAN, *PDEVPROP_BOOLEAN; +#define DEVPROP_TRUE ((DEVPROP_BOOLEAN)-1) +#define DEVPROP_FALSE ((DEVPROP_BOOLEAN)0) + +#ifndef DEVPROPKEY_DEFINED +#define DEVPROPKEY_DEFINED +typedef GUID DEVPROPGUID, *PDEVPROPGUID; +typedef ULONG DEVPROPID, *PDEVPROPID; + +typedef struct _DEVPROPKEY { + DEVPROPGUID fmtid; + DEVPROPID pid; +} DEVPROPKEY, *PDEVPROPKEY; + +#define DEVPROPID_FIRST_USABLE 2 + +#endif /*DEVPROPKEY_DEFINED*/ + +#endif /*_DEVPROPDEF_H_*/ + +#undef DEFINE_DEVPROPKEY +#ifdef INITGUID +#ifdef __cplusplus +#define DEFINE_DEVPROPKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ + EXTERN_C const DEVPROPKEY name DECLSPEC_HIDDEN DECLSPEC_SELECTANY; \ + EXTERN_C const DEVPROPKEY name = \ + { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }, pid } +#else +#define DEFINE_DEVPROPKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ + const DEVPROPKEY name DECLSPEC_HIDDEN DECLSPEC_SELECTANY; \ + const DEVPROPKEY name = \ + { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }, pid } +#endif +#else +#define DEFINE_DEVPROPKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ + EXTERN_C const DEVPROPKEY name DECLSPEC_HIDDEN DECLSPEC_SELECTANY +#endif + +#ifndef IsEqualDevPropKey +#ifdef __cplusplus +#define IsEqualDevPropKey(a,b) (((a).pid == (b).pid) && IsEqualIID((a).fmtid,(b).fmtid)) +#else +#define IsEqualDevPropKey(a,b) (((a).pid == (b).pid) && IsEqualIID(&(a).fmtid,&(b).fmtid)) +#endif +#endif

1 0

Maarten Lankhorst : include: Fix IsEqualPropertyKey definition.
by Alexandre Julliard 01 Mar '10

01 Mar '10

Module: wine Branch: master Commit: f6efdd40d8846ea7cc5dd2040bc8c97fad09b90b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6efdd40d8846ea7cc5dd2040… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Jan 29 21:51:41 2010 +0100 include: Fix IsEqualPropertyKey definition. --- include/propkeydef.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/propkeydef.h b/include/propkeydef.h index 2a45984..b3a2559 100644 --- a/include/propkeydef.h +++ b/include/propkeydef.h @@ -48,7 +48,11 @@ #endif #ifndef IsEqualPropertyKey +#ifdef __cplusplus #define IsEqualPropertyKey(a,b) (((a).pid == (b).pid) && IsEqualIID((a).fmtid,(b).fmtid)) +#else +#define IsEqualPropertyKey(a,b) (((a).pid == (b).pid) && IsEqualIID(&(a).fmtid,&(b).fmtid)) +#endif #endif #ifndef _PROPERTYKEY_EQUALITY_OPERATORS_

1 0

Alexandre Julliard : makefiles: Fix makedep dependency now that we explicitly to make depend when creating makefiles .
by Alexandre Julliard 01 Mar '10

01 Mar '10

Module: wine Branch: master Commit: 877e31c10f9d5fc74fb4eb613ee259874e5249a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=877e31c10f9d5fc74fb4eb613… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 1 11:35:37 2010 +0100 makefiles: Fix makedep dependency now that we explicitly to make depend when creating makefiles. --- tools/Makefile.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/Makefile.in b/tools/Makefile.in index 2f6eaca..1f48cbc 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -83,6 +83,6 @@ uninstall:: $(RM) $(DESTDIR)$(bindir)/winemaker $(DESTDIR)$(bindir)/wineprefixcreate $(DESTDIR)$(mandir)/man$(prog_manext)/winemaker.$(prog_manext) $(DESTDIR)$(mandir)/man$(prog_manext)/wineprefixcreate.$(prog_manext) $(DESTDIR)$(datadir)/wine/wine.inf $(DESTDIR)$(datadir)/applications/wine.desktop -$(UPDATE_DESKTOP_DATABASE) -@DEPENDENCIES@ # everything below this line is overwritten by make depend +depend: makedep$(EXEEXT) -Makefile: makedep$(EXEEXT) +@DEPENDENCIES@ # everything below this line is overwritten by make depend

1 0

Alexandre Julliard : kernel32: Move shared heap creation to krnl386 and load it by default on Win9x versions .
by Alexandre Julliard 01 Mar '10

01 Mar '10

Module: wine Branch: master Commit: 00ac7074df65a0abd7e0ee962c570e2da30349e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00ac7074df65a0abd7e0ee962… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 1 11:34:34 2010 +0100 kernel32: Move shared heap creation to krnl386 and load it by default on Win9x versions. --- dlls/kernel32/kernel_main.c | 8 +------- dlls/krnl386.exe16/kernel.c | 3 +++ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index cf73052..2308d60 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -123,13 +123,7 @@ static BOOL process_attach( HMODULE module ) /* Securom checks for this one when version is NT */ set_entry_point( module, "FT_Thunk", 0 ); } -#ifdef __i386__ - else - { - /* create the shared heap for broken win95 native dlls */ - HeapCreate( HEAP_SHARED, 0, 0 ); - } -#endif + else LoadLibraryA( "krnl386.exe16" ); /* finish the process initialisation for console bits, if needed */ __wine_set_signal_handler(SIGINT, CONSOLE_HandleCtrlC); diff --git a/dlls/krnl386.exe16/kernel.c b/dlls/krnl386.exe16/kernel.c index b6fbbcb..7658549 100644 --- a/dlls/krnl386.exe16/kernel.c +++ b/dlls/krnl386.exe16/kernel.c @@ -95,6 +95,9 @@ BOOL WINAPI KERNEL_DllEntryPoint( DWORD reasion, HINSTANCE16 inst, WORD ds, if (done) return TRUE; done = 1; + /* create the shared heap for broken win95 native dlls */ + HeapCreate( HEAP_SHARED, 0, 0 ); + /* setup emulation of protected instructions from 32-bit code */ if (GetVersion() & 0x80000000) RtlAddVectoredExceptionHandler( TRUE, INSTR_vectored_handler );

1 0

Nikolay Sivov : kernel32/lcformat: Get rid of back jumps on errors.
by Alexandre Julliard 01 Mar '10

01 Mar '10

Module: wine Branch: master Commit: 464ece6474c4c06404b2ca80f6538f3c6edf55cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=464ece6474c4c06404b2ca80f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 1 01:22:28 2010 +0300 kernel32/lcformat: Get rid of back jumps on errors. --- dlls/kernel32/lcformat.c | 68 +++++++++++++++++++++++++++------------------ 1 files changed, 41 insertions(+), 27 deletions(-) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index 99d1c46..b6432f8 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -756,7 +756,6 @@ static INT NLS_GetDateTimeFormatA(LCID lcid, DWORD dwFlags, if (NLS_IsUnicodeOnlyLcid(lcid)) { -GetDateTimeFormatA_InvalidParameter: SetLastError(ERROR_INVALID_PARAMETER); return 0; } @@ -765,7 +764,11 @@ GetDateTimeFormatA_InvalidParameter: { const NLS_FORMAT_NODE *node = NLS_GetFormats(lcid, dwFlags); if (!node) - goto GetDateTimeFormatA_InvalidParameter; + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + cp = node->dwCodePage; } @@ -967,7 +970,6 @@ INT WINAPI GetNumberFormatA(LCID lcid, DWORD dwFlags, if (NLS_IsUnicodeOnlyLcid(lcid)) { -GetNumberFormatA_InvalidParameter: SetLastError(ERROR_INVALID_PARAMETER); return 0; } @@ -976,7 +978,11 @@ GetNumberFormatA_InvalidParameter: { const NLS_FORMAT_NODE *node = NLS_GetFormats(lcid, dwFlags); if (!node) - goto GetNumberFormatA_InvalidParameter; + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + cp = node->dwCodePage; } @@ -1048,9 +1054,7 @@ INT WINAPI GetNumberFormatW(LCID lcid, DWORD dwFlags, !IsValidLocale(lcid, 0) || (lpFormat && (dwFlags || !lpFormat->lpDecimalSep || !lpFormat->lpThousandSep))) { -GetNumberFormatW_Error: - SetLastError(lpFormat && dwFlags ? ERROR_INVALID_FLAGS : ERROR_INVALID_PARAMETER); - return 0; + goto error; } if (!lpFormat) @@ -1058,7 +1062,7 @@ GetNumberFormatW_Error: const NLS_FORMAT_NODE *node = NLS_GetFormats(lcid, dwFlags); if (!node) - goto GetNumberFormatW_Error; + goto error; lpFormat = &node->fmt; lpszNegStart = lpszNeg = GetNegative(node); } @@ -1089,23 +1093,23 @@ GetNumberFormatW_Error: else if (*szSrc == '-') { if (dwState) - goto GetNumberFormatW_Error; /* '-' not first character */ + goto error; /* '-' not first character */ dwState |= NF_ISNEGATIVE; } else if (*szSrc == '.') { if (dwState & NF_ISREAL) - goto GetNumberFormatW_Error; /* More than one '.' */ + goto error; /* More than one '.' */ dwState |= NF_ISREAL; } else - goto GetNumberFormatW_Error; /* Invalid char */ + goto error; /* Invalid char */ szSrc++; } szSrc--; /* Point to last character */ if (!(dwState & NF_DIGITS)) - goto GetNumberFormatW_Error; /* No digits */ + goto error; /* No digits */ /* Add any trailing negative sign */ if (dwState & NF_ISNEGATIVE) @@ -1263,6 +1267,10 @@ GetNumberFormatW_Error: } } return iRet; + +error: + SetLastError(lpFormat && dwFlags ? ERROR_INVALID_FLAGS : ERROR_INVALID_PARAMETER); + return 0; } /************************************************************************** @@ -1307,7 +1315,6 @@ INT WINAPI GetCurrencyFormatA(LCID lcid, DWORD dwFlags, if (NLS_IsUnicodeOnlyLcid(lcid)) { -GetCurrencyFormatA_InvalidParameter: SetLastError(ERROR_INVALID_PARAMETER); return 0; } @@ -1316,7 +1323,11 @@ GetCurrencyFormatA_InvalidParameter: { const NLS_FORMAT_NODE *node = NLS_GetFormats(lcid, dwFlags); if (!node) - goto GetCurrencyFormatA_InvalidParameter; + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + cp = node->dwCodePage; } @@ -1416,9 +1427,7 @@ INT WINAPI GetCurrencyFormatW(LCID lcid, DWORD dwFlags, !lpFormat->lpCurrencySymbol || lpFormat->NegativeOrder > 15 || lpFormat->PositiveOrder > 3))) { -GetCurrencyFormatW_Error: - SetLastError(lpFormat && dwFlags ? ERROR_INVALID_FLAGS : ERROR_INVALID_PARAMETER); - return 0; + goto error; } if (!lpFormat) @@ -1426,7 +1435,8 @@ GetCurrencyFormatW_Error: const NLS_FORMAT_NODE *node = NLS_GetFormats(lcid, dwFlags); if (!node) - goto GetCurrencyFormatW_Error; + goto error; + lpFormat = &node->cyfmt; lpszNegStart = lpszNeg = GetNegative(node); } @@ -1459,23 +1469,23 @@ GetCurrencyFormatW_Error: else if (*szSrc == '-') { if (dwState) - goto GetCurrencyFormatW_Error; /* '-' not first character */ + goto error; /* '-' not first character */ dwState |= NF_ISNEGATIVE; } else if (*szSrc == '.') { if (dwState & NF_ISREAL) - goto GetCurrencyFormatW_Error; /* More than one '.' */ + goto error; /* More than one '.' */ dwState |= NF_ISREAL; } else - goto GetCurrencyFormatW_Error; /* Invalid char */ + goto error; /* Invalid char */ szSrc++; } szSrc--; /* Point to last character */ if (!(dwState & NF_DIGITS)) - goto GetCurrencyFormatW_Error; /* No digits */ + goto error; /* No digits */ if (dwState & NF_ISNEGATIVE) dwFmt = NLS_NegCyFormats[lpFormat->NegativeOrder]; @@ -1650,6 +1660,10 @@ GetCurrencyFormatW_Error: } } return iRet; + +error: + SetLastError(lpFormat && dwFlags ? ERROR_INVALID_FLAGS : ERROR_INVALID_PARAMETER); + return 0; } /* FIXME: Everything below here needs to move somewhere else along with the @@ -1949,7 +1963,7 @@ static BOOL NLS_EnumCalendarInfoAW(void *calinfoproc, LCID locale, if (opt == NULL) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto NLS_EnumCalendarInfoAW_Cleanup; + goto cleanup; } if (GetLocaleInfoW(locale, LOCALE_IOPTIONALCALENDAR, opt, optSz)) iter = opt; @@ -1976,14 +1990,14 @@ static BOOL NLS_EnumCalendarInfoAW(void *calinfoproc, LCID locale, if (bufSz >= newSz) { ERR("Buffer resizing disorder: was %d, requested %d.\n", bufSz, newSz); - goto NLS_EnumCalendarInfoAW_Cleanup; + goto cleanup; } bufSz = newSz; WARN("Buffer too small; resizing to %d bytes.\n", bufSz); buf = HeapReAlloc(GetProcessHeap(), 0, buf, bufSz); if (buf == NULL) - goto NLS_EnumCalendarInfoAW_Cleanup; - } else goto NLS_EnumCalendarInfoAW_Cleanup; + goto cleanup; + } else goto cleanup; } } while (!ret); @@ -2017,7 +2031,7 @@ static BOOL NLS_EnumCalendarInfoAW(void *calinfoproc, LCID locale, } } -NLS_EnumCalendarInfoAW_Cleanup: +cleanup: HeapFree(GetProcessHeap(), 0, opt); HeapFree(GetProcessHeap(), 0, buf); return ret;

1 0

Michael Stefaniuc : oleaut32: Remove superfluous NULL check before HeapFree (Smatch).
by Alexandre Julliard 01 Mar '10

01 Mar '10

Module: wine Branch: master Commit: 400fb552198335c1314bf49f0ae983a1357029e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=400fb552198335c1314bf49f0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Feb 28 21:48:09 2010 +0100 oleaut32: Remove superfluous NULL check before HeapFree (Smatch). --- dlls/oleaut32/typelib2.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index de84e4a..4544317 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -3141,8 +3141,7 @@ static void WINAPI ITypeInfo2_fnReleaseTypeAttr( { TRACE("(%p,%p)\n", iface, pTypeAttr); - if(pTypeAttr) - HeapFree(GetProcessHeap(), 0, pTypeAttr); + HeapFree(GetProcessHeap(), 0, pTypeAttr); } /******************************************************************************

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 2010