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

James Hawkins : janitorial: Remove links to any microsoft site.
by Alexandre Julliard March 1, 2008

March 1, 2008

Module: wine Branch: master Commit: c2a627c6e8d1b5a7824945f31d259cc75a005e02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2a627c6e8d1b5a7824945f31… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri Feb 29 22:34:39 2008 -0600 janitorial: Remove links to any microsoft site. --- dlls/dmime/performance.c | 18 ++---------------- dlls/dmime/segment.c | 1 - dlls/wined3d/baseshader.c | 3 +-- dlls/wined3d/device.c | 8 +------- dlls/wined3d/directx.c | 4 +--- dlls/wined3d/query.c | 2 -- dlls/wined3d/state.c | 3 --- dlls/wined3d/vertexshader.c | 24 ------------------------ 8 files changed, 5 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c2a627c6e8d1b5a782494…

1 0

Maarten Lankhorst : cfgmgr32: Forward some more functions to setupapi.
by Alexandre Julliard March 1, 2008

March 1, 2008

Module: wine Branch: master Commit: 109943cc4c3889fb90b8c9dc2f94bd66e27cb46f URL: http://source.winehq.org/git/wine.git/?a=commit;h=109943cc4c3889fb90b8c9dc2… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Feb 29 18:00:41 2008 -0800 cfgmgr32: Forward some more functions to setupapi. --- dlls/cfgmgr32/cfgmgr32.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index b00648b..dec3940 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -61,7 +61,7 @@ @ stub CM_Get_DevNode_Status @ stub CM_Get_DevNode_Status_Ex @ stdcall CM_Get_Device_IDA(ptr ptr long long) setupapi.CM_Get_Device_IDA -@ stub CM_Get_Device_IDW +@ stdcall CM_Get_Device_IDW(ptr ptr long long) setupapi.CM_Get_Device_IDW @ stub CM_Get_Device_ID_ExA @ stub CM_Get_Device_ID_ExW @ stdcall CM_Get_Device_ID_ListA(ptr ptr long long) setupapi.CM_Get_Device_ID_ListA @@ -104,7 +104,7 @@ @ stub CM_Get_Next_Log_Conf_Ex @ stub CM_Get_Next_Res_Des @ stub CM_Get_Next_Res_Des_Ex -@ stub CM_Get_Parent +@ stdcall CM_Get_Parent(ptr long long) setupapi.CM_Get_Parent @ stub CM_Get_Parent_Ex @ stub CM_Get_Res_Des_Data @ stub CM_Get_Res_Des_Data_Ex

1 0

James Hawkins : janitorial: Remove links to any microsoft site.
by Alexandre Julliard March 1, 2008

March 1, 2008

Module: wine Branch: master Commit: 26ad93947bea85a9daeb25dcb972fd8dc1bddaa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26ad93947bea85a9daeb25dcb… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri Feb 29 22:33:54 2008 -0600 janitorial: Remove links to any microsoft site. --- dlls/d3d9/device.c | 2 +- dlls/ddraw/ddraw.c | 4 ---- dlls/gdi32/dib.c | 3 --- dlls/gdi32/freetype.c | 4 ---- dlls/setupapi/setupx_main.c | 2 -- dlls/shell32/shellpath.c | 7 +------ dlls/shell32/shlexec.c | 4 +--- dlls/svrapi/svrapi_main.c | 1 - 8 files changed, 3 insertions(+), 24 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 7d63a10..4eade04 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1407,7 +1407,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_DrawRectPatch(LPDIRECT3DDEVICE9 ifa LeaveCriticalSection(&d3d9_cs); return hr; } -/*http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c/directx/graphics/reference/d3d/interfaces/idirect3ddevice9/DrawTriPatch.asp*/ + static HRESULT WINAPI IDirect3DDevice9Impl_DrawTriPatch(LPDIRECT3DDEVICE9 iface, UINT Handle, CONST float* pNumSegs, CONST D3DTRIPATCH_INFO* pTriPatchInfo) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e87043a..4cac55d 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -73,10 +73,6 @@ static const DDDEVICEIDENTIFIER2 deviceidentifier = * method. * The returned interface is AddRef()-ed before it's returned * - * Rules for QueryInterface: - * http://msdn.microsoft.com/library/default.asp? \ - * url=/library/en-us/com/html/6db17ed8-06e4-4bae-bc26-113176cc7e0e.asp - * * Used for version 1, 2, 4 and 7 * * Params: diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index d53b8f2..f5e8707 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -82,7 +82,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(bitmap); * DIB_GetDIBWidthBytes * * Return the width of a DIB bitmap in bytes. DIB bitmap data is 32-bit aligned. - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/gdi/bitmap… */ int DIB_GetDIBWidthBytes( int width, int depth ) { @@ -570,8 +569,6 @@ static const RGBTRIPLE DefLogPaletteTriples[20] = { /* Copy of Default Logical P * RETURNS * Success: Number of scan lines copied from bitmap * Failure: 0 - * - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/gdi/bitmap… */ INT WINAPI GetDIBits( HDC hdc, /* [in] Handle to device context */ diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b92c0be..d011cd8 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2625,10 +2625,6 @@ static LONG load_VDMX(GdiFont *font, LONG height) LONG ppem = 0; int i; - /* For documentation on VDMX records, see - * http://www.microsoft.com/OpenType/OTSpec/vdmx.htm - */ - result = WineEngGetFontData(font, MS_VDMX_TAG, 0, hdr, 6); if(result == GDI_ERROR) /* no vdmx table present, use linear scaling */ diff --git a/dlls/setupapi/setupx_main.c b/dlls/setupapi/setupx_main.c index 9b12ff7..197eac3 100644 --- a/dlls/setupapi/setupx_main.c +++ b/dlls/setupapi/setupx_main.c @@ -22,11 +22,9 @@ * See: * http://www.geocities.com/SiliconValley/Network/5317/drivers.html * http://willemer.de/informatik/windows/inf_info.htm (German) - * http://www.microsoft.com/ddk/ddkdocs/win98ddk/devinst_12uw.htm * DDK: setupx.h * http://mmatrix.tripod.com/customsystemfolder/infsysntaxfull.html * http://www.rdrop.com/~cary/html/inf_faq.html - * http://support.microsoft.com/support/kb/articles/q194/6/40.asp * * Stuff tested with: * - rs405deu.exe (German Acroread 4.05 setup) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 5be77d7..796e539 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -1624,17 +1624,12 @@ end: * Most values can be overridden in either * HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders * or in the same location in HKLM. - * The registry usage is explained by the following tech note: - * http://www.microsoft.com/windows2000/techinfo/reskit/en-us/default.asp?url=… * The "Shell Folders" registry key was used in NT4 and earlier systems. * Beginning with Windows 2000, the "User Shell Folders" key is used, so * changes made to it are made to the former key too. This synchronization is * done on-demand: not until someone requests the value of one of these paths * (by calling one of the SHGet functions) is the value synchronized. - * Furthermore, as explained here: - * http://www.microsoft.com/windows2000/techinfo/reskit/en-us/default.asp?url=… - * the HKCU paths take precedence over the HKLM paths. - * + * Furthermore, the HKCU paths take precedence over the HKLM paths. */ HRESULT WINAPI SHGetFolderPathW( HWND hwndOwner, /* [I] owner window */ diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index f55e05c..f562bc6 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -681,9 +681,7 @@ UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpOperation, } else { - /* Truncate on first space, like Windows: - * http://support.microsoft.com/?scid=kb%3Ben-us%3B140724 - */ + /* Truncate on first space */ WCHAR *p = lpResult; while (*p != ' ' && *p != '\0') p++; diff --git a/dlls/svrapi/svrapi_main.c b/dlls/svrapi/svrapi_main.c index 9649772..364ecfd 100644 --- a/dlls/svrapi/svrapi_main.c +++ b/dlls/svrapi/svrapi_main.c @@ -1,6 +1,5 @@ /* * Part of NETAPI on Windows 9x -* http://msdn.microsoft.com/library/default.asp?url=/library/en-us/stgmgmt/fs… * * Copyright 2006 Konstantin Petrov *

1 0

James Hawkins : janitorial: Remove links to any microsoft site.
by Alexandre Julliard March 1, 2008

March 1, 2008

Module: wine Branch: master Commit: eedfacdfe7628876490a73f70c785bbbed6e679f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eedfacdfe7628876490a73f70… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri Feb 29 22:29:54 2008 -0600 janitorial: Remove links to any microsoft site. --- dlls/msi/action.c | 8 -------- dlls/msi/appsearch.c | 3 --- dlls/msi/events.c | 5 ----- dlls/msi/package.c | 6 ------ dlls/msvcrt/except.c | 10 +--------- dlls/msvcrt/file.c | 3 +-- dlls/msvcrt/scanf.h | 12 ++---------- dlls/usp10/usp10.c | 5 ----- 8 files changed, 4 insertions(+), 48 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index d5fad0c..6efe14c 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -18,14 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* - * Pages I need - * -http://msdn.microsoft.com/library/default.asp?url=/library/en-us/msi/setup/installexecutesequence_table.asp - -http://msdn.microsoft.com/library/default.asp?url=/library/en-us/msi/setup/standard_actions_reference.asp - */ - #include <stdarg.h> #define COBJMACROS diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index a1e6045..0743aee 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -901,9 +901,6 @@ static UINT iterate_appsearch(MSIRECORD *row, LPVOID param) return r; } -/* http://msdn.microsoft.com/library/en-us/msi/setup/appsearch_table.asp - * is the best reference for the AppSearch table and how it's used. - */ UINT ACTION_AppSearch(MSIPACKAGE *package) { static const WCHAR query[] = { diff --git a/dlls/msi/events.c b/dlls/msi/events.c index b85a5c5..6b6ead9 100644 --- a/dlls/msi/events.c +++ b/dlls/msi/events.c @@ -18,11 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -/* -http://msdn.microsoft.com/library/default.asp?url=/library/en-us/msi/setup/controlevent_overview.asp -*/ - #include <stdarg.h> #include <stdio.h> diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 2ffbfb5..672de8d 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -332,12 +332,6 @@ done: msi_free(version); } -/* - * There are a whole slew of these we need to set - * - * -http://msdn.microsoft.com/library/default.asp?url=/library/en-us/msi/setup/properties.asp - */ static VOID set_installer_properties(MSIPACKAGE *package) { WCHAR pth[MAX_PATH]; diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 9af5ff2..4cb1436 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -18,11 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * - * NOTES: - * - * See http://www.microsoft.com/msj/0197/exception/exception.htm, - * but don't believe all of it. - * * FIXME: Incomplete support for nested exceptions/try block cleanup. */ @@ -468,8 +463,7 @@ static LONG WINAPI msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except) ret = EXCEPTION_CONTINUE_EXECUTION; } break; - /* According to - * http://msdn.microsoft.com/library/en-us/vclib/html/_CRT_signal.asp + /* According to msdn, * the FPE signal handler takes as a second argument the type of * floating point exception. */ @@ -531,8 +525,6 @@ void msvcrt_free_signals(void) /********************************************************************* * signal (MSVCRT.@) - * MS signal handling is described here: - * http://msdn.microsoft.com/library/en-us/vclib/html/_CRT_signal.asp * Some signals may never be generated except through an explicit call to * raise. */ diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index e8189a1..c2539c2 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -671,8 +671,7 @@ int CDECL _commit(int fd) /********************************************************************* * _dup2 (MSVCRT.@) * NOTES - * MSDN isn't clear on this point, but the remarks for _pipe, - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html… + * MSDN isn't clear on this point, but the remarks for _pipe * indicate file descriptors duplicated with _dup and _dup2 are always * inheritable. */ diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 7fe3cc4..a3ca454 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -73,12 +73,6 @@ #endif /* STRING */ #endif /* CONSOLE */ -/********************************************************************* - * Implemented based on - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore98/h… - * Extended by C. Scott Ananian <cananian(a)alumni.princeton.edu> to handle - * more types of format spec. - */ _FUNCTION_ { int rd = 0, consumed = 0; int nch; @@ -314,8 +308,7 @@ _FUNCTION_ { } } break; - /* According to - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html… + /* According to msdn, * 's' reads a character string in a call to fscanf * and 'S' a wide character string and vice versa in a * call to fwscanf. The 'h', 'w' and 'l' prefixes override @@ -454,8 +447,7 @@ _FUNCTION_ { format++; } while(*format && (*format != ']')) { - /* According to: - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore98/h… + /* According to msdn: * "Note that %[a-z] and %[z-a] are interpreted as equivalent to %[abcde...z]." */ if((*format == '-') && (*(format + 1) != ']')) { if ((*(format - 1)) < *(format + 1)) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 28b0f90..3f0c896 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -35,11 +35,6 @@ #include "wine/debug.h" #include "wine/unicode.h" -/** - * some documentation here: - * http://www.microsoft.com/typography/developers/uniscribe/uniscribe.htm - */ - WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); static const SCRIPT_PROPERTIES props[] =

1 0

James Hawkins : janitorial: Remove links to any microsoft site.
by Alexandre Julliard March 1, 2008

March 1, 2008

Module: wine Branch: master Commit: 00394486df414122682846f09fa2b8299911db50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00394486df414122682846f09… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri Feb 29 22:28:45 2008 -0600 janitorial: Remove links to any microsoft site. --- dlls/lz32/tests/lzexpand_main.c | 5 +---- dlls/mscms/tests/profile.c | 5 +---- dlls/mshtml/service.c | 1 - dlls/ntdll/tests/error.c | 3 +-- dlls/ntdll/version.c | 2 -- dlls/rpcrt4/cproxy.c | 4 ---- dlls/rpcrt4/ndr_stubless.h | 1 - dlls/rpcrt4/rpc_defs.h | 2 -- 8 files changed, 3 insertions(+), 20 deletions(-) diff --git a/dlls/lz32/tests/lzexpand_main.c b/dlls/lz32/tests/lzexpand_main.c index b51067b..c67883a 100644 --- a/dlls/lz32/tests/lzexpand_main.c +++ b/dlls/lz32/tests/lzexpand_main.c @@ -54,10 +54,7 @@ static char filename2[] = "testfile.yyy"; a simple text file with the contents "This is a test file." The file was created using COMPRESS.EXE from the Windows Server 2003 - Resource Kit from Microsoft. The resource kit was retrieved from the - following URL: - - http://www.microsoft.com/downloads/details.aspx?FamilyID=9d467a69-57ff-4ae7… + Resource Kit from Microsoft. */ static const unsigned char compressed_file[] = {0x53,0x5A,0x44,0x44,0x88,0xF0,0x27,0x33,0x41, diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 68d14d2..efcd3b5 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -98,10 +98,7 @@ static const WCHAR machineW[] = { 'd','u','m','m','y',0 }; /* To do any real functionality testing with this suite you need a copy of * the freely distributable standard RGB color space profile. It comes * standard with Windows, but on Wine you probably need to install it yourself - * in one of the locations mentioned below. Here's a link to the profile in - * a self extracting zip file: - * - * http://download.microsoft.com/download/whistler/hwdev1/1.0/wxp/en-us/ColorP… + * in one of the locations mentioned below. */ /* Two common places to find the standard color space profile, relative diff --git a/dlls/mshtml/service.c b/dlls/mshtml/service.c index 66fa8b6..a74729e 100644 --- a/dlls/mshtml/service.c +++ b/dlls/mshtml/service.c @@ -232,7 +232,6 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFG { HTMLDocument *This = SERVPROV_THIS(iface); - /* See http://msdn.microsoft.com/workshop/browser/hosting/wbcustompart2.asp */ if(IsEqualGUID(&CLSID_CMarkup, guidService)) { FIXME("(%p)->(CLSID_CMarkup %s %p)\n", This, debugstr_guid(riid), ppv); return E_NOINTERFACE; diff --git a/dlls/ntdll/tests/error.c b/dlls/ntdll/tests/error.c index 77d30ee..ab5c0d4 100644 --- a/dlls/ntdll/tests/error.c +++ b/dlls/ntdll/tests/error.c @@ -32,8 +32,7 @@ #include "winreg.h" #include "winternl.h" -/* FIXME!!! this test checks only mappings, defined by MSDN: - * http://support.microsoft.com/default.aspx?scid=KB;EN-US;q113996& +/* FIXME!!! this test checks only mappings, defined by MSDN * It is necessary to add other mappings and to test them up to Windows XP. * * Some Windows platforms don't know about all the mappings, and in such diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 0f18833..e519144 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -86,8 +86,6 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = * Win95osr2.1: 4, 3, 0x40304BC, " B " (according to doc) * Win95osr2.5: 4, 3, 0x40304BE, " C " (according to doc) * Win95a/b can be discerned via regkey SubVersionNumber - * See also: - * http://support.microsoft.com/support/kb/articles/q158/2/38.asp */ sizeof(RTL_OSVERSIONINFOEXW), 4, 0, 0x40003B6, VER_PLATFORM_WIN32_WINDOWS, {0}, diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 084285a..6ddaccd 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -58,10 +58,6 @@ static const IRpcProxyBufferVtbl StdProxy_Vtbl; #define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) -/* How the Windows stubless proxy thunks work is explained at - * http://msdn.microsoft.com/library/en-us/dnmsj99/html/com0199.asp, - * but I'll use a slightly different method, to make life easier */ - #if defined(__i386__) #include "pshpack1.h" diff --git a/dlls/rpcrt4/ndr_stubless.h b/dlls/rpcrt4/ndr_stubless.h index 02850d1..6ee5ff6 100644 --- a/dlls/rpcrt4/ndr_stubless.h +++ b/dlls/rpcrt4/ndr_stubless.h @@ -23,7 +23,6 @@ /* there can't be any alignment with the structures in this file */ #include "pshpack1.h" -/* From http://msdn.microsoft.com/library/default.asp?url=/library/en-us/rpc/rpc/pa… */ typedef struct _NDR_PROC_HEADER { /* type of handle to use: diff --git a/dlls/rpcrt4/rpc_defs.h b/dlls/rpcrt4/rpc_defs.h index c0c3609..f552490 100644 --- a/dlls/rpcrt4/rpc_defs.h +++ b/dlls/rpcrt4/rpc_defs.h @@ -22,8 +22,6 @@ #ifndef __WINE_RPC_DEFS_H #define __WINE_RPC_DEFS_H -/* info from http://www.microsoft.com/msj/0398/dcomtextfigs.htm */ - typedef struct { unsigned char rpc_ver; /* RPC major version (5) */

1 0

Maarten Lankhorst : setupapi: Implement CM_Get_Device_ID and add a stub for CM_Get_Parent.
by Alexandre Julliard March 1, 2008

March 1, 2008

Module: wine Branch: master Commit: ba8642639aa8f682c0b6441b6636d2322c204206 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba8642639aa8f682c0b6441b6… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Feb 29 17:46:58 2008 -0800 setupapi: Implement CM_Get_Device_ID and add a stub for CM_Get_Parent. --- dlls/setupapi/devinst.c | 80 +++++++++++++++++++++++++++++++++++++++--- dlls/setupapi/setupapi.spec | 4 +- dlls/setupapi/stubs.c | 21 +++-------- 3 files changed, 81 insertions(+), 24 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 0e5aad5..c90170b 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -454,13 +454,16 @@ static HKEY SETUPDI_CreateDrvKey(struct DeviceInfo *devInfo) static struct DeviceInfo *SETUPDI_AllocateDeviceInfo(struct DeviceInfoSet *set, DWORD devId, LPCWSTR instanceId, BOOL phantom) { - struct DeviceInfo *devInfo = HeapAlloc(GetProcessHeap(), 0, - sizeof(struct DeviceInfo)); + struct DeviceInfo *devInfo = NULL; + HANDLE devInst = GlobalAlloc(GMEM_FIXED, sizeof(struct DeviceInfo)); + if (devInst) + devInfo = GlobalLock(devInst); if (devInfo) { devInfo->set = set; - devInfo->devId = devId; + devInfo->devId = (DWORD)devInst; + devInfo->instanceId = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(instanceId) + 1) * sizeof(WCHAR)); if (devInfo->instanceId) @@ -477,10 +480,12 @@ static struct DeviceInfo *SETUPDI_AllocateDeviceInfo(struct DeviceInfoSet *set, (LPBYTE)&phantom, sizeof(phantom)); } list_init(&devInfo->interfaces); + GlobalUnlock(devInst); } else { - HeapFree(GetProcessHeap(), 0, devInfo); + GlobalUnlock(devInst); + GlobalFree(devInst); devInfo = NULL; } } @@ -514,7 +519,7 @@ static void SETUPDI_FreeDeviceInfo(struct DeviceInfo *devInfo) SETUPDI_FreeInterfaceInstances(iface); HeapFree(GetProcessHeap(), 0, iface); } - HeapFree(GetProcessHeap(), 0, devInfo); + GlobalFree((HANDLE)devInfo->devId); } /* Adds a device with GUID guid and identifer devInst to set. Allocates a @@ -551,7 +556,7 @@ static BOOL SETUPDI_AddDeviceToSet(struct DeviceInfoSet *set, DeviceInfoData->cbSize = sizeof(SP_DEVINFO_DATA); memcpy(&DeviceInfoData->ClassGuid, guid, sizeof(GUID)); - DeviceInfoData->DevInst = devInst; + DeviceInfoData->DevInst = devInfo->devId; DeviceInfoData->Reserved = (ULONG_PTR)devInfo; SETUPDI_GuidToString(guid, classGuidStr); SetupDiSetDeviceRegistryPropertyW((HDEVINFO)set, @@ -3848,3 +3853,66 @@ BOOL WINAPI SetupDiDeleteDevRegKey( } return ret; } + +/*********************************************************************** + * CM_Get_Device_IDA (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_Device_IDA( DEVINST dnDevInst, PSTR Buffer, + ULONG BufferLen, ULONG ulFlags) +{ + struct DeviceInfo *devInfo = GlobalLock((HANDLE)dnDevInst); + + TRACE("%x->%p, %p, %u %u\n", dnDevInst, devInfo, Buffer, BufferLen, ulFlags); + + if (!devInfo) + return CR_NO_SUCH_DEVINST; + + WideCharToMultiByte(CP_ACP, 0, devInfo->instanceId, -1, Buffer, BufferLen, 0, 0); + TRACE("Returning %s\n", debugstr_a(Buffer)); + return CR_SUCCESS; +} + +/*********************************************************************** + * CM_Get_Device_IDW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_Device_IDW( DEVINST dnDevInst, LPWSTR Buffer, + ULONG BufferLen, ULONG ulFlags) +{ + struct DeviceInfo *devInfo = GlobalLock((HANDLE)dnDevInst); + + TRACE("%x->%p, %p, %u %u\n", dnDevInst, devInfo, Buffer, BufferLen, ulFlags); + + if (!devInfo) + { + WARN("dev instance %d not found!\n", dnDevInst); + return CR_NO_SUCH_DEVINST; + } + + lstrcpynW(Buffer, devInfo->instanceId, BufferLen); + TRACE("Returning %s\n", debugstr_w(Buffer)); + GlobalUnlock((HANDLE)dnDevInst); + return CR_SUCCESS; +} + + + +/*********************************************************************** + * CM_Get_Device_ID_Size (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_Device_ID_Size( PULONG pulLen, DEVINST dnDevInst, + ULONG ulFlags) +{ + struct DeviceInfo *ppdevInfo = GlobalLock((HANDLE)dnDevInst); + + TRACE("%x->%p, %p, %u\n", dnDevInst, ppdevInfo, pulLen, ulFlags); + + if (!ppdevInfo) + { + WARN("dev instance %d not found!\n", dnDevInst); + return CR_NO_SUCH_DEVINST; + } + + *pulLen = lstrlenW(ppdevInfo->instanceId); + GlobalUnlock((HANDLE)dnDevInst); + return CR_SUCCESS; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index ab62b6d..5f31721 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -72,7 +72,7 @@ @ stub CM_Get_DevNode_Status @ stub CM_Get_DevNode_Status_Ex @ stdcall CM_Get_Device_IDA(ptr ptr long long) -@ stub CM_Get_Device_IDW +@ stdcall CM_Get_Device_IDW(ptr ptr long long) @ stub CM_Get_Device_ID_ExA @ stub CM_Get_Device_ID_ExW @ stdcall CM_Get_Device_ID_ListA(ptr ptr long long) @@ -115,7 +115,7 @@ @ stub CM_Get_Next_Log_Conf_Ex @ stub CM_Get_Next_Res_Des @ stub CM_Get_Next_Res_Des_Ex -@ stub CM_Get_Parent +@ stdcall CM_Get_Parent(ptr long long) @ stub CM_Get_Parent_Ex @ stub CM_Get_Res_Des_Data @ stub CM_Get_Res_Des_Data_Ex diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 130973a..a6f7a5b 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -28,6 +28,7 @@ #include "winreg.h" #include "cfgmgr32.h" #include "setupapi.h" +#include "winnls.h" WINE_DEFAULT_DEBUG_CHANNEL(setupapi); @@ -70,17 +71,6 @@ CONFIGRET WINAPI CM_Disconnect_Machine(HMACHINE handle) } /*********************************************************************** - * CM_Get_Device_IDA (SETUPAPI.@) - */ -CONFIGRET WINAPI CM_Get_Device_IDA( DEVINST dnDevInst, PSTR Buffer, - ULONG BufferLen, ULONG ulFlags) -{ - FIXME("%x, %p, %u %u\n",dnDevInst, Buffer, BufferLen, ulFlags); - Buffer[0] = 0; - return CR_SUCCESS; -} - -/*********************************************************************** * CM_Get_Device_ID_ListA (SETUPAPI.@) */ @@ -93,13 +83,12 @@ CONFIGRET WINAPI CM_Get_Device_ID_ListA( } /*********************************************************************** - * CM_Get_Device_ID_Size (SETUPAPI.@) + * CM_Get_Parent (SETUPAPI.@) */ -CONFIGRET WINAPI CM_Get_Device_ID_Size( PULONG pulLen, DEVINST dnDevInst, - ULONG ulFlags) +DWORD WINAPI CM_Get_Parent(PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags) { - FIXME("%p %x %u\n",pulLen, dnDevInst, ulFlags); - *pulLen = 1; + FIXME("%p 0x%08x 0x%08x stub\n", pdnDevInst, dnDevInst, ulFlags); + *pdnDevInst = dnDevInst; return CR_SUCCESS; }

1 0

Andrew Talbot : itss: Assign to structs instead of using memcpy.
by Alexandre Julliard March 1, 2008

March 1, 2008

Module: wine Branch: master Commit: f6cbd9a0458fe3ed6d09053579ac104e61df455d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6cbd9a0458fe3ed6d0905357… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Feb 29 22:06:59 2008 +0000 itss: Assign to structs instead of using memcpy. --- dlls/itss/moniker.c | 2 +- dlls/itss/protocol.c | 2 +- dlls/itss/storage.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/itss/moniker.c b/dlls/itss/moniker.c index d57f381..41e2bda 100644 --- a/dlls/itss/moniker.c +++ b/dlls/itss/moniker.c @@ -99,7 +99,7 @@ static HRESULT WINAPI ITS_IMonikerImpl_GetClassID( ITS_IMonikerImpl *This = (ITS_IMonikerImpl *)iface; TRACE("%p %p\n", This, pClassID); - memcpy( pClassID, &CLSID_ITStorage, sizeof (CLSID) ); + *pClassID = CLSID_ITStorage; return S_OK; } diff --git a/dlls/itss/protocol.c b/dlls/itss/protocol.c index 8571174..c2277e2 100644 --- a/dlls/itss/protocol.c +++ b/dlls/itss/protocol.c @@ -234,7 +234,7 @@ static HRESULT WINAPI ITSProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, release_chm(This); /* Native leaks handle here */ This->chm_file = chm_file; - memcpy(&This->chm_object, &chm_object, sizeof(chm_object)); + This->chm_object = chm_object; hres = IInternetProtocolSink_ReportData(pOIProtSink, BSCF_FIRSTDATANOTIFICATION|BSCF_DATAFULLYAVAILABLE, diff --git a/dlls/itss/storage.c b/dlls/itss/storage.c index 97d7755..de0acfa 100644 --- a/dlls/itss/storage.c +++ b/dlls/itss/storage.c @@ -445,7 +445,7 @@ static int ITSS_chm_enumerator( TRACE("adding %s to enumeration\n", debugstr_w(ui->path) ); info = HeapAlloc( GetProcessHeap(), 0, sizeof (struct enum_info) ); - memcpy( &info->ui, ui, sizeof info->ui ); + info->ui = *ui; info->next = NULL; info->prev = stgenum->last; @@ -788,7 +788,7 @@ static HRESULT WINAPI ITSS_IStream_Stat( pstatstg->type = STGTY_STREAM; pstatstg->cbSize.QuadPart = This->ui.length; pstatstg->grfMode = STGM_READ; - memcpy( &pstatstg->clsid, &CLSID_ITStorage, sizeof (CLSID) ); + pstatstg->clsid = CLSID_ITStorage; return S_OK; } @@ -828,7 +828,7 @@ static IStream_Impl *ITSS_create_stream( stm->vtbl_IStream = &ITSS_IStream_vtbl; stm->ref = 1; stm->addr = 0; - memcpy( &stm->ui, ui, sizeof stm->ui ); + stm->ui = *ui; stm->stg = stg; IStorage_AddRef( (IStorage*) stg );

1 0

Andrew Talbot : dbghelp: Assign to struct instead of using memcpy.
by Alexandre Julliard March 1, 2008

March 1, 2008

Module: wine Branch: master Commit: 53e9e24aa2894ee439c178866694291d9c281b04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53e9e24aa2894ee439c178866… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Feb 29 22:06:16 2008 +0000 dbghelp: Assign to struct instead of using memcpy. --- dlls/dbghelp/minidump.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index d6b2b25..52458f2 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -644,7 +644,7 @@ static unsigned dump_threads(struct dump_context* dc, cbin.CallbackType = ThreadCallback; cbin.u.Thread.ThreadId = dc->spi->ti[i].dwThreadID; cbin.u.Thread.ThreadHandle = 0; /* FIXME */ - memcpy(&cbin.u.Thread.Context, &ctx, sizeof(CONTEXT)); + cbin.u.Thread.Context = ctx; cbin.u.Thread.SizeOfContext = sizeof(CONTEXT); cbin.u.Thread.StackBase = mdThd.Stack.StartOfMemoryRange; cbin.u.Thread.StackEnd = mdThd.Stack.StartOfMemoryRange +

1 0

Andrew Talbot : dinput: Assign to structs instead of using memcpy.
by Alexandre Julliard March 1, 2008

March 1, 2008

Module: wine Branch: master Commit: da0a48d235c533e5c2113ad9d6e1ead9a8220c99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da0a48d235c533e5c2113ad9d… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Feb 29 22:06:34 2008 +0000 dinput: Assign to structs instead of using memcpy. --- dlls/dinput/effect_linuxinput.c | 6 +++--- dlls/dinput/mouse.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index 0dfbe23..7d603bb 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -780,12 +780,12 @@ HRESULT linuxinput_create_effect( LinuxInputEffectImpl* newEffect = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LinuxInputEffectImpl)); DWORD type = _typeFromGUID(rguid); - + newEffect->lpVtbl = &LinuxInputEffectVtbl; newEffect->ref = 1; - memcpy(&(newEffect->guid), rguid, sizeof(*rguid)); + newEffect->guid = *rguid; newEffect->fd = fd; - + /* set the type. this cannot be changed over the effect's life. */ switch (type) { case DIEFT_PERIODIC: diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 70c65cf..3c3b3c3 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -180,7 +180,7 @@ static SysMouseImpl *alloc_device(REFGUID rguid, const void *mvt, IDirectInputIm newDevice->base.lpVtbl = mvt; newDevice->base.ref = 1; newDevice->base.dwCoopLevel = DISCL_NONEXCLUSIVE | DISCL_BACKGROUND; - memcpy(&newDevice->base.guid, rguid, sizeof(*rguid)); + newDevice->base.guid = *rguid; InitializeCriticalSection(&newDevice->base.crit); newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SysMouseImpl*->base.crit"); newDevice->base.dinput = dinput;

1 0

Andrew Talbot : gdiplus: Assign to structs instead of using memcpy.
by Alexandre Julliard March 1, 2008

March 1, 2008

Module: wine Branch: master Commit: 5e8253aaf94615db99ec7a3daf366fb8da50b48d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e8253aaf94615db99ec7a3da… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Feb 29 22:06:47 2008 +0000 gdiplus: Assign to structs instead of using memcpy. --- dlls/gdiplus/font.c | 2 +- dlls/gdiplus/graphics.c | 4 ++-- dlls/gdiplus/graphicspath.c | 2 +- dlls/gdiplus/image.c | 2 +- dlls/gdiplus/matrix.c | 2 +- dlls/gdiplus/pen.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 7d2e14a..be60843 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -95,7 +95,7 @@ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont *font, GpGraphics *graphics, if(!font || !graphics || !lfw) return InvalidParameter; - memcpy(lfw, &font->lfw, sizeof(LOGFONTW)); + *lfw = font->lfw; return Ok; } diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index ab8733d..508b489 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1426,7 +1426,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string * width, angle). */ SelectObject(graphics->hdc, CreateFontIndirectW(&font->lfw)); GetTextMetricsW(graphics->hdc, &textmet); - memcpy(&lfw, &font->lfw, sizeof(LOGFONTW)); + lfw = font->lfw; lfw.lfHeight = roundr(((REAL)lfw.lfHeight) * rel_height); lfw.lfWidth = roundr(textmet.tmAveCharWidth * rel_width); @@ -1811,7 +1811,7 @@ GpStatus WINGDIPAPI GdipGetWorldTransform(GpGraphics *graphics, GpMatrix *matrix if(!graphics || !matrix) return InvalidParameter; - memcpy(matrix, graphics->worldtrans, sizeof(GpMatrix)); + *matrix = *graphics->worldtrans; return Ok; } diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 2a2d96c..69a9526 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -281,7 +281,7 @@ GpStatus WINGDIPAPI GdipClonePath(GpPath* path, GpPath **clone) *clone = GdipAlloc(sizeof(GpPath)); if(!*clone) return OutOfMemory; - memcpy(*clone, path, sizeof(GpPath)); + **clone = *path; (*clone)->pathdata.Points = GdipAlloc(path->datalen * sizeof(PointF)); (*clone)->pathdata.Types = GdipAlloc(path->datalen); diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 0fe7dfe..0e37798 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -441,7 +441,7 @@ GpStatus WINGDIPAPI GdipGetImageBounds(GpImage *image, GpRectF *srcRect, if(!image || !srcRect || !srcUnit) return InvalidParameter; if(image->type == ImageTypeMetafile){ - memcpy(srcRect, &((GpMetafile*)image)->bounds, sizeof(GpRectF)); + *srcRect = ((GpMetafile*)image)->bounds; *srcUnit = ((GpMetafile*)image)->unit; } else if(image->type == ImageTypeBitmap){ diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index e6be418..2ee4458 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -97,7 +97,7 @@ GpStatus WINGDIPAPI GdipCloneMatrix(GpMatrix *matrix, GpMatrix **clone) *clone = GdipAlloc(sizeof(GpMatrix)); if(!*clone) return OutOfMemory; - memcpy(*clone, matrix, sizeof(GpMatrix)); + **clone = *matrix; return Ok; } diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 97fc99d..7a692e3 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -75,7 +75,7 @@ GpStatus WINGDIPAPI GdipClonePen(GpPen *pen, GpPen **clonepen) *clonepen = GdipAlloc(sizeof(GpPen)); if(!*clonepen) return OutOfMemory; - memcpy(*clonepen, pen, sizeof(GpPen)); + **clonepen = *pen; GdipCloneCustomLineCap(pen->customstart, &(*clonepen)->customstart); GdipCloneCustomLineCap(pen->customend, &(*clonepen)->customend);

1 0