September 2007 - Wine-Commits

Andrew Talbot : gdiplus: Fix some memory leaks.
by Alexandre Julliard Sept. 27, 2007

Sept. 27, 2007

Module: wine Branch: master Commit: dfac0635f65c07e4f45106395aacbcce8819073f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfac0635f65c07e4f45106395… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Sep 25 20:52:58 2007 +0100 gdiplus: Fix some memory leaks. --- dlls/gdiplus/graphics.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 3072b50..c69c0e5 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1418,6 +1418,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string break; } + GdipFree(stringdup); DeleteObject(rgn); DeleteObject(gdifont); @@ -1827,6 +1828,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, bounds->Width = (REAL)max_width; bounds->Height = (REAL) min(height, nheight); + GdipFree(stringdup); DeleteObject(SelectObject(graphics->hdc, oldfont)); return Ok;

1 0

Alexandre Julliard : gdi32: Fix typo in FIXME (spotted by Rob Shearman).
by Alexandre Julliard Sept. 27, 2007

Sept. 27, 2007

Module: wine Branch: master Commit: 161821155d1e3e491f63a017d5fdcd9ea1e43339 URL: http://source.winehq.org/git/wine.git/?a=commit;h=161821155d1e3e491f63a017d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 27 18:05:57 2007 +0200 gdi32: Fix typo in FIXME (spotted by Rob Shearman). --- dlls/gdi32/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3ec28f9..6036f48 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5062,7 +5062,7 @@ BOOL WineEngGetLinkedHFont(DC *dc, WCHAR c, HFONT *new_hfont, UINT *glyph) DWORD WineEngGetFontUnicodeRanges(GdiFont *font, LPGLYPHSET glyphset) { - FIXME("(%p, %p): stub\n", hdc, glyphset); + FIXME("(%p, %p): stub\n", font, glyphset); return 0; }

1 0

Francois Gouget : riched20/tests: Add '\n's to ok() calls.
by Alexandre Julliard Sept. 27, 2007

Sept. 27, 2007

Module: wine Branch: master Commit: d32d8ac862270319c6ece3c97aebedfdbab34d7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d32d8ac862270319c6ece3c97… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 27 18:29:08 2007 +0200 riched20/tests: Add '\n's to ok() calls. --- dlls/riched20/tests/editor.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 0ec7da4..de36d6e 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1290,7 +1290,7 @@ static void test_EM_EXLIMITTEXT(void) /* try inserting more text at end */ i = SendMessage(hwndRichEdit, WM_CHAR, 'A', 0); - ok(0 == i, "WM_CHAR wasn't processed"); + ok(0 == i, "WM_CHAR wasn't processed\n"); SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); i = strlen(buffer); ok(10 == i, "expected 10 chars, got %i\n", i); @@ -1300,7 +1300,7 @@ static void test_EM_EXLIMITTEXT(void) /* try inserting text at beginning */ SendMessage(hwndRichEdit, EM_SETSEL, 0, 0); i = SendMessage(hwndRichEdit, WM_CHAR, 'A', 0); - ok(0 == i, "WM_CHAR wasn't processed"); + ok(0 == i, "WM_CHAR wasn't processed\n"); SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); i = strlen(buffer); ok(10 == i, "expected 10 chars, got %i\n", i); @@ -1312,9 +1312,9 @@ static void test_EM_EXLIMITTEXT(void) SendMessage(hwndRichEdit, EM_EXLIMITTEXT, 0, textlimit); SendMessage(hwndRichEdit, EM_SETSEL, 0, -1); /* select everything */ i = SendMessage(hwndRichEdit, WM_CHAR, 'A', 0); - ok(0 == i, "WM_CHAR wasn't processed"); + ok(0 == i, "WM_CHAR wasn't processed\n"); i = SendMessage(hwndRichEdit, WM_CHAR, 'A', 0); - ok(0 == i, "WM_CHAR wasn't processed"); + ok(0 == i, "WM_CHAR wasn't processed\n"); SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); i = strlen(buffer); ok(1 == i, "expected 1 chars, got %i instead\n", i);

1 0

Francois Gouget : includes: Make headers C++ compatible.
by Alexandre Julliard Sept. 27, 2007

Sept. 27, 2007

Module: wine Branch: master Commit: 4b340fff6fc5ab2ac9e249a993d402e20570b8ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b340fff6fc5ab2ac9e249a99… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 27 18:50:21 2007 +0200 includes: Make headers C++ compatible. --- include/appmgmt.h | 9 +++++++++ include/cfgmgr32.h | 9 +++++++++ include/evntrace.h | 8 ++++++++ include/icmpapi.h | 9 +++++++++ include/msiquery.h | 9 +++++++++ include/powrprof.h | 9 +++++++++ include/rpcdcep.h | 8 ++++++++ include/rpcproxy.h | 8 ++++++++ include/setupapi.h | 8 ++++++++ include/winnetwk.h | 7 +++++++ 10 files changed, 84 insertions(+), 0 deletions(-) diff --git a/include/appmgmt.h b/include/appmgmt.h index 5cc262f..385f81a 100644 --- a/include/appmgmt.h +++ b/include/appmgmt.h @@ -39,7 +39,16 @@ typedef struct _MANAGEDAPPLICATION BOOL bInstalled; } MANAGEDAPPLICATION, *PMANAGEDAPPLICATION; + +#ifdef __cplusplus +extern "C" { +#endif + DWORD WINAPI CommandLineFromMsiDescriptor(WCHAR*,WCHAR*,DWORD*); DWORD WINAPI GetManagedApplications(GUID*,DWORD,DWORD,LPDWORD,PMANAGEDAPPLICATION*); +#ifdef __cplusplus +} +#endif + #endif /* _APPMGMT_H */ diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index c5a4a25..3214c43 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -27,8 +27,17 @@ typedef DWORD CONFIGRET; #define MAX_GUID_STRING_LEN 39 #define MAX_PROFILE_LEN 80 + +#ifdef __cplusplus +extern "C" { +#endif + CONFIGRET WINAPI CM_Get_Device_ID_ListA( PCSTR, PCHAR, ULONG, ULONG ); CONFIGRET WINAPI CM_Get_Device_ID_ListW( PCWSTR, PWCHAR, ULONG, ULONG ); #define CM_Get_Device_ID_List WINELIB_NAME_AW(CM_Get_Device_ID_List) +#ifdef __cplusplus +} +#endif + #endif /* _CFGMGR32_H_ */ diff --git a/include/evntrace.h b/include/evntrace.h index c12b716..093696b 100644 --- a/include/evntrace.h +++ b/include/evntrace.h @@ -21,6 +21,10 @@ #include <guiddef.h> +#ifdef __cplusplus +extern "C" { +#endif + typedef ULONG64 TRACEHANDLE, *PTRACEHANDLE; struct _EVENT_TRACE_LOGFILEA; @@ -178,4 +182,8 @@ ULONG WINAPI RegisterTraceGuidsA(WMIDPREQUEST,PVOID,LPCGUID,ULONG,PTRACE_GUID_RE ULONG WINAPI RegisterTraceGuidsW(WMIDPREQUEST,PVOID,LPCGUID,ULONG,PTRACE_GUID_REGISTRATION,LPCWSTR,LPCWSTR,PTRACEHANDLE); #define RegisterTraceGuids WINELIB_NAME_AW(RegisterTraceGuids) +#ifdef __cplusplus +} +#endif + #endif /* _EVNTRACE_ */ diff --git a/include/icmpapi.h b/include/icmpapi.h index 8dfde8e..102851a 100644 --- a/include/icmpapi.h +++ b/include/icmpapi.h @@ -21,6 +21,11 @@ #ifndef __WINE_ICMPAPI_H #define __WINE_ICMPAPI_H +#ifdef __cplusplus +extern "C" { +#endif + + HANDLE WINAPI IcmpCreateFile( VOID ); @@ -41,4 +46,8 @@ DWORD WINAPI IcmpSendEcho( ); +#ifdef __cplusplus +} +#endif + #endif /* __WINE_ICMPAPI_H */ diff --git a/include/msiquery.h b/include/msiquery.h index 67205c9..1c52a76 100644 --- a/include/msiquery.h +++ b/include/msiquery.h @@ -142,6 +142,11 @@ typedef enum tagMSIDBSTATE MSIDBSTATE_WRITE = 1 } MSIDBSTATE; + +#ifdef __cplusplus +extern "C" { +#endif + /* view manipulation */ UINT WINAPI MsiViewFetch(MSIHANDLE,MSIHANDLE*); UINT WINAPI MsiViewExecute(MSIHANDLE,MSIHANDLE); @@ -307,4 +312,8 @@ UINT WINAPI MsiSetInstallLevel(MSIHANDLE, int); MSIHANDLE WINAPI MsiGetLastErrorRecord(void); +#ifdef __cplusplus +} +#endif + #endif /* __WINE_MSIQUERY_H */ diff --git a/include/powrprof.h b/include/powrprof.h index ea47b8a..5fed4ae 100644 --- a/include/powrprof.h +++ b/include/powrprof.h @@ -109,6 +109,11 @@ typedef struct _POWER_POLICY { } POWER_POLICY, *PPOWER_POLICY; + +#ifdef __cplusplus +extern "C" { +#endif + typedef BOOLEAN (CALLBACK* PWRSCHEMESENUMPROC)(UINT, DWORD, LPWSTR, DWORD, LPWSTR, PPOWER_POLICY, LPARAM); NTSTATUS WINAPI CallNtPowerInformation(POWER_INFORMATION_LEVEL, PVOID, ULONG, PVOID, ULONG); @@ -132,4 +137,8 @@ BOOLEAN WINAPI WriteGlobalPwrPolicy(PGLOBAL_POWER_POLICY); BOOLEAN WINAPI WriteProcessorPwrScheme(UINT, PMACHINE_PROCESSOR_POWER_POLICY); BOOLEAN WINAPI WritePwrScheme(PUINT, LPWSTR, LPWSTR, PPOWER_POLICY); +#ifdef __cplusplus +} +#endif + #endif /* _POWRPROF_H */ diff --git a/include/rpcdcep.h b/include/rpcdcep.h index 6c3f41f..944070f 100644 --- a/include/rpcdcep.h +++ b/include/rpcdcep.h @@ -19,6 +19,10 @@ #ifndef __WINE_RPCDCEP_H #define __WINE_RPCDCEP_H +#ifdef __cplusplus +extern "C" { +#endif + typedef struct _RPC_VERSION { unsigned short MajorVersion; unsigned short MinorVersion; @@ -182,4 +186,8 @@ RPCRTAPI UINT RPC_ENTRY #endif +#ifdef __cplusplus +} +#endif + #endif /*__WINE_RPCDCEP_H */ diff --git a/include/rpcproxy.h b/include/rpcproxy.h index 1ebc5d8..eaf2a6a 100644 --- a/include/rpcproxy.h +++ b/include/rpcproxy.h @@ -33,6 +33,10 @@ #include <rpc.h> #include <rpcndr.h> +#ifdef __cplusplus +extern "C" { +#endif + typedef struct tagCInterfaceStubVtbl *PCInterfaceStubVtblList; typedef struct tagCInterfaceProxyVtbl *PCInterfaceProxyVtblList; typedef const char *PCInterfaceName; @@ -357,4 +361,8 @@ RPCRTAPI HRESULT RPC_ENTRY #endif +#ifdef __cplusplus +} +#endif + #endif /*__WINE_RPCDCE_H */ diff --git a/include/setupapi.h b/include/setupapi.h index d52790d..3169807 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -22,6 +22,10 @@ #include <commctrl.h> +#ifdef __cplusplus +extern "C" { +#endif + /* setupapi doesn't use the normal convention, it adds an underscore before A/W */ #ifdef __WINESRC__ # define DECL_WINELIB_SETUPAPI_TYPE_AW(type) /* nothing */ @@ -1818,6 +1822,10 @@ PSTR WINAPI UnicodeToMultiByte(PCWSTR lpUnicodeStr, UINT uCodePage); BOOL WINAPI UnmapAndCloseFile(HANDLE, HANDLE, PVOID); +#ifdef __cplusplus +} +#endif + #undef DECL_WINELIB_SETUPAPI_TYPE_AW #ifdef __cplusplus diff --git a/include/winnetwk.h b/include/winnetwk.h index e0b8ab8..b69c0eb 100644 --- a/include/winnetwk.h +++ b/include/winnetwk.h @@ -20,6 +20,10 @@ #ifndef _WINNETWK_H_ #define _WINNETWK_H_ +#ifdef __cplusplus +extern "C" { +#endif + /* * Network types */ @@ -401,5 +405,8 @@ UINT WINAPI WNetEnumCachedPasswords( LPSTR, WORD, BYTE, ENUMPASSWORDPROC, DWORD) DWORD WINAPI WNetGetCachedPassword( LPSTR, WORD, LPSTR, LPWORD, BYTE ); DWORD WINAPI WNetCachePassword( LPSTR, WORD, LPSTR, WORD, BYTE, WORD ); +#ifdef __cplusplus +} +#endif #endif /* _WINNETWK_H_ */

1 0

Francois Gouget : ntoskrnl.exe: Fix the PsCreateSystemThread() prototype and declare it in wdm.h.
by Alexandre Julliard Sept. 27, 2007

Sept. 27, 2007

Module: wine Branch: master Commit: 17c57737c93a563e7ff156ba937bd50320c01156 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17c57737c93a563e7ff156ba9… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 27 18:53:23 2007 +0200 ntoskrnl.exe: Fix the PsCreateSystemThread() prototype and declare it in wdm.h. Add a prototype for PsTerminateSystemThread(). --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- include/ddk/wdm.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 87b0ef5..4eec5f5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -483,7 +483,7 @@ void WINAPI MmFreeNonCachedMemory( void *addr, SIZE_T size ) NTSTATUS WINAPI PsCreateSystemThread(PHANDLE ThreadHandle, ULONG DesiredAccess, POBJECT_ATTRIBUTES ObjectAttributes, HANDLE ProcessHandle, PCLIENT_ID ClientId, - PVOID StartRoutine, PVOID StartContext) + PKSTART_ROUTINE StartRoutine, PVOID StartContext) { if (!ProcessHandle) ProcessHandle = GetCurrentProcess(); return RtlCreateUserThread(ProcessHandle, 0, FALSE, 0, 0, diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index f9e2a5f..c78e2da 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -37,6 +37,7 @@ struct _DEVICE_OBJECT; struct _DRIVER_OBJECT; typedef VOID (WINAPI *PKDEFERRED_ROUTINE)(struct _KDPC *, PVOID, PVOID, PVOID); +typedef VOID (WINAPI *PKSTART_ROUTINE)(PVOID); typedef NTSTATUS (WINAPI *PDRIVER_INITIALIZE)(struct _DRIVER_OBJECT *, PUNICODE_STRING); typedef NTSTATUS (WINAPI *PDRIVER_DISPATCH)(struct _DEVICE_OBJECT *, struct _IRP *); @@ -889,11 +890,13 @@ ULONG WINAPI KeQueryTimeIncrement(void); PVOID WINAPI MmAllocateNonCachedMemory(SIZE_T); void WINAPI MmFreeNonCachedMemory(PVOID,SIZE_T); +NTSTATUS WINAPI PsCreateSystemThread(PHANDLE,ULONG,POBJECT_ATTRIBUTES,HANDLE,PCLIENT_ID,PKSTART_ROUTINE,PVOID); #define PsGetCurrentProcess() IoGetCurrentProcess() #define PsGetCurrentThread() ((PETHREAD)KeGetCurrentThread()) HANDLE WINAPI PsGetCurrentProcessId(void); HANDLE WINAPI PsGetCurrentThreadId(void); BOOLEAN WINAPI PsGetVersion(ULONG*,ULONG*,ULONG*,UNICODE_STRING*); +NTSTATUS WINAPI PsTerminateSystemThread(NTSTATUS); NTSTATUS WINAPI ZwAddBootEntry(PUNICODE_STRING,PUNICODE_STRING); NTSTATUS WINAPI ZwAccessCheckAndAuditAlarm(PUNICODE_STRING,HANDLE,PUNICODE_STRING,PUNICODE_STRING,PSECURITY_DESCRIPTOR,ACCESS_MASK,PGENERIC_MAPPING,BOOLEAN,PACCESS_MASK,PBOOLEAN,PBOOLEAN);

1 0

Andrew Talbot : kernel32: Fix a memory leak.
by Alexandre Julliard Sept. 27, 2007

Sept. 27, 2007

Module: wine Branch: master Commit: 344e8acb8e40075587220464715414cdf907bf10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=344e8acb8e400755872204647… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Sep 26 16:51:29 2007 +0100 kernel32: Fix a memory leak. --- dlls/kernel32/profile.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 27a3d06..f58a989 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -311,7 +311,7 @@ static inline ENCODING PROFILE_DetectTextEncoding(const void * buffer, int * len */ static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) { - void *pBuffer; + void *buffer_base, *pBuffer; WCHAR * szFile; const WCHAR *szLineStart, *szLineEnd; const WCHAR *szValueStart, *szEnd, *next_line; @@ -327,20 +327,20 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) if (dwFileSize == INVALID_FILE_SIZE) return NULL; - pBuffer = HeapAlloc(GetProcessHeap(), 0 , dwFileSize); - if (!pBuffer) return NULL; + buffer_base = HeapAlloc(GetProcessHeap(), 0 , dwFileSize); + if (!buffer_base) return NULL; - if (!ReadFile(hFile, pBuffer, dwFileSize, &dwFileSize, NULL)) + if (!ReadFile(hFile, buffer_base, dwFileSize, &dwFileSize, NULL)) { - HeapFree(GetProcessHeap(), 0, pBuffer); + HeapFree(GetProcessHeap(), 0, buffer_base); WARN("Error %d reading file\n", GetLastError()); return NULL; } len = dwFileSize; - *pEncoding = PROFILE_DetectTextEncoding(pBuffer, &len); + *pEncoding = PROFILE_DetectTextEncoding(buffer_base, &len); /* len is set to the number of bytes in the character marker. * we want to skip these bytes */ - pBuffer = (char *)pBuffer + len; + pBuffer = (char *)buffer_base + len; dwFileSize -= len; switch (*pEncoding) { @@ -351,7 +351,7 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) szFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (!szFile) { - HeapFree(GetProcessHeap(), 0, pBuffer); + HeapFree(GetProcessHeap(), 0, buffer_base); return NULL; } MultiByteToWideChar(CP_ACP, 0, (char *)pBuffer, dwFileSize, szFile, len); @@ -364,7 +364,7 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) szFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (!szFile) { - HeapFree(GetProcessHeap(), 0, pBuffer); + HeapFree(GetProcessHeap(), 0, buffer_base); return NULL; } MultiByteToWideChar(CP_UTF8, 0, (char *)pBuffer, dwFileSize, szFile, len); @@ -383,7 +383,7 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) break; default: FIXME("encoding type %d not implemented\n", *pEncoding); - HeapFree(GetProcessHeap(), 0, pBuffer); + HeapFree(GetProcessHeap(), 0, buffer_base); return NULL; } @@ -392,7 +392,7 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) { if (szFile != pBuffer) HeapFree(GetProcessHeap(), 0, szFile); - HeapFree(GetProcessHeap(), 0, pBuffer); + HeapFree(GetProcessHeap(), 0, buffer_base); return NULL; } first_section->name[0] = 0; @@ -489,7 +489,7 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) } if (szFile != pBuffer) HeapFree(GetProcessHeap(), 0, szFile); - HeapFree(GetProcessHeap(), 0, pBuffer); + HeapFree(GetProcessHeap(), 0, buffer_base); return first_section; }

1 0

Francois Gouget : includes: Remove unneeded extern "C" statements.
by Alexandre Julliard Sept. 27, 2007

Sept. 27, 2007

Module: wine Branch: master Commit: 74b240bff207d048e2d519e58316581bbe944b19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74b240bff207d048e2d519e58… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 27 18:47:24 2007 +0200 includes: Remove unneeded extern "C" statements. --- include/msidefs.h | 8 -------- include/wshisotp.h | 7 ------- 2 files changed, 0 insertions(+), 15 deletions(-) diff --git a/include/msidefs.h b/include/msidefs.h index 9e1e75d..ab9dcb6 100644 --- a/include/msidefs.h +++ b/include/msidefs.h @@ -19,10 +19,6 @@ #ifndef __WINE_MSIDEFS_H #define __WINE_MSIDEFS_H -#ifdef __cplusplus -extern "C" { -#endif - enum msidbUpgradeAttributes { msidbUpgradeAttributesMigrateFeatures = 0x0000001, msidbUpgradeAttributesOnlyDetect = 0x00000002, @@ -243,8 +239,4 @@ enum msidbServiceControlEvent #define PID_MSISOURCE PID_WORDCOUNT #define PID_MSIRESTRICT PID_CHARCOUNT -#ifdef __cplusplus -} -#endif - #endif /* __WINE_MSIDEFS_H */ diff --git a/include/wshisotp.h b/include/wshisotp.h index 28f2182..2e91086 100644 --- a/include/wshisotp.h +++ b/include/wshisotp.h @@ -19,9 +19,6 @@ #ifndef _WINE_WSHISOTP_ #define _WINE_WSHISOTP_ -#ifdef __cplusplus -extern "C" { -#endif /* defined(__cplusplus) */ /* * constants @@ -30,8 +27,4 @@ extern "C" { #define ISOPROTO_TP ISOPROTO_TP4 -#ifdef __cplusplus -} /* extern "C" */ -#endif /* defined(__cplusplus) */ - #endif /* _WINE_WSHISOTP_ */

1 0

Alexandre Julliard : winex11.drv: Don' t call GDI functions while holding the X11 lock.
by Alexandre Julliard Sept. 27, 2007

Sept. 27, 2007

Module: wine Branch: master Commit: 809af590a191459c232bd00e0f0238747fc13f58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=809af590a191459c232bd00e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 27 18:02:26 2007 +0200 winex11.drv: Don't call GDI functions while holding the X11 lock. --- dlls/winex11.drv/bitblt.c | 48 ++++++++++++++++++++++++++++++++++--------- dlls/winex11.drv/dib.c | 15 ++++++++++-- dlls/winex11.drv/graphics.c | 24 +++++++++++--------- dlls/winex11.drv/init.c | 4 ++- dlls/winex11.drv/opengl.c | 10 ++++++-- dlls/winex11.drv/xrender.c | 4 ++- 6 files changed, 76 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=809af590a191459c232bd…

1 0

Mikolaj Zalewski : advapi32: The lpServiceStartName should default to LocalSystem for Win32 services.
by Alexandre Julliard Sept. 27, 2007

Sept. 27, 2007

Module: wine Branch: master Commit: 2ba324738d9d04e7b32cd9fc0ec7b0aa8b45305b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ba324738d9d04e7b32cd9fc0… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Wed Sep 26 11:45:51 2007 -0700 advapi32: The lpServiceStartName should default to LocalSystem for Win32 services. --- dlls/advapi32/service.c | 4 ++++ dlls/advapi32/tests/service.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 82bd7ed..4708506 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -39,6 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(advapi); +static const WCHAR szLocalSystem[] = {'L','o','c','a','l','S','y','s','t','e','m',0}; static const WCHAR szServiceManagerKey[] = { 'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'S','e','r','v','i','c','e','s',0 }; @@ -1342,6 +1343,9 @@ CreateServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, return NULL; } + if (!lpServiceStartName && (dwServiceType & SERVICE_WIN32)) + lpServiceStartName = szLocalSystem; + /* StartType can only be a single value (if several values are mixed the result is probably not what was intended) */ if (dwStartType > SERVICE_DISABLED) { diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index bfb535d..79b4c3c 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -815,8 +815,8 @@ static void test_sequence(void) todo_wine { ok(!memcmp(config->lpDependencies, dependencies, sizeof(dependencies)), "Wrong string\n"); - ok(!strcmp(config->lpServiceStartName, localsystem), "Expected 'LocalSystem', got '%s'\n", config->lpServiceStartName); } + ok(!strcmp(config->lpServiceStartName, localsystem), "Expected 'LocalSystem', got '%s'\n", config->lpServiceStartName); ok(!strcmp(config->lpDisplayName, displayname), "Expected '%s', got '%s'\n", displayname, config->lpDisplayName); SetLastError(0xdeadbeef);

1 0

Maarten Lankhorst : wineoss: Only initialise midi once.
by Alexandre Julliard Sept. 27, 2007

Sept. 27, 2007

Module: wine Branch: master Commit: cb92675953ced8d699c3fe542a10e8d45182b600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb92675953ced8d699c3fe542… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Sep 27 00:19:14 2007 +0200 wineoss: Only initialise midi once. --- dlls/wineoss.drv/midi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 7472b56..dfacffb 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -187,7 +187,7 @@ LRESULT OSS_MidiInit(void) return 0; TRACE("Initializing the MIDI variables.\n"); - bInitDone = 0; + bInitDone = TRUE; /* try to open device */ if (midiOpenSeq() == -1) {

1 0