wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

Nikolay Sivov : kernel32/lcformat: Add support for genitive month names in GetDateFormat().
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: 8ea4102a6c6e0ce0fad52e87fdd94530475255f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ea4102a6c6e0ce0fad52e87f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Dec 4 03:06:58 2009 +0300 kernel32/lcformat: Add support for genitive month names in GetDateFormat(). --- dlls/kernel32/lcformat.c | 90 +++++++++++++++++++++++++++++++++++++---- dlls/kernel32/tests/locale.c | 69 ++++++++++++++++++++++++++++++++ 2 files changed, 150 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8ea4102a6c6e0ce0fad52…

1 0

Nikolay Sivov : kernel32/lcformat: Don't use uneeded string conversion.
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: 8e4f283e2de59fad52b60c500007187e36b64a8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e4f283e2de59fad52b60c500… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Dec 3 23:02:21 2009 +0300 kernel32/lcformat: Don't use uneeded string conversion. --- dlls/kernel32/lcformat.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index 83c190f..c24ee37 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -470,7 +470,6 @@ static INT NLS_GetDateTimeFormatW(LCID lcid, DWORD dwFlags, else if ((dwFlags & DATE_DATEVARSONLY && IsDateFmtChar(*lpFormat)) || (dwFlags & TIME_TIMEVARSONLY && IsTimeFmtChar(*lpFormat))) { - char buffA[32]; WCHAR buff[32], fmtChar; LPCWSTR szAdd = NULL; DWORD dwVal = 0; @@ -604,9 +603,9 @@ static INT NLS_GetDateTimeFormatW(LCID lcid, DWORD dwFlags, if (szAdd == buff && buff[0] == '\0') { + static const WCHAR fmtW[] = {'%','.','*','d',0}; /* We have a numeric value to add */ - sprintf(buffA, "%.*d", count, dwVal); - MultiByteToWideChar(CP_ACP, 0, buffA, -1, buff, sizeof(buff)/sizeof(WCHAR)); + snprintfW(buff, sizeof(buff)/sizeof(WCHAR), fmtW, count, dwVal); } dwLen = szAdd ? strlenW(szAdd) : 0;

1 0

Nikolay Sivov : kernel32/lcformat: Avoid back jumps on failure.
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: 1a2609189f9d96e919d32ac6560976b55a40cc39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a2609189f9d96e919d32ac65… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Dec 3 21:23:43 2009 +0300 kernel32/lcformat: Avoid back jumps on failure. --- dlls/kernel32/lcformat.c | 38 ++++++++++++++++++++------------------ 1 files changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index f1b5ba5..83c190f 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -355,11 +355,7 @@ static INT NLS_GetDateTimeFormatW(LCID lcid, DWORD dwFlags, /* Verify our arguments */ if ((cchOut && !lpStr) || !(node = NLS_GetFormats(lcid, dwFlags))) - { -NLS_GetDateTimeFormatW_InvalidParameter: - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } + goto invalid_parameter; if (dwFlags & ~(DATE_DATEVARSONLY|TIME_TIMEVARSONLY)) { @@ -367,15 +363,13 @@ NLS_GetDateTimeFormatW_InvalidParameter: ((dwFlags & DATE_DATEVARSONLY && dwFlags & ~DATE_FORMAT_FLAGS) || (dwFlags & TIME_TIMEVARSONLY && dwFlags & ~TIME_FORMAT_FLAGS))) { -NLS_GetDateTimeFormatW_InvalidFlags: - SetLastError(ERROR_INVALID_FLAGS); - return 0; + goto invalid_flags; } if (dwFlags & DATE_DATEVARSONLY) { if ((dwFlags & (DATE_LTRREADING|DATE_RTLREADING)) == (DATE_LTRREADING|DATE_RTLREADING)) - goto NLS_GetDateTimeFormatW_InvalidFlags; + goto invalid_flags; else if (dwFlags & (DATE_LTRREADING|DATE_RTLREADING)) FIXME("Unsupported flags: DATE_LTRREADING/DATE_RTLREADING\n"); @@ -387,10 +381,10 @@ NLS_GetDateTimeFormatW_InvalidFlags: case DATE_LONGDATE: case DATE_YEARMONTH: if (lpFormat) - goto NLS_GetDateTimeFormatW_InvalidFlags; + goto invalid_flags; break; default: - goto NLS_GetDateTimeFormatW_InvalidFlags; + goto invalid_flags; } } } @@ -429,7 +423,7 @@ NLS_GetDateTimeFormatW_InvalidFlags: st.wDay = lpTime->wDay; if (st.wDay > 31 || st.wMonth > 12 || !SystemTimeToFileTime(&st, &ftTmp)) - goto NLS_GetDateTimeFormatW_InvalidParameter; + goto invalid_parameter; FileTimeToSystemTime(&ftTmp, &st); lpTime = &st; @@ -439,7 +433,7 @@ NLS_GetDateTimeFormatW_InvalidFlags: { /* Verify the time */ if (lpTime->wHour > 24 || lpTime->wMinute > 59 || lpTime->wSecond > 59) - goto NLS_GetDateTimeFormatW_InvalidParameter; + goto invalid_parameter; } } @@ -464,7 +458,7 @@ NLS_GetDateTimeFormatW_InvalidFlags: if (!cchOut) cchWritten++; /* Count size only */ else if (cchWritten >= cchOut) - goto NLS_GetDateTimeFormatW_Overrun; + goto overrun; else if (!bSkipping) { lpStr[cchWritten] = *lpFormat; @@ -624,7 +618,7 @@ NLS_GetDateTimeFormatW_InvalidFlags: else { memcpy(lpStr + cchWritten, szAdd, (cchOut - cchWritten) * sizeof(WCHAR)); - goto NLS_GetDateTimeFormatW_Overrun; + goto overrun; } } cchWritten += dwLen; @@ -636,7 +630,7 @@ NLS_GetDateTimeFormatW_InvalidFlags: if (!cchOut) cchWritten++; /* Count size only */ else if (cchWritten >= cchOut) - goto NLS_GetDateTimeFormatW_Overrun; + goto overrun; else if (!bSkipping || *lpFormat == ' ') { lpStr[cchWritten] = *lpFormat; @@ -650,7 +644,7 @@ NLS_GetDateTimeFormatW_InvalidFlags: if (cchOut) { if (cchWritten >= cchOut) - goto NLS_GetDateTimeFormatW_Overrun; + goto overrun; else lpStr[cchWritten] = '\0'; } @@ -659,10 +653,18 @@ NLS_GetDateTimeFormatW_InvalidFlags: TRACE("returning length=%d, ouput=%s\n", cchWritten, debugstr_w(lpStr)); return cchWritten; -NLS_GetDateTimeFormatW_Overrun: +overrun: TRACE("returning 0, (ERROR_INSUFFICIENT_BUFFER)\n"); SetLastError(ERROR_INSUFFICIENT_BUFFER); return 0; + +invalid_parameter: + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + +invalid_flags: + SetLastError(ERROR_INVALID_FLAGS); + return 0; } /******************************************************************************

1 0

Juan Lang : wintrust: Fix memory leaks in tests.
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: ba9ccc51e252ac9f38cb4c145b5619ac5508b6fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba9ccc51e252ac9f38cb4c145… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 3 15:12:57 2009 -0800 wintrust: Fix memory leaks in tests. --- dlls/wintrust/tests/softpub.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index c60ccb3..e01a26c 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -179,8 +179,12 @@ static void test_utils(SAFE_PROVIDER_FUNCTIONS *funcs) ok(data.pasSigners[0].pasCertChain != NULL, "Expected pasCertChain to be allocated\n"); if (data.pasSigners[0].pasCertChain) + { ok(data.pasSigners[0].pasCertChain[0].pCert == cert, "Unexpected cert\n"); + CertFreeCertificateContext( + data.pasSigners[0].pasCertChain[0].pCert); + } CertFreeCertificateContext(cert); } else @@ -433,6 +437,9 @@ static void testCertTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) (CERT_CONFIDENCE_SIG | CERT_CONFIDENCE_TIMENEST), "Expected CERT_CONFIDENCE_SIG | CERT_CONFIDENCE_TIMENEST, got %08x\n", data.pasSigners[0].pasCertChain[0].dwConfidence); + CertFreeCertificateContext( + data.pasSigners[0].pasCertChain[0].pCert); + CertFreeCertificateChain(data.pasSigners[0].pChainContext); CertFreeCertificateContext(cert); } }

1 0

Roderick Colenbrander : wgl: Add a direct rendering check to new winediag channel.
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: a191184ae9b2c3f7d94fd39c3674066fe79494b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a191184ae9b2c3f7d94fd39c3… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Dec 3 21:12:26 2009 +0100 wgl: Add a direct rendering check to new winediag channel. --- dlls/winex11.drv/opengl.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 19e3fe3..aadb7f1 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -29,12 +29,20 @@ #include <stdlib.h> #include <string.h> +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif +#ifdef HAVE_SYS_UN_H +#include <sys/un.h> +#endif + #include "x11drv.h" #include "winternl.h" #include "wine/library.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wgl); +WINE_DECLARE_DEBUG_CHANNEL(winediag); #ifdef SONAME_LIBGL @@ -351,6 +359,19 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) TRACE("Client GLX vendor: : %s.\n", WineGLInfo.glxClientVendor); TRACE("Direct rendering enabled: %s\n", WineGLInfo.glxDirect ? "True" : "False"); + if(!WineGLInfo.glxDirect) + { + int fd = ConnectionNumber(gdi_display); + struct sockaddr_un uaddr; + unsigned int uaddrlen = sizeof(struct sockaddr_un); + + /* In general indirect rendering on a local X11 server indicates a driver problem. + * Detect a local X11 server by checking whether the X11 socket is a Unix socket. + */ + if(!getsockname(fd, &uaddr, &uaddrlen) && uaddr.sun_family == AF_UNIX) + ERR_(winediag)("Direct rendering is disabled, most likely your OpenGL drivers haven't been installed correctly\n"); + } + if(vis) XFree(vis); if(ctx) { pglXMakeCurrent(gdi_display, None, NULL);

1 0

Alexandre Julliard : ntdll/tests: Fix a few test failures on Windows in the open by id test.
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: 3dd6c9a6fe41c47c141a0ca5f2265b7c2cddf2f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dd6c9a6fe41c47c141a0ca5f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 4 12:06:40 2009 +0100 ntdll/tests: Fix a few test failures on Windows in the open by id test. --- dlls/ntdll/tests/file.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index aeb8cc7..39e71a5 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -199,7 +199,9 @@ static void open_file_test(void) nameW.Length += sizeof(WCHAR); status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE ); - ok( status == STATUS_INVALID_PARAMETER || status == STATUS_OBJECT_PATH_SYNTAX_BAD, /* nt4 */ + ok( status == STATUS_INVALID_PARAMETER || + status == STATUS_OBJECT_NAME_INVALID || + status == STATUS_OBJECT_PATH_SYNTAX_BAD, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); if (!status) CloseHandle( handle ); @@ -228,8 +230,13 @@ static void open_file_test(void) FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN_BY_FILE_ID | ((info->FileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? FILE_DIRECTORY_FILE : 0) ); - ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, + ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED || status == STATUS_NOT_IMPLEMENTED, "open %s failed %x\n", wine_dbgstr_w(info->FileName), status ); + if (status == STATUS_NOT_IMPLEMENTED) + { + win_skip( "FILE_OPEN_BY_FILE_ID not supported\n" ); + break; + } if (!status) { FILE_ALL_INFORMATION all_info;

1 0

Alexandre Julliard : ntdll: Add stubs for RtlAddFunctionTable and RtlDeleteFunctionTable.
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: 866db819b8684f9a11fe977de398221f292ead09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=866db819b8684f9a11fe977de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 4 12:06:20 2009 +0100 ntdll: Add stubs for RtlAddFunctionTable and RtlDeleteFunctionTable. --- dlls/kernel32/kernel32.spec | 1 + dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/signal_x86_64.c | 20 ++++++++++++++++++++ include/winnt.h | 2 ++ 4 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index aad5e79..bab25a0 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -924,6 +924,7 @@ @ stdcall ResetWriteWatch(ptr long) @ stdcall RestoreLastError(long) ntdll.RtlRestoreLastWin32Error @ stdcall ResumeThread(long) +@ cdecl -arch=x86_64 RtlAddFunctionTable(ptr long long) ntdll.RtlAddFunctionTable @ stdcall -register RtlCaptureContext(ptr) ntdll.RtlCaptureContext @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) ntdll.RtlCaptureStackBackTrace @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index e7f298d..0b3ebef 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -408,6 +408,7 @@ # @ stub RtlAddAuditAccessObjectAce # @ stub RtlAddCompoundAce # @ stub RtlAddRange +@ cdecl -arch=x86_64 RtlAddFunctionTable(ptr long long) @ stdcall RtlAddRefActivationContext(ptr) # @ stub RtlAddRefMemoryStream @ stdcall RtlAddVectoredExceptionHandler(long ptr) @@ -513,6 +514,7 @@ @ stdcall RtlDeleteCriticalSection(ptr) @ stub RtlDeleteElementGenericTable @ stub RtlDeleteElementGenericTableAvl +@ cdecl -arch=x86_64 RtlDeleteFunctionTable(ptr) @ stub RtlDeleteNoSplay @ stub RtlDeleteOwnersRanges @ stub RtlDeleteRange diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 94ec742..97a952e 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2311,6 +2311,26 @@ void signal_init_process(void) /********************************************************************** + * RtlAddFunctionTable (NTDLL.@) + */ +BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, DWORD64 addr ) +{ + FIXME( "%p %u %lx: stub\n", table, count, addr ); + return FALSE; +} + + +/********************************************************************** + * RtlDeleteFunctionTable (NTDLL.@) + */ +BOOLEAN CDECL RtlDeleteFunctionTable( RUNTIME_FUNCTION *table ) +{ + FIXME( "%p: stub\n", table ); + return FALSE; +} + + +/********************************************************************** * RtlLookupFunctionEntry (NTDLL.@) */ PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry( ULONG64 pc, ULONG64 *base, UNWIND_HISTORY_TABLE *table ) diff --git a/include/winnt.h b/include/winnt.h index fae8a45..e2d1d1a 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1076,6 +1076,8 @@ typedef struct _KNONVOLATILE_CONTEXT_POINTERS } DUMMYUNIONNAME2; } KNONVOLATILE_CONTEXT_POINTERS, *PKNONVOLATILE_CONTEXT_POINTERS; +BOOLEAN CDECL RtlAddFunctionTable(RUNTIME_FUNCTION*,DWORD,DWORD64); +BOOLEAN CDECL RtlDeleteFunctionTable(RUNTIME_FUNCTION*); PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry(DWORD64,DWORD64*,UNWIND_HISTORY_TABLE*); PVOID WINAPI RtlVirtualUnwind(ULONG,ULONG64,ULONG64,RUNTIME_FUNCTION*,CONTEXT*,PVOID*,ULONG64*,KNONVOLATILE_CONTEXT_POINTERS*);

1 0

Alexandre Julliard : include: Move some 64-bit definitions to winnt. h to match the latest PSDK.
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: 3c11ff975018cf07ec29ba4d9cbc1798257a38ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c11ff975018cf07ec29ba4d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 4 14:29:35 2009 +0100 include: Move some 64-bit definitions to winnt.h to match the latest PSDK. --- include/winnt.h | 158 ++++++++++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 168 ---------------------------------------------------- 2 files changed, 158 insertions(+), 168 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 222af22..fae8a45 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1004,8 +1004,166 @@ typedef struct _RUNTIME_FUNCTION DWORD UnwindData; } RUNTIME_FUNCTION, *PRUNTIME_FUNCTION; +#define UNWIND_HISTORY_TABLE_SIZE 12 + +typedef struct _UNWIND_HISTORY_TABLE_ENTRY +{ + ULONG64 ImageBase; + PRUNTIME_FUNCTION FunctionEntry; +} UNWIND_HISTORY_TABLE_ENTRY, *PUNWIND_HISTORY_TABLE_ENTRY; + +#define UNWIND_HISTORY_TABLE_NONE 0 +#define UNWIND_HISTORY_TABLE_GLOBAL 1 +#define UNWIND_HISTORY_TABLE_LOCAL 2 + +typedef struct _UNWIND_HISTORY_TABLE +{ + ULONG Count; + UCHAR Search; + ULONG64 LowAddress; + ULONG64 HighAddress; + UNWIND_HISTORY_TABLE_ENTRY Entry[UNWIND_HISTORY_TABLE_SIZE]; +} UNWIND_HISTORY_TABLE, *PUNWIND_HISTORY_TABLE; + +typedef struct _KNONVOLATILE_CONTEXT_POINTERS +{ + union + { + PM128A FloatingContext[16]; + struct + { + PM128A Xmm0; + PM128A Xmm1; + PM128A Xmm2; + PM128A Xmm3; + PM128A Xmm4; + PM128A Xmm5; + PM128A Xmm6; + PM128A Xmm7; + PM128A Xmm8; + PM128A Xmm9; + PM128A Xmm10; + PM128A Xmm11; + PM128A Xmm12; + PM128A Xmm13; + PM128A Xmm14; + PM128A Xmm15; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME1; + + union + { + PULONG64 IntegerContext[16]; + struct + { + PULONG64 Rax; + PULONG64 Rcx; + PULONG64 Rdx; + PULONG64 Rbx; + PULONG64 Rsp; + PULONG64 Rbp; + PULONG64 Rsi; + PULONG64 Rdi; + PULONG64 R8; + PULONG64 R9; + PULONG64 R10; + PULONG64 R11; + PULONG64 R12; + PULONG64 R13; + PULONG64 R14; + PULONG64 R15; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME2; +} KNONVOLATILE_CONTEXT_POINTERS, *PKNONVOLATILE_CONTEXT_POINTERS; + +PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry(DWORD64,DWORD64*,UNWIND_HISTORY_TABLE*); +PVOID WINAPI RtlVirtualUnwind(ULONG,ULONG64,ULONG64,RUNTIME_FUNCTION*,CONTEXT*,PVOID*,ULONG64*,KNONVOLATILE_CONTEXT_POINTERS*); + +#define UNW_FLAG_NHANDLER 0 +#define UNW_FLAG_EHANDLER 1 +#define UNW_FLAG_UHANDLER 2 +#define UNW_FLAG_CHAININFO 4 + #endif /* __x86_64__ */ +/* IA64 context definitions */ +#ifdef __ia64__ + +typedef struct _FRAME_POINTERS { + ULONGLONG MemoryStackFp; + ULONGLONG BackingStoreFp; +} FRAME_POINTERS, *PFRAME_POINTERS; + +#define UNWIND_HISTORY_TABLE_SIZE 12 + +typedef struct _UNWIND_HISTORY_TABLE_ENTRY { + ULONG64 ImageBase; + ULONG64 Gp; + PRUNTIME_FUNCTION FunctionEntry; +} UNWIND_HISTORY_TABLE_ENTRY, *PUNWIND_HISTORY_TABLE_ENTRY; + +typedef struct _UNWIND_HISTORY_TABLE { + ULONG Count; + UCHAR Search; + ULONG64 LowAddress; + ULONG64 HighAddress; + UNWIND_HISTORY_TABLE_ENTRY Entry[UNWIND_HISTORY_TABLE_SIZE]; +} UNWIND_HISTORY_TABLE, *PUNWIND_HISTORY_TABLE; + +typedef struct _KNONVOLATILE_CONTEXT_POINTERS +{ + PFLOAT128 FltS0; + PFLOAT128 FltS1; + PFLOAT128 FltS2; + PFLOAT128 FltS3; + PFLOAT128 HighFloatingContext[10]; + PFLOAT128 FltS4; + PFLOAT128 FltS5; + PFLOAT128 FltS6; + PFLOAT128 FltS7; + PFLOAT128 FltS8; + PFLOAT128 FltS9; + PFLOAT128 FltS10; + PFLOAT128 FltS11; + PFLOAT128 FltS12; + PFLOAT128 FltS13; + PFLOAT128 FltS14; + PFLOAT128 FltS15; + PFLOAT128 FltS16; + PFLOAT128 FltS17; + PFLOAT128 FltS18; + PFLOAT128 FltS19; + PULONGLONG IntS0; + PULONGLONG IntS1; + PULONGLONG IntS2; + PULONGLONG IntS3; + PULONGLONG IntSp; + PULONGLONG IntS0Nat; + PULONGLONG IntS1Nat; + PULONGLONG IntS2Nat; + PULONGLONG IntS3Nat; + PULONGLONG IntSpNat; + PULONGLONG Preds; + PULONGLONG BrRp; + PULONGLONG BrS0; + PULONGLONG BrS1; + PULONGLONG BrS2; + PULONGLONG BrS3; + PULONGLONG BrS4; + PULONGLONG ApUNAT; + PULONGLONG ApLC; + PULONGLONG ApEC; + PULONGLONG RsPFS; + PULONGLONG StFSR; + PULONGLONG StFIR; + PULONGLONG StFDR; + PULONGLONG Cflag; +} KNONVOLATILE_CONTEXT_POINTERS, *PKNONVOLATILE_CONTEXT_POINTERS; + +ULONGLONG WINAPI RtlVirtualUnwind(ULONGLONG,ULONGLONG,RUNTIME_FUNCTION*,CONTEXT*,BOOLEAN*,FRAME_POINTERS*,KNONVOLATILE_CONTEXT_POINTERS*); + +#endif /* __ia64__ */ + /* Alpha context definitions */ #if defined(_ALPHA_) || defined(__ALPHA__) || defined(__alpha__) diff --git a/include/winternl.h b/include/winternl.h index 9625d88..315becf 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -883,174 +883,6 @@ typedef enum UNC_DOT_PATH /* "//." */ } DOS_PATHNAME_TYPE; -/*********************************************************************** - * IA64 specific types and data structures - */ - -#ifdef __ia64__ - -typedef struct _FRAME_POINTERS { - ULONGLONG MemoryStackFp; - ULONGLONG BackingStoreFp; -} FRAME_POINTERS, *PFRAME_POINTERS; - -#define UNWIND_HISTORY_TABLE_SIZE 12 - -typedef struct _UNWIND_HISTORY_TABLE_ENTRY { - ULONG64 ImageBase; - ULONG64 Gp; - PRUNTIME_FUNCTION FunctionEntry; -} UNWIND_HISTORY_TABLE_ENTRY, *PUNWIND_HISTORY_TABLE_ENTRY; - -typedef struct _UNWIND_HISTORY_TABLE { - ULONG Count; - UCHAR Search; - ULONG64 LowAddress; - ULONG64 HighAddress; - UNWIND_HISTORY_TABLE_ENTRY Entry[UNWIND_HISTORY_TABLE_SIZE]; -} UNWIND_HISTORY_TABLE, *PUNWIND_HISTORY_TABLE; - -typedef struct _KNONVOLATILE_CONTEXT_POINTERS -{ - PFLOAT128 FltS0; - PFLOAT128 FltS1; - PFLOAT128 FltS2; - PFLOAT128 FltS3; - PFLOAT128 HighFloatingContext[10]; - PFLOAT128 FltS4; - PFLOAT128 FltS5; - PFLOAT128 FltS6; - PFLOAT128 FltS7; - PFLOAT128 FltS8; - PFLOAT128 FltS9; - PFLOAT128 FltS10; - PFLOAT128 FltS11; - PFLOAT128 FltS12; - PFLOAT128 FltS13; - PFLOAT128 FltS14; - PFLOAT128 FltS15; - PFLOAT128 FltS16; - PFLOAT128 FltS17; - PFLOAT128 FltS18; - PFLOAT128 FltS19; - PULONGLONG IntS0; - PULONGLONG IntS1; - PULONGLONG IntS2; - PULONGLONG IntS3; - PULONGLONG IntSp; - PULONGLONG IntS0Nat; - PULONGLONG IntS1Nat; - PULONGLONG IntS2Nat; - PULONGLONG IntS3Nat; - PULONGLONG IntSpNat; - PULONGLONG Preds; - PULONGLONG BrRp; - PULONGLONG BrS0; - PULONGLONG BrS1; - PULONGLONG BrS2; - PULONGLONG BrS3; - PULONGLONG BrS4; - PULONGLONG ApUNAT; - PULONGLONG ApLC; - PULONGLONG ApEC; - PULONGLONG RsPFS; - PULONGLONG StFSR; - PULONGLONG StFIR; - PULONGLONG StFDR; - PULONGLONG Cflag; -} KNONVOLATILE_CONTEXT_POINTERS, *PKNONVOLATILE_CONTEXT_POINTERS; - -ULONGLONG WINAPI RtlVirtualUnwind(ULONGLONG,ULONGLONG,RUNTIME_FUNCTION*,CONTEXT*,BOOLEAN*,FRAME_POINTERS*,KNONVOLATILE_CONTEXT_POINTERS*); - -#endif /* defined(__ia64__) */ - -/*********************************************************************** - * x86-64 specific types and data structures - */ - -#ifdef __x86_64__ - -#define UNWIND_HISTORY_TABLE_SIZE 12 - -typedef struct _UNWIND_HISTORY_TABLE_ENTRY -{ - ULONG64 ImageBase; - PRUNTIME_FUNCTION FunctionEntry; -} UNWIND_HISTORY_TABLE_ENTRY, *PUNWIND_HISTORY_TABLE_ENTRY; - -#define UNWIND_HISTORY_TABLE_NONE 0 -#define UNWIND_HISTORY_TABLE_GLOBAL 1 -#define UNWIND_HISTORY_TABLE_LOCAL 2 - -typedef struct _UNWIND_HISTORY_TABLE -{ - ULONG Count; - UCHAR Search; - ULONG64 LowAddress; - ULONG64 HighAddress; - UNWIND_HISTORY_TABLE_ENTRY Entry[UNWIND_HISTORY_TABLE_SIZE]; -} UNWIND_HISTORY_TABLE, *PUNWIND_HISTORY_TABLE; - -typedef struct _KNONVOLATILE_CONTEXT_POINTERS -{ - union - { - PM128A FloatingContext[16]; - struct - { - PM128A Xmm0; - PM128A Xmm1; - PM128A Xmm2; - PM128A Xmm3; - PM128A Xmm4; - PM128A Xmm5; - PM128A Xmm6; - PM128A Xmm7; - PM128A Xmm8; - PM128A Xmm9; - PM128A Xmm10; - PM128A Xmm11; - PM128A Xmm12; - PM128A Xmm13; - PM128A Xmm14; - PM128A Xmm15; - } DUMMYSTRUCTNAME; - } DUMMYUNIONNAME1; - - union - { - PULONG64 IntegerContext[16]; - struct - { - PULONG64 Rax; - PULONG64 Rcx; - PULONG64 Rdx; - PULONG64 Rbx; - PULONG64 Rsp; - PULONG64 Rbp; - PULONG64 Rsi; - PULONG64 Rdi; - PULONG64 R8; - PULONG64 R9; - PULONG64 R10; - PULONG64 R11; - PULONG64 R12; - PULONG64 R13; - PULONG64 R14; - PULONG64 R15; - } DUMMYSTRUCTNAME; - } DUMMYUNIONNAME2; -} KNONVOLATILE_CONTEXT_POINTERS, *PKNONVOLATILE_CONTEXT_POINTERS; - -PVOID WINAPI RtlVirtualUnwind(ULONG,ULONG64,ULONG64,RUNTIME_FUNCTION*,CONTEXT*,PVOID*,ULONG64*,KNONVOLATILE_CONTEXT_POINTERS*); - -#define UNW_FLAG_NHANDLER 0 -#define UNW_FLAG_EHANDLER 1 -#define UNW_FLAG_UHANDLER 2 -#define UNW_FLAG_CHAININFO 4 - -#endif /* __x86_64 */ - /*********************************************************************** * Types and data structures

1 0

Juan Lang : cryptnet: Store the bytes actually read, not the bytes available to be read.
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: 907205090652b8cf1398d46a0784880ee281e28f URL: http://source.winehq.org/git/wine.git/?a=commit;h=907205090652b8cf1398d46a0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 3 12:07:20 2009 -0800 cryptnet: Store the bytes actually read, not the bytes available to be read. --- dlls/cryptnet/cryptnet_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index fef7837..8b47602 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -669,7 +669,7 @@ static BOOL CRYPT_DownloadObject(DWORD dwRetrievalFlags, HINTERNET hHttp, } } if (ret) - object.cbData += bytesAvailable; + object.cbData += buffer.dwBufferLength; } else {

1 0

Aric Stewart : shlwapi: Close the correct key in SHRegCloseUSKey.
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: 3a55f964b9a2204bb94a08855d0d5374b0699af4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a55f964b9a2204bb94a08855… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 3 14:04:20 2009 -0600 shlwapi: Close the correct key in SHRegCloseUSKey. --- dlls/shlwapi/reg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index c6fa2c7..9f652c9 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -200,7 +200,7 @@ LONG WINAPI SHRegCloseUSKey( if (hKey->HKLMkey) ret = RegCloseKey(hKey->HKLMkey); if (hKey->HKLMstart && hKey->HKLMstart != HKEY_LOCAL_MACHINE) - ret = RegCloseKey(hKey->HKCUstart); + ret = RegCloseKey(hKey->HKLMstart); HeapFree(GetProcessHeap(), 0, hKey); return ret;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2009