wine-commits December 2007

wine-commits@winehq.org

3 participants
824 discussions

Hans Leidekker : usp10: Do glyph translation for truetype fonts only.
by Alexandre Julliard 13 Dec '07

13 Dec '07

Module: wine Branch: master Commit: 25e836e83ce986daacea2d11912c7404e0aea321 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25e836e83ce986daacea2d119… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Dec 12 19:11:28 2007 +0100 usp10: Do glyph translation for truetype fonts only. --- dlls/usp10/usp10.c | 85 ++++++++++++++++++++++++++------------------------- 1 files changed, 43 insertions(+), 42 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index ecb9cdc..28b0f90 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -145,9 +145,8 @@ static const SCRIPT_PROPERTIES *script_props[] = typedef struct { HDC hdc; - LONG height; - WCHAR default_char; LOGFONTW lf; + TEXTMETRICW tm; } ScriptCache; typedef struct { @@ -200,23 +199,23 @@ static HDC get_cache_hdc(SCRIPT_CACHE *psc) static WCHAR get_cache_default_char(SCRIPT_CACHE *psc) { - return ((ScriptCache *)*psc)->default_char; + return ((ScriptCache *)*psc)->tm.tmDefaultChar; } static LONG get_cache_height(SCRIPT_CACHE *psc) { - return ((ScriptCache *)*psc)->height; + return ((ScriptCache *)*psc)->tm.tmHeight; } -static HRESULT init_script_cache(const HDC hdc, ScriptCache *sc) +static BYTE get_cache_pitch_family(SCRIPT_CACHE *psc) { - TEXTMETRICW metric; + return ((ScriptCache *)*psc)->tm.tmPitchAndFamily; +} - if (!GetTextMetricsW(hdc, &metric)) return E_INVALIDARG; +static HRESULT init_script_cache(const HDC hdc, ScriptCache *sc) +{ + if (!GetTextMetricsW(hdc, &sc->tm)) return E_INVALIDARG; if (!GetObjectW(GetCurrentObject(hdc, OBJ_FONT), sizeof(LOGFONTW), &sc->lf)) return E_INVALIDARG; - - sc->height = metric.tmHeight; - sc->default_char = metric.tmDefaultChar; sc->hdc = hdc; return S_OK; } @@ -1260,15 +1259,16 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, hfont = select_cached_font(psc); - if (!psa->fNoGlyphIndex) { /* Glyph translate */ - if (!(GetGlyphIndicesW(get_cache_hdc(psc), pwcChars, cChars, pwOutGlyphs, 0))) - return S_FALSE; + if ((get_cache_pitch_family(psc) & TMPF_TRUETYPE) && !psa->fNoGlyphIndex) + { + GetGlyphIndicesW(get_cache_hdc(psc), pwcChars, cChars, pwOutGlyphs, 0); } - else { - for (cnt = 0; cnt < cChars; cnt++) { /* no translate so set up */ - pwOutGlyphs[cnt] = pwcChars[cnt]; /* copy in to out and */ - } + else + { + TRACE("no glyph translation\n"); + for (cnt = 0; cnt < cChars; cnt++) pwOutGlyphs[cnt] = pwcChars[cnt]; } + if (psva) { /* set up a valid SCRIPT_VISATTR and LogClust for each char in this run */ @@ -1311,10 +1311,10 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, int cGlyphs, const SCRIPT_VISATTR *psva, SCRIPT_ANALYSIS *psa, int *piAdvance, GOFFSET *pGoffset, ABC *pABC ) { - int wcnt; HRESULT hr; LPABC lpABC; HFONT hfont; + unsigned int i; TRACE("(%p, %p, %p, %s, %d, %p, %p, %p)\n", hdc, psc, pwGlyphs, debugstr_wn(pwGlyphs, cGlyphs), cGlyphs, psva, psa, piAdvance); @@ -1328,38 +1328,39 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, * has been converted to glyphs and we still need to translate back to the original chars * to get the correct ABC widths. */ - if (!(lpABC = heap_alloc_zero(sizeof(ABC) * cGlyphs))) return E_OUTOFMEMORY; - if (pABC) - memset(pABC, 0, sizeof(ABC)); + if (!(lpABC = heap_alloc_zero(sizeof(ABC) * cGlyphs))) return E_OUTOFMEMORY; + if (pABC) memset(pABC, 0, sizeof(ABC)); - /* FIXME: set pGoffset to more reasonable values */ - if (!GetCharABCWidthsI(get_cache_hdc(psc), 0, cGlyphs, (WORD *)pwGlyphs, lpABC)) + if ((get_cache_pitch_family(psc) & TMPF_TRUETYPE) && !psa->fNoGlyphIndex) { - WARN("Could not get ABC values\n"); - for (wcnt = 0; wcnt < cGlyphs; wcnt++) - { - if (pGoffset) pGoffset[wcnt].du = pGoffset[wcnt].dv = 0; - if (piAdvance) piAdvance[wcnt] = 0; - } + GetCharABCWidthsI(get_cache_hdc(psc), 0, cGlyphs, (WORD *)pwGlyphs, lpABC); } else { - for (wcnt = 0; wcnt < cGlyphs; wcnt++) /* add up the char lengths */ + INT width; + for (i = 0; i < cGlyphs; i++) { - TRACE(" Glyph=%04x, abcA=%d, abcB=%d, abcC=%d wcnt=%d\n", - pwGlyphs[wcnt], lpABC[wcnt].abcA, lpABC[wcnt].abcB, lpABC[wcnt].abcC, wcnt); + GetCharWidth32W(get_cache_hdc(psc), pwGlyphs[i], pwGlyphs[i], &width); + lpABC[i].abcB = width; + } + } - if (pABC) - { - pABC->abcA += lpABC[wcnt].abcA; - pABC->abcB += lpABC[wcnt].abcB; - pABC->abcC += lpABC[wcnt].abcC; - } - if (pGoffset) pGoffset[wcnt].du = pGoffset[wcnt].dv = 0; - if (piAdvance) piAdvance[wcnt] = lpABC[wcnt].abcA + lpABC[wcnt].abcB + lpABC[wcnt].abcC; + for (i = 0; i < cGlyphs; i++) + { + TRACE(" Glyph=%04x, abcA=%d, abcB=%d, abcC=%d index=%d\n", + pwGlyphs[i], lpABC[i].abcA, lpABC[i].abcB, lpABC[i].abcC, i); + + if (pABC) + { + pABC->abcA += lpABC[i].abcA; + pABC->abcB += lpABC[i].abcB; + pABC->abcC += lpABC[i].abcC; } + /* FIXME: set to more reasonable values */ + if (pGoffset) pGoffset[i].du = pGoffset[i].dv = 0; + if (piAdvance) piAdvance[i] = lpABC[i].abcA + lpABC[i].abcB + lpABC[i].abcC; } - if (pABC) TRACE("Total for run: abcA=%d, abcB=%d, abcC=%d\n", pABC->abcA, pABC->abcB, pABC->abcC); + if (pABC) TRACE("Total for run: abcA=%d, abcB=%d, abcC=%d\n", pABC->abcA, pABC->abcB, pABC->abcC); heap_free(lpABC); unselect_cached_font(psc, hfont); @@ -1620,7 +1621,7 @@ const SIZE * WINAPI ScriptString_pSize(SCRIPT_STRING_ANALYSIS ssa) if (!analysis->sz) { if (!(analysis->sz = heap_alloc(sizeof(SIZE)))) return NULL; - analysis->sz->cy = analysis->sc->height; + analysis->sz->cy = analysis->sc->tm.tmHeight; analysis->sz->cx = 0; for (i = 0; i < analysis->numItems; i++)

1 0

Alexandre Julliard : wordpad: Fix invalid pointer usage.
by Alexandre Julliard 13 Dec '07

13 Dec '07

Module: wine Branch: master Commit: c7278c21bd52de4ffb8f725f976777fae95bde07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7278c21bd52de4ffb8f725f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 12 22:32:38 2007 +0100 wordpad: Fix invalid pointer usage. --- programs/wordpad/registry.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/registry.c b/programs/wordpad/registry.c index f959b6d..196e7d1 100644 --- a/programs/wordpad/registry.c +++ b/programs/wordpad/registry.c @@ -99,9 +99,8 @@ void registry_read_winrect(RECT* rc) HKEY hKey; DWORD size = sizeof(RECT); - ZeroMemory(&rc, sizeof(RECT)); if(registry_get_handle(&hKey, 0, (LPWSTR)key_options) != ERROR_SUCCESS || - RegQueryValueExW(hKey, var_framerect, 0, NULL, (LPBYTE)&rc, &size) != + RegQueryValueExW(hKey, var_framerect, 0, NULL, (LPBYTE)rc, &size) != ERROR_SUCCESS || size != sizeof(RECT)) { rc->top = 0;

1 0

Rob Shearman : widl: Remove some confusion in how version numbers are packed into an attribute by defining some macros for this purpose .
by Alexandre Julliard 12 Dec '07

12 Dec '07

Module: wine Branch: master Commit: 9741751962e87074422bfd1c247aec6eee0a0c9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9741751962e87074422bfd1c2… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Dec 12 14:49:34 2007 +0000 widl: Remove some confusion in how version numbers are packed into an attribute by defining some macros for this purpose. Remove unneeded includes. --- tools/widl/client.c | 8 ++------ tools/widl/header.c | 9 ++++----- tools/widl/parser.y | 6 ++---- tools/widl/server.c | 13 +++++-------- tools/widl/typegen.c | 1 - tools/widl/utils.h | 4 ++++ 6 files changed, 17 insertions(+), 24 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 9d09671..5cd2a81 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -29,16 +29,12 @@ #include <ctype.h> #include <signal.h> -#include "windef.h" - #include "widl.h" #include "utils.h" #include "parser.h" #include "header.h" #include "widltypes.h" -#include "typelib.h" -#include "typelib_struct.h" #include "typegen.h" static FILE* client; @@ -337,7 +333,7 @@ static void write_clientinterfacedecl(type_t *iface) print_client("{{0x%08lx,0x%04x,0x%04x,{0x%02x,0x%02x,0x%02x,0x%02x,0x%02x,0x%02x,0x%02x,0x%02x}},{%d,%d}},\n", uuid->Data1, uuid->Data2, uuid->Data3, uuid->Data4[0], uuid->Data4[1], uuid->Data4[2], uuid->Data4[3], uuid->Data4[4], uuid->Data4[5], uuid->Data4[6], - uuid->Data4[7], LOWORD(ver), HIWORD(ver)); + uuid->Data4[7], MAJORVERSION(ver), MINORVERSION(ver)); print_client("{{0x8a885d04,0x1ceb,0x11c9,{0x9f,0xe8,0x08,0x00,0x2b,0x10,0x48,0x60}},{2,0}},\n"); /* FIXME */ print_client("0,\n"); if (endpoints) @@ -360,7 +356,7 @@ static void write_clientinterfacedecl(type_t *iface) iface->name, iface->name); else print_client("RPC_IF_HANDLE %s%s_v%d_%d_c_ifspec = (RPC_IF_HANDLE)& %s___RpcClientInterface;\n", - prefix_client, iface->name, LOWORD(ver), HIWORD(ver), iface->name); + prefix_client, iface->name, MAJORVERSION(ver), MINORVERSION(ver), iface->name); fprintf(client, "\n"); } diff --git a/tools/widl/header.c b/tools/widl/header.c index 16bf82b..fd89534 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -31,7 +31,6 @@ #include <ctype.h> #include <signal.h> -#include "windef.h" #include "widl.h" #include "utils.h" #include "parser.h" @@ -942,7 +941,7 @@ static void write_com_interface(type_t *iface) static void write_rpc_interface(const type_t *iface) { - unsigned long ver = get_attrv(iface->attrs, ATTR_VERSION); + unsigned int ver = get_attrv(iface->attrs, ATTR_VERSION); const char *var = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); static int allocate_written = 0; @@ -954,7 +953,7 @@ static void write_rpc_interface(const type_t *iface) } fprintf(header, "/*****************************************************************************\n"); - fprintf(header, " * %s interface (v%d.%d)\n", iface->name, LOWORD(ver), HIWORD(ver)); + fprintf(header, " * %s interface (v%d.%d)\n", iface->name, MAJORVERSION(ver), MINORVERSION(ver)); fprintf(header, " */\n"); fprintf(header,"#ifndef __%s_INTERFACE_DEFINED__\n", iface->name); fprintf(header,"#define __%s_INTERFACE_DEFINED__\n\n", iface->name); @@ -970,9 +969,9 @@ static void write_rpc_interface(const type_t *iface) else { fprintf(header, "extern RPC_IF_HANDLE %s%s_v%d_%d_c_ifspec;\n", - prefix_client, iface->name, LOWORD(ver), HIWORD(ver)); + prefix_client, iface->name, MAJORVERSION(ver), MINORVERSION(ver)); fprintf(header, "extern RPC_IF_HANDLE %s%s_v%d_%d_s_ifspec;\n", - prefix_server, iface->name, LOWORD(ver), HIWORD(ver)); + prefix_server, iface->name, MAJORVERSION(ver), MINORVERSION(ver)); } write_function_protos(iface); } diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 0a8af54..6c8337e 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -31,8 +31,6 @@ #include <alloca.h> #endif -#include "windef.h" - #include "widl.h" #include "utils.h" #include "parser.h" @@ -929,8 +927,8 @@ uniondef: tUNION t_ident '{' fields '}' { $$ = get_typev(RPC_FC_NON_ENCAPSULATE ; version: - aNUM { $$ = MAKELONG($1, 0); } - | aNUM '.' aNUM { $$ = MAKELONG($1, $3); } + aNUM { $$ = MAKEVERSION($1, 0); } + | aNUM '.' aNUM { $$ = MAKEVERSION($1, $3); } ; %% diff --git a/tools/widl/server.c b/tools/widl/server.c index f020613..e2c3ac9 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -35,10 +35,7 @@ #include "utils.h" #include "parser.h" #include "header.h" -#include "windef.h" -#include "typelib.h" -#include "typelib_struct.h" #include "typegen.h" static FILE* server; @@ -285,7 +282,7 @@ static void write_dispatchtable(type_t *iface) print_server("0\n"); indent--; print_server("};\n"); - print_server("RPC_DISPATCH_TABLE %s_v%d_%d_DispatchTable =\n", iface->name, LOWORD(ver), HIWORD(ver)); + print_server("RPC_DISPATCH_TABLE %s_v%d_%d_DispatchTable =\n", iface->name, MAJORVERSION(ver), MINORVERSION(ver)); print_server("{\n"); indent++; print_server("%u,\n", method_count); @@ -349,7 +346,7 @@ static void write_serverinterfacedecl(type_t *iface) if (endpoints) write_endpoints( server, iface->name, endpoints ); - print_server("extern RPC_DISPATCH_TABLE %s_v%d_%d_DispatchTable;\n", iface->name, LOWORD(ver), HIWORD(ver)); + print_server("extern RPC_DISPATCH_TABLE %s_v%d_%d_DispatchTable;\n", iface->name, MAJORVERSION(ver), MINORVERSION(ver)); fprintf(server, "\n"); print_server("static const RPC_SERVER_INTERFACE %s___RpcServerInterface =\n", iface->name ); print_server("{\n"); @@ -358,9 +355,9 @@ static void write_serverinterfacedecl(type_t *iface) print_server("{{0x%08lx,0x%04x,0x%04x,{0x%02x,0x%02x,0x%02x,0x%02x,0x%02x,0x%02x,0x%02x,0x%02x}},{%d,%d}},\n", uuid->Data1, uuid->Data2, uuid->Data3, uuid->Data4[0], uuid->Data4[1], uuid->Data4[2], uuid->Data4[3], uuid->Data4[4], uuid->Data4[5], uuid->Data4[6], - uuid->Data4[7], LOWORD(ver), HIWORD(ver)); + uuid->Data4[7], MAJORVERSION(ver), MINORVERSION(ver)); print_server("{{0x8a885d04,0x1ceb,0x11c9,{0x9f,0xe8,0x08,0x00,0x2b,0x10,0x48,0x60}},{2,0}},\n"); /* FIXME */ - print_server("&%s_v%d_%d_DispatchTable,\n", iface->name, LOWORD(ver), HIWORD(ver)); + print_server("&%s_v%d_%d_DispatchTable,\n", iface->name, MAJORVERSION(ver), MINORVERSION(ver)); if (endpoints) { print_server("%u,\n", list_count(endpoints)); @@ -381,7 +378,7 @@ static void write_serverinterfacedecl(type_t *iface) iface->name, iface->name); else print_server("RPC_IF_HANDLE %s%s_v%d_%d_s_ifspec = (RPC_IF_HANDLE)& %s___RpcServerInterface;\n", - prefix_server, iface->name, LOWORD(ver), HIWORD(ver), iface->name); + prefix_server, iface->name, MAJORVERSION(ver), MINORVERSION(ver), iface->name); fprintf(server, "\n"); } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index b293b1a..3bb88da 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -37,7 +37,6 @@ #include "utils.h" #include "parser.h" #include "header.h" -#include "windef.h" #include "wine/list.h" #include "typegen.h" diff --git a/tools/widl/utils.h b/tools/widl/utils.h index c9cc2ba..1cd3dd3 100644 --- a/tools/widl/utils.h +++ b/tools/widl/utils.h @@ -46,4 +46,8 @@ size_t widl_getline(char **linep, size_t *lenp, FILE *fp); UUID *parse_uuid(const char *u); int is_valid_uuid(const char *s); +#define MAKEVERSION(major, minor) ((((major) & 0xffff) << 16) | ((minor) & 0xffff)) +#define MAJORVERSION(version) (((version) >> 16) & 0xffff) +#define MINORVERSION(version) ((version) & 0xffff) + #endif

1 0

Rob Shearman : rpcrt4: Try to free every non-stack pointer in PointerFree now that NdrFree does the sanity checking for us .
by Alexandre Julliard 12 Dec '07

12 Dec '07

Module: wine Branch: master Commit: e12b487e2621816645a1f98a46249c2c9fa78f9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e12b487e2621816645a1f98a4… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Dec 12 14:48:51 2007 +0000 rpcrt4: Try to free every non-stack pointer in PointerFree now that NdrFree does the sanity checking for us. --- dlls/rpcrt4/ndr_marshall.c | 14 ++++---------- dlls/rpcrt4/tests/ndr_marshall.c | 2 -- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 0fd2456..8c79751 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1270,23 +1270,17 @@ static void PointerFree(PMIDL_STUB_MESSAGE pStubMsg, m = NdrFreer[*desc & NDR_TABLE_MASK]; if (m) m(pStubMsg, Pointer, desc); - /* we should check if the memory comes from NdrAllocate, - * and deallocate only if so - checking if the pointer is between - * BufferStart and BufferEnd will not always work since the buffer - * may be reallocated when the server wants to marshal the reply */ - if (Pointer >= (unsigned char *)pStubMsg->RpcMsg->Buffer || - Pointer <= (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength) - goto notfree; - if (attr & RPC_FC_P_ONSTACK) { TRACE("not freeing stack ptr %p\n", Pointer); return; } + + /* try to free everything else. NdrFree will do the job of sorting out + * whether we allocated it or whether the app did */ + TRACE("freeing %p\n", Pointer); NdrFree(pStubMsg, Pointer); return; -notfree: - TRACE("not freeing %p\n", Pointer); } /*********************************************************************** diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 42929d9..f0028bd 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1193,9 +1193,7 @@ todo_wine { my_free_called = 0; StubMsg.Buffer = StubMsg.BufferStart; NdrPointerFree( &StubMsg, mem, fmtstr_conf_str ); -todo_wine { ok(my_free_called == 1, "free called %d\n", my_free_called); -} /* Server */ my_alloc_called = 0;

1 0

Rob Shearman : rpcrt4: Store allocated memory in a singly-linked list to keep track of what we should and shouldn 't free in NdrFree.
by Alexandre Julliard 12 Dec '07

12 Dec '07

Module: wine Branch: master Commit: 9c8c74f388631be71c3d1c6ad52cdcbc702272b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c8c74f388631be71c3d1c6ad… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Dec 12 14:48:41 2007 +0000 rpcrt4: Store allocated memory in a singly-linked list to keep track of what we should and shouldn't free in NdrFree. --- dlls/rpcrt4/ndr_marshall.c | 65 ++++++++++++++++++++++++++++++++++++-- dlls/rpcrt4/tests/ndr_marshall.c | 2 - 2 files changed, 62 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 66833df..0fd2456 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -331,15 +331,74 @@ const NDR_FREE NdrFreer[NDR_TABLE_SIZE] = { NdrRangeFree }; +typedef struct _NDR_MEMORY_LIST +{ + ULONG magic; + ULONG size; + ULONG reserved; + struct _NDR_MEMORY_LIST *next; +} NDR_MEMORY_LIST; + +#define MEML_MAGIC ('M' << 24 | 'E' << 16 | 'M' << 8 | 'L') + void * WINAPI NdrAllocate(MIDL_STUB_MESSAGE *pStubMsg, size_t len) { - /* hmm, this is probably supposed to do more? */ - return pStubMsg->pfnAllocate(len); + size_t aligned_len; + size_t adjusted_len; + void *p; + NDR_MEMORY_LIST *mem_list; + + aligned_len = ALIGNED_LENGTH(len, 8); + adjusted_len = aligned_len + sizeof(NDR_MEMORY_LIST); + /* check for overflow */ + if (adjusted_len < len) + { + ERR("overflow of adjusted_len %d, len %d\n", adjusted_len, len); + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } + + p = pStubMsg->pfnAllocate(adjusted_len); + if (!p) RpcRaiseException(ERROR_OUTOFMEMORY); + + mem_list = (NDR_MEMORY_LIST *)((char *)p + aligned_len); + mem_list->magic = MEML_MAGIC; + mem_list->size = aligned_len; + mem_list->reserved = 0; + mem_list->next = pStubMsg->pMemoryList; + pStubMsg->pMemoryList = mem_list; + + TRACE("-- %p\n", p); + return p; } static void WINAPI NdrFree(MIDL_STUB_MESSAGE *pStubMsg, unsigned char *Pointer) { - pStubMsg->pfnFree(Pointer); + NDR_MEMORY_LIST *mem_list, *prev_mem_list; + + TRACE("(%p, %p)\n", pStubMsg, Pointer); + + for (prev_mem_list = NULL, mem_list = pStubMsg->pMemoryList; + mem_list; + prev_mem_list = mem_list, mem_list = mem_list->next) + { + const unsigned char *base_pointer = (unsigned char *)mem_list - mem_list->size; + if (base_pointer == Pointer) + { + if (mem_list->magic != MEML_MAGIC) + { + ERR("memory linked list corrupted, magic changed to 0x%08x\n", mem_list->magic); + break; + } + + /* fixup next pointers */ + if (prev_mem_list) + prev_mem_list->next = mem_list->next; + else + pStubMsg->pMemoryList = mem_list->next; + pStubMsg->pfnFree(Pointer); + break; + } + } } static inline BOOL IsConformanceOrVariancePresent(PFORMAT_STRING pFormat) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 5389fcc..42929d9 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -975,9 +975,7 @@ static void test_ndr_allocate(void) p1 = NdrAllocate(&StubMsg, 10); p2 = NdrAllocate(&StubMsg, 24); ok(my_alloc_called == 2, "alloc called %d\n", my_alloc_called); -todo_wine { ok(StubMsg.pMemoryList != NULL, "StubMsg.pMemoryList NULL\n"); - } if(StubMsg.pMemoryList) { mem_list_v2 = StubMsg.pMemoryList;

1 0

Rob Shearman : rpcrt4: Make the NdrAllocate tests pass on XP SP2 and greater.
by Alexandre Julliard 12 Dec '07

12 Dec '07

Module: wine Branch: master Commit: 33c4c25dadc4a222db8ad545c53ecea8a30e5083 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33c4c25dadc4a222db8ad545c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Dec 12 14:48:28 2007 +0000 rpcrt4: Make the NdrAllocate tests pass on XP SP2 and greater. --- dlls/rpcrt4/tests/ndr_marshall.c | 60 ++++++++++++++++++++++++++++--------- 1 files changed, 45 insertions(+), 15 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 51aecd5..5389fcc 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -952,12 +952,19 @@ static void test_ndr_allocate(void) MIDL_STUB_MESSAGE StubMsg; MIDL_STUB_DESC StubDesc; void *p1, *p2; - struct tag_mem_list_t + struct tag_mem_list_v1_t { DWORD magic; void *ptr; - struct tag_mem_list_t *next; - } *mem_list; + struct tag_mem_list_v1_t *next; + } *mem_list_v1; + struct tag_mem_list_v2_t + { + DWORD magic; + DWORD size; + DWORD unknown; + struct tag_mem_list_v2_t *next; + } *mem_list_v2; const DWORD magic_MEML = 'M' << 24 | 'E' << 16 | 'M' << 8 | 'L'; StubDesc = Object_StubDesc; @@ -966,23 +973,46 @@ static void test_ndr_allocate(void) ok(StubMsg.pMemoryList == NULL, "memlist %p\n", StubMsg.pMemoryList); my_alloc_called = my_free_called = 0; p1 = NdrAllocate(&StubMsg, 10); - p2 = NdrAllocate(&StubMsg, 20); + p2 = NdrAllocate(&StubMsg, 24); ok(my_alloc_called == 2, "alloc called %d\n", my_alloc_called); - mem_list = StubMsg.pMemoryList; todo_wine { - ok(mem_list != NULL, "mem_list NULL\n"); + ok(StubMsg.pMemoryList != NULL, "StubMsg.pMemoryList NULL\n"); } - if(mem_list) + if(StubMsg.pMemoryList) { - ok(mem_list->magic == magic_MEML, "magic %08x\n", mem_list->magic); - ok(mem_list->ptr == p2, "ptr != p2\n"); - ok(mem_list->next != NULL, "next NULL\n"); - mem_list = mem_list->next; - if(mem_list) + mem_list_v2 = StubMsg.pMemoryList; + if (mem_list_v2->size == 24) + { + trace("v2 mem list format\n"); + ok((char *)mem_list_v2 == (char *)p2 + 24, "expected mem_list_v2 pointer %p, but got %p\n", (char *)p2 + 24, mem_list_v2); + ok(mem_list_v2->magic == magic_MEML, "magic %08x\n", mem_list_v2->magic); + ok(mem_list_v2->size == 24, "wrong size for p2 %d\n", mem_list_v2->size); + ok(mem_list_v2->unknown == 0, "wrong unknown for p2 0x%x\n", mem_list_v2->unknown); + ok(mem_list_v2->next != NULL, "next NULL\n"); + mem_list_v2 = mem_list_v2->next; + if(mem_list_v2) + { + ok((char *)mem_list_v2 == (char *)p1 + 16, "expected mem_list_v2 pointer %p, but got %p\n", (char *)p1 + 16, mem_list_v2); + ok(mem_list_v2->magic == magic_MEML, "magic %08x\n", mem_list_v2->magic); + ok(mem_list_v2->size == 16, "wrong size for p1 %d\n", mem_list_v2->size); + ok(mem_list_v2->unknown == 0, "wrong unknown for p1 0x%x\n", mem_list_v2->unknown); + ok(mem_list_v2->next == NULL, "next %p\n", mem_list_v2->next); + } + } + else { - ok(mem_list->magic == magic_MEML, "magic %08x\n", mem_list->magic); - ok(mem_list->ptr == p1, "ptr != p2\n"); - ok(mem_list->next == NULL, "next %p\n", mem_list->next); + trace("v1 mem list format\n"); + mem_list_v1 = StubMsg.pMemoryList; + ok(mem_list_v1->magic == magic_MEML, "magic %08x\n", mem_list_v1->magic); + ok(mem_list_v1->ptr == p2, "ptr != p2\n"); + ok(mem_list_v1->next != NULL, "next NULL\n"); + mem_list_v1 = mem_list_v1->next; + if(mem_list_v1) + { + ok(mem_list_v1->magic == magic_MEML, "magic %08x\n", mem_list_v1->magic); + ok(mem_list_v1->ptr == p1, "ptr != p1\n"); + ok(mem_list_v1->next == NULL, "next %p\n", mem_list_v1->next); + } } } /* NdrFree isn't exported so we can't test free'ing */

1 0

Aric Stewart : netapi32: Improve stub for NetLocalGroupGetMembers a bit to return current user.
by Alexandre Julliard 12 Dec '07

12 Dec '07

Module: wine Branch: master Commit: f3e59a3d701d7ec3831645e92dee0659b614551f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3e59a3d701d7ec3831645e92… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Dec 12 19:21:49 2007 +0900 netapi32: Improve stub for NetLocalGroupGetMembers a bit to return current user. --- dlls/netapi32/local_group.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/netapi32/local_group.c b/dlls/netapi32/local_group.c index a9f838f..e125de5 100644 --- a/dlls/netapi32/local_group.c +++ b/dlls/netapi32/local_group.c @@ -166,6 +166,39 @@ NET_API_STATUS WINAPI NetLocalGroupGetMembers( FIXME("(%s %s %d %p %d, %p %p %p) stub!\n", debugstr_w(servername), debugstr_w(localgroupname), level, bufptr, prefmaxlen, entriesread, totalentries, resumehandle); + + if (level == 3) + { + WCHAR userName[MAX_COMPUTERNAME_LENGTH + 1]; + DWORD userNameLen; + DWORD len,needlen; + PLOCALGROUP_MEMBERS_INFO_3 ptr; + + /* still a stub, current user is belonging to all groups */ + + *totalentries = 1; + *entriesread = 0; + + userNameLen = MAX_COMPUTERNAME_LENGTH + 1; + GetUserNameW(userName,&userNameLen); + needlen = sizeof(LOCALGROUP_MEMBERS_INFO_3) + + (userNameLen+2) * sizeof(WCHAR); + if (prefmaxlen != MAX_PREFERRED_LENGTH) + len = min(prefmaxlen,needlen); + else + len = needlen; + + NetApiBufferAllocate(len, (LPVOID *) bufptr); + if (len < needlen) + return ERROR_MORE_DATA; + + ptr = (PLOCALGROUP_MEMBERS_INFO_3)*bufptr; + ptr->lgrmi3_domainandname = (LPWSTR)(*bufptr+sizeof(LOCALGROUP_MEMBERS_INFO_3)); + lstrcpyW(ptr->lgrmi3_domainandname,userName); + + *entriesread = 1; + } + return NERR_Success; }

1 0

Aric Stewart : imagehlp: Improve last error handling in ImageGetCertificateData.
by Alexandre Julliard 12 Dec '07

12 Dec '07

Module: wine Branch: master Commit: 1e3d65dbb8d3ecc182db3291b460830f0e99c714 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e3d65dbb8d3ecc182db3291b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Dec 12 11:11:07 2007 +0900 imagehlp: Improve last error handling in ImageGetCertificateData. --- dlls/imagehlp/integrity.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/imagehlp/integrity.c b/dlls/imagehlp/integrity.c index df6de0f..bbec56b 100644 --- a/dlls/imagehlp/integrity.c +++ b/dlls/imagehlp/integrity.c @@ -226,19 +226,25 @@ BOOL WINAPI ImageGetCertificateData( TRACE("%p %d %p %p\n", handle, Index, Certificate, RequiredLength); + if( !RequiredLength) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if( !IMAGEHLP_GetCertificateOffset( handle, Index, &ofs, &size ) ) return FALSE; - if( !Certificate ) + if( *RequiredLength < size ) { *RequiredLength = size; - return TRUE; + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; } - if( *RequiredLength < size ) + if( !Certificate ) { - *RequiredLength = size; - SetLastError( ERROR_INSUFFICIENT_BUFFER ); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } @@ -255,6 +261,7 @@ BOOL WINAPI ImageGetCertificateData( return FALSE; TRACE("OK\n"); + SetLastError( NO_ERROR ); return TRUE; }

1 0

Marcel Partap : configure: Add i586-mingw32 prefix for crosscompiling.
by Alexandre Julliard 12 Dec '07

12 Dec '07

Module: wine Branch: master Commit: 7c3a7d8af1bf56732d87b29d30cf5b9e5acb67df URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c3a7d8af1bf56732d87b29d3… Author: Marcel Partap <mpartap(a)gmx.net> Date: Sun Dec 9 19:52:09 2007 +0100 configure: Add i586-mingw32 prefix for crosscompiling. --- aclocal.m4 | 2 +- configure | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index a0b08d7..d5f09e1 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -141,7 +141,7 @@ dnl AC_DEFUN([WINE_CHECK_MINGW_PROG], [AC_CHECK_PROGS([$1], m4_foreach([ac_wine_prefix], - [i586-mingw32msvc, i386-mingw32msvc, i686-mingw32, i386-mingw32, mingw32, mingw], + [i586-mingw32msvc, i386-mingw32msvc, i686-mingw32, i586-mingw32, i386-mingw32, mingw32, mingw], [ac_wine_prefix-$2 ]), [$3],[$4])]) diff --git a/configure b/configure index 0b2e0b4..37104b9 100755 --- a/configure +++ b/configure @@ -8880,7 +8880,7 @@ echo "${ECHO_T}$ac_cv_c_dll_hpux" >&6; } if test "$cross_compiling" = "no" then - for ac_prog in i586-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i386-mingw32-gcc mingw32-gcc mingw-gcc + for ac_prog in i586-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i386-mingw32-gcc mingw32-gcc mingw-gcc do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -8923,7 +8923,7 @@ fi done test -n "$CROSSCC" || CROSSCC="false" - for ac_prog in i586-mingw32msvc-dlltool i386-mingw32msvc-dlltool i686-mingw32-dlltool i386-mingw32-dlltool mingw32-dlltool mingw-dlltool + for ac_prog in i586-mingw32msvc-dlltool i386-mingw32msvc-dlltool i686-mingw32-dlltool i586-mingw32-dlltool i386-mingw32-dlltool mingw32-dlltool mingw-dlltool do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -8966,7 +8966,7 @@ fi done test -n "$DLLTOOL" || DLLTOOL="false" - for ac_prog in i586-mingw32msvc-windres i386-mingw32msvc-windres i686-mingw32-windres i386-mingw32-windres mingw32-windres mingw-windres + for ac_prog in i586-mingw32msvc-windres i386-mingw32msvc-windres i686-mingw32-windres i586-mingw32-windres i386-mingw32-windres mingw32-windres mingw-windres do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -9009,7 +9009,7 @@ fi done test -n "$CROSSWINDRES" || CROSSWINDRES="false" - for ac_prog in i586-mingw32msvc-ar i386-mingw32msvc-ar i686-mingw32-ar i386-mingw32-ar mingw32-ar mingw-ar + for ac_prog in i586-mingw32msvc-ar i386-mingw32msvc-ar i686-mingw32-ar i586-mingw32-ar i386-mingw32-ar mingw32-ar mingw-ar do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2

1 0

Marcel Partap : winspool.drv/tests: Add dumping of FORM_INFO_1/ 2 in test_EnumForms.
by Alexandre Julliard 12 Dec '07

12 Dec '07

Module: wine Branch: master Commit: c9663015486882dbc177ca93b0996e6509cfabec URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9663015486882dbc177ca93b… Author: Marcel Partap <mpartap(a)gmx.net> Date: Sun Dec 9 19:50:56 2007 +0100 winspool.drv/tests: Add dumping of FORM_INFO_1/2 in test_EnumForms. --- dlls/winspool.drv/tests/info.c | 36 ++++++++++++++++++++++++++++++++---- 1 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 65d0cf4..96020ef 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -768,7 +768,12 @@ static void test_EnumForms(LPSTR pName) DWORD pcbNeeded; DWORD pcReturned; DWORD level; - + INT i; + const char *formtype; + static const char * const formtypes[] = { "FORM_USER", "FORM_BUILTIN", "FORM_PRINTER", "FORM_flag_unknown" }; +#define FORMTYPE_MAX 2 + PFORM_INFO_1A pFI_1a; + PFORM_INFO_2A pFI_2a; res = OpenPrinter(pName, &hprinter, NULL); RETURN_ON_DEACTIVATED_SPOOLER(res) @@ -785,7 +790,7 @@ static void test_EnumForms(LPSTR pName) pcReturned = 0xdeadbeef; SetLastError(0xdeadbeef); res = EnumFormsA(hprinter, level, NULL, 0, &cbBuf, &pcReturned); - + /* EnumForms is not implemented in win9x */ if (!res && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) continue; @@ -803,7 +808,7 @@ static void test_EnumForms(LPSTR pName) "ERROR_INVALID_LEVEL or '!=0' and 0x0)\n", level, res, GetLastError(), pcReturned); continue; - } + } ok((!res) && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), "(%d) returned %d with %d (expected '0' with " @@ -816,8 +821,31 @@ static void test_EnumForms(LPSTR pName) res = EnumFormsA(hprinter, level, buffer, cbBuf, &pcbNeeded, &pcReturned); ok(res, "(%d) returned %d with %d (expected '!=0')\n", level, res, GetLastError()); - /* We can dump the returned Data here */ + if (winetest_debug > 1) { + trace("dumping %d forms level %d\n", pcReturned, level); + pFI_1a = (PFORM_INFO_1A)buffer; + pFI_2a = (PFORM_INFO_2A)buffer; + for (i = 0; i < pcReturned; i++) + { + /* first part is same in FORM_INFO_1 and FORM_INFO_2 */ + formtype = (pFI_1a->Flags <= FORMTYPE_MAX) ? formtypes[pFI_1a->Flags] : formtypes[3]; + trace("%u (%s): %.03fmm x %.03fmm, %s\n", i, pFI_1a->pName, + (float)pFI_1a->Size.cx/1000, (float)pFI_1a->Size.cy/1000, formtype); + + if (level == 1) pFI_1a ++; + else { + /* output additional FORM_INFO_2 fields */ + trace("\tkeyword=%s strtype=%u muidll=%s resid=%u dispname=%s langid=%u\n", + pFI_2a->pKeyword, pFI_2a->StringType, pFI_2a->pMuiDll, + pFI_2a->dwResourceId, pFI_2a->pDisplayName, pFI_2a->wLangId); + + /* offset pointer pFI_1a by 1*sizeof(FORM_INFO_2A) Bytes */ + pFI_2a ++; + pFI_1a = (PFORM_INFO_1A)pFI_2a; + } + } + } SetLastError(0xdeadbeef); res = EnumFormsA(hprinter, level, buffer, cbBuf+1, &pcbNeeded, &pcReturned);

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
83
Older →

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 2007