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

Christian Costa : d3dxof: Remove wrong description.
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: b30509fc0c696ccb4e5aa9f14d1df59c2e4f92c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b30509fc0c696ccb4e5aa9f14… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Mar 1 09:36:31 2010 +0100 d3dxof: Remove wrong description. --- dlls/d3dxof/d3dxof.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 4d183d6..d385e0d 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -3,9 +3,6 @@ * * Copyright 2004, 2008 Christian Costa * - * This file contains the (internal) driver registration functions, - * driver enumeration APIs and DirectDraw creation functions. - * * 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

1 0

Maarten Lankhorst : include: Fix IsEqualPropertyKey definition.
by Alexandre Julliard March 1, 2010

March 1, 2010

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

Nikolay Sivov : shlwapi: Implement SHFormatDateTimeA/ SHFormatDateTimeW with tests.
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: cf663d17e7121d22cc2b6d0fcdcab40bb3122c8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf663d17e7121d22cc2b6d0fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 1 01:10:24 2010 +0300 shlwapi: Implement SHFormatDateTimeA/SHFormatDateTimeW with tests. --- dlls/shlwapi/ordinal.c | 75 +++++++++-- dlls/shlwapi/tests/ordinal.c | 307 +++++++++++++++++++++++++++++++++++++++++- include/shlwapi.h | 11 ++ 3 files changed, 381 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf663d17e7121d22cc2b6…

1 0

Maarten Lankhorst : include: Add devpkey.h.
by Alexandre Julliard March 1, 2010

March 1, 2010

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

Nikolay Sivov : shlwapi: Fix mask usage in SHSetWindowBits with tests.
by Alexandre Julliard March 1, 2010

March 1, 2010

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

Alexandre Julliard : kernel32: Move shared heap creation to krnl386 and load it by default on Win9x versions .
by Alexandre Julliard March 1, 2010

March 1, 2010

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

Alexandre Julliard : makefiles: Fix makedep dependency now that we explicitly to make depend when creating makefiles .
by Alexandre Julliard March 1, 2010

March 1, 2010

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) -(a)DEPENDENCIES@ # everything below this line is overwritten by make depend +depend: makedep$(EXEEXT) -Makefile: makedep$(EXEEXT) +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend

1 0

Maarten Lankhorst : mmdevapi: Implement a stub of MMDevice.
by Alexandre Julliard March 1, 2010

March 1, 2010

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

Christian Costa : d3dxof: Fix file types checks + tests.
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: aed6a4a4f89182b193e3492919406825f715c3a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aed6a4a4f89182b193e349291… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Mar 1 09:36:25 2010 +0100 d3dxof: Fix file types checks + tests. --- dlls/d3dxof/d3dxof.c | 39 ++++++++++++++------ dlls/d3dxof/tests/d3dxof.c | 82 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 12 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index eccdf98..4d183d6 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -42,6 +42,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dxof); #define XOFFILE_FORMAT_VERSION_303 MAKEFOUR('0','3','0','3') #define XOFFILE_FORMAT_BINARY MAKEFOUR('b','i','n',' ') #define XOFFILE_FORMAT_TEXT MAKEFOUR('t','x','t',' ') +#define XOFFILE_FORMAT_BINARY_MSZIP MAKEFOUR('b','z','i','p') +#define XOFFILE_FORMAT_TEXT_MSZIP MAKEFOUR('t','z','i','p') #define XOFFILE_FORMAT_COMPRESSED MAKEFOUR('c','m','p',' ') #define XOFFILE_FORMAT_FLOAT_BITS_32 MAKEFOUR('0','0','3','2') #define XOFFILE_FORMAT_FLOAT_BITS_64 MAKEFOUR('0','0','6','4') @@ -58,6 +60,15 @@ static HRESULT IDirectXFileDataReferenceImpl_Create(IDirectXFileDataReferenceImp static HRESULT IDirectXFileEnumObjectImpl_Create(IDirectXFileEnumObjectImpl** ppObj); static HRESULT IDirectXFileSaveObjectImpl_Create(IDirectXFileSaveObjectImpl** ppObj); +/* FOURCC to string conversion for debug messages */ +const char *debugstr_fourcc(DWORD fourcc) +{ + if (!fourcc) return "'null'"; + return wine_dbg_sprintf ("\'%c%c%c%c\'", + (char)(fourcc), (char)(fourcc >> 8), + (char)(fourcc >> 16), (char)(fourcc >> 24)); +} + HRESULT IDirectXFileImpl_Create(IUnknown* pUnkOuter, LPVOID* ppObj) { IDirectXFileImpl* object; @@ -247,16 +258,18 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV goto error; } - if ((header[2] != XOFFILE_FORMAT_BINARY) && (header[2] != XOFFILE_FORMAT_TEXT) && (header[2] != XOFFILE_FORMAT_COMPRESSED)) + if ((header[2] != XOFFILE_FORMAT_BINARY) && (header[2] != XOFFILE_FORMAT_TEXT) && + (header[2] != XOFFILE_FORMAT_BINARY_MSZIP) && (header[2] != XOFFILE_FORMAT_TEXT_MSZIP)) { + WARN("File type %s unknown\n", debugstr_fourcc(header[2])); hr = DXFILEERR_BADFILETYPE; goto error; } - if (header[2] == XOFFILE_FORMAT_COMPRESSED) + if ((header[2] == XOFFILE_FORMAT_BINARY_MSZIP) || (header[2] == XOFFILE_FORMAT_TEXT_MSZIP)) { - FIXME("Compressed formats not supported yet\n"); - hr = DXFILEERR_BADVALUE; + FIXME("Compressed format %s not supported yet\n", debugstr_fourcc(header[2])); + hr = DXFILEERR_BADALLOC; goto error; } @@ -381,20 +394,22 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP read_bytes(&buf, &token_header, 4); - if ((token_header != XOFFILE_FORMAT_BINARY) && (token_header != XOFFILE_FORMAT_TEXT) && (token_header != XOFFILE_FORMAT_COMPRESSED)) - return DXFILEERR_BADFILETYPE; - - if (token_header == XOFFILE_FORMAT_TEXT) + if ((token_header != XOFFILE_FORMAT_BINARY) && (token_header != XOFFILE_FORMAT_TEXT) && + (token_header != XOFFILE_FORMAT_BINARY_MSZIP) && (token_header != XOFFILE_FORMAT_TEXT_MSZIP)) { - buf.txt = TRUE; + WARN("File type %s unknown\n", debugstr_fourcc(token_header)); + return DXFILEERR_BADFILETYPE; } - if (token_header == XOFFILE_FORMAT_COMPRESSED) + if ((token_header == XOFFILE_FORMAT_BINARY_MSZIP) || (token_header == XOFFILE_FORMAT_TEXT_MSZIP)) { - FIXME("Compressed formats not supported yet\n"); - return DXFILEERR_BADVALUE; + FIXME("Compressed format %s not supported yet\n", debugstr_fourcc(token_header)); + return DXFILEERR_BADALLOC; } + if (token_header == XOFFILE_FORMAT_TEXT) + buf.txt = TRUE; + read_bytes(&buf, &token_header, 4); if ((token_header != XOFFILE_FORMAT_FLOAT_BITS_32) && (token_header != XOFFILE_FORMAT_FLOAT_BITS_64)) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index dd1abca..1198229 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -53,6 +53,13 @@ char object[] = "1; 2; 3;\n" "}\n"; +char empty_txt_file[] = "xof 0302txt 0064"; +char empty_bin_file[] = "xof 0302bin 0064"; +char empty_tzip_file[] = "xof 0302tzip0064"; +char empty_bzip_file[] = "xof 0302bzip0064"; +char empty_cmp_file[] = "xof 0302cmp 0064"; +char empty_xxxx_file[] = "xof 0302xxxx0064"; + static void init_function_pointers(void) { /* We have to use LoadLibrary as no d3dxof functions are referenced directly */ @@ -190,6 +197,80 @@ static void test_CreateEnumObject(void) ok(ref == 0, "Got refcount %d, expected 0\n", ref); } +static void test_file_types(void) +{ + HRESULT hr; + LPDIRECTXFILE dxfile = NULL; + LPDIRECTXFILEENUMOBJECT enum_object; + DXFILELOADMEMORY lminfo; + + if (!pDirectXFileCreate) + { + win_skip("DirectXFileCreate is not available\n"); + return; + } + + hr = pDirectXFileCreate(&dxfile); + ok(hr == DXFILE_OK, "DirectXFileCreate: %x\n", hr); + if (!dxfile) + { + skip("Couldn't create DirectXFile interface\n"); + return; + } + + hr = IDirectXFile_RegisterTemplates(dxfile, empty_txt_file, strlen(empty_txt_file)); + ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + + hr = IDirectXFile_RegisterTemplates(dxfile, empty_bin_file, strlen(empty_bin_file)); + ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + + hr = IDirectXFile_RegisterTemplates(dxfile, empty_tzip_file, strlen(empty_tzip_file)); + ok(hr == DXFILEERR_BADALLOC, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + + hr = IDirectXFile_RegisterTemplates(dxfile, empty_bzip_file, strlen(empty_bzip_file)); + ok(hr == DXFILEERR_BADALLOC, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + + hr = IDirectXFile_RegisterTemplates(dxfile, empty_cmp_file, strlen(empty_cmp_file)); + ok(hr == DXFILEERR_BADFILETYPE, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + + hr = IDirectXFile_RegisterTemplates(dxfile, empty_xxxx_file, strlen(empty_xxxx_file)); + ok(hr == DXFILEERR_BADFILETYPE, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + + lminfo.lpMemory = empty_txt_file; + lminfo.dSize = strlen(empty_txt_file); + hr = IDirectXFile_CreateEnumObject(dxfile, &lminfo, DXFILELOAD_FROMMEMORY, &enum_object); + ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); + if (hr == DXFILE_OK) IDirectXFileEnumObject_Release(enum_object); + + lminfo.lpMemory = empty_bin_file; + lminfo.dSize = strlen(empty_bin_file); + hr = IDirectXFile_CreateEnumObject(dxfile, &lminfo, DXFILELOAD_FROMMEMORY, &enum_object); + ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); + if (hr == DXFILE_OK) IDirectXFileEnumObject_Release(enum_object); + + lminfo.lpMemory = empty_tzip_file; + lminfo.dSize = strlen(empty_tzip_file); + hr = IDirectXFile_CreateEnumObject(dxfile, &lminfo, DXFILELOAD_FROMMEMORY, &enum_object); + ok(hr == DXFILEERR_BADALLOC, "IDirectXFile_CreateEnumObject: %x\n", hr); + + lminfo.lpMemory = empty_bzip_file; + lminfo.dSize = strlen(empty_bzip_file); + hr = IDirectXFile_CreateEnumObject(dxfile, &lminfo, DXFILELOAD_FROMMEMORY, &enum_object); + ok(hr == DXFILEERR_BADALLOC, "IDirectXFile_CreateEnumObject: %x\n", hr); + + lminfo.lpMemory = empty_cmp_file; + lminfo.dSize = strlen(empty_cmp_file); + hr = IDirectXFile_CreateEnumObject(dxfile, &lminfo, DXFILELOAD_FROMMEMORY, &enum_object); + ok(hr == DXFILEERR_BADFILETYPE, "IDirectXFile_CreateEnumObject: %x\n", hr); + + lminfo.lpMemory = empty_xxxx_file; + lminfo.dSize = strlen(empty_xxxx_file); + hr = IDirectXFile_CreateEnumObject(dxfile, &lminfo, DXFILELOAD_FROMMEMORY, &enum_object); + ok(hr == DXFILEERR_BADFILETYPE, "IDirectXFile_CreateEnumObject: %x\n", hr); + + IDirectXFile_Release(dxfile); +} + /* Set it to 1 to expand the string when dumping the object. This is useful when there is * only one string in a sub-object (very common). Use with care, this may lead to a crash. */ #define EXPAND_STRING 0 @@ -364,6 +445,7 @@ START_TEST(d3dxof) test_refcount(); test_CreateEnumObject(); + test_file_types(); test_dump(); FreeLibrary(hd3dxof);

1 0

Andrey Turkin : extrac32: Enhance command-line parsing.
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: 9939fd6012b0f48c30293f85af47746dc4a81bce URL: http://source.winehq.org/git/wine.git/?a=commit;h=9939fd6012b0f48c30293f85a… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sun Feb 28 17:50:16 2010 +0300 extrac32: Enhance command-line parsing. --- programs/extrac32/extrac32.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/programs/extrac32/extrac32.c b/programs/extrac32/extrac32.c index d7f2da4..fc1ae1c 100644 --- a/programs/extrac32/extrac32.c +++ b/programs/extrac32/extrac32.c @@ -105,10 +105,14 @@ int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sho for(i = 0; i < argc; i++) { /* Get cabfile */ - if ((argv[i][0] != '/') && !cabfile) + if (argv[i][0] != '/') { - cabfile = argv[i]; - continue; + if (!cabfile) + { + cabfile = argv[i]; + continue; + } else + break; } /* Get parameters for commands */ check = toupperW( argv[i][1] ); @@ -127,11 +131,7 @@ int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sho break; case 'C': if (cmd) return 0; - if ((i + 2) >= argc) return 0; cmd = check; - cabfile = argv[++i]; - if (!GetFullPathNameW(argv[++i], MAX_PATH, path, NULL)) - return 0; break; case 'E': case 'D': @@ -146,6 +146,13 @@ int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sho if (!cabfile) return 0; + if (cmd == 'C') + { + if ((i + 1) != argc) return 0; + if (!GetFullPathNameW(argv[i], MAX_PATH, path, NULL)) + return 0; + } + if (!path[0]) GetCurrentDirectoryW(MAX_PATH, path);

1 0