wine-commits November 2007

wine-commits@winehq.org

3 participants
757 discussions

Sven Paschukat : ctapi32: Added null terminator to library name.
by Alexandre Julliard 30 Nov '07

30 Nov '07

Module: wine Branch: master Commit: a080af035e767e6793fd8fa3c076537386feb6b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a080af035e767e6793fd8fa3c… Author: Sven Paschukat <Sven.Paschukat(a)T-Online.de> Date: Thu Nov 29 21:36:09 2007 +0100 ctapi32: Added null terminator to library name. --- dlls/ctapi32/ctapi32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ctapi32/ctapi32.c b/dlls/ctapi32/ctapi32.c index 2af4632..5c330bd 100644 --- a/dlls/ctapi32/ctapi32.c +++ b/dlls/ctapi32/ctapi32.c @@ -66,7 +66,7 @@ static int load_functions(void) { buffer_w[size / sizeof(WCHAR)] = '\0'; len = WideCharToMultiByte(CP_UNIXCP, 0, buffer_w, -1, buffer, sizeof(buffer), NULL, NULL); if (len) - memcpy(soname, buffer, len - 1); + memcpy(soname, buffer, len); } RegCloseKey(key_handle); }

1 0

Rob Shearman : rpcrt4: Fix NdrSimpleStructUnmarshall to cope with [in, out] embedded pointers.
by Alexandre Julliard 30 Nov '07

30 Nov '07

Module: wine Branch: master Commit: c735a14788011a139b55751c051809d14df9dde8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c735a14788011a139b55751c0… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Nov 29 17:35:40 2007 +0000 rpcrt4: Fix NdrSimpleStructUnmarshall to cope with [in, out] embedded pointers. --- dlls/rpcrt4/ndr_marshall.c | 26 +++++++++++++------------- dlls/rpcrt4/tests/server.c | 1 - 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index f895376..8300b64 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1715,28 +1715,28 @@ unsigned char * WINAPI NdrSimpleStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char fMustAlloc) { unsigned size = *(const WORD*)(pFormat+2); + unsigned char *saved_buffer; TRACE("(%p,%p,%p,%d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); ALIGN_POINTER(pStubMsg->Buffer, pFormat[1] + 1); - pStubMsg->BufferMark = pStubMsg->Buffer; - - if (fMustAlloc) { + if (fMustAlloc) *ppMemory = NdrAllocate(pStubMsg, size); - safe_copy_from_buffer(pStubMsg, *ppMemory, size); - } else { - if (!pStubMsg->IsClient && !*ppMemory) { + else + { + if (!pStubMsg->IsClient && !*ppMemory) /* for servers, we just point straight into the RPC buffer */ *ppMemory = pStubMsg->Buffer; - safe_buffer_increment(pStubMsg, size); - } - else - /* for clients, memory should be provided by caller */ - safe_copy_from_buffer(pStubMsg, *ppMemory, size); } - if (pFormat[0] != RPC_FC_STRUCT) - EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, *ppMemory, pFormat+4, TRUE /* FIXME */); + saved_buffer = pStubMsg->BufferMark = pStubMsg->Buffer; + safe_buffer_increment(pStubMsg, size); + if (pFormat[0] == RPC_FC_PSTRUCT) + EmbeddedPointerUnmarshall(pStubMsg, saved_buffer, *ppMemory, pFormat+4, fMustAlloc); + + TRACE("copying %p to %p\n", saved_buffer, *ppMemory); + if (*ppMemory != saved_buffer) + memcpy(*ppMemory, saved_buffer, size); return NULL; } diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index ad0dd73..20e6033 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -876,7 +876,6 @@ pointer_tests(void) name.size = 10; name.name = buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, name.size); get_name(&name); - todo_wine ok(name.name == buffer, "[in,out] pointer should have stayed as %p but instead changed to %p\n", name.name, buffer); HeapFree(GetProcessHeap(), 0, name.name);

1 0

Rob Shearman : rpcrt4: Improve PointerUnmarshall to cope with keeping the non-NULL source pointer of a client unmarshall .
by Alexandre Julliard 30 Nov '07

30 Nov '07

Module: wine Branch: master Commit: b676309db3fbde48ba0a7ca202172f37c443e0c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b676309db3fbde48ba0a7ca20… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Nov 29 17:35:34 2007 +0000 rpcrt4: Improve PointerUnmarshall to cope with keeping the non-NULL source pointer of a client unmarshall. This will enable various types with embedded pointers to handle [in,out] parameters correctly by keeping the existing memory. --- dlls/rpcrt4/ndr_marshall.c | 98 ++++++++++++++++++++++++++++++++------------ 1 files changed, 71 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b676309db3fbde48ba0a7…

1 0

Rob Shearman : rpcrt4: Move forcing of fMustAlloc to NULL to the callers of EmbeddedPointerUnmarshall .
by Alexandre Julliard 30 Nov '07

30 Nov '07

Module: wine Branch: master Commit: 4e8f69ac2d8d7edc8f68068e23d1a161f8f06662 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e8f69ac2d8d7edc8f68068e2… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Nov 29 17:35:29 2007 +0000 rpcrt4: Move forcing of fMustAlloc to NULL to the callers of EmbeddedPointerUnmarshall. This will enable them to be individually fixed up to use memory if it was provided by the caller. --- dlls/rpcrt4/ndr_marshall.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 9394251..f665f1c 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1322,7 +1322,7 @@ static unsigned char * EmbeddedPointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, for (u=0; u<count; u++,info+=8) { unsigned char *memptr = membase + *(const SHORT*)&info[0]; unsigned char *bufptr = bufbase + *(const SHORT*)&info[2]; - PointerUnmarshall(pStubMsg, bufptr, (unsigned char**)memptr, info+4, TRUE); + PointerUnmarshall(pStubMsg, bufptr, (unsigned char**)memptr, info+4, fMustAlloc); } } pFormat += 8 * count; @@ -1692,7 +1692,7 @@ unsigned char * WINAPI NdrSimpleStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, } if (pFormat[0] != RPC_FC_STRUCT) - EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat+4, fMustAlloc); + EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat+4, TRUE /* FIXME */); return NULL; } @@ -2579,7 +2579,7 @@ unsigned char * WINAPI NdrConformantArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, pStubMsg->BufferMark = pStubMsg->Buffer; safe_copy_from_buffer(pStubMsg, *ppMemory, size); - EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat, fMustAlloc); + EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat, TRUE /* FIXME */); return NULL; } @@ -2723,7 +2723,7 @@ unsigned char* WINAPI NdrConformantVaryingArrayUnmarshall( PMIDL_STUB_MESSAGE pS *ppMemory = NdrAllocate(pStubMsg, memsize); safe_copy_from_buffer(pStubMsg, *ppMemory + pStubMsg->Offset, bufsize); - EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat, fMustAlloc); + EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat, TRUE /* FIXME */); return NULL; } @@ -3471,7 +3471,7 @@ unsigned char * WINAPI NdrConformantStructUnmarshall(PMIDL_STUB_MESSAGE pStubMs safe_copy_from_buffer(pStubMsg, *ppMemory, pCStructFormat->memory_size + bufsize); if (pCStructFormat->type == RPC_FC_CPSTRUCT) - EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat, fMustAlloc); + EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat, TRUE /* FIXME */); return NULL; } @@ -3721,7 +3721,7 @@ unsigned char * WINAPI NdrConformantVaryingStructUnmarshall(PMIDL_STUB_MESSAGE else if (cvarray_type == RPC_FC_C_WSTRING) TRACE("string=%s\n", debugstr_w((WCHAR *)(*ppMemory + pCVStructFormat->memory_size))); - EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat, fMustAlloc); + EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat, TRUE /* FIXME */); return NULL; } @@ -4025,7 +4025,7 @@ unsigned char * WINAPI NdrFixedArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, pStubMsg->BufferMark = pStubMsg->Buffer; safe_copy_from_buffer(pStubMsg, *ppMemory, total_size); - pFormat = EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat, fMustAlloc); + pFormat = EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat, TRUE /* FIXME */); return NULL; } @@ -4255,7 +4255,7 @@ unsigned char * WINAPI NdrVaryingArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, *ppMemory = NdrAllocate(pStubMsg, size); safe_copy_from_buffer(pStubMsg, *ppMemory + pStubMsg->Offset, bufsize); - EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat, fMustAlloc); + EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat, TRUE /* FIXME */); return NULL; }

1 0

Rob Shearman : rpcrt4: EmbeddedPointerUnmarshall doesn' t need to change the address of the allocated memory, so reduce the level of indirection of the memory parameter by one.
by Alexandre Julliard 30 Nov '07

30 Nov '07

Module: wine Branch: master Commit: 43e0c67fe2ee1fc1fa2f3983cc08d43c3a59b2b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43e0c67fe2ee1fc1fa2f3983c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Nov 29 17:35:22 2007 +0000 rpcrt4: EmbeddedPointerUnmarshall doesn't need to change the address of the allocated memory, so reduce the level of indirection of the memory parameter by one. --- dlls/rpcrt4/ndr_marshall.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 35028b4..9394251 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1268,7 +1268,7 @@ static unsigned char * EmbeddedPointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, * EmbeddedPointerUnmarshall */ static unsigned char * EmbeddedPointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, - unsigned char **ppMemory, + unsigned char *pMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) { @@ -1277,7 +1277,7 @@ static unsigned char * EmbeddedPointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned i; unsigned char *saved_buffer = NULL; - TRACE("(%p,%p,%p,%d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); + TRACE("(%p,%p,%p,%d)\n", pStubMsg, pMemory, pFormat, fMustAlloc); if (*pFormat != RPC_FC_PP) return NULL; pFormat += 2; @@ -1315,7 +1315,7 @@ static unsigned char * EmbeddedPointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, } for (i = 0; i < rep; i++) { PFORMAT_STRING info = pFormat; - unsigned char *membase = *ppMemory + (i * stride); + unsigned char *membase = pMemory + (i * stride); unsigned char *bufbase = Mark + (i * stride); unsigned u; @@ -1692,7 +1692,7 @@ unsigned char * WINAPI NdrSimpleStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, } if (pFormat[0] != RPC_FC_STRUCT) - EmbeddedPointerUnmarshall(pStubMsg, ppMemory, pFormat+4, fMustAlloc); + EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat+4, fMustAlloc); return NULL; } @@ -2579,7 +2579,7 @@ unsigned char * WINAPI NdrConformantArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, pStubMsg->BufferMark = pStubMsg->Buffer; safe_copy_from_buffer(pStubMsg, *ppMemory, size); - EmbeddedPointerUnmarshall(pStubMsg, ppMemory, pFormat, fMustAlloc); + EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat, fMustAlloc); return NULL; } @@ -2723,7 +2723,7 @@ unsigned char* WINAPI NdrConformantVaryingArrayUnmarshall( PMIDL_STUB_MESSAGE pS *ppMemory = NdrAllocate(pStubMsg, memsize); safe_copy_from_buffer(pStubMsg, *ppMemory + pStubMsg->Offset, bufsize); - EmbeddedPointerUnmarshall(pStubMsg, ppMemory, pFormat, fMustAlloc); + EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat, fMustAlloc); return NULL; } @@ -3471,7 +3471,7 @@ unsigned char * WINAPI NdrConformantStructUnmarshall(PMIDL_STUB_MESSAGE pStubMs safe_copy_from_buffer(pStubMsg, *ppMemory, pCStructFormat->memory_size + bufsize); if (pCStructFormat->type == RPC_FC_CPSTRUCT) - EmbeddedPointerUnmarshall(pStubMsg, ppMemory, pFormat, fMustAlloc); + EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat, fMustAlloc); return NULL; } @@ -3721,7 +3721,7 @@ unsigned char * WINAPI NdrConformantVaryingStructUnmarshall(PMIDL_STUB_MESSAGE else if (cvarray_type == RPC_FC_C_WSTRING) TRACE("string=%s\n", debugstr_w((WCHAR *)(*ppMemory + pCVStructFormat->memory_size))); - EmbeddedPointerUnmarshall(pStubMsg, ppMemory, pFormat, fMustAlloc); + EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat, fMustAlloc); return NULL; } @@ -4025,7 +4025,7 @@ unsigned char * WINAPI NdrFixedArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, pStubMsg->BufferMark = pStubMsg->Buffer; safe_copy_from_buffer(pStubMsg, *ppMemory, total_size); - pFormat = EmbeddedPointerUnmarshall(pStubMsg, ppMemory, pFormat, fMustAlloc); + pFormat = EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat, fMustAlloc); return NULL; } @@ -4255,7 +4255,7 @@ unsigned char * WINAPI NdrVaryingArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, *ppMemory = NdrAllocate(pStubMsg, size); safe_copy_from_buffer(pStubMsg, *ppMemory + pStubMsg->Offset, bufsize); - EmbeddedPointerUnmarshall(pStubMsg, ppMemory, pFormat, fMustAlloc); + EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat, fMustAlloc); return NULL; }

1 0

Rob Shearman : rpcrt4: Errors in sending or receiving packets should result in RPC_S_CALL_FAILED being returned , not RPC_S_PROTOCOL_ERROR.
by Alexandre Julliard 30 Nov '07

30 Nov '07

Module: wine Branch: master Commit: 34522de870f14af0ed3bcffd24cd9138e6270098 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34522de870f14af0ed3bcffd2… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Nov 29 15:42:20 2007 +0000 rpcrt4: Errors in sending or receiving packets should result in RPC_S_CALL_FAILED being returned, not RPC_S_PROTOCOL_ERROR. --- dlls/rpcrt4/rpc_message.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 91572b1..5b4d30e 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -532,7 +532,7 @@ write: if (count<0) { WARN("rpcrt4_conn_write failed (auth)\n"); RPCRT4_SetThreadCurrentConnection(NULL); - return RPC_S_PROTOCOL_ERROR; + return RPC_S_CALL_FAILED; } buffer_pos += Header->common.frag_len - hdr_size - alen - auth_pad_len; @@ -708,7 +708,7 @@ RPC_STATUS RPCRT4_Receive(RpcConnection *Connection, RpcPktHdr **Header, dwRead = rpcrt4_conn_read(Connection, &common_hdr, sizeof(common_hdr)); if (dwRead != sizeof(common_hdr)) { WARN("Short read of header, %d bytes\n", dwRead); - status = RPC_S_PROTOCOL_ERROR; + status = RPC_S_CALL_FAILED; goto fail; } @@ -734,7 +734,7 @@ RPC_STATUS RPCRT4_Receive(RpcConnection *Connection, RpcPktHdr **Header, dwRead = rpcrt4_conn_read(Connection, &(*Header)->common + 1, hdr_length - sizeof(common_hdr)); if (dwRead != hdr_length - sizeof(common_hdr)) { WARN("bad header length, %d bytes, hdr_length %d\n", dwRead, hdr_length); - status = RPC_S_PROTOCOL_ERROR; + status = RPC_S_CALL_FAILED; goto fail; } @@ -760,7 +760,7 @@ RPC_STATUS RPCRT4_Receive(RpcConnection *Connection, RpcPktHdr **Header, if (auth_length) { auth_data = HeapAlloc(GetProcessHeap(), 0, RPC_AUTH_VERIFIER_LEN(&common_hdr)); if (!auth_data) { - status = RPC_S_PROTOCOL_ERROR; + status = RPC_S_OUT_OF_RESOURCES; goto fail; } } @@ -806,7 +806,7 @@ RPC_STATUS RPCRT4_Receive(RpcConnection *Connection, RpcPktHdr **Header, (unsigned char *)pMsg->Buffer + buffer_length, data_length); if (dwRead != data_length) { WARN("bad data length, %d/%ld\n", dwRead, data_length); - status = RPC_S_PROTOCOL_ERROR; + status = RPC_S_CALL_FAILED; goto fail; } @@ -826,7 +826,7 @@ RPC_STATUS RPCRT4_Receive(RpcConnection *Connection, RpcPktHdr **Header, if (dwRead != header_auth_len) { WARN("bad authentication data length, %d/%d\n", dwRead, header_auth_len); - status = RPC_S_PROTOCOL_ERROR; + status = RPC_S_CALL_FAILED; goto fail; } @@ -854,7 +854,7 @@ RPC_STATUS RPCRT4_Receive(RpcConnection *Connection, RpcPktHdr **Header, dwRead = rpcrt4_conn_read(Connection, *Header, hdr_length); if (dwRead != hdr_length) { WARN("invalid packet header size (%d)\n", dwRead); - status = RPC_S_PROTOCOL_ERROR; + status = RPC_S_CALL_FAILED; goto fail; }

1 0

Alexander Nicolaysen Sørnes : vendor: Order application list by name
by Chris Morgan 30 Nov '07

30 Nov '07

Module: appdb Branch: master Commit: 31750b9de02fa6a56d819b7393d1d5c95164ffc8 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=31750b9de02fa6a56d819b73… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Nov 29 23:54:31 2007 +0100 vendor: Order application list by name --- include/vendor.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/vendor.php b/include/vendor.php index 409467f..0690415 100644 --- a/include/vendor.php +++ b/include/vendor.php @@ -47,7 +47,7 @@ class Vendor { */ $sQuery = "SELECT appId FROM appFamily - WHERE vendorId = '?'"; + WHERE vendorId = '?' ORDER by appName"; if($hResult = query_parameters($sQuery, $this->iVendorId)) { while($oRow = query_fetch_object($hResult))

1 0

Louis Lenders : advapi32: Add stub for CreateProcessWithLogonW.
by Alexandre Julliard 29 Nov '07

29 Nov '07

Module: wine Branch: master Commit: defbdf76e5d01c6e134edd0bc2589f6d7d10ad61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=defbdf76e5d01c6e134edd0bc… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Tue Nov 27 20:48:53 2007 +0000 advapi32: Add stub for CreateProcessWithLogonW. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 9724113..1a346b5 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -96,7 +96,7 @@ @ stdcall CreateProcessAsUserA(long str str ptr ptr long long ptr str ptr ptr) # @ stub CreateProcessAsUserSecure @ stdcall CreateProcessAsUserW(long str str ptr ptr long long ptr str ptr ptr) -# @ stub CreateProcessWithLogonW +@ stdcall CreateProcessWithLogonW(wstr wstr wstr long wstr wstr long ptr wstr ptr ptr) # @ stub CreateRestrictedToken @ stdcall CreateServiceA(long ptr ptr long long long long ptr ptr ptr ptr ptr ptr) @ stdcall CreateServiceW (long ptr ptr long long long long ptr ptr ptr ptr ptr ptr) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 4fdbb54..9b32fdd 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -4253,6 +4253,21 @@ BOOL WINAPI CreateProcessAsUserW( } /****************************************************************************** + * CreateProcessWithLogonW + */ +BOOL WINAPI CreateProcessWithLogonW( LPCWSTR lpUsername, LPCWSTR lpDomain, LPCWSTR lpPassword, DWORD dwLogonFlags, + LPCWSTR lpApplicationName, LPWSTR lpCommandLine, DWORD dwCreationFlags, LPVOID lpEnvironment, + LPCWSTR lpCurrentDirectory, LPSTARTUPINFOW lpStartupInfo, LPPROCESS_INFORMATION lpProcessInformation ) +{ + FIXME("%s %s %s 0x%08x %s %s 0x%08x %p %s %p %p stub\n", debugstr_w(lpUsername), debugstr_w(lpDomain), + debugstr_w(lpPassword), dwLogonFlags, debugstr_w(lpApplicationName), + debugstr_w(lpCommandLine), dwCreationFlags, lpEnvironment, debugstr_w(lpCurrentDirectory), + lpStartupInfo, lpProcessInformation); + + return FALSE; +} + +/****************************************************************************** * DuplicateTokenEx [ADVAPI32.@] */ BOOL WINAPI DuplicateTokenEx(

1 0

Gerald Pfeifer : gdi32: Fix the type of two loop variables.
by Alexandre Julliard 29 Nov '07

29 Nov '07

Module: wine Branch: master Commit: 24186d42dae5f34c278895b6353ea8af7f376577 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24186d42dae5f34c278895b63… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Nov 28 23:18:12 2007 +0100 gdi32: Fix the type of two loop variables. --- dlls/gdi32/font.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 3b6ec3b..1b80df1 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2128,7 +2128,8 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, { HFONT orig_font = dc->hFont, cur_font; UINT glyph; - INT span = 0, *offsets = NULL, i; + INT span = 0, *offsets = NULL; + unsigned int i; glyphs = HeapAlloc(GetProcessHeap(), 0, count * sizeof(WORD)); for(i = 0; i < count; i++) @@ -2138,7 +2139,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, { if(!offsets) { - int j; + unsigned int j; offsets = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*deltas)); offsets[0] = 0; if(!deltas)

1 0

Gerald Pfeifer : user32: Reduce scope of variable in ICO_ExtractIconExW() and initialize it.
by Alexandre Julliard 29 Nov '07

29 Nov '07

Module: wine Branch: master Commit: 2ff2d88510fea8c7be40b2fe9cfb105b3a35620d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ff2d88510fea8c7be40b2fe9… Author: Gerald Pfeifer <pfeifer(a)dbai.tuwien.ac.at> Date: Wed Nov 28 23:59:45 2007 +0100 user32: Reduce scope of variable in ICO_ExtractIconExW() and initialize it. --- dlls/user32/exticon.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/exticon.c b/dlls/user32/exticon.c index 8b70309..2b54df4 100644 --- a/dlls/user32/exticon.c +++ b/dlls/user32/exticon.c @@ -338,7 +338,6 @@ static UINT ICO_ExtractIconExW( UINT16 iconDirCount = 0,iconCount = 0; LPBYTE peimage; HANDLE fmapping; - ULONG uSize; DWORD fsizeh,fsizel; WCHAR szExePath[MAX_PATH]; DWORD dwSearchReturn; @@ -420,6 +419,7 @@ static UINT ICO_ExtractIconExW( NE_NAMEINFO *pIconStorage = NULL; NE_NAMEINFO *pIconDir = NULL; LPicoICONDIR lpiID = NULL; + ULONG uSize = 0; TRACE("-- OS2/icon Signature (0x%08x)\n", sig);

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 November 2007