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

Jon Yang : gdiplus: Implemented GdipDrawImageRectRectI.
by Alexandre Julliard March 1, 2008

March 1, 2008

Module: wine Branch: master Commit: 29bc9ba14e0b0f787e6312b1a84ff1f66a8390bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=29bc9ba14e0b0f787e6312b1a… Author: Jon Yang <jyang08(a)ucla.edu> Date: Thu Feb 28 21:54:47 2008 -0800 gdiplus: Implemented GdipDrawImageRectRectI. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index ce4640f..2118a3d 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -184,7 +184,7 @@ @ stub GdipDrawImageRect @ stub GdipDrawImageRectI @ stdcall GdipDrawImageRectRect(ptr ptr long long long long long long long long long ptr long ptr) -@ stub GdipDrawImageRectRectI +@ stdcall GdipDrawImageRectRectI(ptr ptr long long long long long long long long long ptr long ptr) @ stdcall GdipDrawLine(ptr ptr long long long long) @ stdcall GdipDrawLineI(ptr ptr long long long long) @ stdcall GdipDrawLines(ptr ptr ptr long) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 508b489..74c755b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1158,6 +1158,25 @@ GpStatus WINGDIPAPI GdipDrawImageRectRect(GpGraphics *graphics, GpImage *image, srcwidth, srcheight, srcUnit, imageattr, callback, callbackData); } +GpStatus WINGDIPAPI GdipDrawImageRectRectI(GpGraphics *graphics, GpImage *image, + INT dstx, INT dsty, INT dstwidth, INT dstheight, INT srcx, INT srcy, + INT srcwidth, INT srcheight, GpUnit srcUnit, + GDIPCONST GpImageAttributes* imageAttributes, DrawImageAbort callback, + VOID * callbackData) +{ + GpPointF points[3]; + + points[0].X = dstx; + points[0].Y = dsty; + points[1].X = dstx + dstwidth; + points[1].Y = dsty; + points[2].X = dstx; + points[2].Y = dsty + dstheight; + + return GdipDrawImagePointsRect(graphics, image, points, 3, srcx, srcy, + srcwidth, srcheight, srcUnit, imageAttributes, callback, callbackData); +} + GpStatus WINGDIPAPI GdipDrawLine(GpGraphics *graphics, GpPen *pen, REAL x1, REAL y1, REAL x2, REAL y2) {

1 0

James Hawkins : msi: Remove a pointless wrapper of RegCreateKey.
by Alexandre Julliard March 1, 2008

March 1, 2008

Module: wine Branch: master Commit: 6febb8fda8583ba4fc9f451ebd3fa754b397fc96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6febb8fda8583ba4fc9f451eb… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sat Mar 1 02:06:54 2008 -0600 msi: Remove a pointless wrapper of RegCreateKey. --- dlls/msi/registry.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index a3b63b5..1d41e65 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -808,11 +808,6 @@ UINT MSIREG_DeleteUserDataProductKey(LPCWSTR szProduct) return RegDeleteTreeW(HKEY_LOCAL_MACHINE, keypath); } -UINT MSIREG_OpenProducts(HKEY* key) -{ - return RegCreateKeyW(HKEY_LOCAL_MACHINE,szInstaller_Products,key); -} - UINT MSIREG_OpenProductsKey(LPCWSTR szProduct, HKEY* key, BOOL create) { UINT rc; @@ -1137,7 +1132,7 @@ UINT WINAPI MsiEnumProductsW(DWORD index, LPWSTR lpguid) if (NULL == lpguid) return ERROR_INVALID_PARAMETER; - r = MSIREG_OpenProducts(&hkeyProducts); + r = RegCreateKeyW(HKEY_LOCAL_MACHINE, szInstaller_Products, &hkeyProducts); if( r != ERROR_SUCCESS ) return ERROR_NO_MORE_ITEMS;

1 0

James Hawkins : msi: Implement the UILevel property of the Installer object .
by Alexandre Julliard March 1, 2008

March 1, 2008

Module: wine Branch: master Commit: 617eb48d5bb2b3182a4bed00676851fea029ee90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=617eb48d5bb2b3182a4bed006… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri Feb 29 13:37:44 2008 -0600 msi: Implement the UILevel property of the Installer object. --- dlls/msi/automation.c | 26 ++++++++++++++++++++++++++ dlls/msi/msiserver.idl | 15 +++++++++++++++ dlls/msi/msiserver_dispids.h | 1 + dlls/msi/tests/automation.c | 6 ++---- 4 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index dc94cbc..ed6b7f1 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1535,6 +1535,7 @@ static HRESULT WINAPI InstallerImpl_Invoke( HRESULT hr; LPWSTR szString = NULL; DWORD dwSize = 0; + INSTALLUILEVEL ui; VariantInit(&varg0); VariantInit(&varg1); @@ -1627,6 +1628,31 @@ static HRESULT WINAPI InstallerImpl_Invoke( else return DISP_E_MEMBERNOTFOUND; break; + case DISPID_INSTALLER_UILEVEL: + if (wFlags & DISPATCH_PROPERTYPUT) + { + hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); + if (FAILED(hr)) return hr; + if ((ui = MsiSetInternalUI(V_I4(&varg0), NULL) == INSTALLUILEVEL_NOCHANGE)) + { + ERR("MsiSetInternalUI failed\n"); + return DISP_E_EXCEPTION; + } + } + else if (wFlags & DISPATCH_PROPERTYGET) + { + if ((ui = MsiSetInternalUI(INSTALLUILEVEL_NOCHANGE, NULL) == INSTALLUILEVEL_NOCHANGE)) + { + ERR("MsiSetInternalUI failed\n"); + return DISP_E_EXCEPTION; + } + + V_VT(pVarResult) = VT_I4; + V_I4(pVarResult) = ui; + } + else return DISP_E_MEMBERNOTFOUND; + break; + case DISPID_INSTALLER_INSTALLPRODUCT: if (wFlags & DISPATCH_METHOD) { diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 317a3ac..d5b47ac 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -126,10 +126,25 @@ library WindowsInstaller msiOpenDatabaseModePatchFile = 32 } MsiOpenDatabaseMode; + typedef enum { + msiUILevelNoChange = 0, + msiUILevelDefault = 1, + msiUILevelNone = 2, + msiUILevelBasic = 3, + msiUILevelReduced = 4, + msiUILevelFull = 5, + msiUILevelHideCancel = 32, + msiUILevelProgressOnly = 64, + msiUILevelEndDialog = 128, + msiUILevelSourceResOnly = 256 + } MsiUILevel; + [ uuid(000C1090-0000-0000-C000-000000000046) ] dispinterface Installer { properties: + [id(DISPID_INSTALLER_UILEVEL)] + MsiUILevel UILevel; methods: [id(DISPID_INSTALLER_CREATERECORD)] Record *CreateRecord([in] long Count); diff --git a/dlls/msi/msiserver_dispids.h b/dlls/msi/msiserver_dispids.h index afbadbb..3a58f6a 100644 --- a/dlls/msi/msiserver_dispids.h +++ b/dlls/msi/msiserver_dispids.h @@ -19,6 +19,7 @@ #define DISPID_INSTALLER_CREATERECORD 1 #define DISPID_INSTALLER_OPENPACKAGE 2 #define DISPID_INSTALLER_OPENDATABASE 4 +#define DISPID_INSTALLER_UILEVEL 6 #define DISPID_INSTALLER_INSTALLPRODUCT 8 #define DISPID_INSTALLER_VERSION 9 #define DISPID_INSTALLER_REGISTRYVALUE 11 diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 09d1279..089360b 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -470,11 +470,9 @@ static void test_dispid(void) ok( get_dispid( pInstaller, "OpenPackage" ) == 2, "dispid wrong\n"); todo_wine ok( get_dispid( pInstaller, "OpenProduct" ) == 3, "dispid wrong\n"); ok( get_dispid( pInstaller, "OpenDatabase" ) == 4, "dispid wrong\n"); - todo_wine { - ok( get_dispid( pInstaller, "SummaryInformation" ) == 5, "dispid wrong\n"); + todo_wine ok( get_dispid( pInstaller, "SummaryInformation" ) == 5, "dispid wrong\n"); ok( get_dispid( pInstaller, "UILevel" ) == 6, "dispid wrong\n"); - ok( get_dispid( pInstaller, "EnableLog" ) == 7, "dispid wrong\n"); - } + todo_wine ok( get_dispid( pInstaller, "EnableLog" ) == 7, "dispid wrong\n"); ok( get_dispid( pInstaller, "InstallProduct" ) == 8, "dispid wrong\n"); ok( get_dispid( pInstaller, "Version" ) == 9, "dispid wrong\n"); todo_wine {

1 0

James Hawkins : msi: Add definitions for MsiEnumComponentCosts.
by Alexandre Julliard March 1, 2008

March 1, 2008

Module: wine Branch: master Commit: 72706972d2b647619de8286e13b84e9861898ca8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72706972d2b647619de8286e1… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sat Mar 1 02:07:49 2008 -0600 msi: Add definitions for MsiEnumComponentCosts. --- include/msi.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/msi.h b/include/msi.h index 93c4c28..4adc49d 100644 --- a/include/msi.h +++ b/include/msi.h @@ -385,6 +385,10 @@ UINT WINAPI MsiApplyPatchA(LPCSTR, LPCSTR, INSTALLTYPE, LPCSTR); UINT WINAPI MsiApplyPatchW(LPCWSTR, LPCWSTR, INSTALLTYPE, LPCWSTR); #define MsiApplyPatch WINELIB_NAME_AW(MsiApplyPatch) +UINT WINAPI MsiEnumComponentCostsA(MSIHANDLE, LPCSTR, DWORD, INSTALLSTATE, LPSTR, LPDWORD, LPINT, LPINT); +UINT WINAPI MsiEnumComponentCostsW(MSIHANDLE, LPCWSTR, DWORD, INSTALLSTATE, LPWSTR, LPDWORD, LPINT, LPINT); +#define MsiEnumComponentCosts WINELIB_NAME_AW(MsiEnumComponentCosts) + UINT WINAPI MsiEnumProductsA(DWORD, LPSTR); UINT WINAPI MsiEnumProductsW(DWORD, LPWSTR); #define MsiEnumProducts WINELIB_NAME_AW(MsiEnumProducts)

1 0

James Hawkins : msi: Include query. h to pull in the definition of STREAMS_CreateView.
by Alexandre Julliard March 1, 2008

March 1, 2008

Module: wine Branch: master Commit: 0c3ecefbc33858a077465632cb9364ded2b683de URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c3ecefbc33858a077465632c… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sat Mar 1 02:08:48 2008 -0600 msi: Include query.h to pull in the definition of STREAMS_CreateView. --- dlls/msi/streams.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index defcad5..318fb41 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -29,6 +29,7 @@ #include "msiquery.h" #include "objbase.h" #include "msipriv.h" +#include "query.h" #include "wine/debug.h"

1 0

James Hawkins : msi: Don' t bail out if the row to modify is not found as not all modify commands need the row .
by Alexandre Julliard March 1, 2008

March 1, 2008

Module: wine Branch: master Commit: 724c8da7343ee6b9996dac5e4b71890a9756eb72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=724c8da7343ee6b9996dac5e4… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri Feb 29 13:41:04 2008 -0600 msi: Don't bail out if the row to modify is not found as not all modify commands need the row. --- dlls/msi/where.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/msi/where.c b/dlls/msi/where.c index c12f7a4..aa5d5f3 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -88,7 +88,7 @@ static UINT find_entry_in_hash(MSIHASHENTRY **table, UINT row, UINT *val) if (!(entry = table[row % MSI_HASH_TABLE_SIZE])) { - ERR("Row not found in hash table!\n"); + WARN("Row not found in hash table!\n"); return ERROR_FUNCTION_FAILED; } @@ -511,10 +511,7 @@ static UINT WHERE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, if (r != ERROR_SUCCESS) return r; - r = find_entry_in_hash(wv->reorder, row - 1, &row); - if (r != ERROR_SUCCESS) - return r; - + find_entry_in_hash(wv->reorder, row - 1, &row); return wv->table->ops->modify( wv->table, eModifyMode, rec, row ); }

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: e4c1227ec99459f2179104d6f6fd5dd66fa9e8ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4c1227ec99459f2179104d6f… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri Feb 29 22:37:21 2008 -0600 janitorial: Remove links to any microsoft site. --- dlls/ole32/storage32.c | 3 --- include/d3d9types.h | 9 --------- include/ndrtypes.h | 4 +--- include/rpcproxy.h | 2 -- include/ws2tcpip.h | 3 --- programs/notepad/dialog.c | 4 +--- tools/winedump/winedump.h | 5 ----- 7 files changed, 2 insertions(+), 28 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index ac0cbbf..389b047 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -28,9 +28,6 @@ * The compound file implementation of IStorage used for create * and manage substorages and streams within a storage object * residing in a compound file object. - * - * MSDN - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/stg/stg/is… */ #include <assert.h> diff --git a/include/d3d9types.h b/include/d3d9types.h index 1a0ebec..83e54b8 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -226,15 +226,6 @@ typedef enum _D3DDECLUSAGE { D3DDECLUSAGE_SAMPLE = 13 } D3DDECLUSAGE; -/* MSDN is quite confussing at this point... -http://msdn.microsoft.com/archive/default.asp?url=/archive/en-us/directx9_c/directx/graphics/reference/d3d/constants/OTHER_D3D.asp -says D3DMAX, and D3DMAXDECLUSAGE = D3DDECLUSAGE_DEPTH -http://msdn.microsoft.com/library/default.asp?url=/archive/en-us/directx9_c_summer_03/directx/graphics/reference/d3d/constants/other_d3d.asp -says MAXD3D, and D3DDECLUSAGE_SAMPLE - -So both are defined -*/ - #define D3DMAXDECLUSAGE D3DDECLUSAGE_SAMPLE #define D3DMAXDECLUSAGEINDEX 15 #define D3DMAXDECLLENGTH 18 diff --git a/include/ndrtypes.h b/include/ndrtypes.h index 5d932fa..8605b73 100644 --- a/include/ndrtypes.h +++ b/include/ndrtypes.h @@ -31,9 +31,7 @@ typedef struct unsigned short MustFree : 1; /* 0x0002 - server interpreter MUST size this * parameter, other parameters may be skipped, using the value in * NDR_PROC_PARTIAL_OIF_HEADER::constant_server_buffer_size instead. */ - unsigned short IsPipe : 1; /* 0x0004 - The parameter is a pipe handle. See - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/rpc/rpc/pi… - * for more information on pipes. */ + unsigned short IsPipe : 1; /* 0x0004 - The parameter is a pipe handle */ unsigned short IsIn : 1; /* 0x0008 - The parameter is an input */ unsigned short IsOut : 1; /* 0x0010 - The parameter is an output */ unsigned short IsReturn : 1; /* 0x0020 - The parameter is to be returned */ diff --git a/include/rpcproxy.h b/include/rpcproxy.h index eaf2a6a..7bec080 100644 --- a/include/rpcproxy.h +++ b/include/rpcproxy.h @@ -350,8 +350,6 @@ ULONG WINAPI CStdStubBuffer2_Release(IRpcStubBuffer *This) \ #if 0 -/* see http://www.microsoft.com/msj/0199/com/com0199.aspx */ - RPCRTAPI HRESULT RPC_ENTRY CreateProxyFromTypeInfo( LPTYPEINFO pTypeInfo, LPUNKNOWN pUnkOuter, REFIID riid, LPRPCPROXYBUFFER *ppProxy, LPVOID *ppv ); diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index 57a1dc7..9a68e24 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -90,9 +90,6 @@ typedef struct WS(in_addr6) u_char s6_addr[16]; /* IPv6 address */ } IN6_ADDR, *PIN6_ADDR, *LPIN6_ADDR; -/* check for sockaddr_in6 / sockaddr_in6_old madness: - * http://msdn.microsoft.com/library/en-us/winsock/winsock/sockaddr_2.asp - */ typedef struct WS(sockaddr_in6) { short sin6_family; /* AF_INET6 */ diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index c21c2d7..ea469c1 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -265,9 +265,7 @@ void DoOpenFile(LPCWSTR szFileName) SendMessage(Globals.hEdit, EM_EMPTYUNDOBUFFER, 0, 0); SetFocus(Globals.hEdit); - /* If the file starts with .LOG, add a time/date at the end and set cursor after - * See http://support.microsoft.com/?kbid=260563 - */ + /* If the file starts with .LOG, add a time/date at the end and set cursor after */ if (GetWindowTextW(Globals.hEdit, log, sizeof(log)/sizeof(log[0])) && !lstrcmp(log, dotlog)) { static const WCHAR lfW[] = { '\r','\n',0 }; diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 2e15e24..f3caf94 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -25,11 +25,6 @@ * All the cool functionality (prototyping, call tracing, forwarding) * relies on Patrik Stridvall's 'function_grep.pl' script to work. * - * http://msdn.microsoft.com/library/periodic/period96/msj/S330.htm - * This article provides both a description and freely downloadable - * implementation, in source code form, of how to extract symbols - * from Win32 PE executables/DLLs. - * * http://www.kegel.com/mangle.html * Gives information on the name mangling scheme used by MS compilers, * used as the starting point for the code here. Contains a few

1 0

James Hawkins : msi: Make local functions static.
by Alexandre Julliard March 1, 2008

March 1, 2008

Module: wine Branch: master Commit: 4439e0b57d9dc3491b7f6fe33b795caac6e61acc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4439e0b57d9dc3491b7f6fe33… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri Feb 29 23:29:43 2008 -0600 msi: Make local functions static. --- dlls/msi/action.c | 4 ++-- dlls/msi/automation.c | 6 +++--- dlls/msi/database.c | 16 ++++++++-------- dlls/msi/package.c | 36 ++++++++++++++++++------------------ dlls/msi/record.c | 2 +- 5 files changed, 32 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4439e0b57d9dc3491b7f6…

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: 7b56757cf68f6ec38ffedb616b5f830496f41669 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b56757cf68f6ec38ffedb616… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri Feb 29 22:36:46 2008 -0600 janitorial: Remove links to any microsoft site. --- dlls/ole32/compobj_private.h | 3 +-- dlls/ole32/dcom.idl | 3 +-- dlls/ole32/moniker.c | 3 ++- dlls/ole32/oleproxy.c | 18 +----------------- dlls/ole32/stg_prop.c | 26 +++----------------------- dlls/ws2_32/socket.c | 4 +--- 6 files changed, 9 insertions(+), 48 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 1c49956..ba80edf 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -269,8 +269,7 @@ void apartment_joinmta(void); #define DM_HOSTOBJECT (WM_USER + 1) /* WPARAM = 0, LPARAM = (struct host_object_params *) */ /* - * Per-thread values are stored in the TEB on offset 0xF80, - * see http://www.microsoft.com/msj/1099/bugslayer/bugslayer1099.htm + * Per-thread values are stored in the TEB on offset 0xF80 */ /* will create if necessary */ diff --git a/dlls/ole32/dcom.idl b/dlls/ole32/dcom.idl index 6e5a454..d4abf43 100644 --- a/dlls/ole32/dcom.idl +++ b/dlls/ole32/dcom.idl @@ -16,8 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* see http://www.microsoft.com/msj/0398/dcom.htm */ -/* and the official DCOM specification +/* see the official DCOM specification * (there's a copy at http://www.grimes.demon.co.uk/DCOM/DCOMSpec.htm) */ import "unknwn.idl"; diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index b191821..dca2a1c 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -50,7 +50,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); /* see MSDN docs for IROTData::GetComparisonData, which states what this - * constant is (http://msdn2.microsoft.com/en-us/library/ms693773.aspx) */ + * constant is + */ #define MAX_COMPARISON_DATA 2048 static LONG WINAPI rpc_filter(EXCEPTION_POINTERS *eptr) diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index 4f91d7e..015d3fc 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -19,22 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* Documentation on MSDN: - * - * (Top level COM documentation) - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dnanchor/h… - * - * (COM Proxy) - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/com/htm/co… - * - * (COM Stub) - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/com/htm/co… - * - * (Marshal) - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/com/htm/co… - * - */ - #include "config.h" #include <stdlib.h> @@ -64,7 +48,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); static ULONG WINAPI RURpcProxyBufferImpl_Release(LPRPCPROXYBUFFER iface); -/* From: http://msdn.microsoft.com/library/en-us/com/cmi_m_4lda.asp +/* From msdn: * * The first time a client requests a pointer to an interface on a * particular object, COM loads an IClassFactory stub in the server diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 6f4c690..b688855 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -25,11 +25,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 * - * There's a decent overview of property set storage here: - * http://msdn.microsoft.com/archive/en-us/dnarolegen/html/msdn_propset.asp - * It's a little bit out of date, and more definitive references are given - * below, but it gives the best "big picture" that I've found. - * * TODO: * - I don't honor the maximum property set size. * - Certain bogus files could result in reading past the end of a buffer. @@ -68,9 +63,7 @@ static inline StorageImpl *impl_from_IPropertySetStorage( IPropertySetStorage *i return (StorageImpl *)((char*)iface - FIELD_OFFSET(StorageImpl, base.pssVtbl)); } -/* These are documented in MSDN, e.g. - * http://msdn.microsoft.com/library/en-us/stg/stg/property_set_header.asp - * http://msdn.microsoft.com/library/library/en-us/stg/stg/section.asp +/* These are documented in MSDN, * but they don't seem to be in any header file. */ #define PROPSETHDR_BYTEORDER_MAGIC 0xfffe @@ -87,9 +80,6 @@ static inline StorageImpl *impl_from_IPropertySetStorage( IPropertySetStorage *i #define CFTAG_FMTID (-3L) #define CFTAG_NODATA 0L -/* The format version (and what it implies) is described here: - * http://msdn.microsoft.com/library/en-us/stg/stg/format_version.asp - */ typedef struct tagPROPERTYSETHEADER { WORD wByteOrder; /* always 0xfffe */ @@ -1421,9 +1411,7 @@ static HRESULT PropertyStorage_ReadFromStream(PropertyStorage_impl *This) } if (!This->codePage) { - /* default to Unicode unless told not to, as specified here: - * http://msdn.microsoft.com/library/en-us/stg/stg/names_in_istorage.asp - */ + /* default to Unicode unless told not to, as specified on msdn */ if (This->grfFlags & PROPSETFLAG_ANSI) This->codePage = GetACP(); else @@ -2037,9 +2025,7 @@ static HRESULT PropertyStorage_ConstructEmpty(IStream *stm, ps->grfFlags = grfFlags; if (ps->grfFlags & PROPSETFLAG_CASE_SENSITIVE) ps->format = 1; - /* default to Unicode unless told not to, as specified here: - * http://msdn.microsoft.com/library/en-us/stg/stg/names_in_istorage.asp - */ + /* default to Unicode unless told not to, as specified here on mdsn */ if (ps->grfFlags & PROPSETFLAG_ANSI) ps->codePage = GetACP(); else @@ -2507,8 +2493,6 @@ static const WCHAR szDocSummaryInfo[] = { 5,'D','o','c','u','m','e','n','t', * * NOTES * str must be at least CCH_MAX_PROPSTG_NAME characters in length. - * Based on the algorithm described here: - * http://msdn.microsoft.com/library/en-us/stg/stg/names_in_istorage.asp */ HRESULT WINAPI FmtIdToPropStgName(const FMTID *rfmtid, LPOLESTR str) { @@ -2574,10 +2558,6 @@ HRESULT WINAPI FmtIdToPropStgName(const FMTID *rfmtid, LPOLESTR str) * RETURNS * E_INVALIDARG if rfmtid or str is NULL or if str can't be converted to * a format ID, S_OK otherwise. - * - * NOTES - * Based on the algorithm described here: - * http://msdn.microsoft.com/library/en-us/stg/stg/names_in_istorage.asp */ HRESULT WINAPI PropStgNameToFmtId(const LPOLESTR str, FMTID *rfmtid) { diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index fb6a20d..502f309 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1,6 +1,5 @@ /* * based on Windows Sockets 1.1 specs - * (ftp.microsoft.com:/Advsys/winsock/spec11/WINSOCK.TXT) * * Copyright (C) 1993,1994,1996,1997 John Brezak, Erik Bos, Alex Korobka. * Copyright (C) 2005 Marcus Meissner @@ -881,8 +880,7 @@ static unsigned int ws_sockaddr_ws2u(const struct WS_sockaddr* wsaddr, int wsadd const struct WS_sockaddr_in6* win6 = (const struct WS_sockaddr_in6*)wsaddr; /* Note: Windows has 2 versions of the sockaddr_in6 struct, one with - * scope_id, one without. Check: - * http://msdn.microsoft.com/library/en-us/winsock/winsock/sockaddr_2.asp + * scope_id, one without. */ if (wsaddrlen >= sizeof(struct WS_sockaddr_in6_old)) { uaddrlen = sizeof(struct sockaddr_in6);

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: c29c740de0d447fa2d44870ec225f7cb49ce0c1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c29c740de0d447fa2d44870ec… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri Feb 29 22:35:20 2008 -0600 janitorial: Remove links to any microsoft site. --- dlls/user32/combo.c | 2 -- dlls/user32/comm16.c | 1 - dlls/user32/cursoricon.c | 2 -- dlls/user32/dde_client.c | 1 - dlls/user32/exticon.c | 1 - dlls/winex11.drv/init.c | 3 +-- dlls/winex11.drv/palette.c | 3 --- dlls/winex11.drv/xfont.c | 4 ---- 8 files changed, 1 insertions(+), 16 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index cd78891..549600e 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -1837,8 +1837,6 @@ static char *strdupA(LPCSTR str) /*********************************************************************** * ComboWndProc_common - * - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/pl… */ static LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, BOOL unicode ) diff --git a/dlls/user32/comm16.c b/dlls/user32/comm16.c index f09389f..8bd4a44 100644 --- a/dlls/user32/comm16.c +++ b/dlls/user32/comm16.c @@ -817,7 +817,6 @@ INT16 WINAPI SetCommState16(LPDCB16 lpdcb) * 2. if it is greater than 57600, the baud rate is 115200 * 3. use the actual baudrate * steps 2 and 3 are equivalent to 16550 baudrate divisor = 115200/BaudRate - * see http://support.microsoft.com/support/kb/articles/q108/9/28.asp */ switch(lpdcb->BaudRate) { diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 0ec5b32..aa1bdf5 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -24,8 +24,6 @@ /* * Theory: * - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dnwui/html… - * * Cursors and icons are stored in a global heap block, with the * following layout: * diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index adec249..1a868ef 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -988,7 +988,6 @@ static WDML_QUEUE_STATE WDML_HandleReply(WDML_CONV* pConv, MSG* msg, HDDEDATA* h case WM_DDE_ACK: /* This happens at end of DdeClientTransaction XTYP_EXECUTE * Without this assignment, DdeClientTransaction's return value is undefined - * See also http://support.microsoft.com/kb/102574 */ *hdd = (HDDEDATA)TRUE; if (ack) diff --git a/dlls/user32/exticon.c b/dlls/user32/exticon.c index 8e9f938..e25e9c9 100644 --- a/dlls/user32/exticon.c +++ b/dlls/user32/exticon.c @@ -194,7 +194,6 @@ static BYTE * ICO_LoadIcon( LPBYTE peimage, LPicoICONDIRENTRY lpiIDE, ULONG *uSi * ICO_GetIconDirectory * * Reads .ico file and build phony ICONDIR struct - * see http://www.microsoft.com/win32dev/ui/icons.htm */ #define HEADER_SIZE (sizeof(CURSORICONDIR) - sizeof (CURSORICONDIRENTRY)) #define HEADER_SIZE_FILE (sizeof(icoICONDIR) - sizeof (icoICONDIRENTRY)) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index ebd9dde..5e549b9 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -251,8 +251,7 @@ INT X11DRV_GetDeviceCaps( X11DRV_PDEVICE *physDev, INT cap ) case CAPS1: FIXME("(%p): CAPS1 is unimplemented, will return 0\n", physDev->hdc ); /* please see wingdi.h for the possible bit-flag values that need - to be returned. also, see - http://msdn.microsoft.com/library/ddkdoc/win95ddk/graphcnt_1m0p.htm */ + to be returned. */ return 0; case SIZEPALETTE: return palette_size; diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index 1b74e2c..356cb95 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -43,9 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(palette); * the screendepth > 8 - we abandon palette mappings altogether * because pixel values can be calculated without X server * assistance. - * - * Windows palette manager is described in the - * http://premium.microsoft.com/msdn/library/techart/f30/f34/f40/d4d/sa942.htm */ #define NB_RESERVED_COLORS 20 /* number of fixed colors in system palette */ diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c index 7dc3a40..6137be7 100644 --- a/dlls/winex11.drv/xfont.c +++ b/dlls/winex11.drv/xfont.c @@ -1029,9 +1029,6 @@ static BOOL LFD_ComposeLFD( const fontObject* fo, /*********************************************************************** * X Font Resources - * - * font info - http://www.microsoft.com/kb/articles/q65/1/23.htm - * Windows font metrics - http://www.microsoft.com/kb/articles/q32/6/67.htm */ static void XFONT_GetLeading( const IFONTINFO16 *pFI, const XFontStruct* x_fs, INT16* pIL, INT16* pEL, const XFONTTRANS *XFT ) @@ -2404,7 +2401,6 @@ static int XFONT_GetDefResolution( int log_pixels_x, int log_pixels_y ) * weight, italics, underlines, strikeouts * * NOTE: you can experiment with different penalty weights to see what happens. - * http://premium.microsoft.com/msdn/library/techart/f365/f36b/f37b/d38b/sa8bf… */ static UINT XFONT_Match( fontMatch* pfm ) {

1 0