winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
May 2013
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
498 discussions
Start a n
N
ew thread
Ken Thomases : winemac: Implement simpler way to find front Wine window.
by Alexandre Julliard
17 May '13
17 May '13
Module: wine Branch: master Commit: c3183fc00783a3e7ff1ad0eb937150b66f1f016b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c3183fc00783a3e7ff1ad0eb9…
Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 16 18:43:16 2013 -0500 winemac: Implement simpler way to find front Wine window. This uses Cocoa and the window server to track windows and their z-order, which is more reliable than our own tracking. --- dlls/winemac.drv/cocoa_app.h | 1 + dlls/winemac.drv/cocoa_app.m | 37 ++++++++++++++++++++----------------- dlls/winemac.drv/cocoa_window.m | 8 ++------ 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 8ed9763..551635d 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -111,6 +111,7 @@ enum { - (void) wineWindow:(WineWindow*)window ordered:(NSWindowOrderingMode)order relativeTo:(WineWindow*)otherWindow; + - (WineWindow*) frontWineWindow; - (BOOL) handleEvent:(NSEvent*)anEvent; - (void) didSendEvent:(NSEvent*)anEvent; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index f9363c1..67984cd 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -486,6 +486,19 @@ int macdrv_err_on; } } + - (WineWindow*) frontWineWindow + { + NSNumber* windowNumber; + for (windowNumber in [NSWindow windowNumbersWithOptions:NSWindowNumberListAllSpaces]) + { + NSWindow* window = [NSApp windowWithWindowNumber:[windowNumber integerValue]]; + if ([window isKindOfClass:[WineWindow class]] && [window screen]) + return (WineWindow*)window; + } + + return nil; + } + - (void) sendDisplaysChanged:(BOOL)activating { macdrv_event* event; @@ -1613,10 +1626,6 @@ int macdrv_err_on; */ - (void)applicationDidBecomeActive:(NSNotification *)notification { - WineWindow* window; - WineWindow* firstMinimized; - BOOL anyShowing; - [self activateCursorClipping]; [orderedWineWindows enumerateObjectsWithOptions:NSEnumerationReverse usingBlock:^(id obj, NSUInteger idx, BOOL *stop){ @@ -1625,23 +1634,17 @@ int macdrv_err_on; [window setLevel:[window levelWhenActive]]; }]; - firstMinimized = nil; - anyShowing = FALSE; - for (window in orderedWineWindows) + if (![self frontWineWindow]) { - if ([window isMiniaturized]) - { - if (!firstMinimized) - firstMinimized = window; - } - else if ([window isVisible]) + for (WineWindow* window in [NSApp windows]) { - anyShowing = TRUE; - break; + if ([window isKindOfClass:[WineWindow class]] && [window isMiniaturized]) + { + [window deminiaturize:self]; + break; + } } } - if (!anyShowing && firstMinimized) - [firstMinimized deminiaturize:self]; // If a Wine process terminates abruptly while it has the display captured // and switched to a different resolution, Mac OS X will uncapture the diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 3e60c84..6bc6183 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1920,12 +1920,8 @@ int macdrv_send_text_input_event(int pressed, unsigned int flags, int repeat, in if (![window isKindOfClass:[WineWindow class]]) { window = (WineWindow*)[NSApp mainWindow]; - if (![window isKindOfClass:[WineWindow class]] && [[NSApp orderedWineWindows] count]) - { - window = [[NSApp orderedWineWindows] objectAtIndex:0]; - if (![window isKindOfClass:[WineWindow class]]) - window = nil; - } + if (![window isKindOfClass:[WineWindow class]]) + window = [[WineApplicationController sharedController] frontWineWindow]; } if (window)
1
0
0
0
Dmitry Timoshkov : ntdll: Thread creation control is now taken care by server.
by Alexandre Julliard
17 May '13
17 May '13
Module: wine Branch: master Commit: 94336f1aabebac164764b838ccd92b0b9a55c8b1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=94336f1aabebac164764b838c…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 13 16:47:30 2013 +0900 ntdll: Thread creation control is now taken care by server. --- dlls/ntdll/thread.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 4499afa..01a8026 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -461,8 +461,6 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * return result.create_thread.status; } - if (RtlDllShutdownInProgress()) return STATUS_ACCESS_DENIED; - if (server_pipe( request_pipe ) == -1) return STATUS_TOO_MANY_OPENED_FILES; wine_server_send_fd( request_pipe[0] );
1
0
0
0
Dmitry Timoshkov : kernel32: Terminate threads before unloading DLLs on process exit.
by Alexandre Julliard
17 May '13
17 May '13
Module: wine Branch: master Commit: bfcdf6df8eea1230fb0e1835a809e49e5971e5d2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=bfcdf6df8eea1230fb0e1835a…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 13 16:46:37 2013 +0900 kernel32: Terminate threads before unloading DLLs on process exit. --- dlls/kernel32/process.c | 2 ++ dlls/kernel32/tests/loader.c | 22 ---------------------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 683385f..d07065c 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2631,6 +2631,7 @@ __ASM_STDCALL_FUNC( ExitProcess, 4, /* Shrinker depend on this particular ExitPr void WINAPI process_ExitProcess( DWORD status ) { RtlAcquirePebLock(); + NtTerminateProcess(0, status); LdrShutdownProcess(); NtTerminateProcess(GetCurrentProcess(), status); exit(status); @@ -2641,6 +2642,7 @@ void WINAPI process_ExitProcess( DWORD status ) void WINAPI ExitProcess( DWORD status ) { RtlAcquirePebLock(); + NtTerminateProcess(0, status); LdrShutdownProcess(); NtTerminateProcess(GetCurrentProcess(), status); exit(status); diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index d481f08..bd80508 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1225,19 +1225,11 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) if (expected_code != STILL_ACTIVE) { ret = WaitForSingleObject(attached_thread[i], 1000); - /* FIXME: remove once Wine is fixed */ - if (test_dll_phase == 1) todo_wine - ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); - else ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); } ret = GetExitCodeThread(attached_thread[i], &code); trace("dll: GetExitCodeThread(%u) => %d,%u\n", i, ret, code); ok(ret == 1, "GetExitCodeThread returned %d, expected 1\n", ret); - /* FIXME: remove once Wine is fixed */ - if (test_dll_phase == 1) todo_wine - ok(code == expected_code, "expected thread exit code %u, got %u\n", expected_code, code); - else ok(code == expected_code, "expected thread exit code %u, got %u\n", expected_code, code); } @@ -1248,13 +1240,7 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) if (expected_code == STILL_ACTIVE) ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); else - { - /* FIXME: remove once Wine is fixed */ - if (test_dll_phase == 1) todo_wine - ok(ret == WAIT_ABANDONED, "expected WAIT_ABANDONED, got %#x\n", ret); - else ok(ret == WAIT_ABANDONED, "expected WAIT_ABANDONED, got %#x\n", ret); - } /* semaphore is not abandoned on thread termination */ ret = WaitForSingleObject(semaphore, 0); @@ -1270,16 +1256,8 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) else { ret = WaitForSingleObject(attached_thread[0], 0); - /* FIXME: remove once Wine is fixed */ - if (test_dll_phase == 1) todo_wine - ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); - else ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); ret = WaitForSingleObject(attached_thread[1], 0); - /* FIXME: remove once Wine is fixed */ - if (test_dll_phase == 1) todo_wine - ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); - else ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); }
1
0
0
0
Alexandre Julliard : winhttp: Don't bother to clean up at process exit.
by Alexandre Julliard
17 May '13
17 May '13
Module: wine Branch: master Commit: 7ad43e4e8874e16401aab08205ea2f22d3a01862 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7ad43e4e8874e16401aab0820…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 17 12:28:45 2013 +0200 winhttp: Don't bother to clean up at process exit. --- dlls/winhttp/main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index 5348d4d..5827c10 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -46,6 +46,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) DisableThreadLibraryCalls(hInstDLL); break; case DLL_PROCESS_DETACH: + if (lpv) break; netconn_unload(); break; }
1
0
0
0
Alexandre Julliard : netapi32: Don't bother to clean up at process exit.
by Alexandre Julliard
17 May '13
17 May '13
Module: wine Branch: master Commit: 670c621414e2ac3556352ee2b4a3975af572659e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=670c621414e2ac3556352ee2b…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 17 12:28:05 2013 +0200 netapi32: Don't bother to clean up at process exit. --- dlls/netapi32/netapi32.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index a24320c..a5f1c03 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -33,17 +33,14 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { case DLL_PROCESS_ATTACH: - { DisableThreadLibraryCalls(hinstDLL); NetBIOSInit(); NetBTInit(); break; - } case DLL_PROCESS_DETACH: - { + if (lpvReserved) break; NetBIOSShutdown(); break; - } } return TRUE;
1
0
0
0
Alexandre Julliard : mshtml: Don't bother to clean up at process exit.
by Alexandre Julliard
17 May '13
17 May '13
Module: wine Branch: master Commit: 1d0fe8664ec1b1030cd4816e25e45368299e7f55 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1d0fe8664ec1b1030cd4816e2…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 17 12:27:20 2013 +0200 mshtml: Don't bother to clean up at process exit. --- dlls/mshtml/main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 503d738..f81255a 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -164,13 +164,14 @@ HDC get_display_dc(void) return display_dc; } -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) { switch(fdwReason) { case DLL_PROCESS_ATTACH: hInst = hInstDLL; break; case DLL_PROCESS_DETACH: + if (reserved) break; process_detach(); break; case DLL_THREAD_DETACH:
1
0
0
0
Alexandre Julliard : wineps.drv: Don' t bother to free memory at process exit.
by Alexandre Julliard
17 May '13
17 May '13
Module: wine Branch: master Commit: d7ddcdfca7d2df2b62b4da67b79e92dcf7a0e4ce URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d7ddcdfca7d2df2b62b4da67b…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 17 12:28:28 2013 +0200 wineps.drv: Don't bother to free memory at process exit. --- dlls/wineps.drv/init.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 4b5baed..ec98f04 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -139,7 +139,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) break; case DLL_PROCESS_DETACH: - + if (reserved) break; DeleteObject( PSDRV_DefaultFont ); HeapDestroy( PSDRV_Heap ); break;
1
0
0
0
Alexandre Julliard : imagehlp: Don't bother to free memory at process exit.
by Alexandre Julliard
17 May '13
17 May '13
Module: wine Branch: master Commit: 4d9dbfc3fb5245028182a32e5044588bfda30874 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4d9dbfc3fb5245028182a32e5…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 17 12:26:31 2013 +0200 imagehlp: Don't bother to free memory at process exit. --- dlls/imagehlp/imagehlp_main.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/imagehlp/imagehlp_main.c b/dlls/imagehlp/imagehlp_main.c index 3ddae7a..e505126 100644 --- a/dlls/imagehlp/imagehlp_main.c +++ b/dlls/imagehlp/imagehlp_main.c @@ -40,10 +40,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) IMAGEHLP_hHeap = HeapCreate(0, 0x10000, 0); break; case DLL_PROCESS_DETACH: + if (lpvReserved) break; HeapDestroy(IMAGEHLP_hHeap); - IMAGEHLP_hHeap = NULL; - break; - default: break; } return TRUE;
1
0
0
0
Alexandre Julliard : shdocvw: Don' t bother to free libraries at process exit.
by Alexandre Julliard
17 May '13
17 May '13
Module: wine Branch: master Commit: e3b84cf4f7cbc48ad6dac77856dcc7a7e26789af URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e3b84cf4f7cbc48ad6dac7785…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 17 12:25:09 2013 +0200 shdocvw: Don't bother to free libraries at process exit. --- dlls/shdocvw/shdocvw_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index fa89051..5095696 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -149,9 +149,9 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) case DLL_PROCESS_ATTACH: break; case DLL_PROCESS_DETACH: + if (fImpLoad) break; if (SHDOCVW_hshell32) FreeLibrary(SHDOCVW_hshell32); - if(ieframe_instance) - FreeLibrary(ieframe_instance); + if (ieframe_instance) FreeLibrary(ieframe_instance); break; } return TRUE;
1
0
0
0
Alexandre Julliard : setupapi: Don' t bother to free libraries at process exit.
by Alexandre Julliard
17 May '13
17 May '13
Module: wine Branch: master Commit: 2aa3d2b0e193cb50e2c345d28c266f59823da350 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2aa3d2b0e193cb50e2c345d28…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 17 12:24:41 2013 +0200 setupapi: Don't bother to free libraries at process exit. --- dlls/setupapi/setupcab.c | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index 8fcd989..21336d7 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -114,14 +114,6 @@ static BOOL LoadCABINETDll(void) return TRUE; } -static void UnloadCABINETDll(void) -{ - if (CABINET_hInstance) { - FreeLibrary(CABINET_hInstance); - CABINET_hInstance = 0; - } -} - /* FDICreate callbacks */ static void * CDECL sc_cb_alloc(ULONG cb) @@ -701,7 +693,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) SETUPAPI_hInstance = hinstDLL; break; case DLL_PROCESS_DETACH: - UnloadCABINETDll(); + if (lpvReserved) break; + if (CABINET_hInstance) FreeLibrary(CABINET_hInstance); break; }
1
0
0
0
← Newer
1
...
21
22
23
24
25
26
27
...
50
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
Results per page:
10
25
50
100
200