December 2009 - Wine-commits

Rob Shearman : rpcrt4: Implement RpcServerRegisterAuthInfoA/W.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 6ad4d5922b82af125153c98c824efa479be44829 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ad4d5922b82af125153c98c8… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Dec 13 21:35:29 2009 +0000 rpcrt4: Implement RpcServerRegisterAuthInfoA/W. --- dlls/rpcrt4/rpc_server.c | 175 +++++++++++++++++++++++++++++++++++++++++++-- dlls/rpcrt4/rpc_server.h | 1 + dlls/rpcrt4/rpcrt4_main.c | 1 + 3 files changed, 171 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 84e8854..4778a5e 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -67,6 +67,7 @@ static RpcObjTypeMap *RpcObjTypeMaps; /* list of type RpcServerProtseq */ static struct list protseqs = LIST_INIT(protseqs); static struct list server_interfaces = LIST_INIT(server_interfaces); +static struct list server_registered_auth_info = LIST_INIT(server_registered_auth_info); static CRITICAL_SECTION server_cs; static CRITICAL_SECTION_DEBUG server_cs_debug = @@ -86,6 +87,15 @@ static CRITICAL_SECTION_DEBUG listen_cs_debug = }; static CRITICAL_SECTION listen_cs = { &listen_cs_debug, -1, 0, 0, 0, 0 }; +static CRITICAL_SECTION server_auth_info_cs; +static CRITICAL_SECTION_DEBUG server_auth_info_cs_debug = +{ + 0, 0, &server_auth_info_cs, + { &server_auth_info_cs_debug.ProcessLocksList, &server_auth_info_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": server_auth_info_cs") } +}; +static CRITICAL_SECTION server_auth_info_cs = { &server_auth_info_cs_debug, -1, 0, 0, 0, 0 }; + /* whether the server is currently listening */ static BOOL std_listen; /* number of manual listeners (calls to RpcServerListen) */ @@ -1134,15 +1144,114 @@ RPC_STATUS WINAPI RpcObjectSetType( UUID* ObjUuid, UUID* TypeUuid ) return RPC_S_OK; } +struct rpc_server_registered_auth_info +{ + struct list entry; + TimeStamp exp; + CredHandle cred; + ULONG max_token; + USHORT auth_type; +}; + +RPC_STATUS RPCRT4_ServerGetRegisteredAuthInfo( + USHORT auth_type, CredHandle *cred, TimeStamp *exp, ULONG *max_token) +{ + RPC_STATUS status = RPC_S_UNKNOWN_AUTHN_SERVICE; + struct rpc_server_registered_auth_info *auth_info; + + EnterCriticalSection(&server_auth_info_cs); + LIST_FOR_EACH_ENTRY(auth_info, &server_registered_auth_info, struct rpc_server_registered_auth_info, entry) + { + if (auth_info->auth_type == auth_type) + { + *cred = auth_info->cred; + *exp = auth_info->exp; + *max_token = auth_info->max_token; + status = RPC_S_OK; + break; + } + } + LeaveCriticalSection(&server_auth_info_cs); + + return status; +} + +void RPCRT4_ServerFreeAllRegisteredAuthInfo(void) +{ + struct rpc_server_registered_auth_info *auth_info, *cursor2; + + EnterCriticalSection(&server_auth_info_cs); + LIST_FOR_EACH_ENTRY_SAFE(auth_info, cursor2, &server_registered_auth_info, struct rpc_server_registered_auth_info, entry) + { + FreeCredentialsHandle(&auth_info->cred); + HeapFree(GetProcessHeap(), 0, auth_info); + } + LeaveCriticalSection(&server_auth_info_cs); +} + /*********************************************************************** * RpcServerRegisterAuthInfoA (RPCRT4.@) */ RPC_STATUS WINAPI RpcServerRegisterAuthInfoA( RPC_CSTR ServerPrincName, ULONG AuthnSvc, RPC_AUTH_KEY_RETRIEVAL_FN GetKeyFn, LPVOID Arg ) { - FIXME( "(%s,%u,%p,%p): stub\n", ServerPrincName, AuthnSvc, GetKeyFn, Arg ); - - return RPC_S_UNKNOWN_AUTHN_SERVICE; /* We don't know any authentication services */ + SECURITY_STATUS sec_status; + CredHandle cred; + TimeStamp exp; + ULONG package_count; + ULONG i; + PSecPkgInfoA packages; + ULONG max_token; + struct rpc_server_registered_auth_info *auth_info; + + TRACE("(%s,%u,%p,%p)\n", ServerPrincName, AuthnSvc, GetKeyFn, Arg); + + sec_status = EnumerateSecurityPackagesA(&package_count, &packages); + if (sec_status != SEC_E_OK) + { + ERR("EnumerateSecurityPackagesA failed with error 0x%08x\n", + sec_status); + return RPC_S_SEC_PKG_ERROR; + } + + for (i = 0; i < package_count; i++) + if (packages[i].wRPCID == AuthnSvc) + break; + + if (i == package_count) + { + WARN("unsupported AuthnSvc %u\n", AuthnSvc); + FreeContextBuffer(packages); + return RPC_S_UNKNOWN_AUTHN_SERVICE; + } + TRACE("found package %s for service %u\n", packages[i].Name, + AuthnSvc); + sec_status = AcquireCredentialsHandleA((SEC_CHAR *)ServerPrincName, + packages[i].Name, + SECPKG_CRED_INBOUND, NULL, NULL, + NULL, NULL, &cred, &exp); + max_token = packages[i].cbMaxToken; + FreeContextBuffer(packages); + if (sec_status != SEC_E_OK) + return RPC_S_SEC_PKG_ERROR; + + auth_info = HeapAlloc(GetProcessHeap(), 0, sizeof(*auth_info)); + if (!auth_info) + { + FreeCredentialsHandle(&cred); + return RPC_S_OUT_OF_RESOURCES; + } + + auth_info->exp = exp; + auth_info->cred = cred; + auth_info->max_token = max_token; + auth_info->auth_type = AuthnSvc; + + EnterCriticalSection(&server_auth_info_cs); + list_add_tail(&server_registered_auth_info, &auth_info->entry); + LeaveCriticalSection(&server_auth_info_cs); + + return RPC_S_OK; } /*********************************************************************** @@ -1151,9 +1260,63 @@ RPC_STATUS WINAPI RpcServerRegisterAuthInfoA( RPC_CSTR ServerPrincName, ULONG Au RPC_STATUS WINAPI RpcServerRegisterAuthInfoW( RPC_WSTR ServerPrincName, ULONG AuthnSvc, RPC_AUTH_KEY_RETRIEVAL_FN GetKeyFn, LPVOID Arg ) { - FIXME( "(%s,%u,%p,%p): stub\n", debugstr_w( ServerPrincName ), AuthnSvc, GetKeyFn, Arg ); - - return RPC_S_UNKNOWN_AUTHN_SERVICE; /* We don't know any authentication services */ + SECURITY_STATUS sec_status; + CredHandle cred; + TimeStamp exp; + ULONG package_count; + ULONG i; + PSecPkgInfoW packages; + ULONG max_token; + struct rpc_server_registered_auth_info *auth_info; + + TRACE("(%s,%u,%p,%p)\n", debugstr_w(ServerPrincName), AuthnSvc, GetKeyFn, Arg); + + sec_status = EnumerateSecurityPackagesW(&package_count, &packages); + if (sec_status != SEC_E_OK) + { + ERR("EnumerateSecurityPackagesW failed with error 0x%08x\n", + sec_status); + return RPC_S_SEC_PKG_ERROR; + } + + for (i = 0; i < package_count; i++) + if (packages[i].wRPCID == AuthnSvc) + break; + + if (i == package_count) + { + WARN("unsupported AuthnSvc %u\n", AuthnSvc); + FreeContextBuffer(packages); + return RPC_S_UNKNOWN_AUTHN_SERVICE; + } + TRACE("found package %s for service %u\n", debugstr_w(packages[i].Name), + AuthnSvc); + sec_status = AcquireCredentialsHandleW((SEC_WCHAR *)ServerPrincName, + packages[i].Name, + SECPKG_CRED_INBOUND, NULL, NULL, + NULL, NULL, &cred, &exp); + max_token = packages[i].cbMaxToken; + FreeContextBuffer(packages); + if (sec_status != SEC_E_OK) + return RPC_S_SEC_PKG_ERROR; + + auth_info = HeapAlloc(GetProcessHeap(), 0, sizeof(*auth_info)); + if (!auth_info) + { + FreeCredentialsHandle(&cred); + return RPC_S_OUT_OF_RESOURCES; + } + + auth_info->exp = exp; + auth_info->cred = cred; + auth_info->max_token = max_token; + auth_info->auth_type = AuthnSvc; + + EnterCriticalSection(&server_auth_info_cs); + list_add_tail(&server_registered_auth_info, &auth_info->entry); + LeaveCriticalSection(&server_auth_info_cs); + + return RPC_S_OK; } /*********************************************************************** diff --git a/dlls/rpcrt4/rpc_server.h b/dlls/rpcrt4/rpc_server.h index cacce79..07fb623 100644 --- a/dlls/rpcrt4/rpc_server.h +++ b/dlls/rpcrt4/rpc_server.h @@ -80,5 +80,6 @@ void RPCRT4_new_client(RpcConnection* conn); const struct protseq_ops *rpcrt4_get_protseq_ops(const char *protseq); void RPCRT4_destroy_all_protseqs(void); +void RPCRT4_ServerFreeAllRegisteredAuthInfo(void); #endif /* __WINE_RPC_SERVER_H */ diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index 67059e7..a790ccb 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -127,6 +127,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_DETACH: RPCRT4_destroy_all_protseqs(); + RPCRT4_ServerFreeAllRegisteredAuthInfo(); break; }

1 0

Rob Shearman : rpcrt4: Fix rpcrt4_conn_tcp_read and rpcrt4_conn_tcp_write for reading/ writing zero-sized data.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: ceb7fda37440f042abffce1b10a5a3aaaa181d91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceb7fda37440f042abffce1b1… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Dec 13 21:35:34 2009 +0000 rpcrt4: Fix rpcrt4_conn_tcp_read and rpcrt4_conn_tcp_write for reading/writing zero-sized data. --- dlls/rpcrt4/rpc_transport.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 5d38b6e..5c7edea 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1345,7 +1345,7 @@ static int rpcrt4_conn_tcp_read(RpcConnection *Connection, { RpcConnection_tcp *tcpc = (RpcConnection_tcp *) Connection; int bytes_read = 0; - do + while (bytes_read != count) { int r = recv(tcpc->sock, (char *)buffer + bytes_read, count - bytes_read, 0); if (!r) @@ -1362,7 +1362,7 @@ static int rpcrt4_conn_tcp_read(RpcConnection *Connection, if (!rpcrt4_sock_wait_for_recv(tcpc)) return -1; } - } while (bytes_read != count); + } TRACE("%d %p %u -> %d\n", tcpc->sock, buffer, count, bytes_read); return bytes_read; } @@ -1372,7 +1372,7 @@ static int rpcrt4_conn_tcp_write(RpcConnection *Connection, { RpcConnection_tcp *tcpc = (RpcConnection_tcp *) Connection; int bytes_written = 0; - do + while (bytes_written != count) { int r = send(tcpc->sock, (const char *)buffer + bytes_written, count - bytes_written, 0); if (r >= 0) @@ -1384,7 +1384,7 @@ static int rpcrt4_conn_tcp_write(RpcConnection *Connection, if (!rpcrt4_sock_wait_for_send(tcpc)) return -1; } - } while (bytes_written != count); + } TRACE("%d %p %u -> %d\n", tcpc->sock, buffer, count, bytes_written); return bytes_written; }

1 0

Rob Shearman : rpcrt4: Add support for server-side authentication.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: e27e61db71e8f0279e3cbc09e32d8f85acde3159 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e27e61db71e8f0279e3cbc09e… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Dec 13 21:35:39 2009 +0000 rpcrt4: Add support for server-side authentication. --- dlls/rpcrt4/rpc_assoc.c | 6 +- dlls/rpcrt4/rpc_binding.c | 10 +- dlls/rpcrt4/rpc_binding.h | 1 + dlls/rpcrt4/rpc_message.c | 205 ++++++++++++++++++++++++------ dlls/rpcrt4/rpc_message.h | 4 + dlls/rpcrt4/rpc_server.c | 307 ++++++++++++++++++++++++++++++--------------- 6 files changed, 383 insertions(+), 150 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e27e61db71e8f0279e3cb…

1 0

Rob Shearman : rpcrt4: Process control packets in the server synchronously to avoid races when using 3-factor authentication .
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: a65f7b637a7381877b6946b811ffb433eb6d7376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a65f7b637a7381877b6946b81… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Dec 13 21:35:43 2009 +0000 rpcrt4: Process control packets in the server synchronously to avoid races when using 3-factor authentication. The client has nothing to wait for after sending the AUTH3 packet before sending the first request packet. Therefore, we must ensure that the AUTH3 packet has finished being processed before we start processing any request packets. --- dlls/rpcrt4/rpc_server.c | 70 +++++++++++++++++++++++++++++++++------------ 1 files changed, 51 insertions(+), 19 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 55d9783..7f3f0c2 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -562,6 +562,7 @@ static DWORD CALLBACK RPCRT4_io_thread(LPVOID the_arg) for (;;) { msg = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(RPC_MESSAGE)); + if (!msg) break; status = RPCRT4_ReceiveWithAuth(conn, &hdr, msg, &auth_data, &auth_length); if (status != RPC_S_OK) { @@ -570,30 +571,61 @@ static DWORD CALLBACK RPCRT4_io_thread(LPVOID the_arg) break; } - packet = HeapAlloc(GetProcessHeap(), 0, sizeof(RpcPacket)); - if (!packet) { - I_RpcFree(msg->Buffer); - RPCRT4_FreeHeader(hdr); - HeapFree(GetProcessHeap(), 0, msg); + switch (hdr->common.ptype) { + case PKT_BIND: + TRACE("got bind packet\n"); + + status = process_bind_packet(conn, &hdr->bind, msg, auth_data, + auth_length); break; - } - packet->conn = conn; - packet->hdr = hdr; - packet->msg = msg; - packet->auth_data = auth_data; - packet->auth_length = auth_length; - if (!QueueUserWorkItem(RPCRT4_worker_thread, packet, WT_EXECUTELONGFUNCTION)) { - ERR("couldn't queue work item for worker thread, error was %d\n", GetLastError()); - I_RpcFree(msg->Buffer); - RPCRT4_FreeHeader(hdr); - HeapFree(GetProcessHeap(), 0, msg); - HeapFree(GetProcessHeap(), 0, packet); - HeapFree(GetProcessHeap(), 0, auth_data); + + case PKT_REQUEST: + TRACE("got request packet\n"); + + packet = HeapAlloc(GetProcessHeap(), 0, sizeof(RpcPacket)); + if (!packet) { + I_RpcFree(msg->Buffer); + RPCRT4_FreeHeader(hdr); + HeapFree(GetProcessHeap(), 0, msg); + HeapFree(GetProcessHeap(), 0, auth_data); + goto exit; + } + packet->conn = conn; + packet->hdr = hdr; + packet->msg = msg; + packet->auth_data = auth_data; + packet->auth_length = auth_length; + if (!QueueUserWorkItem(RPCRT4_worker_thread, packet, WT_EXECUTELONGFUNCTION)) { + ERR("couldn't queue work item for worker thread, error was %d\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, packet); + status = RPC_S_OUT_OF_RESOURCES; + } else { + continue; + } + break; + + case PKT_AUTH3: + TRACE("got auth3 packet\n"); + + status = process_auth3_packet(conn, &hdr->common, msg, auth_data, + auth_length); + break; + default: + FIXME("unhandled packet type %u\n", hdr->common.ptype); break; } - msg = NULL; + I_RpcFree(msg->Buffer); + RPCRT4_FreeHeader(hdr); + HeapFree(GetProcessHeap(), 0, msg); + HeapFree(GetProcessHeap(), 0, auth_data); + + if (status != RPC_S_OK) { + WARN("processing packet failed with error %u\n", status); + break; + } } +exit: RPCRT4_DestroyConnection(conn); return 0; }

1 0

Vincent Povirk : shell32: Fix an uninitialized memory access in SHGetFileInfoW.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: a8c2d4b5bc841b48163811eab92e1c29114d5fdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8c2d4b5bc841b48163811eab… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Dec 13 18:59:13 2009 -0600 shell32: Fix an uninitialized memory access in SHGetFileInfoW. If we are passed SHGFI_PIDL, szFullPath is not initialized. If we're passed the flags PIDL, USEFILEATTRIBUTES, and an icon flag, we will try to use the uninitialized filename to get the icon. Since the test claims that the function should return an icon in this case, and we cannot always convert a pidl to a path, we should just use the pidl. --- dlls/shell32/shell32_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 2334e62..91795b9 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -565,7 +565,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, /* get icon index (or load icon)*/ if (SUCCEEDED(hr) && (flags & (SHGFI_ICON | SHGFI_SYSICONINDEX))) { - if (flags & SHGFI_USEFILEATTRIBUTES) + if (flags & SHGFI_USEFILEATTRIBUTES && !(flags & SHGFI_PIDL)) { WCHAR sTemp [MAX_PATH]; WCHAR * szExt;

1 0

Vincent Povirk : shell32: Fix a memory leak in a test.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 02a01f9585d352808fd98fc70ee0439063593fc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02a01f9585d352808fd98fc70… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Dec 13 19:16:13 2009 -0600 shell32: Fix a memory leak in a test. --- dlls/shell32/tests/shlfolder.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index f676a2a..e3bf191 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1559,6 +1559,8 @@ static void test_ITEMIDLIST_format(void) { pILFree(pidlFile); } + + IShellFolder_Release(psfPersonal); } static void testSHGetFolderPathAndSubDirA(void)

1 0

Vincent Povirk : windowscodecs: Fix a memory leak in a test.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: b02ba85fbc9ff1e9d58e06fb03e40a6f1f881b7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b02ba85fbc9ff1e9d58e06fb0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Dec 13 19:20:58 2009 -0600 windowscodecs: Fix a memory leak in a test. --- dlls/windowscodecs/tests/converter.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 3f82369..5c66636 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -413,6 +413,8 @@ static void test_encoder(const struct bitmap_data *src, const CLSID* clsid_encod IStream_Release(stream); } + + IWICBitmapEncoder_Release(encoder); } DeleteTestBitmap(src_bitmap);

1 0

Jacek Caban : wininet: Directly return error status from HTTP_HttpQueryInfoW.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 9823c23927bb745c887218156db70b4c41c486ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=9823c23927bb745c887218156… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 14 02:27:29 2009 +0100 wininet: Directly return error status from HTTP_HttpQueryInfoW. --- dlls/wininet/http.c | 101 +++++++++++++++++++++++---------------------------- 1 files changed, 46 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9823c23927bb745c88721…

1 0

Vincent Povirk : gdiplus: Explicitly copy the bits from dib sections to new bitmaps.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 3424dac3863f57c5d9724a31744469b9fcd4bd89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3424dac3863f57c5d9724a317… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Dec 12 17:13:39 2009 -0600 gdiplus: Explicitly copy the bits from dib sections to new bitmaps. On Windows, GdipCreateBitmapFromHBITMAP creates a copy of the bitmap, not a reference. Currently, we match this behavior, but this is only because we cannot yet create bitmap objects that reference existing memory. If GdipCreateBitmapFromScan0 were fixed to do this, FromHBITMAP would break. Therefore, we always pass NULL to FromScan0 so that it allocates new memory for the bitmap. --- dlls/gdiplus/image.c | 35 ++++++++++++++++++++++++++--------- dlls/gdiplus/tests/image.c | 13 ++++++++++++- 2 files changed, 38 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index f78b70a..aa03712 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2659,7 +2659,8 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBi BITMAP bm; GpStatus retval; PixelFormat format; - BYTE* bits; + BitmapData lockeddata; + INT y; TRACE("%p %p %p\n", hbm, hpal, bitmap); @@ -2700,16 +2701,32 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBi return InvalidParameter; } - if (bm.bmBits) - bits = (BYTE*)bm.bmBits + (bm.bmHeight - 1) * bm.bmWidthBytes; - else + retval = GdipCreateBitmapFromScan0(bm.bmWidth, bm.bmHeight, 0, + format, NULL, bitmap); + + if (retval == Ok) { - FIXME("can only get image data from DIB sections\n"); - bits = NULL; - } + retval = GdipBitmapLockBits(*bitmap, NULL, ImageLockModeWrite, + format, &lockeddata); + if (retval == Ok) + { + if (bm.bmBits) + { + for (y=0; y<bm.bmHeight; y++) + { + memcpy((BYTE*)lockeddata.Scan0+lockeddata.Stride*y, + (BYTE*)bm.bmBits+bm.bmWidthBytes*(bm.bmHeight-1-y), + bm.bmWidthBytes); + } + } + else + { + FIXME("can only get image data from DIB sections\n"); + } - retval = GdipCreateBitmapFromScan0(bm.bmWidth, bm.bmHeight, -bm.bmWidthBytes, - format, bits, bitmap); + GdipBitmapUnlockBits(*bitmap, &lockeddata); + } + } return retval; } diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 1ef2651..66c6410 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -465,6 +465,7 @@ static void test_GdipCreateBitmapFromHBITMAP(void) const REAL HEIGHT2 = 20; HDC hdc; BITMAPINFO bmi; + BYTE *bits; stat = GdipCreateBitmapFromHBITMAP(NULL, NULL, NULL); expect(InvalidParameter, stat); @@ -504,16 +505,26 @@ static void test_GdipCreateBitmapFromHBITMAP(void) bmi.bmiHeader.biPlanes = 1; bmi.bmiHeader.biCompression = BI_RGB; - hbm = CreateDIBSection(hdc, &bmi, DIB_RGB_COLORS, NULL, NULL, 0); + hbm = CreateDIBSection(hdc, &bmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); ok(hbm != NULL, "CreateDIBSection failed\n"); + bits[0] = 0; + stat = GdipCreateBitmapFromHBITMAP(hbm, NULL, &gpbm); expect(Ok, stat); expect(Ok, GdipGetImageDimension((GpImage*) gpbm, &width, &height)); expectf(WIDTH1, width); expectf(HEIGHT1, height); if (stat == Ok) + { + /* test whether writing to the bitmap affects the original */ + stat = GdipBitmapSetPixel(gpbm, 0, 0, 0xffffffff); + expect(Ok, stat); + + expect(0, bits[0]); + GdipDisposeImage((GpImage*)gpbm); + } LogPal = GdipAlloc(sizeof(LOGPALETTE)); ok(LogPal != NULL, "unable to allocate LOGPALETTE\n");

1 0

Vincent Povirk : gdiplus: Support reading image data from device-dependent bitmaps.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 25dcd43e52693c830967e31afcdef0d317ed6ae5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25dcd43e52693c830967e31af… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Dec 12 17:33:58 2009 -0600 gdiplus: Support reading image data from device-dependent bitmaps. --- dlls/gdiplus/image.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 44 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index aa03712..3dbe4da 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2721,7 +2721,50 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBi } else { - FIXME("can only get image data from DIB sections\n"); + HDC hdc; + HBITMAP oldhbm; + BITMAPINFO *pbmi; + INT src_height, dst_stride; + BYTE *dst_bits; + + hdc = CreateCompatibleDC(NULL); + oldhbm = SelectObject(hdc, hbm); + + pbmi = GdipAlloc(sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); + + if (pbmi) + { + pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + pbmi->bmiHeader.biBitCount = 0; + + GetDIBits(hdc, hbm, 0, 0, NULL, pbmi, DIB_RGB_COLORS); + + src_height = abs(pbmi->bmiHeader.biHeight); + + if (pbmi->bmiHeader.biHeight > 0) + { + dst_bits = (BYTE*)lockeddata.Scan0+lockeddata.Stride*(src_height-1); + dst_stride = -lockeddata.Stride; + } + else + { + dst_bits = lockeddata.Scan0; + dst_stride = lockeddata.Stride; + } + + for (y=0; y<src_height; y++) + { + GetDIBits(hdc, hbm, y, 1, dst_bits+dst_stride*y, + pbmi, DIB_RGB_COLORS); + } + + GdipFree(pbmi); + } + else + retval = OutOfMemory; + + SelectObject(hdc, oldhbm); + DeleteDC(hdc); } GdipBitmapUnlockBits(*bitmap, &lockeddata);

1 0