wine-commits March 2010

wine-commits@winehq.org

3 participants
919 discussions

David Hedberg : user32: Fix case where EM_SCROLL with page down results in trying to scroll up past the beginning .
by Alexandre Julliard 03 Mar '10

03 Mar '10

Module: wine Branch: master Commit: 5a1f8c57a819286f3885d9e05a456d5da522a9e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a1f8c57a819286f3885d9e05… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Mar 3 13:19:47 2010 +0100 user32: Fix case where EM_SCROLL with page down results in trying to scroll up past the beginning. --- dlls/user32/edit.c | 2 +- dlls/user32/tests/edit.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 35f8285..9898bc4 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -1632,7 +1632,7 @@ static LRESULT EDIT_EM_Scroll(EDITSTATE *es, INT action) INT vlc = get_vertical_line_count(es); /* check if we are going to move too far */ if(es->y_offset + dy > es->line_count - vlc) - dy = es->line_count - vlc - es->y_offset; + dy = max(es->line_count - vlc, 0) - es->y_offset; /* Notification is done in EDIT_EM_LineScroll */ if(dy) { diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 6d3afb8..ee181f2 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1320,6 +1320,7 @@ static void test_edit_control_limittext(void) static void test_edit_control_scroll(void) { static const char *single_line_str = "a"; + static const char *multiline_str = "Test\r\nText"; HWND hwEdit; LONG ret; @@ -1348,6 +1349,22 @@ static void test_edit_control_scroll(void) ok(!ret, "Returned %x, expected 0.\n", ret); DestroyWindow (hwEdit); + + /* SB_PAGEDOWN while at the beginning of a buffer with few lines + should not cause EM_SCROLL to return a negative value of + scrolled lines that would put us "before" the beginning. */ + hwEdit = CreateWindow( + "EDIT", + multiline_str, + WS_VSCROLL | ES_MULTILINE, + 0, 0, 100, 100, + NULL, NULL, hinst, NULL); + assert(hwEdit); + + ret = SendMessage(hwEdit, EM_SCROLL, SB_PAGEDOWN, 0); + ok(!ret, "Returned %x, expected 0.\n", ret); + + DestroyWindow (hwEdit); } static void test_margins(void)

1 0

David Hedberg : user32: Fix return value of EDIT_EM_Scroll.
by Alexandre Julliard 03 Mar '10

03 Mar '10

Module: wine Branch: master Commit: 598052b4ad2254af22e9bfc65c567a8d5b07e4fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=598052b4ad2254af22e9bfc65… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Mar 3 13:19:46 2010 +0100 user32: Fix return value of EDIT_EM_Scroll. --- dlls/user32/edit.c | 7 +++++-- dlls/user32/tests/edit.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 0c9287c..35f8285 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -1635,10 +1635,13 @@ static LRESULT EDIT_EM_Scroll(EDITSTATE *es, INT action) dy = es->line_count - vlc - es->y_offset; /* Notification is done in EDIT_EM_LineScroll */ - if(dy) + if(dy) { EDIT_EM_LineScroll(es, 0, dy); + return MAKELONG(dy, TRUE); + } + } - return MAKELONG(dy, TRUE); + return (LRESULT)FALSE; } diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 7ecee13..6d3afb8 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1316,6 +1316,40 @@ static void test_edit_control_limittext(void) DestroyWindow(hwEdit); } +/* Test EM_SCROLL */ +static void test_edit_control_scroll(void) +{ + static const char *single_line_str = "a"; + HWND hwEdit; + LONG ret; + + /* Check the return value when EM_SCROLL doesn't scroll + * anything. Should not return true unless any lines were actually + * scrolled. */ + hwEdit = CreateWindow( + "EDIT", + single_line_str, + WS_VSCROLL | ES_MULTILINE, + 1, 1, 100, 100, + NULL, NULL, hinst, NULL); + + assert(hwEdit); + + ret = SendMessage(hwEdit, EM_SCROLL, SB_PAGEDOWN, 0); + ok(!ret, "Returned %x, expected 0.\n", ret); + + ret = SendMessage(hwEdit, EM_SCROLL, SB_PAGEUP, 0); + ok(!ret, "Returned %x, expected 0.\n", ret); + + ret = SendMessage(hwEdit, EM_SCROLL, SB_LINEUP, 0); + ok(!ret, "Returned %x, expected 0.\n", ret); + + ret = SendMessage(hwEdit, EM_SCROLL, SB_LINEDOWN, 0); + ok(!ret, "Returned %x, expected 0.\n", ret); + + DestroyWindow (hwEdit); +} + static void test_margins(void) { HWND hwEdit; @@ -2319,6 +2353,7 @@ START_TEST(edit) test_edit_control_5(); test_edit_control_6(); test_edit_control_limittext(); + test_edit_control_scroll(); test_margins(); test_margins_font_change(); test_text_position();

1 0

Louis Lenders : wine.inf: Add windows\help directory.
by Alexandre Julliard 03 Mar '10

03 Mar '10

Module: wine Branch: master Commit: cd172dff7cc622889e432ecbfe20ad6c880dfac6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd172dff7cc622889e432ecbf… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Tue Mar 2 22:07:50 2010 +0100 wine.inf: Add windows\help directory. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index e53a2f7..e4e3829 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2427,6 +2427,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" [FakeDllsSection] ; create some directories first +10,help, 10,inf, 10,temp, 11,mui,

1 0

Alexandre Julliard : server: Set the idle event when PeekMessage is called with -1 as window filter.
by Alexandre Julliard 03 Mar '10

03 Mar '10

Module: wine Branch: master Commit: b0760fc2e91d22cd262601a4080d6f8c66e4e32d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0760fc2e91d22cd262601a40… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 3 13:19:13 2010 +0100 server: Set the idle event when PeekMessage is called with -1 as window filter. --- dlls/user32/tests/msg.c | 42 ++++++++++++++++++++++++++++++++++++++++++ server/queue.c | 1 + 2 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 492de62..714e57f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12080,6 +12080,13 @@ static const struct { 0, 0, FALSE }, { 0, WAIT_TIMEOUT, FALSE }, { 0, 0, FALSE }, + { 0, 0, FALSE }, +/* 15 */ { 0, 0, FALSE }, + { WAIT_TIMEOUT, 0, FALSE }, + { WAIT_TIMEOUT, 0, FALSE }, + { WAIT_TIMEOUT, 0, FALSE }, + { WAIT_TIMEOUT, 0, FALSE }, +/* 20 */ { WAIT_TIMEOUT, 0, FALSE }, }; static DWORD CALLBACK do_wait_idle_child_thread( void *arg ) @@ -12205,6 +12212,41 @@ static void do_wait_idle_child( int arg ) WaitForSingleObject( thread, 10000 ); CloseHandle( thread ); break; + case 14: + SetEvent( start_event ); + Sleep( 200 ); + PeekMessage( &msg, HWND_TOPMOST, 0, 0, PM_NOREMOVE ); + break; + case 15: + SetEvent( start_event ); + Sleep( 200 ); + PeekMessage( &msg, HWND_BROADCAST, 0, 0, PM_NOREMOVE ); + break; + case 16: + SetEvent( start_event ); + Sleep( 200 ); + PeekMessage( &msg, HWND_BOTTOM, 0, 0, PM_NOREMOVE ); + break; + case 17: + SetEvent( start_event ); + Sleep( 200 ); + PeekMessage( &msg, (HWND)0xdeadbeef, 0, 0, PM_NOREMOVE ); + break; + case 18: + SetEvent( start_event ); + Sleep( 200 ); + PeekMessage( &msg, HWND_NOTOPMOST, 0, 0, PM_NOREMOVE ); + break; + case 19: + SetEvent( start_event ); + Sleep( 200 ); + PeekMessage( &msg, HWND_MESSAGE, 0, 0, PM_NOREMOVE ); + break; + case 20: + SetEvent( start_event ); + Sleep( 200 ); + PeekMessage( &msg, GetDesktopWindow(), 0, 0, PM_NOREMOVE ); + break; } WaitForSingleObject( end_event, 2000 ); CloseHandle( start_event ); diff --git a/server/queue.c b/server/queue.c index 938d7cf..b2bc603 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1819,6 +1819,7 @@ DECL_HANDLER(get_message) return; } + if (get_win == -1 && current->process->idle_event) set_event( current->process->idle_event ); queue->wake_mask = req->wake_mask; queue->changed_mask = req->changed_mask; set_error( STATUS_PENDING ); /* FIXME */

1 0

Alexandre Julliard : user32: Pass HWND_BOTTOM unmodified to the server in PeekMessage.
by Alexandre Julliard 03 Mar '10

03 Mar '10

Module: wine Branch: master Commit: 4d33d4982f72840b5e2eba1a1a01817986a63b57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d33d4982f72840b5e2eba1a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 3 13:18:33 2010 +0100 user32: Pass HWND_BOTTOM unmodified to the server in PeekMessage. --- dlls/user32/message.c | 3 +-- server/queue.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index fedb917..498b521 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2034,8 +2034,7 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags if (!(buffer = HeapAlloc( GetProcessHeap(), 0, buffer_size ))) return FALSE; if (!first && !last) last = ~0; - if (hwnd == HWND_BROADCAST || hwnd == HWND_TOPMOST || hwnd == HWND_BOTTOM) - hwnd = (HWND)-1; + if (hwnd == HWND_BROADCAST) hwnd = HWND_TOPMOST; for (;;) { diff --git a/server/queue.c b/server/queue.c index cfe9818..938d7cf 100644 --- a/server/queue.c +++ b/server/queue.c @@ -636,7 +636,7 @@ static void reply_message( struct msg_queue *queue, lparam_t result, static int match_window( user_handle_t win, user_handle_t msg_win ) { if (!win) return 1; - if (win == (user_handle_t)-1) return !msg_win; + if (win == -1 || win == 1) return !msg_win; if (msg_win == win) return 1; return is_child_window( win, msg_win ); }

1 0

Roderick Colenbrander : wined3d: Move the 8-bit palette shader code over to the blit_shader backend.
by Alexandre Julliard 03 Mar '10

03 Mar '10

Module: wine Branch: master Commit: c0ef7a1a931e68ea7bf92e9bd9dc3b38adec5cd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0ef7a1a931e68ea7bf92e9bd… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Mar 2 18:46:43 2010 +0100 wined3d: Move the 8-bit palette shader code over to the blit_shader backend. --- dlls/wined3d/arb_program_shader.c | 81 ++++++++++++++++++++++++++++++++++++- dlls/wined3d/device.c | 8 ---- dlls/wined3d/surface.c | 37 +++-------------- dlls/wined3d/utils.c | 4 ++ dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 90 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c0ef7a1a931e68ea7bf92…

1 0

Roderick Colenbrander : wined3d: Rename yuv to complex in order to prepare for 8-bit palette fixups using the same code .
by Alexandre Julliard 03 Mar '10

03 Mar '10

Module: wine Branch: master Commit: 922ad80f42e54dddf5ac889e271d048ca0e9c613 URL: http://source.winehq.org/git/wine.git/?a=commit;h=922ad80f42e54dddf5ac889e2… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Mar 2 16:21:45 2010 +0100 wined3d: Rename yuv to complex in order to prepare for 8-bit palette fixups using the same code. --- dlls/wined3d/arb_program_shader.c | 62 ++++++++++++++++++------------------ dlls/wined3d/glsl_shader.c | 8 ++-- dlls/wined3d/shader.c | 2 +- dlls/wined3d/utils.c | 26 ++++++++-------- dlls/wined3d/wined3d_private.h | 40 ++++++++++++------------ 5 files changed, 69 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=922ad80f42e54dddf5ac8…

1 0

Nikolay Sivov : shlwapi/tests: Some tests for PathGetDriveNumber.
by Alexandre Julliard 03 Mar '10

03 Mar '10

Module: wine Branch: master Commit: 2d76bf2e69fc4b082030e0238f3aa17e273cf00e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d76bf2e69fc4b082030e0238… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 3 12:38:39 2010 +0300 shlwapi/tests: Some tests for PathGetDriveNumber. --- dlls/shlwapi/tests/path.c | 106 ++++++++++++++++++++++++++++++-------------- 1 files changed, 72 insertions(+), 34 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index e52502f..3e83a45 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -28,12 +28,12 @@ #include "shlwapi.h" #include "wininet.h" -static HMODULE hShlwapi; static HRESULT (WINAPI *pPathIsValidCharA)(char,DWORD); static HRESULT (WINAPI *pPathIsValidCharW)(WCHAR,DWORD); static LPWSTR (WINAPI *pPathCombineW)(LPWSTR, LPCWSTR, LPCWSTR); static HRESULT (WINAPI *pPathCreateFromUrlA)(LPCSTR, LPSTR, LPDWORD, DWORD); static HRESULT (WINAPI *pPathCreateFromUrlW)(LPCWSTR, LPWSTR, LPDWORD, DWORD); +static BOOL (WINAPI *pPathAppendA)(LPSTR, LPCSTR); /* ################ */ @@ -300,6 +300,15 @@ static void test_PathIsValidCharA(void) BOOL ret; unsigned int c; + /* For whatever reason, PathIsValidCharA and PathAppendA share the same + * ordinal number in some native versions. Check this to prevent a crash. + */ + if (!pPathIsValidCharA || pPathIsValidCharA == (void*)pPathAppendA) + { + win_skip("PathIsValidCharA isn't available\n"); + return; + } + for (c = 0; c < 0x7f; c++) { ret = pPathIsValidCharA( c, ~0U ); @@ -318,6 +327,12 @@ static void test_PathIsValidCharW(void) BOOL ret; unsigned int c; + if (!pPathIsValidCharW) + { + win_skip("PathIsValidCharW isn't available\n"); + return; + } + for (c = 0; c < 0x7f; c++) { ret = pPathIsValidCharW( c, ~0U ); @@ -392,7 +407,13 @@ static void test_PathCombineW(void) WCHAR wbuf[MAX_PATH+1], wstr1[MAX_PATH] = {'C',':','\\',0}, wstr2[MAX_PATH]; static const WCHAR expout[] = {'C',':','\\','A','A',0}; int i; - + + if (!pPathCombineW) + { + win_skip("PathCombineW isn't available\n"); + return; + } + wszString2 = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); /* NULL test */ @@ -1312,43 +1333,60 @@ static void test_PathUnquoteSpaces(void) } } +static void test_PathGetDriveNumber(void) +{ + static const CHAR test1A[] = "a:\\test.file"; + static const CHAR test2A[] = "file:////b:\\test.file"; + static const CHAR test3A[] = "file:///c:\\test.file"; + static const CHAR test4A[] = "file:\\\\c:\\test.file"; + int ret; + + SetLastError(0xdeadbeef); + ret = PathGetDriveNumberA(NULL); + ok(ret == -1, "got %d\n", ret); + ok(GetLastError() == 0xdeadbeef, "got %d\n", GetLastError()); + + ret = PathGetDriveNumberA(test1A); + ok(ret == 0, "got %d\n", ret); + ret = PathGetDriveNumberA(test2A); + ok(ret == -1, "got %d\n", ret); + ret = PathGetDriveNumberA(test3A); + ok(ret == -1, "got %d\n", ret); + ret = PathGetDriveNumberA(test4A); + ok(ret == -1, "got %d\n", ret); +} + /* ################ */ START_TEST(path) { - hShlwapi = GetModuleHandleA("shlwapi.dll"); - pPathCreateFromUrlA = (void*)GetProcAddress(hShlwapi, "PathCreateFromUrlA"); - pPathCreateFromUrlW = (void*)GetProcAddress(hShlwapi, "PathCreateFromUrlW"); - - test_PathSearchAndQualify(); - test_PathCreateFromUrl(); - test_PathIsUrl(); - - test_PathAddBackslash(); - test_PathMakePretty(); - test_PathMatchSpec(); - - /* For whatever reason, PathIsValidCharA and PathAppendA share the same - * ordinal number in some native versions. Check this to prevent a crash. - */ - pPathIsValidCharA = (void*)GetProcAddress(hShlwapi, (LPSTR)455); - if (pPathIsValidCharA && pPathIsValidCharA != (void*)GetProcAddress(hShlwapi, "PathAppendA")) - { - test_PathIsValidCharA(); + HMODULE hShlwapi = GetModuleHandleA("shlwapi.dll"); - pPathIsValidCharW = (void*)GetProcAddress(hShlwapi, (LPSTR)456); - if (pPathIsValidCharW) test_PathIsValidCharW(); - } + pPathCreateFromUrlA = (void*)GetProcAddress(hShlwapi, "PathCreateFromUrlA"); + pPathCreateFromUrlW = (void*)GetProcAddress(hShlwapi, "PathCreateFromUrlW"); + pPathCombineW = (void*)GetProcAddress(hShlwapi, "PathCombineW"); + pPathIsValidCharA = (void*)GetProcAddress(hShlwapi, (LPSTR)455); + pPathIsValidCharW = (void*)GetProcAddress(hShlwapi, (LPSTR)456); + pPathAppendA = (void*)GetProcAddress(hShlwapi, "PathAppendA"); - pPathCombineW = (void*)GetProcAddress(hShlwapi, "PathCombineW"); - if (pPathCombineW) - test_PathCombineW(); + test_PathSearchAndQualify(); + test_PathCreateFromUrl(); + test_PathIsUrl(); + + test_PathAddBackslash(); + test_PathMakePretty(); + test_PathMatchSpec(); - test_PathCombineA(); - test_PathAppendA(); - test_PathCanonicalizeA(); - test_PathFindExtensionA(); - test_PathBuildRootA(); - test_PathCommonPrefixA(); - test_PathUnquoteSpaces(); + test_PathIsValidCharA(); + test_PathIsValidCharW(); + + test_PathCombineW(); + test_PathCombineA(); + test_PathAppendA(); + test_PathCanonicalizeA(); + test_PathFindExtensionA(); + test_PathBuildRootA(); + test_PathCommonPrefixA(); + test_PathUnquoteSpaces(); + test_PathGetDriveNumber(); }

1 0

Alexandre Julliard : krnl386.exe: Don' t try to free again an already freed global block.
by Alexandre Julliard 03 Mar '10

03 Mar '10

Module: wine Branch: master Commit: f8a89aa0833e213eeb5cf91f16628ee5480fd263 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8a89aa0833e213eeb5cf91f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 3 11:52:59 2010 +0100 krnl386.exe: Don't try to free again an already freed global block. --- dlls/krnl386.exe16/global.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/krnl386.exe16/global.c b/dlls/krnl386.exe16/global.c index db07477..ba4d7df 100644 --- a/dlls/krnl386.exe16/global.c +++ b/dlls/krnl386.exe16/global.c @@ -182,6 +182,11 @@ BOOL16 GLOBAL_FreeBlock( HGLOBAL16 handle ) sel = GlobalHandleToSel16( handle ); if (!VALID_HANDLE(sel)) return FALSE; pArena = GET_ARENA_PTR(sel); + if (!pArena->size) + { + WARN( "already free %x\n", handle ); + return FALSE; + } SELECTOR_FreeBlock( sel ); memset( pArena, 0, sizeof(GLOBALARENA) ); return TRUE;

1 0

Andrew Nguyen : msi: Correctly set the process working directory in custom action type 34.
by Alexandre Julliard 03 Mar '10

03 Mar '10

Module: wine Branch: master Commit: 0270f18e110128b2646ac050c8bfb316a0515e43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0270f18e110128b2646ac050c… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Mar 3 02:53:23 2010 -0600 msi: Correctly set the process working directory in custom action type 34. --- dlls/msi/custom.c | 36 +++++++++++++++++++++--------------- 1 files changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 2b2a3e1..584c050 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -1120,38 +1120,44 @@ static UINT HANDLE_CustomType50(MSIPACKAGE *package, LPCWSTR source, static UINT HANDLE_CustomType34(MSIPACKAGE *package, LPCWSTR source, LPCWSTR target, const INT type, LPCWSTR action) { - LPWSTR filename, deformated; + LPWSTR workingdir, filename; STARTUPINFOW si; PROCESS_INFORMATION info; BOOL rc; - memset(&si,0,sizeof(STARTUPINFOW)); + memset(&si, 0, sizeof(STARTUPINFOW)); - filename = resolve_folder(package, source, FALSE, FALSE, TRUE, NULL); + workingdir = resolve_folder(package, source, FALSE, FALSE, TRUE, NULL); - if (!filename) + if (!workingdir) return ERROR_FUNCTION_FAILED; - SetCurrentDirectoryW(filename); - msi_free(filename); + deformat_string(package, target, &filename); - deformat_string(package,target,&deformated); - - if (!deformated) + if (!filename) + { + msi_free(workingdir); return ERROR_FUNCTION_FAILED; + } - TRACE("executing exe %s\n", debugstr_w(deformated)); + TRACE("executing exe %s with working directory %s\n", + debugstr_w(filename), debugstr_w(workingdir)); - rc = CreateProcessW(NULL, deformated, NULL, NULL, FALSE, 0, NULL, - c_collen, &si, &info); + rc = CreateProcessW(NULL, filename, NULL, NULL, FALSE, 0, NULL, + workingdir, &si, &info); if ( !rc ) { - ERR("Unable to execute command %s\n", debugstr_w(deformated)); - msi_free(deformated); + ERR("Unable to execute command %s with working directory %s\n", + debugstr_w(filename), debugstr_w(workingdir)); + msi_free(filename); + msi_free(workingdir); return ERROR_SUCCESS; } - msi_free(deformated); + + msi_free(filename); + msi_free(workingdir); + CloseHandle( info.hThread ); return wait_process_handle(package, type, info.hProcess, action);

1 0

← Newer
1
...
80
81
82
83
84
85
86
...
92
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 March 2010