November 2006 - Wine-commits

Rob Shearman : rpcrt4: Fix a comment and move a WARN to where it really indicates a problem, rather than falsely triggering on normal conditions.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 59a90143bffb0a9181ec58cb1d6a1e58a433e716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59a90143bffb0a9181ec58cb1… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Nov 13 11:45:48 2006 +0000 rpcrt4: Fix a comment and move a WARN to where it really indicates a problem, rather than falsely triggering on normal conditions. --- dlls/rpcrt4/rpc_transport.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 8d54af6..9d84839 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -115,16 +115,16 @@ static RPC_STATUS rpcrt4_conn_listen_pip if (ConnectNamedPipe(npc->pipe, &npc->ovl)) return RPC_S_OK; - WARN("Couldn't ConnectNamedPipe (error was %d)\n", GetLastError()); if (GetLastError() == ERROR_PIPE_CONNECTED) { SetEvent(npc->ovl.hEvent); return RPC_S_OK; } if (GetLastError() == ERROR_IO_PENDING) { - /* FIXME: looks like we need to GetOverlappedResult here? */ + /* will be completed in rpcrt4_protseq_np_wait_for_new_connection */ return RPC_S_OK; } npc->listening = FALSE; + WARN("Couldn't ConnectNamedPipe (error was %d)\n", GetLastError()); return RPC_S_OUT_OF_RESOURCES; }

1 0

Rob Shearman : rpcrt4: Convert the server interfaces list into a standard Wine list.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 0b1cc1061be8d8b84edee1f0b0057701af23a63b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b1cc1061be8d8b84edee1f0b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Nov 13 11:45:57 2006 +0000 rpcrt4: Convert the server interfaces list into a standard Wine list. --- dlls/rpcrt4/rpc_server.c | 15 +++++++-------- dlls/rpcrt4/rpc_server.h | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 77f3c35..acf0f2e 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -68,7 +68,7 @@ static RpcObjTypeMap *RpcObjTypeMaps; /* list of type RpcServerProtseq */ static struct list protseqs = LIST_INIT(protseqs); -static RpcServerInterface* ifs; +static struct list server_interfaces = LIST_INIT(server_interfaces); static CRITICAL_SECTION server_cs; static CRITICAL_SECTION_DEBUG server_cs_debug = @@ -124,20 +124,19 @@ static RpcServerInterface* RPCRT4_find_i BOOL check_object) { UUID* MgrType = NULL; - RpcServerInterface* cif = NULL; + RpcServerInterface* cif; RPC_STATUS status; if (check_object) MgrType = LookupObjType(object); EnterCriticalSection(&server_cs); - cif = ifs; - while (cif) { + LIST_FOR_EACH_ENTRY(cif, &server_interfaces, RpcServerInterface, entry) { if (!memcmp(if_id, &cif->If->InterfaceId, sizeof(RPC_SYNTAX_IDENTIFIER)) && (check_object == FALSE || UuidEqual(MgrType, &cif->MgrTypeUuid, &status)) && std_listen) break; - cif = cif->Next; } LeaveCriticalSection(&server_cs); + if (&cif->entry == &server_interfaces) cif = NULL; TRACE("returning %p for %s\n", cif, debugstr_guid(object)); return cif; } @@ -177,7 +176,8 @@ static void RPCRT4_process_packet(RpcCon response = RPCRT4_BuildBindNackHeader(NDR_LOCAL_DATA_REPRESENTATION, RPC_VER_MAJOR, RPC_VER_MINOR); } else { - TRACE("accepting bind request on connection %p\n", conn); + TRACE("accepting bind request on connection %p for %s\n", conn, + debugstr_guid(&hdr->bind.abstract.SyntaxGUID)); /* accept. */ response = RPCRT4_BuildBindAckHeader(NDR_LOCAL_DATA_REPRESENTATION, @@ -784,8 +784,7 @@ RPC_STATUS WINAPI RpcServerRegisterIf2( sif->IfCallbackFn = IfCallbackFn; EnterCriticalSection(&server_cs); - sif->Next = ifs; - ifs = sif; + list_add_head(&server_interfaces, &sif->entry); LeaveCriticalSection(&server_cs); if (sif->Flags & RPC_IF_AUTOLISTEN) diff --git a/dlls/rpcrt4/rpc_server.h b/dlls/rpcrt4/rpc_server.h index aa873a0..d9460e7 100644 --- a/dlls/rpcrt4/rpc_server.h +++ b/dlls/rpcrt4/rpc_server.h @@ -61,7 +61,7 @@ struct protseq_ops typedef struct _RpcServerInterface { - struct _RpcServerInterface* Next; + struct list entry; RPC_SERVER_INTERFACE* If; UUID MgrTypeUuid; RPC_MGR_EPV* MgrEpv;

1 0

Rob Shearman : rpcrt4: Implement RpcServerUnregisterIf.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 29a9abff8aaeb08edfc94725e93d28debacfdbba URL: http://source.winehq.org/git/wine.git/?a=commit;h=29a9abff8aaeb08edfc94725e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Nov 13 11:46:04 2006 +0000 rpcrt4: Implement RpcServerUnregisterIf. --- dlls/rpcrt4/rpc_server.c | 64 +++++++++++++++++++++++++++++++++++++++++++-- dlls/rpcrt4/rpc_server.h | 4 +++ 2 files changed, 65 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index acf0f2e..50549ea 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -133,7 +133,10 @@ static RpcServerInterface* RPCRT4_find_i LIST_FOR_EACH_ENTRY(cif, &server_interfaces, RpcServerInterface, entry) { if (!memcmp(if_id, &cif->If->InterfaceId, sizeof(RPC_SYNTAX_IDENTIFIER)) && (check_object == FALSE || UuidEqual(MgrType, &cif->MgrTypeUuid, &status)) && - std_listen) break; + std_listen) { + InterlockedIncrement(&cif->CurrentCalls); + break; + } } LeaveCriticalSection(&server_cs); if (&cif->entry == &server_interfaces) cif = NULL; @@ -141,6 +144,17 @@ static RpcServerInterface* RPCRT4_find_i return cif; } +static void RPCRT4_release_server_interface(RpcServerInterface *sif) +{ + if (!InterlockedDecrement(&sif->CurrentCalls) && + sif->CallsCompletedEvent) { + /* sif must have been removed from server_interfaces before + * CallsCompletedEvent is set */ + SetEvent(sif->CallsCompletedEvent); + HeapFree(GetProcessHeap(), 0, sif); + } +} + static WINE_EXCEPTION_FILTER(rpc_filter) { WARN("exception caught with code 0x%08x = %d\n", GetExceptionCode(), GetExceptionCode()); @@ -190,6 +204,8 @@ static void RPCRT4_process_packet(RpcCon /* save the interface for later use */ conn->ActiveInterface = hdr->bind.abstract; conn->MaxTransmissionSize = hdr->bind.max_tsize; + + RPCRT4_release_server_interface(sif); } status = RPCRT4_Send(conn, response, NULL, 0); @@ -219,6 +235,10 @@ static void RPCRT4_process_packet(RpcCon } sif = RPCRT4_find_interface(object_uuid, &conn->ActiveInterface, TRUE); + if (!sif) { + /* FIXME: send fault packet? */ + break; + } msg->RpcInterfaceInformation = sif->If; /* copy the endpoint vector from sif to msg so that midl-generated code will use it */ msg->ManagerEpv = sif->MgrEpv; @@ -262,6 +282,7 @@ static void RPCRT4_process_packet(RpcCon I_RpcSend(msg); msg->RpcInterfaceInformation = NULL; + RPCRT4_release_server_interface(sif); break; @@ -798,8 +819,45 @@ RPC_STATUS WINAPI RpcServerRegisterIf2( */ RPC_STATUS WINAPI RpcServerUnregisterIf( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, UINT WaitForCallsToComplete ) { - FIXME("(IfSpec == (RPC_IF_HANDLE)^%p, MgrTypeUuid == %s, WaitForCallsToComplete == %u): stub\n", - IfSpec, debugstr_guid(MgrTypeUuid), WaitForCallsToComplete); + PRPC_SERVER_INTERFACE If = (PRPC_SERVER_INTERFACE)IfSpec; + HANDLE event = NULL; + BOOL found = FALSE; + BOOL completed = TRUE; + RpcServerInterface *cif; + RPC_STATUS status; + + TRACE("(IfSpec == (RPC_IF_HANDLE)^%p (%s), MgrTypeUuid == %s, WaitForCallsToComplete == %u)\n", + IfSpec, debugstr_guid(&If->InterfaceId.SyntaxGUID), debugstr_guid(MgrTypeUuid), WaitForCallsToComplete); + + EnterCriticalSection(&server_cs); + LIST_FOR_EACH_ENTRY(cif, &server_interfaces, RpcServerInterface, entry) { + if (!memcmp(&If->InterfaceId, &cif->If->InterfaceId, sizeof(RPC_SYNTAX_IDENTIFIER)) && + UuidEqual(MgrTypeUuid, &cif->MgrTypeUuid, &status)) { + list_remove(&cif->entry); + if (cif->CurrentCalls) { + completed = FALSE; + if (WaitForCallsToComplete) + cif->CallsCompletedEvent = event = CreateEventW(NULL, FALSE, FALSE, NULL); + } + found = TRUE; + break; + } + } + LeaveCriticalSection(&server_cs); + + if (!found) { + ERR("not found for object %s\n", debugstr_guid(MgrTypeUuid)); + return RPC_S_UNKNOWN_IF; + } + + if (completed) + HeapFree(GetProcessHeap(), 0, cif); + else if (event) { + /* sif will be freed when the last call is completed, so be careful not to + * touch that memory here as that could happen before we get here */ + WaitForSingleObject(event, INFINITE); + CloseHandle(event); + } return RPC_S_OK; } diff --git a/dlls/rpcrt4/rpc_server.h b/dlls/rpcrt4/rpc_server.h index d9460e7..eb32be6 100644 --- a/dlls/rpcrt4/rpc_server.h +++ b/dlls/rpcrt4/rpc_server.h @@ -69,6 +69,10 @@ typedef struct _RpcServerInterface UINT MaxCalls; UINT MaxRpcSize; RPC_IF_CALLBACK_FN* IfCallbackFn; + LONG CurrentCalls; /* number of calls currently executing */ + /* set when unregistering interface to let the caller of + * RpcServerUnregisterIf* know that all calls have finished */ + HANDLE CallsCompletedEvent; } RpcServerInterface; void RPCRT4_new_client(RpcConnection* conn);

1 0

Rob Shearman : ole32: Re-enable the code that unregisters interfaces with the RPC runtime.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: fff2d8e82b65b09ca183828a232da7626b6b6b56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fff2d8e82b65b09ca183828a2… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Nov 13 11:55:56 2006 +0000 ole32: Re-enable the code that unregisters interfaces with the RPC runtime. --- dlls/ole32/rpc.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 368a6ba..26a139e 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -669,12 +669,9 @@ void RPC_UnregisterInterface(REFIID riid { if (!--rif->refs) { -#if 0 /* this is a stub in builtin and spams the console with FIXME's */ - IID iid = *riid; /* RpcServerUnregisterIf doesn't take const IID */ - RpcServerUnregisterIf((RPC_IF_HANDLE)&rif->If, &iid, 0); + RpcServerUnregisterIf((RPC_IF_HANDLE)&rif->If, NULL, TRUE); list_remove(&rif->entry); HeapFree(GetProcessHeap(), 0, rif); -#endif } break; }

1 0

Mike McCormack : msi: Only free a string in one place.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 4811743b36fae0cb9099d6d4ed1e663a61b42fc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4811743b36fae0cb9099d6d4e… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Nov 13 16:35:59 2006 +0900 msi: Only free a string in one place. --- dlls/msi/custom.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 2dea170..6ec4bb3 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -561,7 +561,7 @@ static UINT HANDLE_CustomType2(MSIPACKAG PROCESS_INFORMATION info; BOOL rc; INT len; - WCHAR *deformated; + WCHAR *deformated = NULL; WCHAR *cmd; static const WCHAR spc[] = {' ',0}; UINT r = ERROR_SUCCESS; @@ -595,15 +595,13 @@ static UINT HANDLE_CustomType2(MSIPACKAG rc = CreateProcessW(NULL, cmd, NULL, NULL, FALSE, 0, NULL, c_collen, &si, &info); - + msi_free(cmd); if ( !rc ) { ERR("Unable to execute command %s\n", debugstr_w(cmd)); - msi_free(cmd); return ERROR_SUCCESS; } - msi_free(cmd); r = process_handle(package, type, info.hThread, info.hProcess, action, &finished);

1 0

Mike McCormack : msi: Fix error handling.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 959c71846dbe314f7e61bf0abfa076a99a18255c URL: http://source.winehq.org/git/wine.git/?a=commit;h=959c71846dbe314f7e61bf0ab… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Nov 13 16:35:46 2006 +0900 msi: Fix error handling. --- dlls/msi/custom.c | 41 +++++++++++++++++++++-------------------- 1 files changed, 21 insertions(+), 20 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index e80c488..2dea170 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -291,13 +291,13 @@ static UINT store_binary_to_temp(MSIPACK 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', '`','B','i' ,'n','a','r','y','`',' ','W','H','E','R','E',' ', '`','N','a','m','e','`',' ','=',' ','\'','%','s','\'',0}; - UINT rc; MSIRECORD *row = 0; HANDLE file; CHAR buffer[1024]; static const WCHAR f1[] = {'m','s','i',0}; WCHAR fmt[MAX_PATH]; DWORD sz = MAX_PATH; + UINT r; if (MSI_GetPropertyW(package, cszTempFolder, fmt, &sz) != ERROR_SUCCESS) GetTempPathW(MAX_PATH, fmt); @@ -309,34 +309,35 @@ static UINT store_binary_to_temp(MSIPACK } track_tempfile(package, tmp_file, tmp_file); - /* write out the file */ - file = CreateFileW(tmp_file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, - FILE_ATTRIBUTE_NORMAL, NULL); - if (file == INVALID_HANDLE_VALUE) - return ERROR_FUNCTION_FAILED; - row = MSI_QueryGetRecord(package->db, query, source); if (!row) return ERROR_FUNCTION_FAILED; - do + /* write out the file */ + file = CreateFileW(tmp_file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + if (file == INVALID_HANDLE_VALUE) + r = ERROR_FUNCTION_FAILED; + else { - DWORD write; - sz = sizeof buffer; - rc = MSI_RecordReadStream(row, 2, buffer, &sz); - if (rc != ERROR_SUCCESS) + do { - ERR("Failed to get stream\n"); - CloseHandle(file); - break; - } - WriteFile(file, buffer, sz, &write, NULL); - } while (sz == sizeof buffer); + DWORD write; + sz = sizeof buffer; + r = MSI_RecordReadStream(row, 2, buffer, &sz); + if (r != ERROR_SUCCESS) + { + ERR("Failed to get stream\n"); + break; + } + WriteFile(file, buffer, sz, &write, NULL); + } while (sz == sizeof buffer); + CloseHandle(file); + } - CloseHandle(file); msiobj_release(&row->hdr); - return ERROR_SUCCESS; + return r; } static void file_running_action(MSIPACKAGE* package, HANDLE Handle,

1 0

Mike McCormack : msi: Track temp files as soon as they are created.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 3ef703ad6c0632d7fa48143b5fad80d704f2162f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ef703ad6c0632d7fa48143b5… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Nov 13 16:35:22 2006 +0900 msi: Track temp files as soon as they are created. --- dlls/msi/custom.c | 12 +----------- 1 files changed, 1 insertions(+), 11 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 18a8304..e80c488 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -307,6 +307,7 @@ static UINT store_binary_to_temp(MSIPACK TRACE("Unable to create file\n"); return ERROR_FUNCTION_FAILED; } + track_tempfile(package, tmp_file, tmp_file); /* write out the file */ file = CreateFileW(tmp_file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, @@ -327,7 +328,6 @@ static UINT store_binary_to_temp(MSIPACK { ERR("Failed to get stream\n"); CloseHandle(file); - DeleteFileW(tmp_file); break; } WriteFile(file, buffer, sz, &write, NULL); @@ -549,11 +549,6 @@ static UINT HANDLE_CustomType1(MSIPACKAG r = process_handle(package, type, ThreadHandle, NULL, action, &finished ); - if (!finished) - track_tempfile(package, tmp_file, tmp_file); - else - DeleteFileW(tmp_file); - return r; } @@ -612,11 +607,6 @@ static UINT HANDLE_CustomType2(MSIPACKAG r = process_handle(package, type, info.hThread, info.hProcess, action, &finished); - if (!finished) - track_tempfile(package, tmp_file, tmp_file); - else - DeleteFileW(tmp_file); - return r; }

1 0

Mike McCormack : msi: Fail if we can't write out a temporary file.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 1767989bd18686357b99040c6d8a2d1cc41d9562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1767989bd18686357b99040c6… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Nov 13 16:35:09 2006 +0900 msi: Fail if we can't write out a temporary file. --- dlls/msi/custom.c | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 841e463..18a8304 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -528,11 +528,13 @@ static UINT HANDLE_CustomType1(MSIPACKAG LPCWSTR target, const INT type, LPCWSTR action) { WCHAR tmp_file[MAX_PATH]; - UINT rc = ERROR_SUCCESS; + UINT r = ERROR_SUCCESS; BOOL finished = FALSE; HANDLE ThreadHandle; - store_binary_to_temp(package, source, tmp_file); + r = store_binary_to_temp(package, source, tmp_file); + if (r != ERROR_SUCCESS) + return r; TRACE("Calling function %s from %s\n",debugstr_w(target), debugstr_w(tmp_file)); @@ -541,18 +543,18 @@ static UINT HANDLE_CustomType1(MSIPACKAG { static const WCHAR dot[]={'.',0}; strcatW(tmp_file,dot); - } + } ThreadHandle = do_msidbCustomActionTypeDll( package, tmp_file, target ); - rc = process_handle(package, type, ThreadHandle, NULL, action, &finished ); + r = process_handle(package, type, ThreadHandle, NULL, action, &finished ); if (!finished) track_tempfile(package, tmp_file, tmp_file); else DeleteFileW(tmp_file); - return rc; + return r; } static UINT HANDLE_CustomType2(MSIPACKAGE *package, LPCWSTR source, @@ -566,12 +568,14 @@ static UINT HANDLE_CustomType2(MSIPACKAG WCHAR *deformated; WCHAR *cmd; static const WCHAR spc[] = {' ',0}; - UINT prc = ERROR_SUCCESS; + UINT r = ERROR_SUCCESS; BOOL finished = FALSE; memset(&si,0,sizeof(STARTUPINFOW)); - store_binary_to_temp(package, source, tmp_file); + r = store_binary_to_temp(package, source, tmp_file); + if (r != ERROR_SUCCESS) + return r; deformat_string(package,target,&deformated); @@ -579,7 +583,7 @@ static UINT HANDLE_CustomType2(MSIPACKAG if (deformated) len += strlenW(deformated); - + cmd = msi_alloc(sizeof(WCHAR)*len); strcpyW(cmd,tmp_file); @@ -605,15 +609,15 @@ static UINT HANDLE_CustomType2(MSIPACKAG } msi_free(cmd); - prc = process_handle(package, type, info.hThread, info.hProcess, action, + r = process_handle(package, type, info.hThread, info.hProcess, action, &finished); if (!finished) track_tempfile(package, tmp_file, tmp_file); else DeleteFileW(tmp_file); - - return prc; + + return r; } static UINT HANDLE_CustomType17(MSIPACKAGE *package, LPCWSTR source,

1 0

Mike McCormack : msi: Fix an uninitialized variable in the test cases.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 2a46821b823934712ceaec321552553341bd01b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a46821b823934712ceaec321… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Nov 13 16:34:47 2006 +0900 msi: Fix an uninitialized variable in the test cases. --- dlls/msi/tests/suminfo.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/suminfo.c b/dlls/msi/tests/suminfo.c index 869495d..3bcc125 100644 --- a/dlls/msi/tests/suminfo.c +++ b/dlls/msi/tests/suminfo.c @@ -391,6 +391,7 @@ static void test_summary_binary(void) ok( sz == 0, "length wrong\n"); } + ival = -1; r = MsiSummaryInfoGetProperty(hsuminfo, PID_WORDCOUNT, &type, &ival, NULL, NULL, NULL); ok(r == ERROR_SUCCESS, "MsiSummaryInfoGetProperty failed\n"); todo_wine ok( ival == 0, "value incorrect\n");

1 0

Mike McCormack : msi: Clean upstore_binary_to_temp.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 0b7a17d28207311fcb9e47c6afba9869d11db108 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b7a17d28207311fcb9e47c6a… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Nov 13 16:34:37 2006 +0900 msi: Clean upstore_binary_to_temp. --- dlls/msi/custom.c | 77 ++++++++++++++++++++++++---------------------------- 1 files changed, 36 insertions(+), 41 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 9c0a7d2..841e463 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -284,62 +284,57 @@ end: } -static UINT store_binary_to_temp(MSIPACKAGE *package, LPCWSTR source, +static UINT store_binary_to_temp(MSIPACKAGE *package, LPCWSTR source, LPWSTR tmp_file) { - DWORD sz=MAX_PATH; + static const WCHAR query[] = { + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + '`','B','i' ,'n','a','r','y','`',' ','W','H','E','R','E',' ', + '`','N','a','m','e','`',' ','=',' ','\'','%','s','\'',0}; + UINT rc; + MSIRECORD *row = 0; + HANDLE file; + CHAR buffer[1024]; static const WCHAR f1[] = {'m','s','i',0}; WCHAR fmt[MAX_PATH]; + DWORD sz = MAX_PATH; if (MSI_GetPropertyW(package, cszTempFolder, fmt, &sz) != ERROR_SUCCESS) - GetTempPathW(MAX_PATH,fmt); + GetTempPathW(MAX_PATH, fmt); - if (GetTempFileNameW(fmt,f1,0,tmp_file) == 0) + if (GetTempFileNameW(fmt, f1, 0, tmp_file) == 0) { TRACE("Unable to create file\n"); return ERROR_FUNCTION_FAILED; } - else - { - /* write out the file */ - UINT rc; - MSIRECORD * row = 0; - static const WCHAR fmt[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', - '`','B','i' ,'n','a','r','y','`',' ','W','H','E','R','E', - ' ','`','N','a','m','e','`',' ','=',' ','\'','%','s','\'',0}; - HANDLE the_file; - CHAR buffer[1024]; - - the_file = CreateFileW(tmp_file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, - FILE_ATTRIBUTE_NORMAL, NULL); - - if (the_file == INVALID_HANDLE_VALUE) - return ERROR_FUNCTION_FAILED; - row = MSI_QueryGetRecord(package->db, fmt, source); - if (!row) - return ERROR_FUNCTION_FAILED; + /* write out the file */ + file = CreateFileW(tmp_file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + if (file == INVALID_HANDLE_VALUE) + return ERROR_FUNCTION_FAILED; - do - { - DWORD write; - sz = 1024; - rc = MSI_RecordReadStream(row,2,buffer,&sz); - if (rc != ERROR_SUCCESS) - { - ERR("Failed to get stream\n"); - CloseHandle(the_file); - DeleteFileW(tmp_file); - break; - } - WriteFile(the_file,buffer,sz,&write,NULL); - } while (sz == 1024); + row = MSI_QueryGetRecord(package->db, query, source); + if (!row) + return ERROR_FUNCTION_FAILED; - CloseHandle(the_file); + do + { + DWORD write; + sz = sizeof buffer; + rc = MSI_RecordReadStream(row, 2, buffer, &sz); + if (rc != ERROR_SUCCESS) + { + ERR("Failed to get stream\n"); + CloseHandle(file); + DeleteFileW(tmp_file); + break; + } + WriteFile(file, buffer, sz, &write, NULL); + } while (sz == sizeof buffer); - msiobj_release(&row->hdr); - } + CloseHandle(file); + msiobj_release(&row->hdr); return ERROR_SUCCESS; }

1 0