July 2009 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Get rid of last_device.
by Alexandre Julliard 23 Jul '09

23 Jul '09

Module: wine Branch: master Commit: 9253bbcb05fcde7ba5132a85f4a2cdb05aeeffb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9253bbcb05fcde7ba5132a85f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 23 10:54:34 2009 +0200 wined3d: Get rid of last_device. --- dlls/wined3d/context.c | 15 --------------- dlls/wined3d/directx.c | 1 - dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 0 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2e50634..61173fb 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -29,19 +29,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define GLINFO_LOCATION (*gl_info) -/* The last used device. - * - * If the application creates multiple devices and switches between them, ActivateContext has to - * change the opengl context. This flag allows to keep track which device is active - */ -static IWineD3DDeviceImpl *last_device; static DWORD wined3d_context_tls_idx; -void context_set_last_device(IWineD3DDeviceImpl *device) -{ - last_device = device; -} - /* FBO helper functions */ /* GL locking is done by the caller */ @@ -1193,7 +1182,6 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar } LEAVE_GL(); - context_set_last_device(This); This->frag_pipe->enable_extension((IWineD3DDevice *) This, TRUE); return ret; @@ -1283,8 +1271,6 @@ void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context) context_destroy_gl_resources(context); destroy = TRUE; - context_set_last_device(NULL); - if (This->activeContext == context) { This->activeContext = NULL; @@ -1840,7 +1826,6 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU } } This->activeContext = context; - context_set_last_device(This); switch (usage) { case CTXUSAGE_CLEAR: diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9daffaa..e6fb1c7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -284,7 +284,6 @@ static BOOL WineD3D_CreateFakeGLContext(struct wined3d_fake_gl_ctx *ctx) ERR_(d3d_caps)("Failed to make fake GL context current.\n"); goto fail; } - context_set_last_device(NULL); return TRUE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 363eb13..a28878e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1271,7 +1271,6 @@ void context_attach_depth_stencil_fbo(struct WineD3DContext *context, GLenum fbo_target, IWineD3DSurface *depth_stencil, BOOL use_render_buffer); void context_attach_surface_fbo(const struct WineD3DContext *context, GLenum fbo_target, DWORD idx, IWineD3DSurface *surface); -void context_set_last_device(IWineD3DDeviceImpl *device); struct WineD3DContext *context_get_current(void); DWORD context_get_tls_idx(void); BOOL context_set_current(struct WineD3DContext *ctx);

1 0

Henri Verbeet : wined3d: Remove some unnecessary code.
by Alexandre Julliard 23 Jul '09

23 Jul '09

Module: wine Branch: master Commit: 401e99b0c074af848379b2602df37fb1e6c7536b URL: http://source.winehq.org/git/wine.git/?a=commit;h=401e99b0c074af848379b2602… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 23 10:54:33 2009 +0200 wined3d: Remove some unnecessary code. Now that we don't depend on activeContext and lastActiveRenderTarget to be non-NULL this code can go. --- dlls/wined3d/context.c | 52 ++------------------------------------------- dlls/wined3d/swapchain.c | 16 -------------- 2 files changed, 3 insertions(+), 65 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 02159fb..2e50634 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -467,59 +467,13 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; UINT i; + if (!This->d3d_initialized) return; + switch(type) { case WINED3DRTYPE_SURFACE: { - if (This->activeContext && (IWineD3DSurface *)resource == This->activeContext->current_rt) - { - IWineD3DSwapChainImpl *swapchain; - - TRACE("Last active render target destroyed.\n"); - - /* Find a replacement surface for the currently active back - * buffer. The context manager does not do NULL checks, so - * switch to a valid target as long as the currently set - * surface is still valid. Use the surface of the implicit - * swpchain. If that is the same as the destroyed surface the - * device is destroyed and the lastActiveRenderTarget member - * shouldn't matter. */ - swapchain = This->swapchains ? (IWineD3DSwapChainImpl *)This->swapchains[0] : NULL; - if (swapchain) - { - if (swapchain->backBuffer && swapchain->backBuffer[0] != (IWineD3DSurface *)resource) - { - TRACE("Activating primary back buffer.\n"); - ActivateContext(This, swapchain->backBuffer[0], CTXUSAGE_RESOURCELOAD); - } - else if (!swapchain->backBuffer && swapchain->frontBuffer != (IWineD3DSurface *)resource) - { - /* Single buffering environment */ - TRACE("Activating primary front buffer.\n"); - - ActivateContext(This, swapchain->frontBuffer, CTXUSAGE_RESOURCELOAD); - } - else - { - /* Implicit render target destroyed, that means the - * device is being destroyed whatever we set here, it - * shouldn't matter. */ - TRACE("Device is being destroyed, setting current_rt to 0xdeadbabe.\n"); - This->activeContext->current_rt = (IWineD3DSurface *)0xdeadbabe; - } - } - else - { - WARN("Render target set, but swapchain does not exist!\n"); - - /* May happen during ddraw uninitialization. */ - This->activeContext->current_rt = (IWineD3DSurface *)0xdeadcafe; - } - } - else if (This->d3d_initialized) - { - ActivateContext(This, NULL, CTXUSAGE_RESOURCELOAD); - } + ActivateContext(This, NULL, CTXUSAGE_RESOURCELOAD); for (i = 0; i < This->numContexts; ++i) { diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 27770ca..683640a 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -66,22 +66,6 @@ static void WINAPI IWineD3DSwapChainImpl_Destroy(IWineD3DSwapChain *iface, D3DCB for (i = 0; i < This->num_contexts; ++i) { - if (This->context[i] == This->wineD3DDevice->activeContext) - { - IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *)This->wineD3DDevice->swapchains[0]; - - /* Avoid destroying the currently active context for non-implicit swapchains. */ - if (This != swapchain) - { - TRACE("Would destroy currently active context %p on a non-implicit swapchain.\n", This->context[i]); - - if (swapchain->backBuffer) - ActivateContext(This->wineD3DDevice, swapchain->backBuffer[0], CTXUSAGE_RESOURCELOAD); - else - ActivateContext(This->wineD3DDevice, swapchain->frontBuffer, CTXUSAGE_RESOURCELOAD); - } - } - DestroyContext(This->wineD3DDevice, This->context[i]); } /* Restore the screen resolution if we rendered in fullscreen

1 0

Henri Verbeet : wined3d: Don't reuse contexts marked for destruction.
by Alexandre Julliard 23 Jul '09

23 Jul '09

Module: wine Branch: master Commit: 57ccdb7e368329cf7e64b4619802becb95115939 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57ccdb7e368329cf7e64b4619… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 23 10:54:32 2009 +0200 wined3d: Don't reuse contexts marked for destruction. --- dlls/wined3d/context.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d82d2dc..02159fb 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1609,6 +1609,8 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf const struct GlPixelFormatDesc *old, *new; struct WineD3DContext *context; + if (current_context && current_context->destroyed) current_context = NULL; + if (!target) { if (current_context

1 0

Paul Vriens : jscript: Add Dutch translations.
by Alexandre Julliard 23 Jul '09

23 Jul '09

Module: wine Branch: master Commit: 40af06a5768e9962b7b1f7b385ee2d170f1d414e URL: http://source.winehq.org/git/wine.git/?a=commit;h=40af06a5768e9962b7b1f7b38… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jul 23 10:01:51 2009 +0200 jscript: Add Dutch translations. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/jscript_Nl.rc | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index 4324896..489567f 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -10,6 +10,7 @@ RC_SRCS = \ jscript_En.rc \ jscript_Fr.rc \ jscript_Lt.rc \ + jscript_Nl.rc \ rsrc.rc C_SRCS = \ diff --git a/dlls/jscript/jscript_Nl.rc b/dlls/jscript/jscript_Nl.rc new file mode 100644 index 0000000..50cf92d --- /dev/null +++ b/dlls/jscript/jscript_Nl.rc @@ -0,0 +1,35 @@ +/* + * Copyright 2009 Paul Vriens + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_TO_PRIMITIVE "Fout bij het omzetten van het object naar een primitief type" + IDS_INVALID_CALL_ARG "Ongeldige procedure-aanroep of argument" + IDS_NO_PROPERTY "Dit object ondersteunt deze eigenschap of methode niet" + IDS_ARG_NOT_OPT "Argument is niet optioneel" + IDS_NOT_FUNC "Functie verwacht" + IDS_NOT_DATE "'[object]' is geen datum object" + IDS_NOT_NUM "Getal verwacht" + IDS_UNDEFINED "'|' is ongedefinieerd" + IDS_NOT_BOOL "Boolean object verwacht" + IDS_INVALID_LENGTH "Array lengte moet een eindig, positief geheel getal zijn" +}

1 0

Ricardo Filipe : cryptui: Add Portuguese translation.
by Alexandre Julliard 23 Jul '09

23 Jul '09

Module: wine Branch: master Commit: b219cbca7477bf49463727710935d8f15b793252 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b219cbca7477bf49463727710… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Wed Jul 22 12:20:53 2009 -0700 cryptui: Add Portuguese translation. --- dlls/cryptui/Makefile.in | 3 +- dlls/cryptui/cryptui_Pt.rc | 465 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 467 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b219cbca7477bf4946372…

1 0

Frédéric Delanoy : jscript: Update French translation.
by Alexandre Julliard 23 Jul '09

23 Jul '09

Module: wine Branch: master Commit: 47cbc3ae65f47a7c2d564caf642ec1ffb215e7a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47cbc3ae65f47a7c2d564caf6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jul 22 22:12:12 2009 +0200 jscript: Update French translation. --- dlls/jscript/jscript_Fr.rc | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Fr.rc b/dlls/jscript/jscript_Fr.rc index 04d19ed..3d31d51 100644 --- a/dlls/jscript/jscript_Fr.rc +++ b/dlls/jscript/jscript_Fr.rc @@ -27,11 +27,14 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { + IDS_TO_PRIMITIVE "Erreur lors de la conversion de l'objet vers un type primitif" IDS_INVALID_CALL_ARG "Appel de procédure ou argument invalide" IDS_NO_PROPERTY "Cet objet ne supporte pas cette propriété ou méthode" IDS_ARG_NOT_OPT "Argument non optionnel" + IDS_NOT_FUNC "Fonction attendue" IDS_NOT_DATE "« [objet] » n'est pas un objet de type date" IDS_NOT_NUM "Nombre attendu" + IDS_UNDEFINED "« | » n'est pas défini" IDS_NOT_BOOL "Booléen attendu" IDS_INVALID_LENGTH "La longueur d'un tableau doit être un entier positif" }

1 0

André Hentschel : jscript: Update German translation.
by Alexandre Julliard 23 Jul '09

23 Jul '09

Module: wine Branch: master Commit: 24eb52b44d11761700718e8b64781c0a18e80312 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24eb52b44d11761700718e8b6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jul 22 18:59:59 2009 +0200 jscript: Update German translation. --- dlls/jscript/jscript_De.rc | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_De.rc b/dlls/jscript/jscript_De.rc index 3eb27cc..2a265ab 100644 --- a/dlls/jscript/jscript_De.rc +++ b/dlls/jscript/jscript_De.rc @@ -24,11 +24,14 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { + IDS_TO_PRIMITIVE "Fehler beim umwandeln des Objektes in einen Grundtyp" IDS_INVALID_CALL_ARG "Ungültiger Funktionsaufruf oder Argument" IDS_NO_PROPERTY "Das Objekt unterstützt diese Eigenschaft oder Methode nicht" IDS_ARG_NOT_OPT "Argument nicht optional" + IDS_NOT_FUNC "Funktion erwarted" IDS_NOT_DATE "'[Objekt]' ist kein Datums-Objekt" IDS_NOT_NUM "Nummer erwartet" + IDS_UNDEFINED "'|' nicht definiert" IDS_NOT_BOOL "Boolisches Objekt erwartet" IDS_INVALID_LENGTH "Array-Größe muss eine endliche, positive Ganzzahl sein" }

1 0

Aurimas Fišeras : jscript: Update Lithuanian translation.
by Alexandre Julliard 23 Jul '09

23 Jul '09

Module: wine Branch: master Commit: 91c3313fe40bb450cf5f5f5583dcd4efae02292a URL: http://source.winehq.org/git/wine.git/?a=commit;h=91c3313fe40bb450cf5f5f558… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Jul 22 17:55:11 2009 +0300 jscript: Update Lithuanian translation. --- dlls/jscript/jscript_Lt.rc | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Lt.rc b/dlls/jscript/jscript_Lt.rc index f29ed63..787fa6c 100644 --- a/dlls/jscript/jscript_Lt.rc +++ b/dlls/jscript/jscript_Lt.rc @@ -25,11 +25,14 @@ LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { + IDS_TO_PRIMITIVE "Klaida keičiant objektą į primityvų tipą" IDS_INVALID_CALL_ARG "Netinkamas kreipinys į procedūrą ar argumentas" IDS_NO_PROPERTY "Objektas nepalaiko šios savybės ar metodo" IDS_ARG_NOT_OPT "Argumentas nėra neprivalomas" + IDS_NOT_FUNC "Tikėtasi funkcijos" IDS_NOT_DATE "„[objektas]“ nėra datos objektas" IDS_NOT_NUM "Tikėtasi skaičiaus" + IDS_UNDEFINED "„|“ yra neapibrėžtas" IDS_NOT_BOOL "Tikėtasi loginio objekto" IDS_INVALID_LENGTH "Masyvo dydis turi būti teigiamas sveikasis skaičius" }

1 0

Alexandre Julliard : shell32/tests: Create our own temp directory to make sure it's not the Windows directory.
by Alexandre Julliard 23 Jul '09

23 Jul '09

Module: wine Branch: master Commit: 7db6d5e3be62b5303ebb17fe16168b1588390272 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7db6d5e3be62b5303ebb17fe1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 22 23:25:25 2009 +0200 shell32/tests: Create our own temp directory to make sure it's not the Windows directory. --- dlls/shell32/tests/shlexec.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 6edc926..5f0776a 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -864,8 +864,7 @@ static void test_find_executable(void) ok(rc == SE_ERR_NOASSOC /* >= win2000 */ || rc > 32 /* win98, nt4 */, "FindExecutable(NULL) returned %ld\n", rc); ok(strcmp(command, "your word") != 0, "FindExecutable(NULL) returned command=[%s]\n", command); - /* Win95 can't cope with double backslashes in FindExecutableA (tmpdir has a trailing backslash) */ - sprintf(filename, "%stest file.sfe", tmpdir); + sprintf(filename, "%s\\test file.sfe", tmpdir); rc=(INT_PTR)FindExecutableA(filename, NULL, command); ok(rc > 32, "FindExecutable(%s) returned %ld\n", filename, rc); /* Depending on the platform, command could be '%1' or 'test file.sfe' */ @@ -911,10 +910,6 @@ static void test_find_executable(void) test=filename_tests; while (test->basename) { - /* Win95 can't cope with double slashes/backslashes in FindExecutableA */ - if (tmpdir[strlen(tmpdir) - 1] == '\\') - tmpdir[strlen(tmpdir) - 1] = 0; - sprintf(filename, test->basename, tmpdir); if (strchr(filename, '/')) { @@ -1527,8 +1522,13 @@ static void init_test(void) "unable to find argv0!\n"); } - GetTempPathA(sizeof(tmpdir)/sizeof(*tmpdir), tmpdir); - assert(GetTempFileNameA(tmpdir, "wt", 0, child_file)!=0); + GetTempPathA(sizeof(filename), filename); + GetTempFileNameA(filename, "wt", 0, tmpdir); + DeleteFileA( tmpdir ); + rc = CreateDirectoryA( tmpdir, NULL ); + ok( rc, "failed to create %s err %u\n", tmpdir, GetLastError() ); + rc = GetTempFileNameA(tmpdir, "wt", 0, child_file); + assert(rc != 0); init_event(child_file); /* Set up the test files */ @@ -1608,6 +1608,7 @@ static void cleanup_test(void) testfile++; } DeleteFile(child_file); + RemoveDirectoryA(tmpdir); /* Delete the test association */ delete_test_association(".shlexec");

1 0

Alexandre Julliard : mountmgr: Protect the device structures with a critical section.
by Alexandre Julliard 23 Jul '09

23 Jul '09

Module: wine Branch: master Commit: 79de2e8126a194a517ab8d6e13dfc8a005f5b43b URL: http://source.winehq.org/git/wine.git/?a=commit;h=79de2e8126a194a517ab8d6e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 22 21:13:00 2009 +0200 mountmgr: Protect the device structures with a critical section. --- dlls/mountmgr.sys/device.c | 66 ++++++++++++++++++++++++++++++++----------- 1 files changed, 49 insertions(+), 17 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index bdade97..03b1f89 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -89,6 +89,15 @@ static struct list volumes_list = LIST_INIT(volumes_list); static DRIVER_OBJECT *harddisk_driver; +static CRITICAL_SECTION device_section; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &device_section, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": device_section") } +}; +static CRITICAL_SECTION device_section = { &critsect_debug, -1, 0, 0, 0, 0 }; + static char *get_dosdevices_path( char **drive ) { const char *config_dir = wine_get_config_dir(); @@ -650,37 +659,41 @@ NTSTATUS add_volume( const char *udi, const char *device, const char *mount_poin enum device_type type, const GUID *guid ) { struct volume *volume; - NTSTATUS status; + NTSTATUS status = STATUS_SUCCESS; TRACE( "adding %s device %s mount %s type %u uuid %s\n", debugstr_a(udi), debugstr_a(device), debugstr_a(mount_point), type, debugstr_guid(guid) ); + EnterCriticalSection( &device_section ); LIST_FOR_EACH_ENTRY( volume, &volumes_list, struct volume, entry ) if (volume->udi && !strcmp( udi, volume->udi )) goto found; /* udi not found, search for a non-dynamic volume */ - if ((volume = find_matching_volume( udi, device, mount_point, type ))) - { - set_volume_udi( volume, udi ); - } - else if ((status = create_volume( udi, type, &volume ))) return status; + if ((volume = find_matching_volume( udi, device, mount_point, type ))) set_volume_udi( volume, udi ); + else status = create_volume( udi, type, &volume ); found: - return set_volume_info( volume, NULL, device, mount_point, type, guid ); + if (!status) status = set_volume_info( volume, NULL, device, mount_point, type, guid ); + LeaveCriticalSection( &device_section ); + return status; } /* create a new disk volume */ NTSTATUS remove_volume( const char *udi ) { + NTSTATUS status = STATUS_NO_SUCH_DEVICE; struct volume *volume; + EnterCriticalSection( &device_section ); LIST_FOR_EACH_ENTRY( volume, &volumes_list, struct volume, entry ) { if (!volume->udi || strcmp( udi, volume->udi )) continue; set_volume_udi( volume, NULL ); - return STATUS_SUCCESS; + status = STATUS_SUCCESS; + break; } - return STATUS_NO_SUCH_DEVICE; + LeaveCriticalSection( &device_section ); + return status; } @@ -692,10 +705,14 @@ NTSTATUS add_dos_device( int letter, const char *udi, const char *device, HKEY hkey; NTSTATUS status = STATUS_SUCCESS; struct dos_drive *drive, *next; - struct volume *volume = find_matching_volume( udi, device, mount_point, type ); + struct volume *volume; + int notify = -1; if (!(path = get_dosdevices_path( &p ))) return STATUS_NO_MEMORY; + EnterCriticalSection( &device_section ); + volume = find_matching_volume( udi, device, mount_point, type ); + if (letter == -1) /* auto-assign a letter */ { letter = add_drive( device, type ); @@ -756,20 +773,25 @@ found: RegCloseKey( hkey ); } - if (udi) send_notify( drive->drive, DBT_DEVICEARRIVAL ); + if (udi) notify = drive->drive; done: + LeaveCriticalSection( &device_section ); RtlFreeHeap( GetProcessHeap(), 0, path ); + if (notify != -1) send_notify( notify, DBT_DEVICEARRIVAL ); return status; } /* remove an existing dos drive, by letter or udi */ NTSTATUS remove_dos_device( int letter, const char *udi ) { + NTSTATUS status = STATUS_NO_SUCH_DEVICE; HKEY hkey; struct dos_drive *drive; char *path, *p; + int notify = -1; + EnterCriticalSection( &device_section ); LIST_FOR_EACH_ENTRY( drive, &drives_list, struct dos_drive, entry ) { if (udi) @@ -797,21 +819,25 @@ NTSTATUS remove_dos_device( int letter, const char *udi ) RegCloseKey( hkey ); } - if (udi && drive->volume->device->unix_mount) - send_notify( drive->drive, DBT_DEVICEREMOVECOMPLETE ); + if (udi && drive->volume->device->unix_mount) notify = drive->drive; delete_dos_device( drive ); - return STATUS_SUCCESS; + status = STATUS_SUCCESS; + break; } - return STATUS_NO_SUCH_DEVICE; + LeaveCriticalSection( &device_section ); + if (notify != -1) send_notify( notify, DBT_DEVICEREMOVECOMPLETE ); + return status; } /* query information about an existing dos drive, by letter or udi */ NTSTATUS query_dos_device( int letter, enum device_type *type, char **device, char **mount_point ) { + NTSTATUS status = STATUS_NO_SUCH_DEVICE; struct dos_drive *drive; struct disk_device *disk_device; + EnterCriticalSection( &device_section ); LIST_FOR_EACH_ENTRY( drive, &drives_list, struct dos_drive, entry ) { if (drive->drive != letter) continue; @@ -819,9 +845,11 @@ NTSTATUS query_dos_device( int letter, enum device_type *type, char **device, ch if (type) *type = disk_device->type; if (device) *device = strdupA( disk_device->unix_device ); if (mount_point) *mount_point = strdupA( disk_device->unix_mount ); - return STATUS_SUCCESS; + status = STATUS_SUCCESS; + break; } - return STATUS_NO_SUCH_DEVICE; + LeaveCriticalSection( &device_section ); + return status; } /* handler for ioctls on the harddisk device */ @@ -835,6 +863,8 @@ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) irpsp->Parameters.DeviceIoControl.InputBufferLength, irpsp->Parameters.DeviceIoControl.OutputBufferLength ); + EnterCriticalSection( &device_section ); + switch(irpsp->Parameters.DeviceIoControl.IoControlCode) { case IOCTL_DISK_GET_DRIVE_GEOMETRY: @@ -869,6 +899,8 @@ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; break; } + + LeaveCriticalSection( &device_section ); return irp->IoStatus.u.Status; }

1 0