July 2006 - Wine-commits - list.winehq.org

Mike McCormack : include: Add cierror.h.
by Alexandre Julliard 11 Jul '06

11 Jul '06

Module: wine Branch: refs/heads/master Commit: d690094807a3b66d2ed4dfcf3f02e52027c98967 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d690094807a3b66d2ed4dfc… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jul 10 15:22:40 2006 +0900 include: Add cierror.h. --- include/Makefile.in | 1 + include/cierror.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 0 deletions(-) create mode 100644 include/cierror.h diff --git a/include/Makefile.in b/include/Makefile.in index 3126010..a5ca78f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -69,6 +69,7 @@ WINDOWS_INCLUDES = \ basetyps.h \ cderr.h \ cguid.h \ + cierror.h \ commctrl.h \ commdlg.h \ compobj.h \ diff --git a/include/cierror.h b/include/cierror.h new file mode 100644 index 0000000..049985b --- /dev/null +++ b/include/cierror.h @@ -0,0 +1,44 @@ +/* + * Copyright 2006 Mike McCormack + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_CIERROR_H__ +#define __WINE_CIERROR_H__ + +#define CI_E_ALREADY_INITIALIZED 0x8004180a +#define CI_E_NOT_INITIALIZED 0x8004180b +#define CI_E_BUFFERTOOSMALL 0x8004180c +#define CI_E_PROPERTY_NOT_CACHED 0x8004180d +#define CI_E_INVALID_STATE 0x8004180f +#define CI_E_FILTERING_DISABLED 0x80041810 +#define CI_E_DISK_FULL 0x80041811 +#define CI_E_SHUTDOWN 0x80041812 +#define CI_E_WORKID_NOTVALID 0x80041813 +#define CI_E_NOT_FOUND 0x80041815 +#define CI_E_USE_DEFAULT_PID 0x80041816 +#define CI_E_DUPLICATE_NOTIFICATION 0x80041817 +#define CI_E_UPDATES_DISABLED 0x80041818 +#define CI_E_INVALID_FLAGS_COMBINATION 0x80041819 +#define CI_E_OUTOFSEQ_INCREMENT_DATA 0x8004181a +#define CI_E_SHARING_VIOLATION 0x8004181b +#define CI_E_LOGON_FAILURE 0x8004181c +#define CI_E_NO_CATALOG 0x8004181d +#define CI_E_STRANGE_PAGEORSECTOR_SIZE 0x8004181e +#define CI_E_TIMEOUT 0x8004181f +#define CI_E_NOT_RUNNING 0x80041820 + +#endif

1 0

Mike McCormack : ole32: Only print a FIXME if necessary in StgOpenStorageEx .
by Alexandre Julliard 11 Jul '06

11 Jul '06

Module: wine Branch: refs/heads/master Commit: 55ab8098547087d249747cbba4608111efa1b3eb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=55ab8098547087d249747cb… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jul 11 11:38:24 2006 +0900 ole32: Only print a FIXME if necessary in StgOpenStorageEx. --- dlls/ole32/storage32.c | 35 ++++++++++++++++++++--------------- 1 files changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index acebb98..8c7fc61 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -5829,28 +5829,33 @@ HRESULT WINAPI StgOpenStorageEx(const WC return STG_E_INVALIDPARAMETER; } - if (stgfmt == STGFMT_DOCFILE && grfAttrs != 0 && grfAttrs != FILE_FLAG_NO_BUFFERING) - { - ERR("grfAttrs must be 0 or FILE_FLAG_NO_BUFFERING if stgfmt == STGFMT_DOCFILE\n"); - return STG_E_INVALIDPARAMETER; - } - - if (stgfmt == STGFMT_FILE) + switch (stgfmt) { + case STGFMT_FILE: ERR("Cannot use STGFMT_FILE - this is NTFS only\n"); return STG_E_INVALIDPARAMETER; - } + + case STGFMT_STORAGE: + break; - if (stgfmt == STGFMT_STORAGE || stgfmt == STGFMT_DOCFILE || stgfmt == STGFMT_ANY) - { - if (stgfmt == STGFMT_ANY) - WARN("STGFMT_ANY assuming storage\n"); + case STGFMT_DOCFILE: + if (grfAttrs && grfAttrs != FILE_FLAG_NO_BUFFERING) + { + ERR("grfAttrs must be 0 or FILE_FLAG_NO_BUFFERING if stgfmt == STGFMT_DOCFILE\n"); + return STG_E_INVALIDPARAMETER; + } FIXME("Stub: calling StgOpenStorage, but ignoring pStgOptions and grfAttrs\n"); - return StgOpenStorage(pwcsName, NULL, grfMode, (SNB)NULL, 0, (IStorage **)ppObjectOpen); + break; + + case STGFMT_ANY: + WARN("STGFMT_ANY assuming storage\n"); + break; + + default: + return STG_E_INVALIDPARAMETER; } - ERR("Invalid stgfmt argument\n"); - return STG_E_INVALIDPARAMETER; + return StgOpenStorage(pwcsName, NULL, grfMode, (SNB)NULL, 0, (IStorage **)ppObjectOpen); }

1 0

Mike McCormack : indexsvr.h: Fix a typo.
by Alexandre Julliard 11 Jul '06

11 Jul '06

Module: wine Branch: refs/heads/master Commit: 5cb1045a2c55fb4c71e0277ba839c5810f60cbb0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5cb1045a2c55fb4c71e0277… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jul 11 11:12:06 2006 +0900 indexsvr.h: Fix a typo. --- include/indexsvr.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/indexsvr.idl b/include/indexsvr.idl index 056bb52..6b18a92 100644 --- a/include/indexsvr.idl +++ b/include/indexsvr.idl @@ -110,7 +110,7 @@ interface IWordBreaker: IUnknown [in] ULONG ulMaxTokenSize, [out] BOOL *pfLicense); HRESULT BreakText( - [in] TEXT_SOURCE pTextSource, + [in] TEXT_SOURCE *pTextSource, [in] IWordSink *pWordSink, [in] IPhraseSink *pPhraseSink); HRESULT ComposePhrase(

1 0

Louis. Lenders : wined3d: Add an "\n" to a fixme to fix another overflow ( in IWineD3DImpl_CheckDeviceFormatConversion).
by Alexandre Julliard 11 Jul '06

11 Jul '06

Module: wine Branch: refs/heads/master Commit: 2ce792fd330a0452d743156967e7eb3c17fa8857 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2ce792fd330a0452d743156… Author: Louis. Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Mon Jul 10 23:57:29 2006 +0100 wined3d: Add an "\n" to a fixme to fix another overflow (in IWineD3DImpl_CheckDeviceFormatConversion). --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ae0ea82..d9bb59c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1471,7 +1471,7 @@ static HRESULT WINAPI IWineD3DImpl_Chec WINED3DFORMAT SourceFormat, WINED3DFORMAT TargetFormat) { IWineD3DImpl *This = (IWineD3DImpl *)iface; - FIXME_(d3d_caps)("(%p)-> (STUB) (Adptr:%d, DevType:(%u,%s), SrcFmt:(%u,%s), TgtFmt:(%u,%s))", + FIXME_(d3d_caps)("(%p)-> (STUB) (Adptr:%d, DevType:(%u,%s), SrcFmt:(%u,%s), TgtFmt:(%u,%s))\n", This, Adapter, DeviceType, debug_d3ddevicetype(DeviceType),

1 0

Juan Lang : riched20: Add stub implementation of ITextDocument.
by Alexandre Julliard 11 Jul '06

11 Jul '06

Module: wine Branch: refs/heads/master Commit: 10d6726b429cb379175723cd4a5fd7a1043e8fcc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=10d6726b429cb379175723c… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon Jul 10 12:03:57 2006 -0700 riched20: Add stub implementation of ITextDocument. --- dlls/riched20/richole.c | 308 +++++++++++++++++++++++++++++++--- include/.gitignore | 1 include/Makefile.in | 1 include/tom.idl | 430 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 718 insertions(+), 22 deletions(-) create mode 100644 include/tom.idl Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=10d6726b429cb379175…

1 0

Juan Lang : crypt32: Implement key context property, with tests.
by Alexandre Julliard 11 Jul '06

11 Jul '06

Module: wine Branch: refs/heads/master Commit: 4b8845ae12f944980971440f3f48d1a4701a64e4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4b8845ae12f944980971440… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon Jul 10 09:10:36 2006 -0700 crypt32: Implement key context property, with tests. --- dlls/crypt32/cert.c | 109 ++++++++++++++++++++++++++++++++++++++++----- dlls/crypt32/tests/cert.c | 73 +++++++++++++++++++++++++++--- 2 files changed, 163 insertions(+), 19 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index eabea82..3af7fa1 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -307,6 +307,40 @@ BOOL WINAPI CertGetCertificateContextPro ret = TRUE; } break; + case CERT_KEY_IDENTIFIER_PROP_ID: + ret = CertContext_GetProperty((void *)pCertContext, dwPropId, + pvData, pcbData); + if (!ret) + SetLastError(ERROR_INVALID_DATA); + break; + case CERT_KEY_PROV_HANDLE_PROP_ID: + { + CERT_KEY_CONTEXT keyContext; + DWORD size = sizeof(keyContext); + + ret = CertContext_GetProperty((void *)pCertContext, + CERT_KEY_CONTEXT_PROP_ID, &keyContext, &size); + if (ret) + { + if (!pvData) + { + *pcbData = sizeof(HCRYPTPROV); + ret = TRUE; + } + else if (*pcbData < sizeof(HCRYPTPROV)) + { + SetLastError(ERROR_MORE_DATA); + *pcbData = sizeof(HCRYPTPROV); + ret = FALSE; + } + else + { + *(HCRYPTPROV *)pvData = keyContext.hCryptProv; + ret = TRUE; + } + } + break; + } case CERT_KEY_PROV_INFO_PROP_ID: ret = CertContext_GetProperty((void *)pCertContext, dwPropId, pvData, pcbData); @@ -397,11 +431,6 @@ static BOOL WINAPI CertContext_SetProper if (!properties) ret = FALSE; - else if (!pvData) - { - ContextPropertyList_RemoveProperty(properties, dwPropId); - ret = TRUE; - } else { switch (dwPropId) @@ -424,20 +453,76 @@ static BOOL WINAPI CertContext_SetProper case CERT_CROSS_CERT_DIST_POINTS_PROP_ID: case CERT_RENEWAL_PROP_ID: { - PCRYPT_DATA_BLOB blob = (PCRYPT_DATA_BLOB)pvData; + if (pvData) + { + PCRYPT_DATA_BLOB blob = (PCRYPT_DATA_BLOB)pvData; - ret = ContextPropertyList_SetProperty(properties, dwPropId, - blob->pbData, blob->cbData); + ret = ContextPropertyList_SetProperty(properties, dwPropId, + blob->pbData, blob->cbData); + } + else + { + ContextPropertyList_RemoveProperty(properties, dwPropId); + ret = TRUE; + } break; } case CERT_DATE_STAMP_PROP_ID: - ret = ContextPropertyList_SetProperty(properties, dwPropId, - (LPBYTE)pvData, sizeof(FILETIME)); + if (pvData) + ret = ContextPropertyList_SetProperty(properties, dwPropId, + (LPBYTE)pvData, sizeof(FILETIME)); + else + { + ContextPropertyList_RemoveProperty(properties, dwPropId); + ret = TRUE; + } + break; + case CERT_KEY_CONTEXT_PROP_ID: + { + if (pvData) + { + PCERT_KEY_CONTEXT keyContext = (PCERT_KEY_CONTEXT)pvData; + + ret = ContextPropertyList_SetProperty(properties, dwPropId, + (const BYTE *)keyContext, keyContext->cbSize); + } + else + { + ContextPropertyList_RemoveProperty(properties, dwPropId); + ret = TRUE; + } break; + } case CERT_KEY_PROV_INFO_PROP_ID: - ret = CertContext_SetKeyProvInfoProperty(properties, - (PCRYPT_KEY_PROV_INFO)pvData); + if (pvData) + ret = CertContext_SetKeyProvInfoProperty(properties, + (PCRYPT_KEY_PROV_INFO)pvData); + else + { + ContextPropertyList_RemoveProperty(properties, dwPropId); + ret = TRUE; + } + break; + case CERT_KEY_PROV_HANDLE_PROP_ID: + { + CERT_KEY_CONTEXT keyContext; + DWORD size = sizeof(keyContext); + + ret = CertContext_GetProperty(context, CERT_KEY_CONTEXT_PROP_ID, + &keyContext, &size); + if (ret) + { + if (!(dwFlags & CERT_STORE_NO_CRYPT_RELEASE_FLAG)) + CryptReleaseContext(keyContext.hCryptProv, 0); + if (pvData) + keyContext.hCryptProv = *(HCRYPTPROV *)pvData; + else + keyContext.hCryptProv = 0; + ret = CertContext_SetProperty(context, CERT_KEY_CONTEXT_PROP_ID, + 0, &keyContext); + } break; + } default: FIXME("%ld: stub\n", dwPropId); ret = FALSE; diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 917236d..b03d61e 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -310,6 +310,9 @@ static void checkHash(const BYTE *data, propID); } +static const WCHAR cspNameW[] = { 'W','i','n','e','C','r','y','p','t','T','e', + 'm','p',0 }; + static void testCertProperties(void) { PCCERT_CONTEXT context = CertCreateCertificateContext(X509_ASN_ENCODING, @@ -323,6 +326,8 @@ static void testCertProperties(void) BOOL ret; BYTE hash[20] = { 0 }, hashProperty[20]; CRYPT_DATA_BLOB blob; + CERT_KEY_CONTEXT keyContext; + HCRYPTPROV csp; /* This crashes propID = CertEnumCertificateContextProperties(NULL, 0); @@ -425,14 +430,71 @@ static void testCertProperties(void) context->pCertInfo->SubjectPublicKeyInfo.PublicKey.cbData, CALG_MD5, context, CERT_SUBJECT_PUBLIC_KEY_MD5_HASH_PROP_ID); - /* Odd: this doesn't fail on other certificates, so there must be - * something weird about this cert that causes it to fail. - */ + /* Test key identifiers and handles and such */ size = 0; ret = CertGetCertificateContextProperty(context, CERT_KEY_IDENTIFIER_PROP_ID, NULL, &size); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_DATA, + ok(!ret && GetLastError() == ERROR_INVALID_DATA, + "Expected ERROR_INVALID_DATA, got %08lx\n", GetLastError()); + size = sizeof(CERT_KEY_CONTEXT); + ret = CertGetCertificateContextProperty(context, + CERT_KEY_IDENTIFIER_PROP_ID, NULL, &size); + ok(!ret && GetLastError() == ERROR_INVALID_DATA, + "Expected ERROR_INVALID_DATA, got %08lx\n", GetLastError()); + ret = CertGetCertificateContextProperty(context, + CERT_KEY_IDENTIFIER_PROP_ID, &keyContext, &size); + ok(!ret && GetLastError() == ERROR_INVALID_DATA, "Expected ERROR_INVALID_DATA, got %08lx\n", GetLastError()); + /* Key context with an invalid size */ + keyContext.cbSize = 0; + ret = CertSetCertificateContextProperty(context, + CERT_KEY_IDENTIFIER_PROP_ID, 0, &keyContext); + ok(ret, "CertSetCertificateContextProperty failed: %08lx\n", + GetLastError()); + size = sizeof(keyContext); + ret = CertGetCertificateContextProperty(context, + CERT_KEY_IDENTIFIER_PROP_ID, &keyContext, &size); + ok(ret, "CertGetCertificateContextProperty failed: %08lx\n", + GetLastError()); + keyContext.cbSize = sizeof(keyContext); + keyContext.hCryptProv = 0; + keyContext.dwKeySpec = AT_SIGNATURE; + /* Crash + ret = CertSetCertificateContextProperty(context, + CERT_KEY_IDENTIFIER_PROP_ID, 0, &keyContext); + ret = CertSetCertificateContextProperty(context, + CERT_KEY_IDENTIFIER_PROP_ID, CERT_STORE_NO_CRYPT_RELEASE_FLAG, + &keyContext); + */ + ret = CryptAcquireContextW(&csp, cspNameW, + MS_DEF_PROV_W, PROV_RSA_FULL, CRYPT_NEWKEYSET); + ok(ret, "CryptAcquireContextW failed: %08lx\n", GetLastError()); + keyContext.hCryptProv = csp; + ret = CertSetCertificateContextProperty(context, + CERT_KEY_CONTEXT_PROP_ID, 0, &keyContext); + ok(ret, "CertSetCertificateContextProperty failed: %08lx\n", + GetLastError()); + /* Now that that's set, the key prov handle property is also gettable. + */ + size = sizeof(DWORD); + ret = CertGetCertificateContextProperty(context, + CERT_KEY_PROV_HANDLE_PROP_ID, &keyContext.hCryptProv, &size); + ok(ret, "Expected to get the CERT_KEY_PROV_HANDLE_PROP_ID, got %08lx\n", + GetLastError()); + /* Remove the key prov handle property.. */ + ret = CertSetCertificateContextProperty(context, + CERT_KEY_PROV_HANDLE_PROP_ID, 0, NULL); + ok(ret, "CertSetCertificateContextProperty failed: %08lx\n", + GetLastError()); + /* and the key context's CSP is set to NULL. */ + size = sizeof(keyContext); + ret = CertGetCertificateContextProperty(context, + CERT_KEY_CONTEXT_PROP_ID, &keyContext, &size); + ok(ret, "CertGetCertificateContextProperty failed: %08lx\n", + GetLastError()); + ok(keyContext.hCryptProv == 0, "Expected no hCryptProv\n"); + + CryptReleaseContext(csp, 0); CertFreeCertificateContext(context); } @@ -799,9 +861,6 @@ static void testCryptHashCert(void) ok(!memcmp(hash, knownHash, sizeof(knownHash)), "Unexpected hash\n"); } -static const WCHAR cspNameW[] = { 'W','i','n','e','C','r','y','p','t','T','e', - 'm','p',0 }; - static void verifySig(HCRYPTPROV csp, const BYTE *toSign, size_t toSignLen, const BYTE *sig, unsigned int sigLen) {

1 0

Ge van Geldorp : winedbg: Implement some x86_64 backend routines.
by Alexandre Julliard 11 Jul '06

11 Jul '06

Module: wine Branch: refs/heads/master Commit: ac857cb31acd5f75c7ff1b6462beb799f6ec360e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ac857cb31acd5f75c7ff1b6… Author: Ge van Geldorp <ge(a)gse.nl> Date: Mon Jul 10 08:59:10 2006 +0200 winedbg: Implement some x86_64 backend routines. --- programs/winedbg/be_x86_64.c | 62 +++++++++++++++++++++++++++++------------- programs/winedbg/debugger.h | 4 +-- 2 files changed, 45 insertions(+), 21 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index a02475f..f816238 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -25,16 +25,34 @@ #if defined(__x86_64__) static unsigned be_x86_64_get_addr(HANDLE hThread, const CONTEXT* ctx, enum be_cpu_addr bca, ADDRESS* addr) { - dbg_printf("not done\n"); - return FALSE; + addr->Mode = AddrModeFlat; + switch (bca) + { + case be_cpu_addr_pc: + addr->Segment = ctx->SegCs; + addr->Offset = ctx->Rip; + return TRUE; + case be_cpu_addr_stack: + addr->Segment = ctx->SegSs; + addr->Offset = ctx->Rsp; + return TRUE; + case be_cpu_addr_frame: + addr->Segment = ctx->SegSs; + addr->Offset = ctx->Rbp; + return TRUE; + default: + addr->Mode = -1; + return FALSE; + } } static void be_x86_64_single_step(CONTEXT* ctx, unsigned enable) { - dbg_printf("not done\n"); + dbg_printf("not done single_step\n"); } -static void be_x86_64_print_context(HANDLE hThread, const CONTEXT* ctx) +static void be_x86_64_print_context(HANDLE hThread, const CONTEXT* ctx, + int all_regs) { dbg_printf("Context printing for x86_64 not done yet\n"); } @@ -106,26 +124,27 @@ static const struct dbg_internal_var* be return be_x86_64_ctx; } -static unsigned be_x86_64_is_step_over_insn(void* insn) +static unsigned be_x86_64_is_step_over_insn(const void* insn) { - dbg_printf("not done\n"); + dbg_printf("not done step_over_insn\n"); return FALSE; } -static unsigned be_x86_64_is_function_return(void* insn) +static unsigned be_x86_64_is_function_return(const void* insn) { - dbg_printf("not done\n"); + dbg_printf("not done is_function_return\n"); return FALSE; } -static unsigned be_x86_64_is_break_insn(void* insn) +static unsigned be_x86_64_is_break_insn(const void* insn) { - dbg_printf("not done\n"); + dbg_printf("not done is_break_insn\n"); return FALSE; } -static unsigned be_x86_64_is_func_call(void* insn, void** insn_callee) +static unsigned be_x86_64_is_func_call(const void* insn, ADDRESS* callee) { + dbg_printf("not done is_func_call\n"); return FALSE; } @@ -138,7 +157,7 @@ static unsigned be_x86_64_insert_Xpoint( CONTEXT* ctx, enum be_xpoint_type type, void* addr, unsigned long* val, unsigned size) { - dbg_printf("not done\n"); + dbg_printf("not done insert_Xpoint\n"); return 0; } @@ -146,38 +165,43 @@ static unsigned be_x86_64_remove_Xpoint( CONTEXT* ctx, enum be_xpoint_type type, void* addr, unsigned long val, unsigned size) { - dbg_printf("not done\n"); + dbg_printf("not done remove_Xpoint\n"); return FALSE; } static unsigned be_x86_64_is_watchpoint_set(const CONTEXT* ctx, unsigned idx) { - dbg_printf("not done\n"); + dbg_printf("not done is_watchpoint_set\n"); return FALSE; } static void be_x86_64_clear_watchpoint(CONTEXT* ctx, unsigned idx) { - dbg_printf("not done\n"); + dbg_printf("not done clear_watchpoint\n"); } static int be_x86_64_adjust_pc_for_break(CONTEXT* ctx, BOOL way) { - dbg_printf("not done\n"); - return 0; + if (way) + { + ctx->Rip--; + return -1; + } + ctx->Rip++; + return 1; } static int be_x86_64_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, unsigned ext_sign, LONGLONG* ret) { - dbg_printf("not done\n"); + dbg_printf("not done fetch_integer\n"); return FALSE; } static int be_x86_64_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, long double* ret) { - dbg_printf("not done\n"); + dbg_printf("not done fetch_float\n"); return FALSE; } diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 1452ff6..e210e22 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -421,13 +421,13 @@ extern int gdb_main(int arg static inline BOOL dbg_read_memory(const void* addr, void* buffer, size_t len) { - DWORD rlen; + SIZE_T rlen; return dbg_curr_process->process_io->read(dbg_curr_process->handle, addr, buffer, len, &rlen) && len == rlen; } static inline BOOL dbg_write_memory(void* addr, const void* buffer, size_t len) { - DWORD wlen; + SIZE_T wlen; return dbg_curr_process->process_io->write(dbg_curr_process->handle, addr, buffer, len, &wlen) && len == wlen; }

1 0

Ge van Geldorp : winebuild: Reserve enough space for null function pointer.
by Alexandre Julliard 11 Jul '06

11 Jul '06

Module: wine Branch: refs/heads/master Commit: 2a8b31d162f54fa77be2eaf5aacaf22c6a6b8428 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2a8b31d162f54fa77be2eaf… Author: Ge van Geldorp <ge(a)gse.nl> Date: Mon Jul 10 08:58:47 2006 +0200 winebuild: Reserve enough space for null function pointer. --- tools/winebuild/spec32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index cf0c54b..e902502 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -202,7 +202,7 @@ static void output_exports( FILE *outfil for (i = spec->base; i <= spec->limit; i++) { ORDDEF *odp = spec->ordinals[i]; - if (!odp) fprintf( outfile, "\t.long 0\n" ); + if (!odp) fprintf( outfile, "\t%s 0\n", get_asm_ptr_keyword() ); else switch(odp->type) { case TYPE_EXTERN:

1 0

Ge van Geldorp : server: Widen lparam for timers.
by Alexandre Julliard 11 Jul '06

11 Jul '06

Module: wine Branch: refs/heads/master Commit: a6df16396aa82b9a64262ea32de1440fba0b5be6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a6df16396aa82b9a64262ea… Author: Ge van Geldorp <ge(a)gse.nl> Date: Mon Jul 10 08:58:35 2006 +0200 server: Widen lparam for timers. --- server/queue.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/queue.c b/server/queue.c index 607c102..60f177b 100644 --- a/server/queue.c +++ b/server/queue.c @@ -92,7 +92,7 @@ struct timer user_handle_t win; /* window handle */ unsigned int msg; /* message to post */ unsigned int id; /* timer id */ - unsigned int lparam; /* lparam for message */ + unsigned long lparam; /* lparam for message */ }; struct thread_input

1 0

Andrew Talbot : shell32: Write-strings warning fix.
by Alexandre Julliard 11 Jul '06

11 Jul '06

Module: wine Branch: refs/heads/master Commit: 414c33365260f2f019c516e6101bdf2009e49cff URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=414c33365260f2f019c516e… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Jul 10 21:42:38 2006 +0100 shell32: Write-strings warning fix. --- dlls/shell32/shlview.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 639306d..1385e36 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -779,19 +779,21 @@ static void ShellView_MergeFileMenu(IShe */ static void ShellView_MergeViewMenu(IShellViewImpl * This, HMENU hSubMenu) -{ MENUITEMINFOA mii; - +{ TRACE("(%p)->(submenu=%p)\n",This,hSubMenu); if(hSubMenu) { /*add a separator at the correct position in the menu*/ + MENUITEMINFOA mii; + static char view[] = "View"; + _InsertMenuItem(hSubMenu, FCIDM_MENU_VIEW_SEP_OPTIONS, FALSE, 0, MFT_SEPARATOR, NULL, MFS_ENABLED); ZeroMemory(&mii, sizeof(mii)); mii.cbSize = sizeof(mii); mii.fMask = MIIM_SUBMENU | MIIM_TYPE | MIIM_DATA; mii.fType = MFT_STRING; - mii.dwTypeData = "View"; + mii.dwTypeData = view; mii.hSubMenu = LoadMenuA(shell32_hInstance, "MENU_001"); InsertMenuItemA(hSubMenu, FCIDM_MENU_VIEW_SEP_OPTIONS, FALSE, &mii); }

1 0