wine-commits May 2011

wine-commits@winehq.org

2 participants
945 discussions

Andrew Nguyen : taskmgr: Remove all TCHAR macro usage in process termination code.
by Alexandre Julliard 17 May '11

17 May '11

Module: wine Branch: master Commit: 10abc15faa8733cafeb916d55491680a0175c49b URL: http://source.winehq.org/git/wine.git/?a=commit;h=10abc15faa8733cafeb916d55… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue May 17 05:15:13 2011 -0500 taskmgr: Remove all TCHAR macro usage in process termination code. --- programs/taskmgr/endproc.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/programs/taskmgr/endproc.c b/programs/taskmgr/endproc.c index 10a8cd4..0095f45 100644 --- a/programs/taskmgr/endproc.c +++ b/programs/taskmgr/endproc.c @@ -47,14 +47,15 @@ static void load_message_strings(void) void ProcessPage_OnEndProcess(void) { LVITEMW lvitem; - ULONG Index; + ULONG Index, Count; DWORD dwProcessId; HANDLE hProcess; WCHAR wstrErrorText[256]; load_message_strings(); - for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) + Count = SendMessageW(hProcessPageListCtrl, LVM_GETITEMCOUNT, 0, 0); + for (Index=0; Index<Count; Index++) { lvitem.mask = LVIF_STATE; lvitem.stateMask = LVIS_SELECTED; @@ -67,9 +68,9 @@ void ProcessPage_OnEndProcess(void) break; } + Count = SendMessageW(hProcessPageListCtrl, LVM_GETSELECTEDCOUNT, 0, 0); dwProcessId = PerfDataGetProcessId(Index); - - if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) + if ((Count != 1) || (dwProcessId == 0)) return; if (MessageBoxW(hMainWnd, wszWarnMsg, wszWarnTitle, MB_YESNO|MB_ICONWARNING) != IDYES) @@ -96,14 +97,15 @@ void ProcessPage_OnEndProcess(void) void ProcessPage_OnEndProcessTree(void) { LVITEMW lvitem; - ULONG Index; + ULONG Index, Count; DWORD dwProcessId; HANDLE hProcess; WCHAR wstrErrorText[256]; load_message_strings(); - for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) + Count = SendMessageW(hProcessPageListCtrl, LVM_GETITEMCOUNT, 0, 0); + for (Index=0; Index<Count; Index++) { lvitem.mask = LVIF_STATE; lvitem.stateMask = LVIS_SELECTED; @@ -116,9 +118,9 @@ void ProcessPage_OnEndProcessTree(void) break; } + Count = SendMessageW(hProcessPageListCtrl, LVM_GETSELECTEDCOUNT, 0, 0); dwProcessId = PerfDataGetProcessId(Index); - - if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) + if ((Count != 1) || (dwProcessId == 0)) return; if (MessageBoxW(hMainWnd, wszWarnMsg, wszWarnTitle, MB_YESNO|MB_ICONWARNING) != IDYES)

1 0

Andrew Nguyen : taskmgr: Remove all TCHAR macro usage in priority handling code.
by Alexandre Julliard 17 May '11

17 May '11

Module: wine Branch: master Commit: c0c857cbc687df336f13dfc0393f9b9f066b7e56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0c857cbc687df336f13dfc03… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue May 17 05:15:08 2011 -0500 taskmgr: Remove all TCHAR macro usage in priority handling code. --- programs/taskmgr/priority.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/taskmgr/priority.c b/programs/taskmgr/priority.c index 1a5ea37..49f23a2 100644 --- a/programs/taskmgr/priority.c +++ b/programs/taskmgr/priority.c @@ -36,7 +36,7 @@ static void DoSetPriority(DWORD priority) { LVITEMW lvitem; - ULONG Index; + ULONG Index, Count; DWORD dwProcessId; HANDLE hProcess; WCHAR wstrErrorText[256]; @@ -49,7 +49,8 @@ static void DoSetPriority(DWORD priority) LoadStringW(hInst, IDS_WARNING_TITLE, wszWarnTitle, sizeof(wszWarnTitle)/sizeof(WCHAR)); LoadStringW(hInst, IDS_PRIORITY_UNABLE2CHANGE, wszUnable2Change, sizeof(wszUnable2Change)/sizeof(WCHAR)); - for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) + Count = SendMessageW(hProcessPageListCtrl, LVM_GETITEMCOUNT, 0, 0); + for (Index=0; Index<Count; Index++) { lvitem.mask = LVIF_STATE; lvitem.stateMask = LVIS_SELECTED; @@ -62,9 +63,9 @@ static void DoSetPriority(DWORD priority) break; } + Count = SendMessageW(hProcessPageListCtrl, LVM_GETSELECTEDCOUNT, 0, 0); dwProcessId = PerfDataGetProcessId(Index); - - if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) + if ((Count != 1) || (dwProcessId == 0)) return; if (MessageBoxW(hMainWnd, wszWarnMsg, wszWarnTitle, MB_YESNO|MB_ICONWARNING) != IDYES)

1 0

Andrew Nguyen : taskmgr: Remove all TCHAR macro usage in affinity dialog code.
by Alexandre Julliard 17 May '11

17 May '11

Module: wine Branch: master Commit: b1f204549cd3bbe0fddaa303ff85edc19644c04f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1f204549cd3bbe0fddaa303f… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue May 17 05:15:03 2011 -0500 taskmgr: Remove all TCHAR macro usage in affinity dialog code. --- programs/taskmgr/affinity.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/programs/taskmgr/affinity.c b/programs/taskmgr/affinity.c index 38dbe7e..88575d8 100644 --- a/programs/taskmgr/affinity.c +++ b/programs/taskmgr/affinity.c @@ -321,11 +321,12 @@ AffinityDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) void ProcessPage_OnSetAffinity(void) { LV_ITEMW lvitem; - ULONG Index; + ULONG Index, Count; DWORD dwProcessId; WCHAR wstrErrorText[256]; - for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) { + Count = SendMessageW(hProcessPageListCtrl, LVM_GETITEMCOUNT, 0, 0); + for (Index=0; Index<Count; Index++) { memset(&lvitem, 0, sizeof(LV_ITEMW)); lvitem.mask = LVIF_STATE; lvitem.stateMask = LVIS_SELECTED; @@ -334,8 +335,10 @@ void ProcessPage_OnSetAffinity(void) if (lvitem.state & LVIS_SELECTED) break; } + + Count = SendMessageW(hProcessPageListCtrl, LVM_GETSELECTEDCOUNT, 0, 0); dwProcessId = PerfDataGetProcessId(Index); - if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) + if ((Count != 1) || (dwProcessId == 0)) return; hProcessAffinityHandle = OpenProcess(PROCESS_QUERY_INFORMATION|PROCESS_SET_INFORMATION, FALSE, dwProcessId); if (!hProcessAffinityHandle) {

1 0

Andrew Nguyen : taskmgr: Remove all TCHAR macro usage in graph drawing code .
by Alexandre Julliard 17 May '11

17 May '11

Module: wine Branch: master Commit: c05ea50ae5c0d7e4ae6d57d11deda4beda5a3a13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c05ea50ae5c0d7e4ae6d57d11… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue May 17 05:14:58 2011 -0500 taskmgr: Remove all TCHAR macro usage in graph drawing code. --- programs/taskmgr/graph.c | 6 +++--- programs/taskmgr/graphctl.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/taskmgr/graph.c b/programs/taskmgr/graph.c index 84a7307..bc37498 100644 --- a/programs/taskmgr/graph.c +++ b/programs/taskmgr/graph.c @@ -439,7 +439,7 @@ Graph_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) hdc = BeginPaint(hWnd, &ps); - WindowId = GetWindowLongPtr(hWnd, GWLP_ID); + WindowId = GetWindowLongPtrW(hWnd, GWLP_ID); switch (WindowId) { @@ -459,9 +459,9 @@ Graph_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) return 0; } - + /* * We pass on all non-handled messages */ - return CallWindowProc((WNDPROC)OldGraphWndProc, hWnd, message, wParam, lParam); + return CallWindowProcW(OldGraphWndProc, hWnd, message, wParam, lParam); } diff --git a/programs/taskmgr/graphctl.c b/programs/taskmgr/graphctl.c index 2fe2a29..c5395d5 100644 --- a/programs/taskmgr/graphctl.c +++ b/programs/taskmgr/graphctl.c @@ -622,5 +622,5 @@ GraphCtrl_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) /* * We pass on all non-handled messages */ - return CallWindowProc((WNDPROC)OldGraphCtrlWndProc, hWnd, message, wParam, lParam); + return CallWindowProcW(OldGraphCtrlWndProc, hWnd, message, wParam, lParam); }

1 0

Andrew Nguyen : taskmgr: Remove all TCHAR macro usage in tab page code.
by Alexandre Julliard 17 May '11

17 May '11

Module: wine Branch: master Commit: e5072fa660a7a6aea702365c47ea6d4fc61b42df URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5072fa660a7a6aea702365c4… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue May 17 05:14:52 2011 -0500 taskmgr: Remove all TCHAR macro usage in tab page code. --- programs/taskmgr/applpage.c | 129 +++++++++++++++++++++++------------------- programs/taskmgr/perfpage.c | 12 ++-- programs/taskmgr/procpage.c | 28 +++++---- 3 files changed, 92 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5072fa660a7a6aea7023…

1 0

Michael Stefaniuc : riched20: COM cleanup for the ITextSelection iface.
by Alexandre Julliard 17 May '11

17 May '11

Module: wine Branch: master Commit: a12ed578c5a0eca6c2f27aab64b205c29cbf4c87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a12ed578c5a0eca6c2f27aab6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 17 12:11:22 2011 +0200 riched20: COM cleanup for the ITextSelection iface. --- dlls/riched20/richole.c | 468 +++++++++++++++-------------------------------- 1 files changed, 149 insertions(+), 319 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a12ed578c5a0eca6c2f27…

1 0

Alexandre Julliard : msvcrt: Implement _seh_longjmp_unwind4 for i386.
by Alexandre Julliard 17 May '11

17 May '11

Module: wine Branch: master Commit: bcd62a7f2e7e6af3deea27cccc672ef1045d800b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcd62a7f2e7e6af3deea27ccc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 17 12:49:20 2011 +0200 msvcrt: Implement _seh_longjmp_unwind4 for i386. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/except.c | 9 +++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 1 + 6 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 4192ff6..2f76515 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1066,7 +1066,7 @@ @ stub _scwprintf_p_l @ cdecl _searchenv(str str ptr) msvcrt._searchenv @ cdecl _searchenv_s(str str ptr long) msvcrt._searchenv_s -@ stub _seh_longjmp_unwind4 +@ stdcall -i386 _seh_longjmp_unwind4(ptr) msvcrt._seh_longjmp_unwind4 @ stdcall -i386 _seh_longjmp_unwind(ptr) msvcrt._seh_longjmp_unwind @ cdecl _set_SSE2_enable(long) msvcrt._set_SSE2_enable @ cdecl _set_abort_behavior(long long) msvcrt._set_abort_behavior diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 2158734..86d93c8 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -918,7 +918,7 @@ @ stub _scwprintf_p_l @ cdecl _searchenv(str str ptr) msvcrt._searchenv @ cdecl _searchenv_s(str str ptr long) msvcrt._searchenv_s -@ stub _seh_longjmp_unwind4 +@ stdcall -i386 _seh_longjmp_unwind4(ptr) msvcrt._seh_longjmp_unwind4 @ stdcall -i386 _seh_longjmp_unwind(ptr) msvcrt._seh_longjmp_unwind @ cdecl _set_SSE2_enable(long) msvcrt._set_SSE2_enable @ cdecl _set_abort_behavior(long long) msvcrt._set_abort_behavior diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 1bb525d..9749a63 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -904,7 +904,7 @@ @ stub _scwprintf_p_l @ cdecl _searchenv(str str ptr) msvcrt._searchenv @ cdecl _searchenv_s(str str ptr long) msvcrt._searchenv_s -@ stub _seh_longjmp_unwind4 +@ stdcall -i386 _seh_longjmp_unwind4(ptr) msvcrt._seh_longjmp_unwind4 @ stdcall -i386 _seh_longjmp_unwind(ptr) msvcrt._seh_longjmp_unwind @ cdecl _set_SSE2_enable(long) msvcrt._set_SSE2_enable @ cdecl _set_abort_behavior(long long) msvcrt._set_abort_behavior diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 422e3fa..eb20903 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -519,6 +519,15 @@ void __stdcall _seh_longjmp_unwind(struct MSVCRT___JUMP_BUFFER *jmp) msvcrt_local_unwind2( (MSVCRT_EXCEPTION_FRAME *)jmp->Registration, jmp->TryLevel, (void *)jmp->Ebp ); } +/********************************************************************* + * _seh_longjmp_unwind4 (MSVCRT.@) + */ +void __stdcall _seh_longjmp_unwind4(struct MSVCRT___JUMP_BUFFER *jmp) +{ + msvcrt_local_unwind4( (void *)jmp->Cookie, (MSVCRT_EXCEPTION_FRAME *)jmp->Registration, + jmp->TryLevel, (void *)jmp->Ebp ); +} + #elif defined(__x86_64__) /******************************************************************* diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 5d065fb..3534c1e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -859,7 +859,7 @@ # stub _scwprintf_p_l(wstr ptr) @ cdecl _searchenv(str str ptr) @ cdecl _searchenv_s(str str ptr long) -# stub _seh_longjmp_unwind4 +@ stdcall -i386 _seh_longjmp_unwind4(ptr) @ stdcall -i386 _seh_longjmp_unwind(ptr) @ cdecl _set_SSE2_enable(long) MSVCRT__set_SSE2_enable @ cdecl _set_controlfp(long long) diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index e4372e9..08119a7 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -485,6 +485,7 @@ @ cdecl -arch=i386 _safe_fprem1() msvcrt._safe_fprem1 @ cdecl _scalb(double long) msvcrt._scalb @ cdecl _searchenv(str str ptr) msvcrt._searchenv +@ stdcall -i386 _seh_longjmp_unwind4(ptr) msvcrt._seh_longjmp_unwind4 @ stdcall -i386 _seh_longjmp_unwind(ptr) msvcrt._seh_longjmp_unwind @ cdecl _set_error_mode(long) msvcrt._set_error_mode @ cdecl _set_sbh_threshold(long) msvcrt._set_sbh_threshold

1 0

Alexandre Julliard : msvcrt: Implement _local_unwind for x86_64.
by Alexandre Julliard 17 May '11

17 May '11

Module: wine Branch: master Commit: 21400066620eb716d54014ac70e26ff7ec5f1d4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=21400066620eb716d54014ac7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 17 12:31:00 2011 +0200 msvcrt: Implement _local_unwind for x86_64. --- dlls/msvcr100/msvcr100.spec | 1 + dlls/msvcr80/msvcr80.spec | 1 + dlls/msvcr90/msvcr90.spec | 1 + dlls/msvcrt/except.c | 9 +++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 1 + dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 3 ++- 7 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index a6cfaa3..4192ff6 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -844,6 +844,7 @@ @ cdecl _lfind(ptr ptr ptr long ptr) msvcrt._lfind @ stub _lfind_s @ cdecl _loaddll(str) msvcrt._loaddll +@ cdecl -arch=x86_64 _local_unwind(ptr ptr) msvcrt._local_unwind @ cdecl -i386 _local_unwind2(ptr long) msvcrt._local_unwind2 @ cdecl -i386 _local_unwind4(ptr ptr long) msvcrt._local_unwind4 @ cdecl _localtime32(ptr) msvcrt._localtime32 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index c9f62f0..2158734 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -690,6 +690,7 @@ @ cdecl _lfind(ptr ptr ptr long ptr) msvcrt._lfind @ stub _lfind_s @ cdecl _loaddll(str) msvcrt._loaddll +@ cdecl -arch=x86_64 _local_unwind(ptr ptr) msvcrt._local_unwind @ cdecl -i386 _local_unwind2(ptr long) msvcrt._local_unwind2 @ cdecl -i386 _local_unwind4(ptr ptr long) msvcrt._local_unwind4 @ cdecl _localtime32(ptr) msvcrt._localtime32 diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 5f09767..1bb525d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -678,6 +678,7 @@ @ cdecl _lfind(ptr ptr ptr long ptr) msvcrt._lfind @ stub _lfind_s @ cdecl _loaddll(str) msvcrt._loaddll +@ cdecl -arch=x86_64 _local_unwind(ptr ptr) msvcrt._local_unwind @ cdecl -i386 _local_unwind2(ptr long) msvcrt._local_unwind2 @ cdecl -i386 _local_unwind4(ptr ptr long) msvcrt._local_unwind4 @ cdecl _localtime32(ptr) msvcrt._localtime32 diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 7404089..422e3fa 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -605,6 +605,15 @@ void __cdecl MSVCRT_longjmp( struct MSVCRT___JUMP_BUFFER *jmp, int retval ) longjmp_set_regs( jmp, retval ); } +/******************************************************************* + * _local_unwind (MSVCRT.@) + */ +void __cdecl _local_unwind( void *frame, void *target ) +{ + CONTEXT context; + RtlUnwindEx( frame, target, NULL, 0, &context, NULL ); +} + #endif /* __x86_64__ */ static MSVCRT___sighandler_t sighandlers[MSVCRT_NSIG] = { MSVCRT_SIG_DFL }; diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 3b36d77..5d065fb 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -627,7 +627,7 @@ @ cdecl _lfind(ptr ptr ptr long ptr) # stub _lfind_s(ptr ptr ptr long ptr ptr) @ cdecl _loaddll(str) -# stub -arch=x86_64 _local_unwind +@ cdecl -arch=x86_64 _local_unwind(ptr ptr) @ cdecl -i386 _local_unwind2(ptr long) @ cdecl -i386 _local_unwind4(ptr ptr long) @ cdecl _localtime32(ptr) MSVCRT__localtime32 diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index ff83f8e..e4372e9 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -378,6 +378,7 @@ @ cdecl _kbhit() msvcrt._kbhit @ cdecl _lfind(ptr ptr ptr long ptr) msvcrt._lfind @ cdecl _loaddll(str) msvcrt._loaddll +@ cdecl -arch=x86_64 _local_unwind(ptr ptr) msvcrt._local_unwind @ cdecl -i386 _local_unwind2(ptr long) msvcrt._local_unwind2 @ cdecl _lock(long) msvcrt._lock @ cdecl _locking(long long long) msvcrt._locking diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 64aaf39..3c059b6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1411,7 +1411,8 @@ @ cdecl -private -i386 _global_unwind2(ptr) msvcrt._global_unwind2 @ cdecl -private _itoa(long ptr long) msvcrt._itoa @ cdecl -private _itow(long ptr long) msvcrt._itow -@ cdecl -private _local_unwind2(ptr long) msvcrt._local_unwind2 +@ cdecl -private -arch=x86_64 _local_unwind(ptr ptr) msvcrt._local_unwind +@ cdecl -private -arch=i386 _local_unwind2(ptr long) msvcrt._local_unwind2 @ cdecl -private _purecall() msvcrt._purecall @ varargs -private _snprintf(str long str) msvcrt._snprintf @ varargs -private _snwprintf(wstr long wstr) msvcrt._snwprintf

1 0

Hans Leidekker : msi: Don't resolve child folders if the target path doesn' t change in MsiSetTargetPath.
by Alexandre Julliard 17 May '11

17 May '11

Module: wine Branch: master Commit: f464b7d2e258561f819a2ee1917510a67624ec8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f464b7d2e258561f819a2ee19… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 17 11:10:02 2011 +0200 msi: Don't resolve child folders if the target path doesn't change in MsiSetTargetPath. --- dlls/msi/install.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 3559792..e90c3b1 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -549,17 +549,23 @@ static void set_target_path( MSIPACKAGE *package, MSIFOLDER *folder, const WCHAR { FolderList *fl; MSIFOLDER *child; + WCHAR *target_path; - msi_free( folder->ResolvedTarget ); - folder->ResolvedTarget = strdupW( path ); - msi_clean_path( folder->ResolvedTarget ); - msi_set_property( package->db, folder->Directory, folder->ResolvedTarget ); - - LIST_FOR_EACH_ENTRY( fl, &folder->children, FolderList, entry ) + if (!(target_path = strdupW( path ))) return; + msi_clean_path( target_path ); + if (strcmpW( target_path, folder->ResolvedTarget )) { - child = fl->folder; - msi_resolve_target_folder( package, child->Directory, FALSE ); + msi_free( folder->ResolvedTarget ); + folder->ResolvedTarget = target_path; + msi_set_property( package->db, folder->Directory, folder->ResolvedTarget ); + + LIST_FOR_EACH_ENTRY( fl, &folder->children, FolderList, entry ) + { + child = fl->folder; + msi_resolve_target_folder( package, child->Directory, FALSE ); + } } + else msi_free( target_path ); } UINT MSI_SetTargetPathW( MSIPACKAGE *package, LPCWSTR szFolder, LPCWSTR szFolderPath )

1 0

Hans Leidekker : msi: Make sure that the target root directory has a trailing backslash.
by Alexandre Julliard 17 May '11

17 May '11

Module: wine Branch: master Commit: 01433f0f300f18945e68358ea73db3ad47cda1f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01433f0f300f18945e68358ea… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 17 11:09:43 2011 +0200 msi: Make sure that the target root directory has a trailing backslash. --- dlls/msi/action.c | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 42c9274..f41c921 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2990,6 +2990,25 @@ void msi_clean_path( WCHAR *p ) } } +static WCHAR *get_target_dir_property( MSIDATABASE *db ) +{ + int len; + WCHAR *path, *target_dir = msi_dup_property( db, szTargetDir ); + + if (!target_dir) return NULL; + + len = strlenW( target_dir ); + if (target_dir[len - 1] == '\\') return target_dir; + if ((path = msi_alloc( (len + 2) * sizeof(WCHAR) ))) + { + strcpyW( path, target_dir ); + path[len] = '\\'; + path[len + 1] = 0; + } + msi_free( target_dir ); + return path; +} + void msi_resolve_target_folder( MSIPACKAGE *package, const WCHAR *name, BOOL load_prop ) { FolderList *fl; @@ -3002,7 +3021,7 @@ void msi_resolve_target_folder( MSIPACKAGE *package, const WCHAR *name, BOOL loa if (!strcmpW( folder->Directory, szTargetDir )) /* special resolving for target root dir */ { - if (!load_prop || !(path = msi_dup_property( package->db, szTargetDir ))) + if (!load_prop || !(path = get_target_dir_property( package->db ))) { path = msi_dup_property( package->db, szRootDrive ); }

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
95
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 May 2011