April 2007 - Wine-Commits - list.winehq.org

Rob Shearman : ntdll: Pass the correct value to NtClose in the tests.
by Alexandre Julliard April 4, 2007

April 4, 2007

Module: wine Branch: master Commit: 20171ac200c027790dfcff6e6e6c45a7d29e27ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=20171ac200c027790dfcff6e6… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 3 13:42:34 2007 +0100 ntdll: Pass the correct value to NtClose in the tests. --- dlls/ntdll/tests/om.c | 4 ++-- dlls/ntdll/tests/reg.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 41471e5..f27b37a 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -171,7 +171,7 @@ static void test_namespace_pipe(void) ok(status == STATUS_SUCCESS, "Failed to open Directory(%08x)\n", status); #define DIR_TEST_CREATE_OPEN_SUCCESS(h,n) \ pRtlCreateUnicodeStringFromAsciiz(&str, n);\ - DIR_TEST_CREATE_SUCCESS(h) pNtClose(h); DIR_TEST_OPEN_SUCCESS(h) pNtClose(h); \ + DIR_TEST_CREATE_SUCCESS(&h) pNtClose(h); DIR_TEST_OPEN_SUCCESS(&h) pNtClose(h); \ pRtlFreeUnicodeString(&str); static void test_name_collisions(void) @@ -352,7 +352,7 @@ static void test_directory(void) DIR_TEST_OPEN_FAILURE(&h, STATUS_OBJECT_NAME_INVALID) InitializeObjectAttributes(&attr, &str, 0, dir, NULL); - DIR_TEST_CREATE_OPEN_SUCCESS(&h, "") + DIR_TEST_CREATE_OPEN_SUCCESS(h, "") DIR_TEST_CREATE_OPEN_FAILURE(&h, "\\", STATUS_OBJECT_PATH_SYNTAX_BAD) DIR_TEST_CREATE_OPEN_FAILURE(&h, "\\om.c-test", STATUS_OBJECT_PATH_SYNTAX_BAD) DIR_TEST_CREATE_OPEN_FAILURE(&h, "\\om.c-test\\", STATUS_OBJECT_PATH_SYNTAX_BAD) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index e21e68c..2f622df 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -368,7 +368,7 @@ static void test_NtCreateKey(void) status = pNtCreateKey(&key, am, &attr, 0, 0, 0, 0); ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got: 0x%08x\n", status); - pNtClose(&key); + pNtClose(key); } static void test_NtSetValueKey(void) @@ -390,7 +390,7 @@ static void test_NtSetValueKey(void) ok(status == STATUS_SUCCESS, "NtSetValueKey Failed: 0x%08x\n", status); pRtlFreeUnicodeString(&ValName); - pNtClose(&key); + pNtClose(key); } static void test_RtlOpenCurrentUser(void) @@ -399,7 +399,7 @@ static void test_RtlOpenCurrentUser(void) HKEY handle; status=pRtlOpenCurrentUser(KEY_READ, &handle); ok(status == STATUS_SUCCESS, "RtlOpenCurrentUser Failed: 0x%08x\n", status); - pNtClose(&handle); + pNtClose(handle); } static void test_RtlCheckRegistryKey(void)

1 0

Alexandre Julliard : server: Hold a pointer to the queue from the async operations.
by Alexandre Julliard April 4, 2007

April 4, 2007

Module: wine Branch: master Commit: b2cba95abd02950577eafa313b781eb8e042490e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2cba95abd02950577eafa313… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 3 19:36:07 2007 +0200 server: Hold a pointer to the queue from the async operations. --- server/async.c | 26 +++++++++++++++----------- server/fd.c | 6 +++--- server/file.h | 1 + server/named_pipe.c | 4 ++-- server/sock.c | 4 ++-- 5 files changed, 23 insertions(+), 18 deletions(-) diff --git a/server/async.c b/server/async.c index c58ef5f..027dd25 100644 --- a/server/async.c +++ b/server/async.c @@ -36,7 +36,8 @@ struct async { struct object obj; /* object header */ struct thread *thread; /* owning thread */ - struct list queue_entry; /* entry in file descriptor queue */ + struct list queue_entry; /* entry in async queue list */ + struct async_queue *queue; /* queue containing this async */ struct timeout_user *timeout; unsigned int timeout_status; /* status to report upon timeout */ struct event *event; @@ -72,7 +73,6 @@ struct async_queue }; static void async_queue_dump( struct object *obj, int verbose ); -static void async_queue_destroy( struct object *obj ); static const struct object_ops async_queue_ops = { @@ -88,7 +88,7 @@ static const struct object_ops async_queue_ops = no_lookup_name, /* lookup_name */ no_open_file, /* open_file */ no_close_handle, /* close_handle */ - async_queue_destroy /* destroy */ + no_destroy /* destroy */ }; @@ -106,6 +106,8 @@ static void async_destroy( struct object *obj ) if (async->timeout) remove_timeout_user( async->timeout ); if (async->event) release_object( async->event ); + release_object( async->queue ); + async->queue = NULL; release_object( async->thread ); } @@ -116,14 +118,6 @@ static void async_queue_dump( struct object *obj, int verbose ) fprintf( stderr, "Async queue fd=%p\n", async_queue->fd ); } -static void async_queue_destroy( struct object *obj ) -{ - struct async_queue *async_queue = (struct async_queue *)obj; - assert( obj->ops == &async_queue_ops ); - - async_wake_up( async_queue, STATUS_HANDLES_CLOSED ); -} - /* notifies client thread of new status of its async request */ /* destroys the server side of it */ static void async_terminate( struct async *async, unsigned int status ) @@ -166,6 +160,15 @@ struct async_queue *create_async_queue( struct fd *fd ) return queue; } +/* free an async queue, cancelling all async operations */ +void free_async_queue( struct async_queue *queue ) +{ + if (!queue) return; + queue->fd = NULL; + async_wake_up( queue, STATUS_HANDLES_CLOSED ); + release_object( queue ); +} + /* create an async on a given queue of a fd */ struct async *create_async( struct thread *thread, struct async_queue *queue, const async_data_t *data ) { @@ -185,6 +188,7 @@ struct async *create_async( struct thread *thread, struct async_queue *queue, co async->event = event; async->data = *data; async->timeout = NULL; + async->queue = (struct async_queue *)grab_object( queue ); list_add_tail( &queue->queue, &async->queue_entry ); grab_object( async ); diff --git a/server/fd.c b/server/fd.c index 279f72a..25917ae 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1286,9 +1286,9 @@ static void fd_destroy( struct object *obj ) { struct fd *fd = (struct fd *)obj; - if (fd->read_q) release_object( fd->read_q ); - if (fd->write_q) release_object( fd->write_q ); - if (fd->wait_q) release_object( fd->wait_q ); + free_async_queue( fd->read_q ); + free_async_queue( fd->write_q ); + free_async_queue( fd->wait_q ); remove_fd_locks( fd ); list_remove( &fd->inode_entry ); diff --git a/server/file.h b/server/file.h index a46a24f..3514022 100644 --- a/server/file.h +++ b/server/file.h @@ -124,6 +124,7 @@ extern struct object *create_serial( struct fd *fd, unsigned int options ); /* async I/O functions */ extern struct async_queue *create_async_queue( struct fd *fd ); +extern void free_async_queue( struct async_queue *queue ); extern struct async *create_async( struct thread *thread, struct async_queue *queue, const async_data_t *data ); extern void async_set_timeout( struct async *async, const struct timeval *timeout, diff --git a/server/named_pipe.c b/server/named_pipe.c index 9136041..0a4ab96 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -274,7 +274,7 @@ static void named_pipe_destroy( struct object *obj) assert( list_empty( &pipe->servers ) ); assert( !pipe->instances ); - if (pipe->waiters) release_object( pipe->waiters ); + free_async_queue( pipe->waiters ); } static struct fd *pipe_client_get_fd( struct object *obj ) @@ -366,7 +366,7 @@ static void pipe_server_destroy( struct object *obj) server->client = NULL; } - release_object( server->wait_q ); + free_async_queue( server->wait_q ); assert( server->pipe->instances ); server->pipe->instances--; diff --git a/server/sock.c b/server/sock.c index 1e70f2e..90103f9 100644 --- a/server/sock.c +++ b/server/sock.c @@ -581,8 +581,8 @@ static void sock_destroy( struct object *obj ) if ( sock->deferred ) release_object( sock->deferred ); - if (sock->read_q) release_object( sock->read_q ); - if (sock->write_q) release_object( sock->write_q ); + free_async_queue( sock->read_q ); + free_async_queue( sock->write_q ); if (sock->event) release_object( sock->event ); if (sock->fd) {

1 0

Alexandre Julliard : server: Make timeout status for async I/O specifiable. Fix mailslots timeout handling.
by Alexandre Julliard April 4, 2007

April 4, 2007

Module: wine Branch: master Commit: 4e5c7038da0c6ee3126d7099326b13565e54cec1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e5c7038da0c6ee3126d70993… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 3 19:12:31 2007 +0200 server: Make timeout status for async I/O specifiable. Fix mailslots timeout handling. --- dlls/kernel32/tests/mailslot.c | 2 +- server/async.c | 6 ++++-- server/file.h | 3 ++- server/mailslot.c | 20 +------------------- server/named_pipe.c | 2 +- server/serial.c | 2 +- 6 files changed, 10 insertions(+), 25 deletions(-) diff --git a/dlls/kernel32/tests/mailslot.c b/dlls/kernel32/tests/mailslot.c index 0c47fde..850b065 100644 --- a/dlls/kernel32/tests/mailslot.c +++ b/dlls/kernel32/tests/mailslot.c @@ -299,7 +299,7 @@ static int mailslot_test(void) ok( !ReadFile( hSlot, buffer, sizeof buffer, &count, NULL), "slot read\n"); ok( GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError() ); dwTimeout = GetTickCount() - dwTimeout; - todo_wine ok( dwTimeout >= 1000, "timeout too short %u\n", dwTimeout ); + ok( dwTimeout >= 1000, "timeout too short %u\n", dwTimeout ); ok( CloseHandle( hSlot ), "closing the mailslot\n"); return 0; diff --git a/server/async.c b/server/async.c index 26221a3..c58ef5f 100644 --- a/server/async.c +++ b/server/async.c @@ -38,6 +38,7 @@ struct async struct thread *thread; /* owning thread */ struct list queue_entry; /* entry in file descriptor queue */ struct timeout_user *timeout; + unsigned int timeout_status; /* status to report upon timeout */ struct event *event; async_data_t data; /* data for async I/O call */ }; @@ -149,7 +150,7 @@ static void async_timeout( void *private ) struct async *async = private; async->timeout = NULL; - async_terminate( async, STATUS_TIMEOUT ); + async_terminate( async, async->timeout_status ); } /* create a new async queue for a given fd */ @@ -193,11 +194,12 @@ struct async *create_async( struct thread *thread, struct async_queue *queue, co } /* set the timeout of an async operation */ -void async_set_timeout( struct async *async, const struct timeval *timeout ) +void async_set_timeout( struct async *async, const struct timeval *timeout, unsigned int status ) { if (async->timeout) remove_timeout_user( async->timeout ); if (timeout) async->timeout = add_timeout_user( timeout, async_timeout, async ); else async->timeout = NULL; + async->timeout_status = status; } /* store the result of the client-side async callback */ diff --git a/server/file.h b/server/file.h index ca2e426..a46a24f 100644 --- a/server/file.h +++ b/server/file.h @@ -126,7 +126,8 @@ extern struct object *create_serial( struct fd *fd, unsigned int options ); extern struct async_queue *create_async_queue( struct fd *fd ); extern struct async *create_async( struct thread *thread, struct async_queue *queue, const async_data_t *data ); -extern void async_set_timeout( struct async *async, const struct timeval *timeout ); +extern void async_set_timeout( struct async *async, const struct timeval *timeout, + unsigned int status ); extern void async_set_result( struct object *obj, unsigned int status ); extern int async_waiting( struct async_queue *queue ); extern void async_wake_up( struct async_queue *queue, unsigned int status ); diff --git a/server/mailslot.c b/server/mailslot.c index 227c99f..89af2bf 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -208,17 +208,6 @@ static void mailslot_dump( struct object *obj, int verbose ) mailslot->max_msgsize, mailslot->read_timeout ); } -static int mailslot_message_count(struct mailslot *mailslot) -{ - struct pollfd pfd; - - /* poll the socket to see if there's any messages */ - pfd.fd = get_unix_fd( mailslot->fd ); - pfd.events = POLLIN; - pfd.revents = 0; - return (poll( &pfd, 1, 0 ) == 1) ? 1 : 0; -} - static enum server_fd_type mailslot_get_info( struct fd *fd, int *flags ) { struct mailslot *mailslot = get_fd_user( fd ); @@ -286,20 +275,13 @@ static void mailslot_queue_async( struct fd *fd, const async_data_t *data, int t assert(mailslot->obj.ops == &mailslot_ops); - if (list_empty( &mailslot->writers ) || - !mailslot_message_count( mailslot )) - { - set_error(STATUS_IO_TIMEOUT); - return; - } - if ((async = fd_queue_async( fd, data, type, count ))) { if (mailslot->read_timeout != -1) { struct timeval when = current_time; add_timeout( &when, max(1,mailslot->read_timeout) ); - async_set_timeout( async, &when ); + async_set_timeout( async, &when, STATUS_IO_TIMEOUT ); } release_object( async ); set_error( STATUS_PENDING ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 6afcdb6..9136041 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -867,7 +867,7 @@ DECL_HANDLER(wait_named_pipe) struct timeval when = current_time; if (req->timeout == NMPWAIT_USE_DEFAULT_WAIT) add_timeout( &when, pipe->timeout ); else add_timeout( &when, req->timeout ); - async_set_timeout( async, &when ); + async_set_timeout( async, &when, STATUS_TIMEOUT ); } release_object( async ); set_error( STATUS_PENDING ); diff --git a/server/serial.c b/server/serial.c index 42a3f72..f2b88c1 100644 --- a/server/serial.c +++ b/server/serial.c @@ -219,7 +219,7 @@ static void serial_queue_async( struct fd *fd, const async_data_t *data, int typ { struct timeval when = current_time; add_timeout( &when, timeout ); - async_set_timeout( async, &when ); + async_set_timeout( async, &when, STATUS_TIMEOUT ); } release_object( async ); set_error( STATUS_PENDING );

1 0

Rob Shearman : msi: Don' t wait on closed handles in ACTION_FinishCustomActions.
by Alexandre Julliard April 4, 2007

April 4, 2007

Module: wine Branch: master Commit: 3fbe9db433519a67d2378fc031ea182966ca6c5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fbe9db433519a67d2378fc03… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 3 17:35:40 2007 +0100 msi: Don't wait on closed handles in ACTION_FinishCustomActions. The handle will be closed by free_custom_action_data, so duplicate the handle before calling it. --- dlls/msi/custom.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 48a0769..d1d492c 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -887,7 +887,8 @@ void ACTION_FinishCustomActions(MSIPACKAGE* package) { if (info->package == package ) { - wait_handles[handle_count++] = info->handle; + if (DuplicateHandle(GetCurrentProcess(), info->handle, GetCurrentProcess(), &wait_handles[handle_count], SYNCHRONIZE, FALSE, 0)) + handle_count++; free_custom_action_data( info ); } } @@ -895,7 +896,10 @@ void ACTION_FinishCustomActions(MSIPACKAGE* package) LeaveCriticalSection( &msi_custom_action_cs ); for (i = 0; i < handle_count; i++) + { msi_dialog_check_messages( wait_handles[i] ); + CloseHandle( wait_handles[i] ); + } HeapFree( GetProcessHeap(), 0, wait_handles ); }

1 0

appdb/include objectManager.php
by WineHQ April 3, 2007

April 3, 2007

ChangeSet ID: 31030 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/03 19:32:43 Modified files: include : objectManager.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add return value to objectManager::displayErrors(). Return true if errors were found Patch: http://cvs.winehq.org/patch.py?id=31030 Old revision New revision Changes Path 1.10 1.11 +1 -0 appdb/include/objectManager.php Index: appdb/include/objectManager.php diff -u -p appdb/include/objectManager.php:1.10 appdb/include/objectManager.php:1.11 --- appdb/include/objectManager.php:1.10 4 Apr 2007 0:32:43 -0000 +++ appdb/include/objectManager.php 4 Apr 2007 0:32:43 -0000 @@ -400,6 +400,7 @@ class ObjectManager echo "The following errors were found \n"; echo "<ul>$sErrors</ul>\n"; echo " "; + return TRUE; } else return FALSE; }

1 0

appdb/. index.php
by WineHQ April 3, 2007

April 3, 2007

ChangeSet ID: 31029 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/03 19:31:57 Modified files: . : index.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> fix display of top-voted application, one of the variables was prefixed with an 's' instead of an 'sh' Patch: http://cvs.winehq.org/patch.py?id=31029 Old revision New revision Changes Path 1.43 1.44 +1 -1 appdb/index.php Index: appdb/index.php diff -u -p appdb/index.php:1.43 appdb/index.php:1.44 --- appdb/index.php:1.43 4 Apr 2007 0:31:57 -0000 +++ appdb/index.php 4 Apr 2007 0:31:57 -0000 @@ -68,7 +68,7 @@ If you have screenshots or links to cont // don't mention the top application if there are no votes yet if($oRow->versionId) { - $sVoteAppLink = version::fullNameLink($oRow->versionId); + $shVoteAppLink = version::fullNameLink($oRow->versionId); echo "There are $numApps applications currently in the database with\n"; echo "$shVoteAppLink being the\n"; echo "top <a href='votestats.php'>voted</a> application.\n";

1 0

appdb/include sidebar_admin.php sidebar_login. ...
by WineHQ April 3, 2007

April 3, 2007

ChangeSet ID: 31028 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/03 19:30:43 Modified files: include : sidebar_admin.php sidebar_login.php sidebar_maintainer_admin.php user.php version.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add and use version::objectGetEntriesCount(). Only display the user menu's 'view rejected apps' link for non-admins Patch: http://cvs.winehq.org/patch.py?id=31028 Old revision New revision Changes Path 1.37 1.38 +3 -1 appdb/include/sidebar_admin.php 1.20 1.21 +5 -3 appdb/include/sidebar_login.php 1.6 1.7 +1 -1 appdb/include/sidebar_maintainer_admin.php 1.85 1.86 +0 -57 appdb/include/user.php 1.110 1.111 +68 -0 appdb/include/version.php

1 0

Byeong-Sik Jeon : regedit: Update Korean resource.
by Alexandre Julliard April 3, 2007

April 3, 2007

Module: wine Branch: master Commit: afdf49f1615c14cea6ee0a3b81778ffe1ebf87c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afdf49f1615c14cea6ee0a3b8… Author: Byeong-Sik Jeon <wjsqudtlr(a)gmail.com> Date: Fri Mar 30 11:07:42 2007 +0900 regedit: Update Korean resource. --- programs/regedit/Ko.rc | 82 ++++++++++++++++++++++++++++------------------- 1 files changed, 49 insertions(+), 33 deletions(-) diff --git a/programs/regedit/Ko.rc b/programs/regedit/Ko.rc index 12e3ef2..cd96c00 100644 --- a/programs/regedit/Ko.rc +++ b/programs/regedit/Ko.rc @@ -61,37 +61,38 @@ BEGIN BEGIN MENUITEM "&Ű(&K)", ID_EDIT_NEW_KEY MENUITEM SEPARATOR - MENUITEM "��ڰ�(&S)", ID_EDIT_NEW_STRINGVALUE + MENUITEM "��ڿ� ��(&S)", ID_EDIT_NEW_STRINGVALUE MENUITEM "��(&B)", ID_EDIT_NEW_BINARYVALUE - MENUITEM "DWORD ��(&D)", ID_EDIT_NEW_DWORDVALUE + MENUITEM "DWORD ��(&D)", ID_EDIT_NEW_DWORDVALUE + MENUITEM "�� ڿ� ��(&M)", ID_EDIT_NEW_MULTI_STRINGVALUE END MENUITEM SEPARATOR MENUITEM "��(&D)\tDel", ID_EDIT_DELETE - MENUITEM "�̸� �ٲٱ�(&R)\tF2", ID_EDIT_RENAME + MENUITEM "�̸� �ٲٱ�(&R)\tF2", ID_EDIT_RENAME MENUITEM SEPARATOR - MENUITEM "Ű �̸� ��(&C)", ID_EDIT_COPYKEYNAME + MENUITEM "Ű �̸� ��(&C)", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR MENUITEM "ã��(&F)\tCtrl+F", ID_EDIT_FIND, GRAYED - MENUITEM "�� ã��(&x)\tF3", ID_EDIT_FINDNEXT, GRAYED + MENUITEM "�� ã��(&x)\tF3", ID_EDIT_FINDNEXT, GRAYED END POPUP "��(&V)" BEGIN - MENUITEM "�� ǥ��(&B)", ID_VIEW_STATUSBAR + MENUITEM "�� ǥ��(&B)", ID_VIEW_STATUSBAR MENUITEM SEPARATOR - MENUITEM "��(&L)", ID_VIEW_SPLIT + MENUITEM "��(&L)", ID_VIEW_SPLIT MENUITEM SEPARATOR - MENUITEM "�� ħ(&R)\tF5", ID_VIEW_REFRESH + MENUITEM "�� ħ(&R)\tF5", ID_VIEW_REFRESH END POPUP "�� ã��(&F)" BEGIN - MENUITEM "�� ã�� ߰�(&A)", ID_FAVORITES_ADDTOFAVORITES - MENUITEM "�� ã�� (&R)", ID_FAVORITES_REMOVEFAVORITE + MENUITEM "�� ã�� ߰�(&A)", ID_FAVORITES_ADDTOFAVORITES + MENUITEM "�� ã�� (&R)", ID_FAVORITES_REMOVEFAVORITE END POPUP "��(&H)" BEGIN - MENUITEM "�� ׸�(&H)\tF1", ID_HELP_HELPTOPICS + MENUITEM "�� ׸�(&H)\tF1", ID_HELP_HELPTOPICS MENUITEM SEPARATOR - MENUITEM "��Ʈ�� (&A)", ID_HELP_ABOUT + MENUITEM "��Ʈ�� (&A)", ID_HELP_ABOUT END END @@ -100,26 +101,27 @@ BEGIN POPUP "" BEGIN MENUITEM "��(&M)", ID_EDIT_MODIFY - MENUITEM "�� ġ��", ID_EDIT_MODIFY_BIN + MENUITEM "�� ġ��", ID_EDIT_MODIFY_BIN MENUITEM SEPARATOR MENUITEM "��(&D)\tDel", ID_EDIT_DELETE - MENUITEM "�̸� �ٲٱ�(&R)", ID_EDIT_RENAME + MENUITEM "�̸� �ٲٱ�(&R)", ID_EDIT_RENAME END POPUP "" BEGIN POPUP "�� (&N)" BEGIN - MENUITEM "&Ű(&K)", ID_EDIT_NEW_KEY + MENUITEM "&Ű(&K)", ID_EDIT_NEW_KEY MENUITEM SEPARATOR - MENUITEM "��ڰ�(&S)", ID_EDIT_NEW_STRINGVALUE + MENUITEM "��ڿ� ��(&S)", ID_EDIT_NEW_STRINGVALUE MENUITEM "��(&B)", ID_EDIT_NEW_BINARYVALUE - MENUITEM "DWORD ��(&D)", ID_EDIT_NEW_DWORDVALUE + MENUITEM "DWORD ��(&D)", ID_EDIT_NEW_DWORDVALUE + MENUITEM "�� ڿ� ��(&M)", ID_EDIT_NEW_MULTI_STRINGVALUE END MENUITEM SEPARATOR MENUITEM "��(&D)\tDel", ID_EDIT_DELETE - MENUITEM "�̸� �ٲٱ�(&R)\tF2", ID_EDIT_RENAME + MENUITEM "�̸� �ٲٱ�(&R)\tF2", ID_EDIT_RENAME MENUITEM SEPARATOR - MENUITEM "Ű �̸� ��(&C)", ID_EDIT_COPYKEYNAME + MENUITEM "Ű �̸� ��(&C)", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR MENUITEM "ã��(&F)\tCtrl+F", ID_EDIT_FIND, GRAYED END @@ -133,7 +135,7 @@ END IDD_ADDFAVORITE DIALOG DISCARDABLE 22, 17, 210, 55 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "�� ã�� ߰�" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" BEGIN LTEXT "�̸�:",IDC_STATIC,5,5,119,8 EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL @@ -144,7 +146,7 @@ END IDD_DELFAVORITE DIALOG DISCARDABLE 22, 17, 210, 90 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "�� ã�� " -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" BEGIN LTEXT "�̸�:",IDC_STATIC,5,5,119,8 LISTBOX IDC_NAME_LIST,5,15,200,52, WS_BORDER | WS_TABSTOP | LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL @@ -155,7 +157,7 @@ END IDD_EDIT_STRING DIALOG DISCARDABLE 22, 17, 210, 75 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "��ڿ� ��" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" BEGIN LTEXT "�� ̸�:",IDC_STATIC,5,5,119,8 EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED @@ -168,7 +170,7 @@ END IDD_EDIT_DWORD DIALOG DISCARDABLE 22, 17, 210, 100 STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU CAPTION "DWORD ��" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" BEGIN LTEXT "�� ̸�:",IDC_STATIC,5,5,119,8 EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED @@ -184,7 +186,7 @@ END IDD_EDIT_BINARY DIALOG DISCARDABLE 22, 17, 210, 100 STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU CAPTION "�� " -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" BEGIN LTEXT "�� ̸�:",IDC_STATIC,5,5,119,8 EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED @@ -194,10 +196,23 @@ BEGIN PUSHBUTTON "��",IDCANCEL,175,80,30,11,WS_GROUP END +IDD_EDIT_MULTI_STRING DIALOG DISCARDABLE 22, 17, 210, 175 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "�� ڿ� ��" +FONT 9, "MS Shell Dlg" +BEGIN + LTEXT "�� ̸�:",IDC_STATIC,5,5,119,8 + EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED + LTEXT "�� :",IDC_STATIC,5,30,119,8 + EDITTEXT IDC_VALUE_DATA,5,40,200,112, WS_BORDER | WS_TABSTOP | WS_HSCROLL | WS_VSCROLL | ES_MULTILINE | ES_WANTRETURN + DEFPUSHBUTTON "Ȯ��",IDOK,140,160,30,11,WS_GROUP + PUSHBUTTON "��",IDCANCEL,175,160,30,11,WS_GROUP +END + IDD_FIND DIALOG DISCARDABLE 22, 17, 210, 85 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "ã��" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" BEGIN LTEXT "ã��:",IDC_STATIC,5,7,119,8 EDITTEXT IDC_VALUE_NAME,40,5,125,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL @@ -213,12 +228,12 @@ END IDD_EXPORT_TEMPLATE DIALOG DISCARDABLE 50, 50, 278, 54 STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER -FONT 8, "MS Shell Dlg" - BEGIN - GROUPBOX "��Ʈ�� ҷ��", IDC_EXPORT_BASE, 6, 6, 266, 42, WS_GROUP - AUTORADIOBUTTON "��(&A)", IDC_EXPORT_ALL, 12, 15, 244, 12 - AUTORADIOBUTTON "��õ� �κи�(&E):", IDC_EXPORT_SELECTED, 12, 30, 70, 12 - EDITTEXT IDC_EXPORT_PATH, 82, 30, 184, 12 +FONT 9, "MS Shell Dlg" +BEGIN + GROUPBOX "��Ʈ�� ҷ��", IDC_EXPORT_BASE, 6, 6, 266, 42, WS_GROUP + AUTORADIOBUTTON "��(&A)", IDC_EXPORT_ALL, 12, 15, 244, 12 + AUTORADIOBUTTON "��õ� �κи�(&E):", IDC_EXPORT_SELECTED, 12, 30, 70, 12 + EDITTEXT IDC_EXPORT_PATH, 82, 30, 184, 12 END /* @@ -253,9 +268,10 @@ STRINGTABLE DISCARDABLE BEGIN ID_EDIT_MODIFY "�� Ÿ ��ġ��" ID_EDIT_NEW_KEY "�� Ű ��ϱ�" - ID_EDIT_NEW_STRINGVALUE "�� ϱ�" + ID_EDIT_NEW_STRINGVALUE "�� ڿ� �� ϱ�" ID_EDIT_NEW_BINARYVALUE "�� ̳ʸ� �� ϱ�" ID_EDIT_NEW_DWORDVALUE "�� ϱ�" + ID_EDIT_NEW_MULTI_STRINGVALUE "�� ڿ� �� ϱ�" ID_REGISTRY_IMPORTREGISTRYFILE "�ؽ�Ʈ �� Ʈ�� ֱ�" ID_REGISTRY_EXPORTREGISTRYFILE "��Ʈ�� γ� �Ϻκ�� ؽ�Ʈ ��Ϸ� ��" @@ -286,7 +302,7 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_ERROR "��" - IDS_BAD_KEY " Ű '%s'�� ϴ�" + IDS_BAD_KEY "Ű '%s'�� ϴ�" IDS_BAD_VALUE "�� '%s'�� ϴ�" IDS_UNSUPPORTED_TYPE "�� Ÿ�� (%ld)�� Ű�� ĥ �� ϴ�" IDS_TOO_BIG_VALUE "�� ʹ� Ů�ϴ� (%ld)"

1 0

Alessandro Pignotti : dplayx: Implement proper interface locking for DP_EnumSession.
by Alexandre Julliard April 3, 2007

April 3, 2007

Module: wine Branch: master Commit: 3040e09ae324c71c5ec9adcd8b24724288f99d7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3040e09ae324c71c5ec9adcd8… Author: Alessandro Pignotti <alex.pigna(a)inventati.org> Date: Fri Mar 30 15:00:06 2007 +0200 dplayx: Implement proper interface locking for DP_EnumSession. --- dlls/dplayx/dplay.c | 6 +++++- dlls/dplayx/dplay_global.h | 1 + 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index d446f51..650adfd 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -272,6 +272,7 @@ static BOOL DP_CreateDirectPlay2( LPVOID lpDP ) This->dp2->bConnectionOpen = FALSE; This->dp2->hEnumSessionThread = INVALID_HANDLE_VALUE; + This->dp2->dwEnumSessionLock = 0; This->dp2->bHostInterface = FALSE; @@ -2273,7 +2274,6 @@ static HRESULT WINAPI DP_IF_EnumSessions return hr; } - /* FIXME: Interface locking sucks in this method */ if( ( dwFlags & DPENUMSESSIONS_ASYNC ) ) { /* Enumerate everything presently in the local session cache */ @@ -2281,11 +2281,14 @@ static HRESULT WINAPI DP_IF_EnumSessions This->dp2->lpNameServerData, dwTimeout, lpContext ); + if( This->dp2->dwEnumSessionLock != 0 ) + return DPERR_CONNECTING; /* See if we've already created a thread to service this interface */ if( This->dp2->hEnumSessionThread == INVALID_HANDLE_VALUE ) { DWORD dwThreadId; + This->dp2->dwEnumSessionLock++; /* Send the first enum request inline since the user may cancel a dialog * if one is presented. Also, may also have a connecting return code. @@ -2326,6 +2329,7 @@ static HRESULT WINAPI DP_IF_EnumSessions 0, &dwThreadId ); } + This->dp2->dwEnumSessionLock--; } } else diff --git a/dlls/dplayx/dplay_global.h b/dlls/dplayx/dplay_global.h index 0c02486..095374d 100644 --- a/dlls/dplayx/dplay_global.h +++ b/dlls/dplayx/dplay_global.h @@ -164,6 +164,7 @@ typedef struct tagDirectPlay2Data /* For async EnumSessions requests */ HANDLE hEnumSessionThread; HANDLE hKillEnumSessionThreadEvent; + DWORD dwEnumSessionLock; LPVOID lpNameServerData; /* DPlay interface doesn't know contents */

1 0

Byeong-Sik Jeon : regedit: Support REG_MULTI_SZ creation and editing.
by Alexandre Julliard April 3, 2007

April 3, 2007

Module: wine Branch: master Commit: f225297a5f496ec01e6884d90b83951f55c501d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f225297a5f496ec01e6884d90… Author: Byeong-Sik Jeon <wjsqudtlr(a)gmail.com> Date: Sat Mar 31 00:14:03 2007 +0900 regedit: Support REG_MULTI_SZ creation and editing. --- programs/regedit/En.rc | 17 +++++++++++++ programs/regedit/edit.c | 53 +++++++++++++++++++++++++++++++++++++++++++ programs/regedit/framewnd.c | 3 ++ programs/regedit/resource.h | 2 + 4 files changed, 75 insertions(+), 0 deletions(-) diff --git a/programs/regedit/En.rc b/programs/regedit/En.rc index 078af00..fad2913 100644 --- a/programs/regedit/En.rc +++ b/programs/regedit/En.rc @@ -53,6 +53,7 @@ BEGIN MENUITEM "&String Value", ID_EDIT_NEW_STRINGVALUE MENUITEM "&Binary Value", ID_EDIT_NEW_BINARYVALUE MENUITEM "&DWORD Value", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Multi String Value", ID_EDIT_NEW_MULTI_STRINGVALUE END MENUITEM SEPARATOR MENUITEM "&Delete\tDel", ID_EDIT_DELETE @@ -129,6 +130,7 @@ BEGIN MENUITEM "&String Value", ID_EDIT_NEW_STRINGVALUE MENUITEM "&Binary Value", ID_EDIT_NEW_BINARYVALUE MENUITEM "&DWORD Value", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Multi String Value", ID_EDIT_NEW_MULTI_STRINGVALUE END MENUITEM SEPARATOR MENUITEM "&Delete\tDel", ID_EDIT_DELETE @@ -179,6 +181,7 @@ BEGIN MENUITEM "&String Value", ID_EDIT_NEW_STRINGVALUE MENUITEM "&Binary Value", ID_EDIT_NEW_BINARYVALUE MENUITEM "&DWORD Value", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Multi String Value", ID_EDIT_NEW_MULTI_STRINGVALUE END MENUITEM SEPARATOR MENUITEM "&Delete\tDel", ID_EDIT_DELETE @@ -286,6 +289,19 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,175,80,30,11,WS_GROUP END +IDD_EDIT_MULTI_STRING DIALOG DISCARDABLE 22, 17, 210, 175 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Edit Multi String" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Value name:",IDC_STATIC,5,5,119,8 + EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED + LTEXT "Value data:",IDC_STATIC,5,30,119,8 + EDITTEXT IDC_VALUE_DATA,5,40,200,112, WS_BORDER | WS_TABSTOP | WS_HSCROLL | WS_VSCROLL | ES_MULTILINE | ES_WANTRETURN + DEFPUSHBUTTON "OK",IDOK,140,160,30,11,WS_GROUP + PUSHBUTTON "Cancel",IDCANCEL,175,160,30,11,WS_GROUP +END + /* * String Table */ @@ -321,6 +337,7 @@ BEGIN ID_EDIT_NEW_STRINGVALUE "Adds a new string value" ID_EDIT_NEW_BINARYVALUE "Adds a new binary value" ID_EDIT_NEW_DWORDVALUE "Adds a new double word value" + ID_EDIT_NEW_MULTI_STRINGVALUE "Adds a new multi string value" ID_REGISTRY_IMPORTREGISTRYFILE "Imports a text file into the registry" ID_REGISTRY_EXPORTREGISTRYFILE "Exports all or part of the registry to a text file" diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index a834966..31645a7 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -322,6 +322,59 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCTSTR keyPath, LPCTSTR valueName) params.cbData = len; result = DialogBoxParam(NULL, MAKEINTRESOURCE(IDD_EDIT_BINARY), hwnd, bin_modify_dlgproc, (LPARAM)&params); + } else if ( type == REG_MULTI_SZ ) { + TCHAR char1 = (TCHAR)'\r', char2 = (TCHAR)'\n'; + TCHAR *tmpValueData = NULL; + INT i, j, count; + + for ( i = 0, count = 0; i < len - 1; i++) + if ( !stringValueData[i] && stringValueData[i + 1] ) + count++; + tmpValueData = HeapAlloc( GetProcessHeap(), 0, ( len + count ) * sizeof(TCHAR)); + if ( !tmpValueData ) goto done; + + for ( i = 0, j = 0; i < len - 1; i++) + { + if ( !stringValueData[i] && stringValueData[i + 1]) + { + tmpValueData[j++] = char1; + tmpValueData[j++] = char2; + } + else + tmpValueData[j++] = stringValueData[i]; + } + tmpValueData[j] = stringValueData[i]; + HeapFree( GetProcessHeap(), 0, stringValueData); + stringValueData = tmpValueData; + tmpValueData = NULL; + + if (DialogBox(0, MAKEINTRESOURCE(IDD_EDIT_MULTI_STRING), hwnd, modify_dlgproc) == IDOK) + { + len = lstrlen( stringValueData ); + tmpValueData = HeapAlloc( GetProcessHeap(), 0, (len + 2) * sizeof(TCHAR)); + if ( !tmpValueData ) goto done; + + for ( i = 0, j = 0; i < len - 1; i++) + { + if ( stringValueData[i] == char1 && stringValueData[i + 1] == char2) + { + if ( tmpValueData[j - 1] != 0) + tmpValueData[j++] = 0; + i++; + } + else + tmpValueData[j++] = stringValueData[i]; + } + tmpValueData[j++] = stringValueData[i]; + tmpValueData[j++] = 0; + tmpValueData[j++] = 0; + HeapFree( GetProcessHeap(), 0, stringValueData); + stringValueData = tmpValueData; + + lRet = RegSetValueEx(hKey, valueName, 0, type, (LPBYTE)stringValueData, j * sizeof(TCHAR)); + if (lRet == ERROR_SUCCESS) result = TRUE; + else error_code_messagebox(hwnd, lRet); + } } else { error(hwnd, IDS_UNSUPPORTED_TYPE, type); } diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 006e802..1c9dbc7 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -710,6 +710,9 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) case ID_EDIT_NEW_STRINGVALUE: valueType = REG_SZ; goto create_value; + case ID_EDIT_NEW_MULTI_STRINGVALUE: + valueType = REG_MULTI_SZ; + goto create_value; case ID_EDIT_NEW_BINARYVALUE: valueType = REG_BINARY; goto create_value; diff --git a/programs/regedit/resource.h b/programs/regedit/resource.h index 8d98d5a..8e703fb 100644 --- a/programs/regedit/resource.h +++ b/programs/regedit/resource.h @@ -132,6 +132,7 @@ #define ID_SWITCH_PANELS 32871 #define ID_FAVORITE_FIRST 33000 #define ID_FAVORITE_LAST 33099 +#define ID_EDIT_NEW_MULTI_STRINGVALUE 33100 #define IDD_EDIT_STRING 2000 #define IDC_VALUE_NAME 2001 @@ -142,6 +143,7 @@ #define IDC_FIND_VALUES 2006 #define IDC_FIND_CONTENT 2007 #define IDC_FIND_WHOLE 2008 +#define IDD_EDIT_MULTI_STRING 2009 #define IDC_EXPORT_BASE 100 #define IDC_EXPORT_ALL 101

1 0