November 2006 - Wine-Commits

Damjan Jovanovic : winex11.drv: Check for incompatible bpps and negative widths.
by Alexandre Julliard Nov. 10, 2006

Nov. 10, 2006

Module: wine Branch: master Commit: 5ec9d9b2f6e46c921c27445d4cf48141a0a3aaa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ec9d9b2f6e46c921c27445d4… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Nov 10 08:01:18 2006 +0200 winex11.drv: Check for incompatible bpps and negative widths. --- dlls/winex11.drv/bitblt.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index c1746fc..a1228d3 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1575,6 +1575,16 @@ static BOOL X11DRV_ClientSideDIBCopy( X1 FIXME("potential optimization: client-side compressed DIB copy\n"); return FALSE; } + if (srcDib.dsBm.bmBitsPixel != dstDib.dsBm.bmBitsPixel) + { + FIXME("potential optimization: pixel format conversion\n"); + return FALSE; + } + if (srcDib.dsBmih.biWidth < 0 || dstDib.dsBmih.biWidth < 0) + { + FIXME("negative widths not yet implemented\n"); + return FALSE; + } switch (dstDib.dsBm.bmBitsPixel) {

1 0

Damjan Jovanovic : winex11.drv: Fix copying top-down/bottom-up DIBs.
by Alexandre Julliard Nov. 10, 2006

Nov. 10, 2006

Module: wine Branch: master Commit: c6fa30a2cf0677dcb1bb83e4bee1639e30933a9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6fa30a2cf0677dcb1bb83e4b… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Nov 10 07:58:08 2006 +0200 winex11.drv: Fix copying top-down/bottom-up DIBs. --- dlls/winex11.drv/bitblt.c | 34 +++++++++++++++++++++++++--------- 1 files changed, 25 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 73c6231..c1746fc 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1535,6 +1535,7 @@ static BOOL X11DRV_ClientSideDIBCopy( X1 { DIBSECTION srcDib, dstDib; BYTE *srcPtr, *dstPtr; + INT srcRowOffset, dstRowOffset; INT bytesPerPixel; INT bytesToCopy; INT y; @@ -1574,11 +1575,6 @@ static BOOL X11DRV_ClientSideDIBCopy( X1 FIXME("potential optimization: client-side compressed DIB copy\n"); return FALSE; } - if (srcDib.dsBmih.biHeight < 0 || dstDib.dsBmih.biHeight < 0) - { - FIXME("potential optimization: client-side bottom-up DIB copy\n"); - return FALSE; - } switch (dstDib.dsBm.bmBitsPixel) { @@ -1599,14 +1595,34 @@ static BOOL X11DRV_ClientSideDIBCopy( X1 bytesToCopy = width * bytesPerPixel; - srcPtr = &physDevSrc->bitmap->base[ySrc*srcDib.dsBm.bmWidthBytes + xSrc*bytesPerPixel]; - dstPtr = &physDevDst->bitmap->base[yDst*dstDib.dsBm.bmWidthBytes + xDst*bytesPerPixel]; + if (srcDib.dsBmih.biHeight < 0) + { + srcPtr = &physDevSrc->bitmap->base[ySrc*srcDib.dsBm.bmWidthBytes + xSrc*bytesPerPixel]; + srcRowOffset = srcDib.dsBm.bmWidthBytes; + } + else + { + srcPtr = &physDevSrc->bitmap->base[(srcDib.dsBm.bmWidth-ySrc-1)*srcDib.dsBm.bmWidthBytes + + xSrc*bytesPerPixel]; + srcRowOffset = -srcDib.dsBm.bmWidthBytes; + } + if (dstDib.dsBmih.biHeight < 0) + { + dstPtr = &physDevDst->bitmap->base[yDst*dstDib.dsBm.bmWidthBytes + xDst*bytesPerPixel]; + dstRowOffset = dstDib.dsBm.bmWidthBytes; + } + else + { + dstPtr = &physDevDst->bitmap->base[(dstDib.dsBm.bmWidth-yDst-1)*dstDib.dsBm.bmWidthBytes + + xDst*bytesPerPixel]; + dstRowOffset = -dstDib.dsBm.bmWidthBytes; + } for (y = yDst; y < yDst + height; ++y) { memcpy(dstPtr, srcPtr, bytesToCopy); - srcPtr += srcDib.dsBm.bmWidthBytes; - dstPtr += dstDib.dsBm.bmWidthBytes; + srcPtr += srcRowOffset; + dstPtr += dstRowOffset; } return TRUE;

1 0

Kai Blin : secur32: work around a bug in ntlm_auth that breaks RPC.
by Alexandre Julliard Nov. 10, 2006

Nov. 10, 2006

Module: wine Branch: master Commit: 48f934ee9667c1445521f326846849fadbc1c630 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48f934ee9667c1445521f3268… Author: Kai Blin <kai.blin(a)gmail.com> Date: Fri Nov 10 03:53:57 2006 +0100 secur32: work around a bug in ntlm_auth that breaks RPC. --- dlls/secur32/ntlm.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 257562b..539696f 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -448,7 +448,11 @@ static SECURITY_STATUS SEC_ENTRY ntlm_In { /* This is default, so we'll enable it */ ctxt_attr |= ISC_RET_CONNECTION; - lstrcatA(want_flags, " NTLMSSP_FEATURE_SESSION_KEY"); + /* Work around a bug in ntlm_auth that sets the + * NTLMSSP_FEATURE_SIGN flag for this want flag, which + * breaks RPC. */ + if(0) + lstrcatA(want_flags, " NTLMSSP_FEATURE_SESSION_KEY"); } if(fContextReq & ISC_REQ_EXTENDED_ERROR) FIXME("ISC_REQ_EXTENDED_ERROR\n");

1 0

Michael Stefaniuc : rpcrt4: Win64 printf format warning fixes.
by Alexandre Julliard Nov. 10, 2006

Nov. 10, 2006

Module: wine Branch: master Commit: de21efbadd1d9197c0843c21aa47f0d7f4346a70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de21efbadd1d9197c0843c21a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Nov 9 23:04:48 2006 +0100 rpcrt4: Win64 printf format warning fixes. --- dlls/rpcrt4/Makefile.in | 2 +- dlls/rpcrt4/cproxy.c | 4 +- dlls/rpcrt4/cstub.c | 8 ++-- dlls/rpcrt4/ndr_clientserver.c | 2 +- dlls/rpcrt4/ndr_fullpointer.c | 8 ++-- dlls/rpcrt4/ndr_marshall.c | 62 ++++++++++++++++++++-------------------- dlls/rpcrt4/ndr_ole.c | 6 ++-- dlls/rpcrt4/ndr_stubless.c | 6 ++-- dlls/rpcrt4/rpc_binding.c | 10 +++--- dlls/rpcrt4/rpc_message.c | 18 ++++++------ dlls/rpcrt4/rpc_server.c | 6 ++-- dlls/rpcrt4/rpc_transport.c | 10 +++--- dlls/rpcrt4/rpcrt4_main.c | 4 +- dlls/rpcrt4/rpcss_np_client.c | 2 +- 14 files changed, 74 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de21efbadd1d9197c0843…

1 0

Jacek Caban : mshtml: Use popup menu from shdoclc.dll.
by Alexandre Julliard Nov. 10, 2006

Nov. 10, 2006

Module: wine Branch: master Commit: 8ea593267cbbea9c9b4d6ca11a8139801caab420 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ea593267cbbea9c9b4d6ca11… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 9 23:54:09 2006 +0100 mshtml: Use popup menu from shdoclc.dll. --- dlls/mshtml/main.c | 15 +++++++++++++++ dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/olewnd.c | 2 +- 3 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 9a45a72..fc224bc 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -49,6 +49,8 @@ HINSTANCE hInst; LONG module_ref = 0; DWORD mshtml_tls = 0; +static HINSTANCE shdoclc = NULL; + static void thread_detach(void) { thread_data_t *thread_data = get_thread_data(FALSE); @@ -62,6 +64,17 @@ static void thread_detach(void) mshtml_free(thread_data); } +HINSTANCE get_shdoclc(void) +{ + static const WCHAR wszShdoclc[] = + {'s','h','d','o','c','l','c','.','d','l','l',0}; + + if(shdoclc) + return shdoclc; + + return shdoclc = LoadLibraryExW(wszShdoclc, NULL, LOAD_LIBRARY_AS_DATAFILE); +} + BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { switch(fdwReason) { @@ -70,6 +83,8 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, break; case DLL_PROCESS_DETACH: close_gecko(); + if(shdoclc) + FreeLibrary(shdoclc); if(mshtml_tls) TlsFree(mshtml_tls); break; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index b352c5f..f47a799 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -405,4 +405,6 @@ static inline BOOL mshtml_free(void *mem return HeapFree(GetProcessHeap(), 0, mem); } +HINSTANCE get_shdoclc(void); + extern HINSTANCE hInst; diff --git a/dlls/mshtml/olewnd.c b/dlls/mshtml/olewnd.c index ef377ab..7a207be 100644 --- a/dlls/mshtml/olewnd.c +++ b/dlls/mshtml/olewnd.c @@ -272,7 +272,7 @@ void HTMLDocument_ShowContextMenu(HTMLDo if(hres == S_OK) return; - menu_res = LoadMenuW(hInst, MAKEINTRESOURCEW(IDR_BROWSE_CONTEXT_MENU)); + menu_res = LoadMenuW(get_shdoclc(), MAKEINTRESOURCEW(IDR_BROWSE_CONTEXT_MENU)); menu = GetSubMenu(menu_res, dwID); TrackPopupMenu(menu, TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD,

1 0

Michael Stefaniuc : rpcrt4: More "unsigned long" to "ULONG" changes in preparation of the removal of WINE_NO_LONG_AS_INT.
by Alexandre Julliard Nov. 10, 2006

Nov. 10, 2006

Module: wine Branch: master Commit: 718f3c3505aa7dd9291bd34af5fcb32d14c8ee92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=718f3c3505aa7dd9291bd34af… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Nov 9 23:02:49 2006 +0100 rpcrt4: More "unsigned long" to "ULONG" changes in preparation of the removal of WINE_NO_LONG_AS_INT. --- dlls/rpcrt4/ndr_fullpointer.c | 6 +++--- dlls/rpcrt4/ndr_marshall.c | 22 +++++++++++----------- dlls/rpcrt4/ndr_misc.h | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/rpcrt4/ndr_fullpointer.c b/dlls/rpcrt4/ndr_fullpointer.c index 1cfd047..1d28023 100644 --- a/dlls/rpcrt4/ndr_fullpointer.c +++ b/dlls/rpcrt4/ndr_fullpointer.c @@ -72,7 +72,7 @@ void WINAPI NdrFullPointerXlatFree(PFULL HeapFree(GetProcessHeap(), 0, pXlatTables); } -static void expand_pointer_table_if_necessary(PFULL_PTR_XLAT_TABLES pXlatTables, unsigned long RefId) +static void expand_pointer_table_if_necessary(PFULL_PTR_XLAT_TABLES pXlatTables, ULONG RefId) { if (RefId >= pXlatTables->RefIdToPointer.NumberOfEntries) { @@ -195,10 +195,10 @@ void WINAPI NdrFullPointerInsertRefId(PF int WINAPI NdrFullPointerFree(PFULL_PTR_XLAT_TABLES pXlatTables, void *Pointer) { - unsigned long Hash = 0; + ULONG Hash = 0; int i; PFULL_PTR_TO_REFID_ELEMENT XlatTableEntry; - unsigned long RefId = 0; + ULONG RefId = 0; TRACE("(%p, %p)\n", pXlatTables, Pointer); diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 3869c6e..c240e92 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -117,7 +117,7 @@ static unsigned char *WINAPI NdrBaseType static unsigned char *WINAPI NdrBaseTypeUnmarshall(PMIDL_STUB_MESSAGE, unsigned char **, PFORMAT_STRING, unsigned char); static void WINAPI NdrBaseTypeBufferSize(PMIDL_STUB_MESSAGE, unsigned char *, PFORMAT_STRING); static void WINAPI NdrBaseTypeFree(PMIDL_STUB_MESSAGE, unsigned char *, PFORMAT_STRING); -static unsigned long WINAPI NdrBaseTypeMemorySize(PMIDL_STUB_MESSAGE, PFORMAT_STRING); +static ULONG WINAPI NdrBaseTypeMemorySize(PMIDL_STUB_MESSAGE, PFORMAT_STRING); const NDR_MARSHALL NdrMarshaller[NDR_TABLE_SIZE] = { 0, @@ -399,7 +399,7 @@ static inline void SizeVariance(MIDL_STU PFORMAT_STRING ComputeConformanceOrVariance( MIDL_STUB_MESSAGE *pStubMsg, unsigned char *pMemory, - PFORMAT_STRING pFormat, ULONG_PTR def, ULONG *pCount) + PFORMAT_STRING pFormat, ULONG_PTR def, ULONG_PTR *pCount) { BYTE dtype = pFormat[0] & 0xf; short ofs = *(const short *)&pFormat[2]; @@ -802,7 +802,7 @@ static void PointerMarshall(PMIDL_STUB_M unsigned type = pFormat[0], attr = pFormat[1]; PFORMAT_STRING desc; NDR_MARSHALL m; - unsigned long pointer_id; + ULONG pointer_id; int pointer_needs_marshaling; TRACE("(%p,%p,%p,%p)\n", pStubMsg, Buffer, Pointer, pFormat); @@ -825,7 +825,7 @@ #endif pointer_needs_marshaling = 1; else pointer_needs_marshaling = 0; - pointer_id = (unsigned long)Pointer; + pointer_id = (ULONG)Pointer; TRACE("writing 0x%08lx to buffer\n", pointer_id); NDR_LOCAL_UINT32_WRITE(Buffer, pointer_id); break; @@ -946,7 +946,7 @@ static void PointerBufferSize(PMIDL_STUB PFORMAT_STRING desc; NDR_BUFFERSIZE m; int pointer_needs_sizing; - unsigned long pointer_id; + ULONG pointer_id; TRACE("(%p,%p,%p)\n", pStubMsg, Pointer, pFormat); TRACE("type=0x%x, attr=", type); dump_pointer_attr(attr); @@ -2742,7 +2742,7 @@ void WINAPI NdrComplexArrayFree(PMIDL_ST pMemory = ComplexFree(pStubMsg, pMemory, pFormat, NULL); } -static unsigned long UserMarshalFlags(PMIDL_STUB_MESSAGE pStubMsg) +static ULONG UserMarshalFlags(PMIDL_STUB_MESSAGE pStubMsg) { return MAKELONG(pStubMsg->dwDestContext, pStubMsg->RpcMsg->DataRepresentation); @@ -2761,7 +2761,7 @@ unsigned char * WINAPI NdrUserMarshalMar { unsigned flags = pFormat[1]; unsigned index = *(const WORD*)&pFormat[2]; - unsigned long uflag = UserMarshalFlags(pStubMsg); + ULONG uflag = UserMarshalFlags(pStubMsg); TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); TRACE("index=%d\n", index); @@ -2795,7 +2795,7 @@ unsigned char * WINAPI NdrUserMarshalUnm unsigned flags = pFormat[1]; unsigned index = *(const WORD*)&pFormat[2]; DWORD memsize = *(const WORD*)&pFormat[4]; - unsigned long uflag = UserMarshalFlags(pStubMsg); + ULONG uflag = UserMarshalFlags(pStubMsg); TRACE("(%p,%p,%p,%d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); TRACE("index=%d\n", index); @@ -2829,7 +2829,7 @@ void WINAPI NdrUserMarshalBufferSize(PMI unsigned flags = pFormat[1]; unsigned index = *(const WORD*)&pFormat[2]; DWORD bufsize = *(const WORD*)&pFormat[6]; - unsigned long uflag = UserMarshalFlags(pStubMsg); + ULONG uflag = UserMarshalFlags(pStubMsg); TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); TRACE("index=%d\n", index); @@ -2894,7 +2894,7 @@ void WINAPI NdrUserMarshalFree(PMIDL_STU { /* unsigned flags = pFormat[1]; */ unsigned index = *(const WORD*)&pFormat[2]; - unsigned long uflag = UserMarshalFlags(pStubMsg); + ULONG uflag = UserMarshalFlags(pStubMsg); TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); TRACE("index=%d\n", index); @@ -4698,7 +4698,7 @@ static void WINAPI NdrBaseTypeBufferSize /*********************************************************************** * NdrBaseTypeMemorySize [internal] */ -static unsigned long WINAPI NdrBaseTypeMemorySize( +static ULONG WINAPI NdrBaseTypeMemorySize( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { diff --git a/dlls/rpcrt4/ndr_misc.h b/dlls/rpcrt4/ndr_misc.h index b5c3d88..ebd70b8 100644 --- a/dlls/rpcrt4/ndr_misc.h +++ b/dlls/rpcrt4/ndr_misc.h @@ -32,7 +32,7 @@ struct IPSFactoryBuffer; PFORMAT_STRING ComputeConformanceOrVariance( MIDL_STUB_MESSAGE *pStubMsg, unsigned char *pMemory, - PFORMAT_STRING pFormat, ULONG_PTR def, ULONG *pCount); + PFORMAT_STRING pFormat, ULONG_PTR def, ULONG_PTR *pCount); static inline PFORMAT_STRING ComputeConformance(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat, ULONG def) { @@ -53,7 +53,7 @@ static inline PFORMAT_STRING ComputeVari typedef unsigned char* (WINAPI *NDR_MARSHALL) (PMIDL_STUB_MESSAGE, unsigned char*, PFORMAT_STRING); typedef unsigned char* (WINAPI *NDR_UNMARSHALL)(PMIDL_STUB_MESSAGE, unsigned char**,PFORMAT_STRING, unsigned char); typedef void (WINAPI *NDR_BUFFERSIZE)(PMIDL_STUB_MESSAGE, unsigned char*, PFORMAT_STRING); -typedef unsigned long (WINAPI *NDR_MEMORYSIZE)(PMIDL_STUB_MESSAGE, PFORMAT_STRING); +typedef ULONG (WINAPI *NDR_MEMORYSIZE)(PMIDL_STUB_MESSAGE, PFORMAT_STRING); typedef void (WINAPI *NDR_FREE) (PMIDL_STUB_MESSAGE, unsigned char*, PFORMAT_STRING); extern const NDR_MARSHALL NdrMarshaller[];

1 0

Michael Stefaniuc : rpcrt4/ndr_marshall.c: Bring the function definitions in sync with their declaration.
by Alexandre Julliard Nov. 10, 2006

Nov. 10, 2006

Module: wine Branch: master Commit: 0628fb509816411fd72fc825a5f7dbd952bbc156 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0628fb509816411fd72fc825a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Nov 9 23:01:58 2006 +0100 rpcrt4/ndr_marshall.c: Bring the function definitions in sync with their declaration. Those got out of sync due to the unsigned long to ULONG migration in the headers. --- dlls/rpcrt4/ndr_marshall.c | 77 ++++++++++++++++++++----------------------- 1 files changed, 36 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0628fb509816411fd72fc…

1 0

Michael Stefaniuc : rpcrt4: Bring the function definitions in sync with their declaration.
by Alexandre Julliard Nov. 10, 2006

Nov. 10, 2006

Module: wine Branch: master Commit: 32ec5284054f022d5a1bbe2f62b2022f126f7b70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32ec5284054f022d5a1bbe2f6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Nov 9 23:02:09 2006 +0100 rpcrt4: Bring the function definitions in sync with their declaration. They got out of sync due to the unsigned long to ULONG changes in the headers. --- dlls/rpcrt4/ndr_clientserver.c | 6 +++--- dlls/rpcrt4/ndr_fullpointer.c | 16 ++++++++-------- dlls/rpcrt4/ndr_ole.c | 4 ++-- dlls/rpcrt4/ndr_stubless.c | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/rpcrt4/ndr_clientserver.c b/dlls/rpcrt4/ndr_clientserver.c index cb260f1..3c17f27 100644 --- a/dlls/rpcrt4/ndr_clientserver.c +++ b/dlls/rpcrt4/ndr_clientserver.c @@ -129,7 +129,7 @@ unsigned char* WINAPI NdrServerInitializ /*********************************************************************** * NdrGetBuffer [RPCRT4.@] */ -unsigned char *WINAPI NdrGetBuffer(MIDL_STUB_MESSAGE *stubmsg, unsigned long buflen, RPC_BINDING_HANDLE handle) +unsigned char *WINAPI NdrGetBuffer(MIDL_STUB_MESSAGE *stubmsg, ULONG buflen, RPC_BINDING_HANDLE handle) { TRACE("(stubmsg == ^%p, buflen == %lu, handle == %p): wild guess.\n", stubmsg, buflen, handle); @@ -195,8 +195,8 @@ unsigned char *WINAPI NdrSendReceive( MI * NdrMapCommAndFaultStatus [RPCRT4.@] */ RPC_STATUS RPC_ENTRY NdrMapCommAndFaultStatus( PMIDL_STUB_MESSAGE pStubMsg, - unsigned long *pCommStatus, - unsigned long *pFaultStatus, + ULONG *pCommStatus, + ULONG *pFaultStatus, RPC_STATUS Status ) { FIXME("(%p, %p, %p, %ld): stub\n", pStubMsg, pCommStatus, pFaultStatus, Status); diff --git a/dlls/rpcrt4/ndr_fullpointer.c b/dlls/rpcrt4/ndr_fullpointer.c index b89b669..1cfd047 100644 --- a/dlls/rpcrt4/ndr_fullpointer.c +++ b/dlls/rpcrt4/ndr_fullpointer.c @@ -29,10 +29,10 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(rpc); -PFULL_PTR_XLAT_TABLES WINAPI NdrFullPointerXlatInit(unsigned long NumberOfPointers, +PFULL_PTR_XLAT_TABLES WINAPI NdrFullPointerXlatInit(ULONG NumberOfPointers, XLAT_SIDE XlatSide) { - unsigned long NumberOfBuckets; + ULONG NumberOfBuckets; PFULL_PTR_XLAT_TABLES pXlatTables = HeapAlloc(GetProcessHeap(), 0, sizeof(*pXlatTables)); TRACE("(%ld, %d)\n", NumberOfPointers, XlatSide); @@ -93,9 +93,9 @@ static void expand_pointer_table_if_nece int WINAPI NdrFullPointerQueryPointer(PFULL_PTR_XLAT_TABLES pXlatTables, void *pPointer, unsigned char QueryType, - unsigned long *pRefId ) + ULONG *pRefId ) { - unsigned long Hash = 0; + ULONG Hash = 0; int i; PFULL_PTR_TO_REFID_ELEMENT XlatTableEntry; @@ -141,8 +141,8 @@ int WINAPI NdrFullPointerQueryPointer(PF } int WINAPI NdrFullPointerQueryRefId(PFULL_PTR_XLAT_TABLES pXlatTables, - unsigned long RefId, - unsigned char QueryType, void **ppPointer) + ULONG RefId, unsigned char QueryType, + void **ppPointer) { TRACE("(%p, 0x%lx, %d, %p)\n", pXlatTables, RefId, QueryType, ppPointer); @@ -168,9 +168,9 @@ int WINAPI NdrFullPointerQueryRefId(PFUL } void WINAPI NdrFullPointerInsertRefId(PFULL_PTR_XLAT_TABLES pXlatTables, - unsigned long RefId, void *pPointer) + ULONG RefId, void *pPointer) { - unsigned long Hash = 0; + ULONG Hash = 0; int i; PFULL_PTR_TO_REFID_ELEMENT XlatTableEntry; diff --git a/dlls/rpcrt4/ndr_ole.c b/dlls/rpcrt4/ndr_ole.c index 2e4c67b..e954340 100644 --- a/dlls/rpcrt4/ndr_ole.c +++ b/dlls/rpcrt4/ndr_ole.c @@ -321,8 +321,8 @@ void WINAPI NdrInterfacePointerBufferSiz /*********************************************************************** * NdrInterfacePointerMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrInterfacePointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, - PFORMAT_STRING pFormat) +ULONG WINAPI NdrInterfacePointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, + PFORMAT_STRING pFormat) { ULONG size; diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 9d4d78a..7539312 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1076,11 +1076,11 @@ static DWORD calc_arg_size(MIDL_STUB_MES } /* FIXME: need to free some stuff in here too */ -long WINAPI NdrStubCall2( +LONG WINAPI NdrStubCall2( struct IRpcStubBuffer * pThis, struct IRpcChannelBuffer * pChannel, PRPC_MESSAGE pRpcMsg, - unsigned long * pdwStubPhase) + DWORD * pdwStubPhase) { const MIDL_SERVER_INFO *pServerInfo; const MIDL_STUB_DESC *pStubDesc;

1 0

Saulius Krasuckas : loader: Use plain binary name of git-describe to avoid junk in version output.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: 06566a534737f7741c05677ccdc50b5f951aa16f URL: http://source.winehq.org/git/wine.git/?a=commit;h=06566a534737f7741c05677cc… Author: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Date: Thu Nov 9 20:05:19 2006 +0200 loader: Use plain binary name of git-describe to avoid junk in version output. --- loader/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/loader/Makefile.in b/loader/Makefile.in index 94c2428..47a8629 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -61,7 +61,7 @@ clean:: $(RM) $(WINE_BINARIES) $(MODULE) version.c version-stamp version-stamp: dummy - (GIT_DIR=$(TOPSRCDIR)/.git git describe 2>/dev/null || echo "wine-(a)PACKAGE_VERSION@") | sed -e 's/$.*$/const char wine_version[] = "\1";/' >$@ || ($(RM) $@ && exit 1) + (GIT_DIR=$(TOPSRCDIR)/.git git-describe 2>/dev/null || echo "wine-(a)PACKAGE_VERSION@") | sed -e 's/$.*$/const char wine_version[] = "\1";/' >$@ || ($(RM) $@ && exit 1) version.c: version-stamp @cmp -s version-stamp $@ || cp version-stamp $@

1 0

Alexandre Julliard : rpcrt4/tests: Replace || by |.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: c0f9d369dc578bd1d5cfefad2852c5690668a8fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0f9d369dc578bd1d5cfefad2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 9 18:20:49 2006 +0100 rpcrt4/tests: Replace || by |. --- dlls/rpcrt4/tests/ndr_marshall.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index e441698..58428c2 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -660,7 +660,7 @@ static void test_simple_struct(void) s1.c = 0xa5; s1.l1 = 0xdeadbeef; s1.l2 = 0xcafebabe; - s1.ll = ((LONGLONG) 0xbadefeed << 32) || 0x2468ace0; + s1.ll = ((LONGLONG) 0xbadefeed << 32) | 0x2468ace0; wiredatalen = 24; memcpy(wiredata, &s1, wiredatalen);

1 0