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

Stefan Dösinger : ddraw: More tests and fixes on surface attachments.
by Alexandre Julliard May 9, 2007

May 9, 2007

Module: wine Branch: master Commit: bed50115eeba9ddce7003455ac805cbb698e2375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bed50115eeba9ddce7003455a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 4 18:31:14 2007 +0200 ddraw: More tests and fixes on surface attachments. --- dlls/ddraw/ddraw.c | 16 ++- dlls/ddraw/ddraw_private.h | 2 + dlls/ddraw/ddraw_thunks.c | 4 + dlls/ddraw/surface.c | 71 ++++++------ dlls/ddraw/surface_thunks.c | 40 ++++++- dlls/ddraw/tests/dsurface.c | 256 ++++++++++++++++++++++++++++++++++++++++++- 6 files changed, 344 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bed50115eeba9ddce7003…

1 0

James Hawkins : msi: Check the volume name when changing media.
by Alexandre Julliard May 9, 2007

May 9, 2007

Module: wine Branch: master Commit: 6eb7eadffa5e9863722058325c0977142cd9af49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eb7eadffa5e9863722058325… Author: James Hawkins <truiken(a)gmail.com> Date: Wed May 9 02:04:10 2007 -0500 msi: Check the volume name when changing media. --- dlls/msi/files.c | 46 ++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 40 insertions(+), 6 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 9b9c324..2aeefd3 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -68,10 +68,25 @@ struct media_info { WCHAR source[MAX_PATH]; }; +static BOOL source_matches_volume(struct media_info *mi, LPWSTR source_root) +{ + WCHAR volume_name[MAX_PATH + 1]; + + if (!GetVolumeInformationW(source_root, volume_name, MAX_PATH + 1, + NULL, NULL, NULL, NULL, 0)) + { + ERR("Failed to get volume information\n"); + return FALSE; + } + + return !lstrcmpW(mi->volume_label, volume_name); +} + static UINT msi_change_media( MSIPACKAGE *package, struct media_info *mi ) { LPSTR msg; LPWSTR error, error_dialog; + LPWSTR source_dir; UINT r = ERROR_SUCCESS; static const WCHAR szUILevel[] = {'U','I','L','e','v','e','l',0}; @@ -82,8 +97,11 @@ static UINT msi_change_media( MSIPACKAGE *package, struct media_info *mi ) error = generate_error_string( package, 1302, 1, mi->disk_prompt ); error_dialog = msi_dup_property( package, error_prop ); + source_dir = msi_dup_property( package, cszSourceDir ); + PathStripToRootW(source_dir); - while ( r == ERROR_SUCCESS && GetFileAttributesW( mi->source ) == INVALID_FILE_ATTRIBUTES ) + while ( r == ERROR_SUCCESS && + !source_matches_volume(mi, source_dir) ) { r = msi_spawn_error_dialog( package, error_dialog, error ); @@ -97,6 +115,7 @@ static UINT msi_change_media( MSIPACKAGE *package, struct media_info *mi ) msi_free( error ); msi_free( error_dialog ); + msi_free( source_dir ); return r; } @@ -572,8 +591,9 @@ static UINT load_media_info(MSIPACKAGE *package, MSIFILE *file, struct media_inf static UINT ready_media(MSIPACKAGE *package, MSIFILE *file, struct media_info *mi) { - UINT rc = ERROR_SUCCESS; - BOOL found = FALSE; + UINT rc = ERROR_SUCCESS, type; + BOOL found = TRUE; + LPWSTR source_dir; /* media info for continuous cabinet is already loaded */ if (mi->is_continuous) @@ -586,9 +606,23 @@ static UINT ready_media(MSIPACKAGE *package, MSIFILE *file, struct media_info *m return ERROR_FUNCTION_FAILED; } + if (mi->volume_label) + { + source_dir = msi_dup_property(package, cszSourceDir); + PathStripToRootW(source_dir); + type = GetDriveTypeW(source_dir); + + if (type == DRIVE_CDROM || type == DRIVE_REMOVABLE) + found = source_matches_volume(mi, source_dir); + + msi_free(source_dir); + } + if (file->IsCompressed && GetFileAttributesW(mi->source) == INVALID_FILE_ATTRIBUTES) { + found = FALSE; + if (package->BaseURL && UrlIsW(package->BaseURL, URLIS_URL)) { rc = download_remote_cabinet(package, mi); @@ -598,11 +632,11 @@ static UINT ready_media(MSIPACKAGE *package, MSIFILE *file, struct media_info *m found = TRUE; } } - - if (!found) - rc = msi_change_media(package, mi); } + if (!found) + rc = msi_change_media(package, mi); + return rc; }

1 0

James Hawkins : msiexec: /quiet is the same options as /qn.
by Alexandre Julliard May 9, 2007

May 9, 2007

Module: wine Branch: master Commit: 5b8bad751894a523d75865d4bc2be7264cd2c924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b8bad751894a523d75865d4b… Author: James Hawkins <truiken(a)gmail.com> Date: Wed May 9 00:52:40 2007 -0500 msiexec: /quiet is the same options as /qn. --- programs/msiexec/msiexec.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 810dd70..e4ff579 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -833,7 +833,8 @@ int main(int argc, char **argv) } else if(msi_option_prefix(argvW[i], "q")) { - if(lstrlenW(argvW[i]) == 2 || msi_strequal(argvW[i]+2, "n")) + if(lstrlenW(argvW[i]) == 2 || msi_strequal(argvW[i]+2, "n") || + msi_strequal(argvW[i] + 2, "uiet")) { InstallUILevel = INSTALLUILEVEL_NONE; }

1 0

Stefan Dösinger : wined3d: Report only D16, D24S8 and D24X8 depth stencil formats as supported.
by Alexandre Julliard May 9, 2007

May 9, 2007

Module: wine Branch: master Commit: 992834016a70fb3b3b5dcddaa2999a38279f5466 URL: http://source.winehq.org/git/wine.git/?a=commit;h=992834016a70fb3b3b5dcddaa… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 1 01:27:05 2007 +0200 wined3d: Report only D16, D24S8 and D24X8 depth stencil formats as supported. --- dlls/wined3d/directx.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c0e9167..60e3694 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1628,21 +1628,25 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt TRACE_(d3d_caps)("[FAILED]\n"); return WINED3DERR_NOTAVAILABLE; /* Enable when fully supported */ } - + if(Usage & WINED3DUSAGE_DEPTHSTENCIL) { switch (CheckFormat) { - case WINED3DFMT_D16_LOCKABLE: - case WINED3DFMT_D32: - case WINED3DFMT_D15S1: + /* In theory we could do all formats, just fetch them accordingly should the buffer be locked. + * Windows supports only those 3, and enumerating the other formats confuses applications + */ case WINED3DFMT_D24S8: case WINED3DFMT_D24X8: - case WINED3DFMT_D24X4S4: case WINED3DFMT_D16: - case WINED3DFMT_L16: - case WINED3DFMT_D32F_LOCKABLE: - case WINED3DFMT_D24FS8: TRACE_(d3d_caps)("[OK]\n"); return WINED3D_OK; + case WINED3DFMT_D16_LOCKABLE: + case WINED3DFMT_D24FS8: + case WINED3DFMT_D32F_LOCKABLE: + case WINED3DFMT_D24X4S4: + case WINED3DFMT_D15S1: + case WINED3DFMT_D32: + TRACE_(d3d_caps)("[FAILED]. Disabled because not enumerated on windows\n"); + return WINED3DERR_NOTAVAILABLE; default: TRACE_(d3d_caps)("[FAILED]\n"); return WINED3DERR_NOTAVAILABLE;

1 0

Juan Lang : crypt32: Implement CertEnumSystemStore.
by Alexandre Julliard May 9, 2007

May 9, 2007

Module: wine Branch: master Commit: 21dce1d02d896d86c8cda122adf09ec1b5ccf0d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21dce1d02d896d86c8cda122a… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue May 8 17:09:21 2007 -0700 crypt32: Implement CertEnumSystemStore. --- dlls/crypt32/crypt32.spec | 1 + dlls/crypt32/store.c | 87 ++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/store.c | 48 ++++++++++++++++++++++++ 3 files changed, 136 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 7ee23f4..81e6023 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -34,6 +34,7 @@ @ stdcall CertEnumCTLsInStore(ptr ptr) @ stdcall CertEnumCertificateContextProperties(ptr long) @ stdcall CertEnumCertificatesInStore(long ptr) +@ stdcall CertEnumSystemStore(long ptr ptr ptr) @ stdcall CertFindAttribute(str long ptr) @ stdcall CertFindCRLInStore(long long long long ptr ptr) @ stub CertFindCTLInStore diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 77a75b1..b3c5fcd 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -2603,3 +2603,90 @@ void WINAPI CertRemoveStoreFromCollection(HCERTSTORE hCollectionStore, } LeaveCriticalSection(&collection->cs); } + +static LONG CRYPT_OpenParentStore(DWORD dwFlags, + void *pvSystemStoreLocationPara, HKEY *key) +{ + HKEY root; + LPCWSTR base; + + TRACE("(%08x, %p)\n", dwFlags, pvSystemStoreLocationPara); + + switch (dwFlags & CERT_SYSTEM_STORE_LOCATION_MASK) + { + case CERT_SYSTEM_STORE_LOCAL_MACHINE: + root = HKEY_LOCAL_MACHINE; + base = CERT_LOCAL_MACHINE_SYSTEM_STORE_REGPATH; + break; + case CERT_SYSTEM_STORE_CURRENT_USER: + root = HKEY_CURRENT_USER; + base = CERT_LOCAL_MACHINE_SYSTEM_STORE_REGPATH; + break; + case CERT_SYSTEM_STORE_CURRENT_SERVICE: + /* hklm\Software\Microsoft\Cryptography\Services\servicename\ + * SystemCertificates + */ + FIXME("CERT_SYSTEM_STORE_CURRENT_SERVICE\n"); + return ERROR_FILE_NOT_FOUND; + case CERT_SYSTEM_STORE_SERVICES: + /* hklm\Software\Microsoft\Cryptography\Services\servicename\ + * SystemCertificates + */ + FIXME("CERT_SYSTEM_STORE_SERVICES"); + return ERROR_FILE_NOT_FOUND; + case CERT_SYSTEM_STORE_USERS: + /* hku\user sid\Software\Microsoft\SystemCertificates */ + FIXME("CERT_SYSTEM_STORE_USERS\n"); + return ERROR_FILE_NOT_FOUND; + case CERT_SYSTEM_STORE_CURRENT_USER_GROUP_POLICY: + root = HKEY_CURRENT_USER; + base = CERT_GROUP_POLICY_SYSTEM_STORE_REGPATH; + break; + case CERT_SYSTEM_STORE_LOCAL_MACHINE_GROUP_POLICY: + root = HKEY_LOCAL_MACHINE; + base = CERT_GROUP_POLICY_SYSTEM_STORE_REGPATH; + break; + case CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE: + /* hklm\Software\Microsoft\EnterpriseCertificates */ + FIXME("CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE\n"); + return ERROR_FILE_NOT_FOUND; + default: + return ERROR_FILE_NOT_FOUND; + } + + return RegOpenKeyExW(root, base, 0, KEY_READ, key); +} + +BOOL WINAPI CertEnumSystemStore(DWORD dwFlags, void *pvSystemStoreLocationPara, + void *pvArg, PFN_CERT_ENUM_SYSTEM_STORE pfnEnum) +{ + BOOL ret = FALSE; + LONG rc; + HKEY key; + + TRACE("(%08x, %p, %p, %p)\n", dwFlags, pvSystemStoreLocationPara, pvArg, + pfnEnum); + + rc = CRYPT_OpenParentStore(dwFlags, pvArg, &key); + if (!rc) + { + DWORD index = 0; + CERT_SYSTEM_STORE_INFO info = { sizeof(info) }; + + ret = TRUE; + do { + WCHAR name[MAX_PATH]; + DWORD size = sizeof(name) / sizeof(name[0]); + + rc = RegEnumKeyExW(key, index++, name, &size, NULL, NULL, NULL, + NULL); + if (!rc) + ret = pfnEnum(name, 0, &info, NULL, pvArg); + } while (ret && !rc); + if (ret && rc != ERROR_NO_MORE_ITEMS) + SetLastError(rc); + } + else + SetLastError(rc); + return ret; +} diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index e251d98..e464abb 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -1379,6 +1379,53 @@ static void testCertOpenSystemStore(void) RegDeleteKeyW(HKEY_CURRENT_USER, BogusPathW); } +struct EnumSystemStoreInfo +{ + BOOL goOn; + DWORD storeCount; +}; + +static BOOL CALLBACK enumSystemStoreCB(const void *systemStore, DWORD dwFlags, + PCERT_SYSTEM_STORE_INFO pStoreInfo, void *pvReserved, void *pvArg) +{ + struct EnumSystemStoreInfo *info = (struct EnumSystemStoreInfo *)pvArg; + + info->storeCount++; + return info->goOn; +} + +static void testCertEnumSystemStore(void) +{ + BOOL ret; + struct EnumSystemStoreInfo info = { FALSE, 0 }; + + SetLastError(0xdeadbeef); + ret = CertEnumSystemStore(0, NULL, NULL, NULL); + ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected ERROR_FILE_NOT_FOUND, got %08x\n", GetLastError()); + /* Crashes + ret = CertEnumSystemStore(CERT_SYSTEM_STORE_LOCAL_MACHINE, NULL, NULL, + NULL); + */ + + SetLastError(0xdeadbeef); + ret = CertEnumSystemStore(CERT_SYSTEM_STORE_LOCAL_MACHINE, NULL, &info, + enumSystemStoreCB); + /* Callback returning FALSE stops enumeration */ + ok(!ret, "Expected CertEnumSystemStore to stop\n"); + ok(info.storeCount == 0 || info.storeCount == 1, + "Expected 0 or 1 stores\n"); + + info.goOn = TRUE; + info.storeCount = 0; + ret = CertEnumSystemStore(CERT_SYSTEM_STORE_LOCAL_MACHINE, NULL, &info, + enumSystemStoreCB); + ok(ret, "CertEnumSystemStore failed: %08x\n", GetLastError()); + /* There should always be at least My, Root, and CA stores */ + ok(info.storeCount == 0 || info.storeCount >= 3, + "Expected at least 3 stores\n"); +} + static void testAddSerialized(void) { BOOL ret; @@ -1545,6 +1592,7 @@ START_TEST(store) testFileNameStore(); testCertOpenSystemStore(); + testCertEnumSystemStore(); testAddSerialized(); }

1 0

Marcus Meissner : server: set_server_state needs to be called with non-NULL server.
by Alexandre Julliard May 9, 2007

May 9, 2007

Module: wine Branch: master Commit: fea59c87adc25baa2fd9c9f75389a9fa5e4e1b31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fea59c87adc25baa2fd9c9f75… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue May 8 21:13:14 2007 +0200 server: set_server_state needs to be called with non-NULL server. Spotted by Coverity. --- server/named_pipe.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index 6dba1f3..39dd10a 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -739,7 +739,7 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned if (!(server->ioctl_fd = alloc_pseudo_fd( &pipe_server_fd_ops, &server->obj, options ))) { release_object( server ); - server = NULL; + return NULL; } set_server_state( server, ps_idle_server ); return server;

1 0

Thomas Spear : uninstaller: Fix trace message.
by Alexandre Julliard May 9, 2007

May 9, 2007

Module: wine Branch: master Commit: 2f5232d5ce6ae6d8b154896678f1557d383b9989 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f5232d5ce6ae6d8b15489667… Author: Thomas Spear <Speeddymon(a)gmail.com> Date: Tue May 8 14:01:01 2007 -0500 uninstaller: Fix trace message. --- programs/uninstaller/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index 372f7a1..09b173c 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -329,7 +329,7 @@ static INT_PTR CALLBACK DlgProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM l } entries[sel].active ^= 1; /* toggle */ WINE_TRACE("toggling %d %s\n", entries[sel].active, - wine_dbgstr_w(entries[oldsel].descr)); + wine_dbgstr_w(entries[sel].descr)); oldsel = sel; } break;

1 0

Alexandre Julliard : advapi32: Fix set process request, a pipe instance can only handle one request.
by Alexandre Julliard May 9, 2007

May 9, 2007

Module: wine Branch: master Commit: 0a5e707a39d5c97c65fa066a52f6d52572532799 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a5e707a39d5c97c65fa066a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 8 21:35:34 2007 +0200 advapi32: Fix set process request, a pipe instance can only handle one request. --- dlls/advapi32/service.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 22489a9..587b9ae 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1590,8 +1590,14 @@ BOOL WINAPI StartServiceW(SC_HANDLE hService, DWORD dwNumServiceArgs, if (handle != INVALID_HANDLE_VALUE) { - if (service_send_start_message(handle, lpServiceArgVectors, dwNumServiceArgs)) - r = service_set_processID(handle, dwProcessId, &dwResult); + r = service_send_start_message(handle, lpServiceArgVectors, dwNumServiceArgs); + CloseHandle(handle); + } + + handle = service_open_pipe(hsvc->name); + if (handle != INVALID_HANDLE_VALUE) + { + service_set_processID(handle, dwProcessId, &dwResult); CloseHandle(handle); }

1 0

Alexandre Julliard : server: Add request to retrieve the next pending ioctl call for a device manager.
by Alexandre Julliard May 9, 2007

May 9, 2007

Module: wine Branch: master Commit: 78b75108cdb57b58746498542f8e29715f4caf15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78b75108cdb57b58746498542… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 8 20:40:26 2007 +0200 server: Add request to retrieve the next pending ioctl call for a device manager. --- include/wine/server_protocol.h | 26 +++++++++++++++++++++- server/device.c | 46 ++++++++++++++++++++++++++++++++++++++++ server/protocol.def | 16 ++++++++++++++ server/request.h | 2 + server/trace.c | 26 ++++++++++++++++++++++ 5 files changed, 115 insertions(+), 1 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 8239e36..e9bb098 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4014,6 +4014,27 @@ struct delete_device_reply }; + +struct get_next_device_request_request +{ + struct request_header __header; + obj_handle_t manager; + obj_handle_t prev; + unsigned int status; + /* VARARG(prev_data,bytes); */ +}; +struct get_next_device_request_reply +{ + struct reply_header __header; + obj_handle_t next; + ioctl_code_t code; + void* user_ptr; + data_size_t in_size; + data_size_t out_size; + /* VARARG(next_data,bytes); */ +}; + + enum request { REQ_new_process, @@ -4233,6 +4254,7 @@ enum request REQ_create_device_manager, REQ_create_device, REQ_delete_device, + REQ_get_next_device_request, REQ_NB_REQUESTS }; @@ -4457,6 +4479,7 @@ union generic_request struct create_device_manager_request create_device_manager_request; struct create_device_request create_device_request; struct delete_device_request delete_device_request; + struct get_next_device_request_request get_next_device_request_request; }; union generic_reply { @@ -4679,8 +4702,9 @@ union generic_reply struct create_device_manager_reply create_device_manager_reply; struct create_device_reply create_device_reply; struct delete_device_reply delete_device_reply; + struct get_next_device_request_reply get_next_device_request_reply; }; -#define SERVER_PROTOCOL_VERSION 301 +#define SERVER_PROTOCOL_VERSION 302 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/device.c b/server/device.c index 803282d..b811ff1 100644 --- a/server/device.c +++ b/server/device.c @@ -442,3 +442,49 @@ DECL_HANDLER(delete_device) release_object( device ); } } + + +/* retrieve the next pending device ioctl request */ +DECL_HANDLER(get_next_device_request) +{ + struct ioctl_call *ioctl; + struct device_manager *manager; + struct list *ptr; + + if (!(manager = (struct device_manager *)get_handle_obj( current->process, req->manager, + 0, &device_manager_ops ))) + return; + + if (req->prev) + { + if ((ioctl = (struct ioctl_call *)get_handle_obj( current->process, req->prev, + 0, &ioctl_call_ops ))) + { + set_ioctl_result( ioctl, req->status, get_req_data(), get_req_data_size() ); + close_handle( current->process, req->prev ); /* avoid an extra round-trip for close */ + release_object( ioctl ); + } + clear_error(); + } + + if ((ptr = list_head( &manager->requests ))) + { + ioctl = LIST_ENTRY( ptr, struct ioctl_call, mgr_entry ); + reply->code = ioctl->code; + reply->user_ptr = ioctl->device->user_ptr; + reply->in_size = ioctl->in_size; + reply->out_size = ioctl->out_size; + if (ioctl->in_size > get_reply_max_size()) set_error( STATUS_BUFFER_OVERFLOW ); + else if ((reply->next = alloc_handle( current->process, ioctl, 0, 0 ))) + { + set_reply_data_ptr( ioctl->in_data, ioctl->in_size ); + ioctl->in_data = NULL; + ioctl->in_size = 0; + list_remove( &ioctl->mgr_entry ); + list_init( &ioctl->mgr_entry ); + } + } + else set_error( STATUS_PENDING ); + + release_object( manager ); +} diff --git a/server/protocol.def b/server/protocol.def index a7b4dfd..55055a4 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2882,3 +2882,19 @@ enum message_type @REQ(delete_device) obj_handle_t handle; /* handle to the device */ @END + + +/* Retrieve the next pending device ioctl request */ +(a)REQ(get_next_device_request) + obj_handle_t manager; /* handle to the device manager */ + obj_handle_t prev; /* handle to the previous ioctl */ + unsigned int status; /* status of the previous ioctl */ + VARARG(prev_data,bytes); /* output data of the previous ioctl */ +(a)REPLY + obj_handle_t next; /* handle to the next ioctl */ + ioctl_code_t code; /* ioctl code */ + void* user_ptr; /* opaque ptr for the device */ + data_size_t in_size; /* total needed input size */ + data_size_t out_size; /* needed output size */ + VARARG(next_data,bytes); /* input data of the next ioctl */ +(a)END diff --git a/server/request.h b/server/request.h index 6d769c1..4f175a6 100644 --- a/server/request.h +++ b/server/request.h @@ -327,6 +327,7 @@ DECL_HANDLER(allocate_locally_unique_id); DECL_HANDLER(create_device_manager); DECL_HANDLER(create_device); DECL_HANDLER(delete_device); +DECL_HANDLER(get_next_device_request); #ifdef WANT_REQUEST_HANDLERS @@ -550,6 +551,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_create_device_manager, (req_handler)req_create_device, (req_handler)req_delete_device, + (req_handler)req_get_next_device_request, }; #endif /* WANT_REQUEST_HANDLERS */ diff --git a/server/trace.c b/server/trace.c index 5762331..7b8b7e4 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3492,6 +3492,28 @@ static void dump_delete_device_request( const struct delete_device_request *req fprintf( stderr, " handle=%p", req->handle ); } +static void dump_get_next_device_request_request( const struct get_next_device_request_request *req ) +{ + fprintf( stderr, " manager=%p,", req->manager ); + fprintf( stderr, " prev=%p,", req->prev ); + fprintf( stderr, " status=%08x,", req->status ); + fprintf( stderr, " prev_data=" ); + dump_varargs_bytes( cur_size ); +} + +static void dump_get_next_device_request_reply( const struct get_next_device_request_reply *req ) +{ + fprintf( stderr, " next=%p,", req->next ); + fprintf( stderr, " code=" ); + dump_ioctl_code( &req->code ); + fprintf( stderr, "," ); + fprintf( stderr, " user_ptr=%p,", req->user_ptr ); + fprintf( stderr, " in_size=%u,", req->in_size ); + fprintf( stderr, " out_size=%u,", req->out_size ); + fprintf( stderr, " next_data=" ); + dump_varargs_bytes( cur_size ); +} + static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_new_process_request, (dump_func)dump_get_new_process_info_request, @@ -3710,6 +3732,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_create_device_manager_request, (dump_func)dump_create_device_request, (dump_func)dump_delete_device_request, + (dump_func)dump_get_next_device_request_request, }; static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { @@ -3930,6 +3953,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_create_device_manager_reply, (dump_func)dump_create_device_reply, (dump_func)0, + (dump_func)dump_get_next_device_request_reply, }; static const char * const req_names[REQ_NB_REQUESTS] = { @@ -4150,6 +4174,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "create_device_manager", "create_device", "delete_device", + "get_next_device_request", }; static const struct @@ -4181,6 +4206,7 @@ static const struct { "ERROR_CLIPBOARD_NOT_OPEN", 0xc0010000 | ERROR_CLIPBOARD_NOT_OPEN }, { "ERROR_INVALID_INDEX", 0xc0010000 | ERROR_INVALID_INDEX }, { "ERROR_INVALID_WINDOW_HANDLE", 0xc0010000 | ERROR_INVALID_WINDOW_HANDLE }, + { "FILE_DELETED", STATUS_FILE_DELETED }, { "FILE_IS_A_DIRECTORY", STATUS_FILE_IS_A_DIRECTORY }, { "FILE_LOCK_CONFLICT", STATUS_FILE_LOCK_CONFLICT }, { "GENERIC_NOT_MAPPED", STATUS_GENERIC_NOT_MAPPED },

1 0

Alexandre Julliard : server: Add support for queuing ioctl calls to a device.
by Alexandre Julliard May 9, 2007

May 9, 2007

Module: wine Branch: master Commit: 61e08b346b892c2dfe86da44f42c2e20e82ab37d URL: http://source.winehq.org/git/wine.git/?a=commit;h=61e08b346b892c2dfe86da44f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 8 20:37:21 2007 +0200 server: Add support for queuing ioctl calls to a device. --- server/async.c | 2 +- server/device.c | 193 +++++++++++++++++++++++++++++++++++++++++++++++++++++- server/file.h | 1 + 3 files changed, 191 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=61e08b346b892c2dfe86d…

1 0