wine-commits November 2010

wine-commits@winehq.org

2 participants
866 discussions

Hans Leidekker : msi: Remove redundant function msi_find_file.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 8fd47bbef754089ae12c4d803948dc00271b1944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fd47bbef754089ae12c4d803… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 11 10:44:52 2010 +0100 msi: Remove redundant function msi_find_file. --- dlls/msi/action.c | 23 +++++------------------ 1 files changed, 5 insertions(+), 18 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 2b41b25..06bbc45 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5896,19 +5896,6 @@ static UINT ACTION_DeleteServices( MSIPACKAGE *package ) return rc; } -static MSIFILE *msi_find_file( MSIPACKAGE *package, LPCWSTR filename ) -{ - MSIFILE *file; - - LIST_FOR_EACH_ENTRY(file, &package->files, MSIFILE, entry) - { - if (!strcmpW( file->File, filename )) - return file; - } - - return NULL; -} - static UINT ITERATE_InstallODBCDriver( MSIRECORD *rec, LPVOID param ) { MSIPACKAGE *package = param; @@ -5930,10 +5917,10 @@ static UINT ITERATE_InstallODBCDriver( MSIRECORD *rec, LPVOID param ) desc = MSI_RecordGetString(rec, 3); file_key = MSI_RecordGetString( rec, 4 ); - if (file_key) driver_file = msi_find_file( package, file_key ); + if (file_key) driver_file = get_loaded_file( package, file_key ); file_key = MSI_RecordGetString( rec, 5 ); - if (file_key) setup_file = msi_find_file( package, file_key ); + if (file_key) setup_file = get_loaded_file( package, file_key ); if (!driver_file) { @@ -6010,10 +5997,10 @@ static UINT ITERATE_InstallODBCTranslator( MSIRECORD *rec, LPVOID param ) desc = MSI_RecordGetString(rec, 3); file_key = MSI_RecordGetString( rec, 4 ); - if (file_key) translator_file = msi_find_file( package, file_key ); + if (file_key) translator_file = get_loaded_file( package, file_key ); file_key = MSI_RecordGetString( rec, 5 ); - if (file_key) setup_file = msi_find_file( package, file_key ); + if (file_key) setup_file = get_loaded_file( package, file_key ); if (!translator_file) { @@ -6980,7 +6967,7 @@ static UINT load_assembly(MSIRECORD *rec, LPVOID param) assembly->component->Action = assembly->component->ActionRequest; assembly->feature = find_feature_by_name(list->package, MSI_RecordGetString(rec, 2)); - assembly->file = msi_find_file(list->package, assembly->component->KeyPath); + assembly->file = get_loaded_file(list->package, assembly->component->KeyPath); if (!assembly->file) {

1 0

Hans Leidekker : msi: MsiGet/ SetFeatureState must get and set the requested feature action, not the action taken.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 9ae062f63e58a175641bd10b69603aa0edc47ec2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ae062f63e58a175641bd10b6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 11 10:44:37 2010 +0100 msi: MsiGet/SetFeatureState must get and set the requested feature action, not the action taken. --- dlls/msi/install.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 730e27e..9463a52 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -821,7 +821,7 @@ UINT WINAPI MSI_SetFeatureStateW(MSIPACKAGE* package, LPCWSTR szFeature, feature->Attributes & msidbFeatureAttributesDisallowAdvertise) return ERROR_FUNCTION_FAILED; - msi_feature_set_state(package, feature, iState); + feature->ActionRequest = iState; ACTION_UpdateComponentStates(package,szFeature); @@ -917,9 +917,9 @@ UINT MSI_GetFeatureStateW(MSIPACKAGE *package, LPCWSTR szFeature, *piInstalled = feature->Installed; if (piAction) - *piAction = feature->Action; + *piAction = feature->ActionRequest; - TRACE("returning %i %i\n", feature->Installed, feature->Action); + TRACE("returning %i %i\n", feature->Installed, feature->ActionRequest); return ERROR_SUCCESS; }

1 0

Austin English : winspool.drv: Skip tests when no printer is installed.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: d2ee7aa790993bc4315719ced4ed078f311e318c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2ee7aa790993bc4315719ced… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Nov 10 23:47:07 2010 -0800 winspool.drv: Skip tests when no printer is installed. --- dlls/winspool.drv/tests/info.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index b81bde4..a31cbc9 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -1924,6 +1924,11 @@ static void test_SetDefaultPrinter(void) CHAR buffer[DEFAULT_PRINTER_SIZE]; CHAR org_value[DEFAULT_PRINTER_SIZE]; + if (!default_printer) + { + skip("There is no default printer installed\n"); + return; + } if (!pSetDefaultPrinterA) return; /* only supported on win2k and above */

1 0

André Hentschel : ntdll/tests: Fix crash in japanese and chinese test.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 574a21cc14746ae391571740ed7a2323deae2db7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=574a21cc14746ae391571740e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Nov 11 00:48:44 2010 +0100 ntdll/tests: Fix crash in japanese and chinese test. --- dlls/ntdll/tests/rtlstr.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 91233a5..78df7ef 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -748,7 +748,10 @@ static const ustr2astr_t ustr2astr[] = { { 8, 6, 12, "------------", 12, 12, 12, "abcdef", FALSE, 5, 6, 6, "abcde", STATUS_BUFFER_OVERFLOW}, { 8, 7, 12, "------------", 12, 12, 12, "abcdef", FALSE, 6, 7, 7, "abcdef", STATUS_SUCCESS}, { 8, 7, 12, "------------", 0, 12, 12, NULL, FALSE, 0, 7, 0, "", STATUS_SUCCESS}, +#if 0 + /* crashes on japanese and chinese XP */ { 0, 0, 12, NULL, 10, 10, 12, NULL, FALSE, 5, 0, 0, NULL, STATUS_BUFFER_OVERFLOW}, +#endif }; #define NB_USTR2ASTR (sizeof(ustr2astr)/sizeof(*ustr2astr))

1 0

André Hentschel : mmdevapi: Add return value which happens on wow64 and pure 64-bit.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 36035d0a223f96363fd9b824d63474de908beca6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36035d0a223f96363fd9b824d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Nov 11 00:22:05 2010 +0100 mmdevapi: Add return value which happens on wow64 and pure 64-bit. --- dlls/mmdevapi/tests/render.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 70d6b39..9661dbd 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -165,7 +165,9 @@ static void test_audioclient(IAudioClient *ac) ok(pwfx2 == NULL, "pwfx2 non-null on exclusive IsFormatSupported\n"); hr = IAudioClient_IsFormatSupported(ac, 0xffffffff, pwfx, NULL); - ok(hr == E_INVALIDARG, "IsFormatSupported(0xffffffff) call returns %08x\n", hr); + ok(hr == E_INVALIDARG || + hr == AUDCLNT_E_UNSUPPORTED_FORMAT, + "IsFormatSupported(0xffffffff) call returns %08x\n", hr); } test_uninitialized(ac);

1 0

Austin Lund : comctl32/tests: Fixed rebar layout tests which depend on system font height.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 293e4292968b7f7817fff2a489911f48a2891c89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=293e4292968b7f7817fff2a48… Author: Austin Lund <austin.lund(a)gmail.com> Date: Thu Nov 11 09:12:54 2010 +1000 comctl32/tests: Fixed rebar layout tests which depend on system font height. --- dlls/comctl32/tests/rebar.c | 122 +++++++++++++++++++++--------------------- 1 files changed, 61 insertions(+), 61 deletions(-) diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 7a92c9e..1a61b51 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -304,59 +304,59 @@ static void rbsize_results_init(void) rbsize_add_band(&rbsize_results[11], 0, 0, 604, 34, 0x00, 200); rbsize_add_band(&rbsize_results[11], 606, 0, 672, 34, 0x04, 66); - rbsize_results[12] = rbsize_init(0, 0, 672, 40, 40, 2, 5); - rbsize_add_row(&rbsize_results[12], 20); - rbsize_add_row(&rbsize_results[12], 20); - rbsize_add_band(&rbsize_results[12], 0, 0, 114, 20, 0x00, 40); - rbsize_add_band(&rbsize_results[12], 114, 0, 184, 20, 0x00, 70); - rbsize_add_band(&rbsize_results[12], 184, 0, 424, 20, 0x00, 240); - rbsize_add_band(&rbsize_results[12], 424, 0, 672, 20, 0x00, 60); - rbsize_add_band(&rbsize_results[12], 0, 20, 672, 40, 0x00, 200); - - rbsize_results[13] = rbsize_init(0, 0, 672, 40, 40, 2, 5); - rbsize_add_row(&rbsize_results[13], 20); - rbsize_add_row(&rbsize_results[13], 20); - rbsize_add_band(&rbsize_results[13], 0, 0, 114, 20, 0x00, 40); - rbsize_add_band(&rbsize_results[13], 114, 0, 227, 20, 0x00, 113); - rbsize_add_band(&rbsize_results[13], 227, 0, 424, 20, 0x00, 197); - rbsize_add_band(&rbsize_results[13], 424, 0, 672, 20, 0x00, 60); - rbsize_add_band(&rbsize_results[13], 0, 20, 672, 40, 0x00, 200); - - rbsize_results[14] = rbsize_init(0, 0, 672, 40, 40, 2, 5); - rbsize_add_row(&rbsize_results[14], 20); - rbsize_add_row(&rbsize_results[14], 20); - rbsize_add_band(&rbsize_results[14], 0, 0, 114, 20, 0x00, 40); - rbsize_add_band(&rbsize_results[14], 114, 0, 328, 20, 0x00, 214); - rbsize_add_band(&rbsize_results[14], 328, 0, 511, 20, 0x00, 183); - rbsize_add_band(&rbsize_results[14], 511, 0, 672, 20, 0x00, 161); - rbsize_add_band(&rbsize_results[14], 0, 20, 672, 40, 0x00, 200); - - rbsize_results[15] = rbsize_init(0, 0, 672, 40, 40, 2, 5); - rbsize_add_row(&rbsize_results[15], 20); - rbsize_add_row(&rbsize_results[15], 20); - rbsize_add_band(&rbsize_results[15], 0, 0, 114, 20, 0x00, 40); - rbsize_add_band(&rbsize_results[15], 114, 0, 167, 20, 0x00, 53); - rbsize_add_band(&rbsize_results[15], 167, 0, 511, 20, 0x00, 344); - rbsize_add_band(&rbsize_results[15], 511, 0, 672, 20, 0x00, 161); - rbsize_add_band(&rbsize_results[15], 0, 20, 672, 40, 0x00, 200); - - rbsize_results[16] = rbsize_init(0, 0, 672, 40, 40, 2, 5); - rbsize_add_row(&rbsize_results[16], 20); - rbsize_add_row(&rbsize_results[16], 20); - rbsize_add_band(&rbsize_results[16], 0, 0, 114, 20, 0x00, 40); - rbsize_add_band(&rbsize_results[16], 114, 0, 328, 20, 0x00, 214); - rbsize_add_band(&rbsize_results[16], 328, 0, 511, 20, 0x00, 183); - rbsize_add_band(&rbsize_results[16], 511, 0, 672, 20, 0x00, 161); - rbsize_add_band(&rbsize_results[16], 0, 20, 672, 40, 0x00, 200); - - rbsize_results[17] = rbsize_init(0, 0, 672, 40, 40, 2, 5); - rbsize_add_row(&rbsize_results[17], 20); - rbsize_add_row(&rbsize_results[17], 20); - rbsize_add_band(&rbsize_results[17], 0, 0, 114, 20, 0x00, 40); - rbsize_add_band(&rbsize_results[17], 114, 0, 328, 20, 0x00, 214); - rbsize_add_band(&rbsize_results[17], 328, 0, 511, 20, 0x00, 183); - rbsize_add_band(&rbsize_results[17], 511, 0, 672, 20, 0x00, 161); - rbsize_add_band(&rbsize_results[17], 0, 20, 672, 40, 0x00, 200); + rbsize_results[12] = rbsize_init(0, 0, 672, 8 + 2*system_font_height, 40, 2, 5); + rbsize_add_row(&rbsize_results[12], 4 + system_font_height); + rbsize_add_row(&rbsize_results[12], 4 + system_font_height); + rbsize_add_band(&rbsize_results[12], 0, 0, 114, 4 + system_font_height, 0x00, 40); + rbsize_add_band(&rbsize_results[12], 114, 0, 184, 4 + system_font_height, 0x00, 70); + rbsize_add_band(&rbsize_results[12], 184, 0, 424, 4 + system_font_height, 0x00, 240); + rbsize_add_band(&rbsize_results[12], 424, 0, 672, 4 + system_font_height, 0x00, 60); + rbsize_add_band(&rbsize_results[12], 0, 4 + system_font_height, 672, 8 + 2*system_font_height, 0x00, 200); + + rbsize_results[13] = rbsize_init(0, 0, 672, 8 + 2*system_font_height, 40, 2, 5); + rbsize_add_row(&rbsize_results[13], 4 + system_font_height); + rbsize_add_row(&rbsize_results[13], 4 + system_font_height); + rbsize_add_band(&rbsize_results[13], 0, 0, 114, 4 + system_font_height, 0x00, 40); + rbsize_add_band(&rbsize_results[13], 114, 0, 227, 4 + system_font_height, 0x00, 113); + rbsize_add_band(&rbsize_results[13], 227, 0, 424, 4 + system_font_height, 0x00, 197); + rbsize_add_band(&rbsize_results[13], 424, 0, 672, 4 + system_font_height, 0x00, 60); + rbsize_add_band(&rbsize_results[13], 0, 4 + system_font_height, 672, 8 + 2*system_font_height, 0x00, 200); + + rbsize_results[14] = rbsize_init(0, 0, 672, 8 + 2*system_font_height, 40, 2, 5); + rbsize_add_row(&rbsize_results[14], 4 + system_font_height); + rbsize_add_row(&rbsize_results[14], 4 + system_font_height); + rbsize_add_band(&rbsize_results[14], 0, 0, 114, 4 + system_font_height, 0x00, 40); + rbsize_add_band(&rbsize_results[14], 114, 0, 328, 4 + system_font_height, 0x00, 214); + rbsize_add_band(&rbsize_results[14], 328, 0, 511, 4 + system_font_height, 0x00, 183); + rbsize_add_band(&rbsize_results[14], 511, 0, 672, 4 + system_font_height, 0x00, 161); + rbsize_add_band(&rbsize_results[14], 0, 4 + system_font_height, 672, 8 + 2*system_font_height, 0x00, 200); + + rbsize_results[15] = rbsize_init(0, 0, 672, 8 + 2*system_font_height, 40, 2, 5); + rbsize_add_row(&rbsize_results[15], 4 + system_font_height); + rbsize_add_row(&rbsize_results[15], 4 + system_font_height); + rbsize_add_band(&rbsize_results[15], 0, 0, 114, 4 + system_font_height, 0x00, 40); + rbsize_add_band(&rbsize_results[15], 114, 0, 167, 4 + system_font_height, 0x00, 53); + rbsize_add_band(&rbsize_results[15], 167, 0, 511, 4 + system_font_height, 0x00, 344); + rbsize_add_band(&rbsize_results[15], 511, 0, 672, 4 + system_font_height, 0x00, 161); + rbsize_add_band(&rbsize_results[15], 0, 4 + system_font_height, 672, 8 + 2*system_font_height, 0x00, 200); + + rbsize_results[16] = rbsize_init(0, 0, 672, 8 + 2*system_font_height, 40, 2, 5); + rbsize_add_row(&rbsize_results[16], 4 + system_font_height); + rbsize_add_row(&rbsize_results[16], 4 + system_font_height); + rbsize_add_band(&rbsize_results[16], 0, 0, 114, 4 + system_font_height, 0x00, 40); + rbsize_add_band(&rbsize_results[16], 114, 0, 328, 4 + system_font_height, 0x00, 214); + rbsize_add_band(&rbsize_results[16], 328, 0, 511, 4 + system_font_height, 0x00, 183); + rbsize_add_band(&rbsize_results[16], 511, 0, 672, 4 + system_font_height, 0x00, 161); + rbsize_add_band(&rbsize_results[16], 0, 4 + system_font_height, 672, 8 + 2*system_font_height, 0x00, 200); + + rbsize_results[17] = rbsize_init(0, 0, 672, 8 + 2*system_font_height, 40, 2, 5); + rbsize_add_row(&rbsize_results[17], 4 + system_font_height); + rbsize_add_row(&rbsize_results[17], 4 + system_font_height); + rbsize_add_band(&rbsize_results[17], 0, 0, 114, 4 + system_font_height, 0x00, 40); + rbsize_add_band(&rbsize_results[17], 114, 0, 328, 4 + system_font_height, 0x00, 214); + rbsize_add_band(&rbsize_results[17], 328, 0, 511, 4 + system_font_height, 0x00, 183); + rbsize_add_band(&rbsize_results[17], 511, 0, 672, 4 + system_font_height, 0x00, 161); + rbsize_add_band(&rbsize_results[17], 0, 4 + system_font_height, 672, 8 + 2*system_font_height, 0x00, 200); rbsize_results[18] = rbsize_init(0, 0, 672, 56, 56, 2, 5); rbsize_add_row(&rbsize_results[18], 28); @@ -367,14 +367,14 @@ static void rbsize_results_init(void) rbsize_add_band(&rbsize_results[18], 511, 0, 672, 28, 0x00, 161); rbsize_add_band(&rbsize_results[18], 0, 28, 672, 56, 0x00, 200); - rbsize_results[19] = rbsize_init(0, 0, 672, 40, 40, 2, 5); - rbsize_add_row(&rbsize_results[19], 20); - rbsize_add_row(&rbsize_results[19], 20); - rbsize_add_band(&rbsize_results[19], 0, 0, 114, 20, 0x00, 40); - rbsize_add_band(&rbsize_results[19], 114, 0, 328, 20, 0x00, 214); - rbsize_add_band(&rbsize_results[19], 328, 0, 511, 20, 0x00, 183); - rbsize_add_band(&rbsize_results[19], 511, 0, 672, 20, 0x00, 161); - rbsize_add_band(&rbsize_results[19], 0, 20, 672, 40, 0x00, 200); + rbsize_results[19] = rbsize_init(0, 0, 672, 8 + 2*system_font_height, 40, 2, 5); + rbsize_add_row(&rbsize_results[19], 4 + system_font_height); + rbsize_add_row(&rbsize_results[19], 4 + system_font_height); + rbsize_add_band(&rbsize_results[19], 0, 0, 114, 4 + system_font_height, 0x00, 40); + rbsize_add_band(&rbsize_results[19], 114, 0, 328, 4 + system_font_height, 0x00, 214); + rbsize_add_band(&rbsize_results[19], 328, 0, 511, 4 + system_font_height, 0x00, 183); + rbsize_add_band(&rbsize_results[19], 511, 0, 672, 4 + system_font_height, 0x00, 161); + rbsize_add_band(&rbsize_results[19], 0, 4 + system_font_height, 672, 8 + 2*system_font_height, 0x00, 200); rbsize_results[20] = rbsize_init(0, 0, 672, 56, 56, 2, 5); rbsize_add_row(&rbsize_results[20], 28);

1 0

Austin Lund : comctl32/tests: Changed rebar layout tests to load data dynamically.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: cddcf039fc57fb2f1fce36219ffb7349128e44ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=cddcf039fc57fb2f1fce36219… Author: Austin Lund <austin.lund(a)gmail.com> Date: Thu Nov 11 09:12:53 2010 +1000 comctl32/tests: Changed rebar layout tests to load data dynamically. --- dlls/comctl32/tests/rebar.c | 345 +++++++++++++++++++++++++++++-------------- 1 files changed, 232 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cddcf039fc57fb2f1fce3…

1 0

Alexandre Julliard : krnl386.exe: Use the correct pointer for RemoveVectoredExceptionHandler.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: c1f7b45751409213f5601d42f5e1860a31f19295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1f7b45751409213f5601d42f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 10 20:56:08 2010 +0100 krnl386.exe: Use the correct pointer for RemoveVectoredExceptionHandler. --- dlls/krnl386.exe16/dosmem.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/krnl386.exe16/dosmem.c b/dlls/krnl386.exe16/dosmem.c index e9acd66..1f1815b 100644 --- a/dlls/krnl386.exe16/dosmem.c +++ b/dlls/krnl386.exe16/dosmem.c @@ -120,6 +120,7 @@ static char *DOSMEM_sysmem; static DWORD DOSMEM_protect; static LONG WINAPI dosmem_handler(EXCEPTION_POINTERS* except); +static void *vectored_handler; /*********************************************************************** * DOSMEM_FillIsrTable @@ -318,7 +319,7 @@ BOOL DOSMEM_InitDosMemory(void) DOSMEM_SIZE - DOSMEM_protect, PAGE_READWRITE, NULL ))) ERR("Cannot load access low 1Mb, DOS subsystem unavailable\n"); - RtlRemoveVectoredExceptionHandler( dosmem_handler ); + RemoveVectoredExceptionHandler( vectored_handler ); /* * Reserve either: @@ -412,7 +413,7 @@ BOOL DOSMEM_Init(void) DOSMEM_sysmem = DOSMEM_dosmem; } - RtlAddVectoredExceptionHandler(FALSE, dosmem_handler); + vectored_handler = AddVectoredExceptionHandler(FALSE, dosmem_handler); DOSMEM_0000H = GLOBAL_CreateBlock( GMEM_FIXED, DOSMEM_sysmem, DOSMEM_64KB, 0, WINE_LDT_FLAGS_DATA ); DOSMEM_BiosDataSeg = GLOBAL_CreateBlock( GMEM_FIXED, DOSMEM_sysmem + 0x400,

1 0

Alexandre Julliard : ntdll: Don' t call vectored exception handlers under the critical section.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 11e71ede147491381bba4762163803f540c7eb5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=11e71ede147491381bba47621… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 10 20:55:07 2010 +0100 ntdll: Don't call vectored exception handlers under the critical section. --- dlls/ntdll/exception.c | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 63fd281..33868c7 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -44,6 +44,7 @@ typedef struct { struct list entry; PVECTORED_EXCEPTION_HANDLER func; + ULONG count; } VECTORED_HANDLER; static struct list vectored_handlers = LIST_INIT(vectored_handlers); @@ -158,21 +159,37 @@ LONG call_vectored_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ) struct list *ptr; LONG ret = EXCEPTION_CONTINUE_SEARCH; EXCEPTION_POINTERS except_ptrs; + VECTORED_HANDLER *handler, *to_free = NULL; except_ptrs.ExceptionRecord = rec; except_ptrs.ContextRecord = context; RtlEnterCriticalSection( &vectored_handlers_section ); - LIST_FOR_EACH( ptr, &vectored_handlers ) + ptr = list_head( &vectored_handlers ); + while (ptr) { - VECTORED_HANDLER *handler = LIST_ENTRY( ptr, VECTORED_HANDLER, entry ); + handler = LIST_ENTRY( ptr, VECTORED_HANDLER, entry ); + handler->count++; + RtlLeaveCriticalSection( &vectored_handlers_section ); + RtlFreeHeap( GetProcessHeap(), 0, to_free ); + to_free = NULL; + TRACE( "calling handler at %p code=%x flags=%x\n", handler->func, rec->ExceptionCode, rec->ExceptionFlags ); ret = handler->func( &except_ptrs ); TRACE( "handler at %p returned %x\n", handler->func, ret ); + + RtlEnterCriticalSection( &vectored_handlers_section ); + ptr = list_next( &vectored_handlers, ptr ); + if (!--handler->count) /* removed during execution */ + { + list_remove( &handler->entry ); + to_free = handler; + } if (ret == EXCEPTION_CONTINUE_EXECUTION) break; } RtlLeaveCriticalSection( &vectored_handlers_section ); + RtlFreeHeap( GetProcessHeap(), 0, to_free ); return ret; } @@ -214,6 +231,7 @@ PVOID WINAPI RtlAddVectoredExceptionHandler( ULONG first, PVECTORED_EXCEPTION_HA if (handler) { handler->func = func; + handler->count = 1; RtlEnterCriticalSection( &vectored_handlers_section ); if (first) list_add_head( &vectored_handlers, &handler->entry ); else list_add_tail( &vectored_handlers, &handler->entry ); @@ -237,7 +255,8 @@ ULONG WINAPI RtlRemoveVectoredExceptionHandler( PVOID handler ) VECTORED_HANDLER *curr_handler = LIST_ENTRY( ptr, VECTORED_HANDLER, entry ); if (curr_handler == handler) { - list_remove( ptr ); + if (!--curr_handler->count) list_remove( ptr ); + else handler = NULL; /* don't free it yet */ ret = TRUE; break; }

1 0

Alexandre Julliard : Revert "ntdll: Fix possible deadlock in vectored exception handling."
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 177a7e5683c5dc85cffe7ce46176743427f8398d URL: http://source.winehq.org/git/wine.git/?a=commit;h=177a7e5683c5dc85cffe7ce46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 10 19:17:41 2010 +0100 Revert "ntdll: Fix possible deadlock in vectored exception handling." This reverts commit eb0e82a75568db095df5f78be703987147f00f66. It's causing different deadlocks, notably when a thread tries to remove a handler inside a handler. --- dlls/ntdll/exception.c | 29 +++++++++++++---------------- dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/thread.c | 1 - 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 4d2f759..63fd281 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -48,17 +48,14 @@ typedef struct static struct list vectored_handlers = LIST_INIT(vectored_handlers); -static RTL_RWLOCK vectored_handlers_lock; - -/********************************************************************** - * exceptions_init - * - * Initialize read/write lock used by the vectored exception handling. - */ -void exceptions_init(void) +static RTL_CRITICAL_SECTION vectored_handlers_section; +static RTL_CRITICAL_SECTION_DEBUG critsect_debug = { - RtlInitializeResource(&vectored_handlers_lock); -} + 0, 0, &vectored_handlers_section, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": vectored_handlers_section") } +}; +static RTL_CRITICAL_SECTION vectored_handlers_section = { &critsect_debug, -1, 0, 0, 0, 0 }; /********************************************************************** * wait_suspend @@ -165,7 +162,7 @@ LONG call_vectored_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ) except_ptrs.ExceptionRecord = rec; except_ptrs.ContextRecord = context; - RtlAcquireResourceShared( &vectored_handlers_lock, TRUE ); + RtlEnterCriticalSection( &vectored_handlers_section ); LIST_FOR_EACH( ptr, &vectored_handlers ) { VECTORED_HANDLER *handler = LIST_ENTRY( ptr, VECTORED_HANDLER, entry ); @@ -175,7 +172,7 @@ LONG call_vectored_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ) TRACE( "handler at %p returned %x\n", handler->func, ret ); if (ret == EXCEPTION_CONTINUE_EXECUTION) break; } - RtlReleaseResource( &vectored_handlers_lock ); + RtlLeaveCriticalSection( &vectored_handlers_section ); return ret; } @@ -217,10 +214,10 @@ PVOID WINAPI RtlAddVectoredExceptionHandler( ULONG first, PVECTORED_EXCEPTION_HA if (handler) { handler->func = func; - RtlAcquireResourceExclusive( &vectored_handlers_lock, TRUE ); + RtlEnterCriticalSection( &vectored_handlers_section ); if (first) list_add_head( &vectored_handlers, &handler->entry ); else list_add_tail( &vectored_handlers, &handler->entry ); - RtlReleaseResource( &vectored_handlers_lock ); + RtlLeaveCriticalSection( &vectored_handlers_section ); } return handler; } @@ -234,7 +231,7 @@ ULONG WINAPI RtlRemoveVectoredExceptionHandler( PVOID handler ) struct list *ptr; ULONG ret = FALSE; - RtlAcquireResourceExclusive( &vectored_handlers_lock, TRUE ); + RtlEnterCriticalSection( &vectored_handlers_section ); LIST_FOR_EACH( ptr, &vectored_handlers ) { VECTORED_HANDLER *curr_handler = LIST_ENTRY( ptr, VECTORED_HANDLER, entry ); @@ -245,7 +242,7 @@ ULONG WINAPI RtlRemoveVectoredExceptionHandler( PVOID handler ) break; } } - RtlReleaseResource( &vectored_handlers_lock ); + RtlLeaveCriticalSection( &vectored_handlers_section ); if (ret) RtlFreeHeap( GetProcessHeap(), 0, handler ); return ret; } diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 3c35251..212edf5 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -71,7 +71,6 @@ extern void virtual_init(void); extern void virtual_init_threading(void); extern void fill_cpu_info(void); extern void heap_set_debug_flags( HANDLE handle ); -extern void exceptions_init(void); /* server support */ extern timeout_t server_start_time; diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index fb6b2d2..56eca23 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -296,7 +296,6 @@ HANDLE thread_init(void) user_shared_data->TickCountMultiplier = 1 << 24; fill_cpu_info(); - exceptions_init(); return exe_file; }

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2010