wine-commits November 2006

wine-commits@winehq.org

3 participants
792 discussions

lostwages/templates/en forums.template
by Jeremy Newman 10 Nov '06

10 Nov '06

ChangeSet ID: 29739 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/11/10 11:22:55 Modified files: templates/en : forums.template Log message: Michael Stefaniuc <mstefani(a)redhat.com> Update the mail traffic statistics.1 Patch: http://cvs.winehq.org/patch.py?id=29739 Old revision New revision Changes Path 1.22 1.23 +3 -3 lostwages/templates/en/forums.template Index: lostwages/templates/en/forums.template diff -u -p lostwages/templates/en/forums.template:1.22 lostwages/templates/en/forums.template:1.23 --- lostwages/templates/en/forums.template:1.22 10 Nov 2006 17:22:55 -0000 +++ lostwages/templates/en/forums.template 10 Nov 2006 17:22:55 -0000 @@ -49,7 +49,7 @@ mailing list software. [<a href="http://news.gmane.org/gmane.comp.emulators.wine.user">Archive 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.user">via newsreader</a>] <a href="mailto:wine-users@winehq.org">wine-users(a)winehq.org</a> - A medium traffic (10/day) open list for end-user discussions. + A medium traffic (12/day) open list for end-user discussions. <li> [<a href="http://www.winehq.org/mailman/listinfo/wine-devel">(Un-)Subscribe</a>] @@ -66,7 +66,7 @@ mailing list software. [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Archive 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">via newsreader</a>] <a href="mailto:wine-patches@winehq.org">wine-patches(a)winehq.org</a> - A medium traffic (15/day) open list for submitting patches only. + A medium traffic (30/day) open list for submitting patches only. <li> [<a href="http://www.winehq.org/mailman/listinfo/wine-cvs">(Un-)Subscribe</a>] @@ -74,7 +74,7 @@ mailing list software. [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Archive 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.cvs">via newsreader</a>] <a href="mailto:wine-cvs@winehq.org">wine-cvs(a)winehq.org</a> - A medium traffic (12/day) read only list which tracks commits to the Git + A medium traffic (25/day) read only list which tracks commits to the Git tree. <li>

1 0

lostwages/include winehq.conf
by Alexandre Julliard 10 Nov '06

10 Nov '06

ChangeSet ID: 29738 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: julliard(a)winehq.org 2006/11/10 11:07:43 Modified files: include : winehq.conf Log message: Release 0.9.25 Patch: http://cvs.winehq.org/patch.py?id=29738 Old revision New revision Changes Path 1.47 1.48 +1 -1 lostwages/include/winehq.conf Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.47 lostwages/include/winehq.conf:1.48 --- lostwages/include/winehq.conf:1.47 10 Nov 2006 17: 7:43 -0000 +++ lostwages/include/winehq.conf 10 Nov 2006 17: 7:43 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.24 +snapshot_date: 0.9.25 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2

1 0

Tag wine-0.9.25 : Alexandre Julliard : Release 0.9.25
by Alexandre Julliard 10 Nov '06

10 Nov '06

Module: wine Branch: refs/tags/wine-0.9.25 Tag: ee4526b29a50d74f82739e6c5e934a12c8029420 URL: http://source.winehq.org/git/wine.git/?a=tag;h=ee4526b29a50d74f82739e6c5e93… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 10 17:32:16 2006 +0100 Release 0.9.25

1 0

Alexandre Julliard : Release 0.9.25.
by Alexandre Julliard 10 Nov '06

10 Nov '06

Module: wine Branch: master Commit: 2f6fb152a2f81016d80c099aa5b4789ba120e393 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f6fb152a2f81016d80c099aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 10 17:32:16 2006 +0100 Release 0.9.25. --- ANNOUNCE | 966 +++++++++++++++++----------------- ChangeLog | 1743 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 2242 insertions(+), 487 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2f6fb152a2f81016d80c0…

1 0

Alexandre Julliard : rpcrt4: Avoid a sizeof in a trace.
by Alexandre Julliard 10 Nov '06

10 Nov '06

Module: wine Branch: master Commit: e9d5e5503f681801a1154873a6b14a8270fb93d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9d5e5503f681801a1154873a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 10 14:29:55 2006 +0100 rpcrt4: Avoid a sizeof in a trace. --- dlls/rpcrt4/rpc_message.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 9c7ea15..dee69a0 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -517,7 +517,7 @@ RPC_STATUS RPCRT4_Receive(RpcConnection /* read the rest of packet 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/%d bytes\n", dwRead, hdr_length - sizeof(common_hdr)); + WARN("bad header length, %d bytes, hdr_length %d\n", dwRead, hdr_length); status = RPC_S_PROTOCOL_ERROR; goto fail; }

1 0

Rob Shearman : rpcrt4: Create one protseq object per used protocol sequence , not per RpcServerUseProtseq* function call.
by Alexandre Julliard 10 Nov '06

10 Nov '06

Module: wine Branch: master Commit: 61967ff4beed8b6551c659f9c8336791485d05df URL: http://source.winehq.org/git/wine.git/?a=commit;h=61967ff4beed8b6551c659f9c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Nov 10 12:13:57 2006 +0000 rpcrt4: Create one protseq object per used protocol sequence, not per RpcServerUseProtseq* function call. --- dlls/rpcrt4/rpc_server.c | 38 ++++++++++++++++++++++++++++++++------ 1 files changed, 32 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index fbd7233..77f3c35 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -500,10 +500,6 @@ static RPC_STATUS RPCRT4_use_protseq(Rpc if (status != RPC_S_OK) return status; - EnterCriticalSection(&server_cs); - list_add_head(&protseqs, &ps->entry); - LeaveCriticalSection(&server_cs); - if (std_listen) { status = RPCRT4_start_listen_protseq(ps, FALSE); @@ -604,6 +600,8 @@ RPC_STATUS WINAPI RpcServerUseProtseqEpW /*********************************************************************** * alloc_serverprotoseq (internal) + * + * Must be called with server_cs held. */ static RPC_STATUS alloc_serverprotoseq(UINT MaxCalls, char *Protseq, RpcServerProtseq **ps) { @@ -628,9 +626,37 @@ static RPC_STATUS alloc_serverprotoseq(U (*ps)->mgr_mutex = NULL; (*ps)->server_ready_event = NULL; + list_add_head(&protseqs, &(*ps)->entry); + + TRACE("new protseq %p created for %s\n", *ps, Protseq); + return RPC_S_OK; } +/* Finds a given protseq or creates a new one if one doesn't already exist */ +static RPC_STATUS RPCRT4_get_or_create_serverprotseq(UINT MaxCalls, char *Protseq, RpcServerProtseq **ps) +{ + RPC_STATUS status; + RpcServerProtseq *cps; + + EnterCriticalSection(&server_cs); + + LIST_FOR_EACH_ENTRY(cps, &protseqs, RpcServerProtseq, entry) + if (!strcmp(cps->Protseq, Protseq)) + { + TRACE("found existing protseq object for %s\n", Protseq); + *ps = cps; + LeaveCriticalSection(&server_cs); + return S_OK; + } + + status = alloc_serverprotoseq(MaxCalls, Protseq, ps); + + LeaveCriticalSection(&server_cs); + + return status; +} + /*********************************************************************** * RpcServerUseProtseqEpExA (RPCRT4.@) */ @@ -645,7 +671,7 @@ RPC_STATUS WINAPI RpcServerUseProtseqEpE debugstr_a(szep), SecurityDescriptor, lpPolicy->Length, lpPolicy->EndpointFlags, lpPolicy->NICFlags ); - status = alloc_serverprotoseq(MaxCalls, RPCRT4_strdupA(szps), &ps); + status = RPCRT4_get_or_create_serverprotseq(MaxCalls, RPCRT4_strdupA(szps), &ps); if (status != RPC_S_OK) return status; @@ -666,7 +692,7 @@ RPC_STATUS WINAPI RpcServerUseProtseqEpE debugstr_w( Endpoint ), SecurityDescriptor, lpPolicy->Length, lpPolicy->EndpointFlags, lpPolicy->NICFlags ); - status = alloc_serverprotoseq(MaxCalls, RPCRT4_strdupWtoA(Protseq), &ps); + status = RPCRT4_get_or_create_serverprotseq(MaxCalls, RPCRT4_strdupWtoA(Protseq), &ps); if (status != RPC_S_OK) return status;

1 0

Rob Shearman : rpcrt4: Don't store the endpoint in the protseq.
by Alexandre Julliard 10 Nov '06

10 Nov '06

Module: wine Branch: master Commit: e1561038d00da5421138a4bb48eefca1ced039f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1561038d00da5421138a4bb4… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Nov 10 12:07:28 2006 +0000 rpcrt4: Don't store the endpoint in the protseq. --- dlls/rpcrt4/rpc_server.c | 21 +++++++++++---------- dlls/rpcrt4/rpc_server.h | 3 +-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 3efcc12..fbd7233 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -492,11 +492,11 @@ static void RPCRT4_stop_listen(BOOL auto LeaveCriticalSection(&listen_cs); } -static RPC_STATUS RPCRT4_use_protseq(RpcServerProtseq* ps) +static RPC_STATUS RPCRT4_use_protseq(RpcServerProtseq* ps, LPSTR endpoint) { RPC_STATUS status; - status = ps->ops->open_endpoint(ps, ps->Endpoint); + status = ps->ops->open_endpoint(ps, endpoint); if (status != RPC_S_OK) return status; @@ -605,7 +605,7 @@ RPC_STATUS WINAPI RpcServerUseProtseqEpW /*********************************************************************** * alloc_serverprotoseq (internal) */ -static RPC_STATUS alloc_serverprotoseq(UINT MaxCalls, char *Protseq, char *Endpoint, RpcServerProtseq **ps) +static RPC_STATUS alloc_serverprotoseq(UINT MaxCalls, char *Protseq, RpcServerProtseq **ps) { const struct protseq_ops *ops = rpcrt4_get_protseq_ops(Protseq); @@ -620,7 +620,6 @@ static RPC_STATUS alloc_serverprotoseq(U return RPC_S_OUT_OF_RESOURCES; (*ps)->MaxCalls = MaxCalls; (*ps)->Protseq = Protseq; - (*ps)->Endpoint = Endpoint; (*ps)->ops = ops; (*ps)->MaxCalls = 0; (*ps)->conn = NULL; @@ -646,12 +645,11 @@ RPC_STATUS WINAPI RpcServerUseProtseqEpE debugstr_a(szep), SecurityDescriptor, lpPolicy->Length, lpPolicy->EndpointFlags, lpPolicy->NICFlags ); - status = alloc_serverprotoseq(MaxCalls, RPCRT4_strdupA(szps), - RPCRT4_strdupA(szep), &ps); + status = alloc_serverprotoseq(MaxCalls, RPCRT4_strdupA(szps), &ps); if (status != RPC_S_OK) return status; - return RPCRT4_use_protseq(ps); + return RPCRT4_use_protseq(ps, szep); } /*********************************************************************** @@ -662,17 +660,20 @@ RPC_STATUS WINAPI RpcServerUseProtseqEpE { RpcServerProtseq* ps; RPC_STATUS status; + LPSTR EndpointA; TRACE("(%s,%u,%s,%p,{%u,%lu,%lu})\n", debugstr_w( Protseq ), MaxCalls, debugstr_w( Endpoint ), SecurityDescriptor, lpPolicy->Length, lpPolicy->EndpointFlags, lpPolicy->NICFlags ); - status = alloc_serverprotoseq(MaxCalls, RPCRT4_strdupWtoA(Protseq), - RPCRT4_strdupWtoA(Endpoint), &ps); + status = alloc_serverprotoseq(MaxCalls, RPCRT4_strdupWtoA(Protseq), &ps); if (status != RPC_S_OK) return status; - return RPCRT4_use_protseq(ps); + EndpointA = RPCRT4_strdupWtoA(Endpoint); + status = RPCRT4_use_protseq(ps, EndpointA); + RPCRT4_strfree(EndpointA); + return status; } /*********************************************************************** diff --git a/dlls/rpcrt4/rpc_server.h b/dlls/rpcrt4/rpc_server.h index c385bed..aa873a0 100644 --- a/dlls/rpcrt4/rpc_server.h +++ b/dlls/rpcrt4/rpc_server.h @@ -31,8 +31,7 @@ typedef struct _RpcServerProtseq const struct protseq_ops *ops; /* RO */ struct list entry; /* CS ::server_cs */ LPSTR Protseq; /* RO */ - LPSTR Endpoint; /* RO */ - UINT MaxCalls; + UINT MaxCalls; /* RO */ /* list of listening connections */ RpcConnection* conn; /* CS cs */ CRITICAL_SECTION cs;

1 0

Rob Shearman : rpcrt4: Fix a crash in RpcServerUseProtseqEpExA/ W when using an unsupported protseq.
by Alexandre Julliard 10 Nov '06

10 Nov '06

Module: wine Branch: master Commit: e0acc8d2767acc2159e01e4fca7364b0fba661a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0acc8d2767acc2159e01e4fc… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Nov 10 11:02:04 2006 +0000 rpcrt4: Fix a crash in RpcServerUseProtseqEpExA/W when using an unsupported protseq. --- dlls/rpcrt4/rpc_server.c | 49 +++++++++++++++++++++++++++------------------ 1 files changed, 29 insertions(+), 20 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 6a5f7ac..3efcc12 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -605,29 +605,31 @@ RPC_STATUS WINAPI RpcServerUseProtseqEpW /*********************************************************************** * alloc_serverprotoseq (internal) */ -static RpcServerProtseq *alloc_serverprotoseq(UINT MaxCalls, char *Protseq, char *Endpoint) +static RPC_STATUS alloc_serverprotoseq(UINT MaxCalls, char *Protseq, char *Endpoint, RpcServerProtseq **ps) { - RpcServerProtseq* ps; const struct protseq_ops *ops = rpcrt4_get_protseq_ops(Protseq); if (!ops) - return NULL; + { + FIXME("protseq %s not supported\n", debugstr_a(Protseq)); + return RPC_S_PROTSEQ_NOT_SUPPORTED; + } - ps = ops->alloc(); - if (!ps) - return NULL; - ps->MaxCalls = MaxCalls; - ps->Protseq = Protseq; - ps->Endpoint = Endpoint; - ps->ops = ops; - ps->MaxCalls = 0; - ps->conn = NULL; - InitializeCriticalSection(&ps->cs); - ps->is_listening = FALSE; - ps->mgr_mutex = NULL; - ps->server_ready_event = NULL; + *ps = ops->alloc(); + if (!*ps) + return RPC_S_OUT_OF_RESOURCES; + (*ps)->MaxCalls = MaxCalls; + (*ps)->Protseq = Protseq; + (*ps)->Endpoint = Endpoint; + (*ps)->ops = ops; + (*ps)->MaxCalls = 0; + (*ps)->conn = NULL; + InitializeCriticalSection(&(*ps)->cs); + (*ps)->is_listening = FALSE; + (*ps)->mgr_mutex = NULL; + (*ps)->server_ready_event = NULL; - return ps; + return RPC_S_OK; } /*********************************************************************** @@ -638,12 +640,16 @@ RPC_STATUS WINAPI RpcServerUseProtseqEpE { char *szps = (char*)Protseq, *szep = (char*)Endpoint; RpcServerProtseq* ps; + RPC_STATUS status; TRACE("(%s,%u,%s,%p,{%u,%lu,%lu})\n", debugstr_a(szps), MaxCalls, debugstr_a(szep), SecurityDescriptor, lpPolicy->Length, lpPolicy->EndpointFlags, lpPolicy->NICFlags ); - ps = alloc_serverprotoseq(MaxCalls, RPCRT4_strdupA(szps), RPCRT4_strdupA(szep)); + status = alloc_serverprotoseq(MaxCalls, RPCRT4_strdupA(szps), + RPCRT4_strdupA(szep), &ps); + if (status != RPC_S_OK) + return status; return RPCRT4_use_protseq(ps); } @@ -655,13 +661,16 @@ RPC_STATUS WINAPI RpcServerUseProtseqEpE PRPC_POLICY lpPolicy ) { RpcServerProtseq* ps; + RPC_STATUS status; TRACE("(%s,%u,%s,%p,{%u,%lu,%lu})\n", debugstr_w( Protseq ), MaxCalls, debugstr_w( Endpoint ), SecurityDescriptor, lpPolicy->Length, lpPolicy->EndpointFlags, lpPolicy->NICFlags ); - ps = alloc_serverprotoseq(MaxCalls, RPCRT4_strdupWtoA(Protseq), - RPCRT4_strdupWtoA(Endpoint)); + status = alloc_serverprotoseq(MaxCalls, RPCRT4_strdupWtoA(Protseq), + RPCRT4_strdupWtoA(Endpoint), &ps); + if (status != RPC_S_OK) + return status; return RPCRT4_use_protseq(ps); }

1 0

Rob Shearman : rpcrt4: Correctly align the results in the RPC Bind Ack packet.
by Alexandre Julliard 10 Nov '06

10 Nov '06

Module: wine Branch: master Commit: 44922d29db4aedc83e6718c8445790af8d4d98db URL: http://source.winehq.org/git/wine.git/?a=commit;h=44922d29db4aedc83e6718c84… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Nov 10 11:01:35 2006 +0000 rpcrt4: Correctly align the results in the RPC Bind Ack packet. --- dlls/rpcrt4/rpc_defs.h | 4 ++-- dlls/rpcrt4/rpc_message.c | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/rpc_defs.h b/dlls/rpcrt4/rpc_defs.h index 4ee840c..7499dcd 100644 --- a/dlls/rpcrt4/rpc_defs.h +++ b/dlls/rpcrt4/rpc_defs.h @@ -88,9 +88,8 @@ #include "poppack.h" typedef struct { - unsigned char padding1[2]; /* Force alignment! */ unsigned char num_results; /* Number of results */ - unsigned char padding2[3]; /* Force alignment! */ + unsigned char reserved[3]; /* Force alignment! */ struct { unsigned short result; unsigned short reason; @@ -106,6 +105,7 @@ typedef struct /* * Following this header are these fields: * RpcAddressString server_address; + * [0 - 3 bytes of padding so that results is 4-byte aligned] * RpcResults results; * RPC_SYNTAX_IDENTIFIER transfer; */ diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 3afbf79..9c7ea15 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -49,6 +49,7 @@ #define AUTH_ALIGNMENT 16 /* gets the amount needed to round a value up to the specified alignment */ #define ROUND_UP_AMOUNT(value, alignment) \ (((alignment) - (((value) % (alignment)))) % (alignment)) +#define ROUND_UP(value, alignment) (((value) + ((alignment) - 1)) & ~((alignment)-1)) static RPC_STATUS I_RpcReAllocateBuffer(PRPC_MESSAGE pMsg); @@ -230,9 +231,10 @@ RpcPktHdr *RPCRT4_BuildBindAckHeader(uns RpcResults *results; RPC_SYNTAX_IDENTIFIER *transfer_id; - header_size = sizeof(header->bind_ack) + sizeof(RpcResults) + - sizeof(RPC_SYNTAX_IDENTIFIER) + sizeof(RpcAddressString) + - strlen(ServerAddress); + header_size = sizeof(header->bind_ack) + + ROUND_UP(FIELD_OFFSET(RpcAddressString, string[strlen(ServerAddress) + 1]), 4) + + sizeof(RpcResults) + + sizeof(RPC_SYNTAX_IDENTIFIER); header = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, header_size); if (header == NULL) { @@ -246,7 +248,8 @@ RpcPktHdr *RPCRT4_BuildBindAckHeader(uns server_address = (RpcAddressString*)(&header->bind_ack + 1); server_address->length = strlen(ServerAddress) + 1; strcpy(server_address->string, ServerAddress); - results = (RpcResults*)((ULONG_PTR)server_address + sizeof(RpcAddressString) + server_address->length - 1); + /* results is 4-byte aligned */ + results = (RpcResults*)((ULONG_PTR)server_address + ROUND_UP(FIELD_OFFSET(RpcAddressString, string[server_address->length]), 4)); results->num_results = 1; results->results[0].result = Result; results->results[0].reason = Reason;

1 0

Dmitry Timoshkov : shlwapi: Unify SHDeleteKeyW implementation with SHDeleteKeyA.
by Alexandre Julliard 10 Nov '06

10 Nov '06

Module: wine Branch: master Commit: 50a18ca57e595801e0ccfa6be0a5494bfc0f0623 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50a18ca57e595801e0ccfa6be… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Nov 10 18:57:27 2006 +0800 shlwapi: Unify SHDeleteKeyW implementation with SHDeleteKeyA. --- dlls/oleaut32/tests/typelib.c | 2 -- dlls/shlwapi/reg.c | 17 +++++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 44b53d6..baeb370 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -503,9 +503,7 @@ static BOOL do_typelib_reg_key(GUID *uid if (remove) { -todo_wine { ok(SHDeleteKeyW(HKEY_CLASSES_ROOT, buf) == ERROR_SUCCESS, "SHDeleteKey failed\n"); -} return TRUE; } diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index 331f84a..3cec25c 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -1553,7 +1553,7 @@ DWORD WINAPI SHDeleteKeyA(HKEY hKey, LPC */ DWORD WINAPI SHDeleteKeyW(HKEY hKey, LPCWSTR lpszSubKey) { - DWORD dwRet, dwKeyCount = 0, dwMaxSubkeyLen = 0, dwSize, i; + DWORD dwRet, dwMaxSubkeyLen = 0, dwSize; WCHAR szNameBuf[MAX_PATH], *lpszName = szNameBuf; HKEY hSubKey = 0; @@ -1562,8 +1562,8 @@ DWORD WINAPI SHDeleteKeyW(HKEY hKey, LPC dwRet = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_READ, &hSubKey); if(!dwRet) { - /* Find how many subkeys there are */ - dwRet = RegQueryInfoKeyW(hSubKey, NULL, NULL, NULL, &dwKeyCount, + /* Find the maximum subkey length so that we can allocate a buffer */ + dwRet = RegQueryInfoKeyW(hSubKey, NULL, NULL, NULL, NULL, &dwMaxSubkeyLen, NULL, NULL, NULL, NULL, NULL, NULL); if(!dwRet) { @@ -1576,15 +1576,16 @@ DWORD WINAPI SHDeleteKeyW(HKEY hKey, LPC dwRet = ERROR_NOT_ENOUGH_MEMORY; else { - /* Recursively delete all the subkeys */ - for(i = 0; i < dwKeyCount && !dwRet; i++) + while (dwRet == ERROR_SUCCESS) { dwSize = dwMaxSubkeyLen; - dwRet = RegEnumKeyExW(hSubKey, i, lpszName, &dwSize, NULL, NULL, NULL, NULL); - if(!dwRet) + dwRet = RegEnumKeyExW(hSubKey, 0, lpszName, &dwSize, NULL, NULL, NULL, NULL); + if (dwRet == ERROR_SUCCESS || dwRet == ERROR_MORE_DATA) dwRet = SHDeleteKeyW(hSubKey, lpszName); } - + if (dwRet == ERROR_NO_MORE_ITEMS) + dwRet = ERROR_SUCCESS; + if (lpszName != szNameBuf) HeapFree(GetProcessHeap(), 0, lpszName); /* Free buffer if allocated */ }

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
80
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 November 2006