wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Francois Gouget : po: Remove English strings from the Swedish translation.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 88b1591e24a015757c8e034edd325bc8f2c793e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88b1591e24a015757c8e034ed… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 9 02:20:29 2011 +0200 po: Remove English strings from the Swedish translation. --- po/sv.po | 231 ++++++++++++++++++++++++++++---------------------------------- 1 files changed, 105 insertions(+), 126 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=88b1591e24a015757c8e0…

1 0

Francois Gouget : po: Remove English strings from the Thai translation.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 44aefb180e566532e7e9ad4e01cb1f4a2bb9fe2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=44aefb180e566532e7e9ad4e0… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 9 02:13:49 2011 +0200 po: Remove English strings from the Thai translation. --- po/th.po | 136 ++++++++++++++++++++----------------------------------------- 1 files changed, 45 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=44aefb180e566532e7e9a…

1 0

Francois Gouget : po: Remove English strings from the Turkish translation.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 9a14be9f6cb733434ea5f1ed12a4a58d4650def8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a14be9f6cb733434ea5f1ed1… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 9 02:05:31 2011 +0200 po: Remove English strings from the Turkish translation. --- po/tr.po | 414 ++++++++++++++++++++------------------------------------------ 1 files changed, 133 insertions(+), 281 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a14be9f6cb733434ea5f…

1 0

Francois Gouget : po: Remove English strings from the Chinese (Taiwan) translation.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: c5f9129ddd9ebb8e1d768d10d66e83a8d7228737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5f9129ddd9ebb8e1d768d10d… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 9 02:02:41 2011 +0200 po: Remove English strings from the Chinese (Taiwan) translation. --- po/zh_TW.po | 141 +++++++++++++++++------------------------------------------ 1 files changed, 40 insertions(+), 101 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index aa319bd..45b3a8e 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -56,11 +56,11 @@ msgstr "版本" #: appwiz.rc:38 msgid "Installation programs" -msgstr "Installation Programs" +msgstr "" #: appwiz.rc:39 msgid "Programs (*.exe)" -msgstr "Programs (*.exe)" +msgstr "" #: appwiz.rc:40 avifil32.rc:30 cryptui.rc:80 shell32.rc:195 notepad.rc:75 #: oleview.rc:101 progman.rc:79 regedit.rc:195 winhlp32.rc:87 @@ -68,14 +68,12 @@ msgid "All files (*.*)" msgstr "所有檔案 (*.*)" #: appwiz.rc:42 -#, fuzzy msgid "&Remove" -msgstr "&Remove..." +msgstr "" #: appwiz.rc:43 -#, fuzzy msgid "&Modify/Remove" -msgstr "&Modify/Remove..." +msgstr "" #: appwiz.rc:48 msgid "Downloading..." @@ -2220,9 +2218,8 @@ msgid "&Help" msgstr "幫助(&H)" #: ieframe.rc:57 -#, fuzzy msgid "&About Internet Explorer" -msgstr "Wine Internet Explorer" +msgstr "" #: ieframe.rc:67 #, fuzzy @@ -3462,9 +3459,8 @@ msgid "No recovery program for service\n" msgstr "" #: winerror.mc:1291 -#, fuzzy msgid "Service not implemented by exe\n" -msgstr "Printing not implemented" +msgstr "" #: winerror.mc:1296 msgid "End of media\n" @@ -4665,19 +4661,16 @@ msgid "Installer service failed.\n" msgstr "剩餘空間" #: winerror.mc:2731 -#, fuzzy msgid "Installation aborted by user\n" -msgstr "Installation Programs" +msgstr "" #: winerror.mc:2736 -#, fuzzy msgid "Installation failure\n" -msgstr "Installation Programs" +msgstr "" #: winerror.mc:2741 -#, fuzzy msgid "Installation suspended\n" -msgstr "Installation Programs" +msgstr "" #: winerror.mc:2746 #, fuzzy @@ -4741,18 +4734,16 @@ msgid "Device removed\n" msgstr "" #: winerror.mc:2811 -#, fuzzy msgid "Installation already running\n" -msgstr "Installation Programs" +msgstr "" #: winerror.mc:2816 msgid "Installation package failed to open\n" msgstr "" #: winerror.mc:2821 -#, fuzzy msgid "Installation package is invalid\n" -msgstr "Installation Programs" +msgstr "" #: winerror.mc:2826 msgid "Installer user interface failed\n" @@ -4772,9 +4763,8 @@ msgid "Installation transform failed to apply\n" msgstr "" #: winerror.mc:2846 -#, fuzzy msgid "Installation package rejected\n" -msgstr "Installation Programs" +msgstr "" #: winerror.mc:2851 msgid "Function could not be called\n" @@ -5335,9 +5325,8 @@ msgid "RPC call cancelled\n" msgstr "" #: winerror.mc:3506 -#, fuzzy msgid "Binding incomplete\n" -msgstr "Printing not implemented" +msgstr "" #: winerror.mc:3511 msgid "RPC comm failure\n" @@ -5606,7 +5595,6 @@ msgid "insert disk %s" msgstr "插入軟碟 %s" #: msi.rc:30 -#, fuzzy msgid "" "Windows Installer %s\n" "\n" @@ -5638,35 +5626,6 @@ msgid "" "\t/help\n" "\t/?\n" msgstr "" -"Windows Installer %s\n" -"\n" -"Usage:\n" -"msiexec command {required parameter} [optional parammeter]\n" -"\n" -"Install a product:\n" -"\t/i {package|productcode} [property]\n" -"\t/package {package|productcode} [property]\n" -"\t/a package [property]\n" -"Repair an installation:\n" -"\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" -"Uninstall a product:\n" -"\t/uninstall {package|productcode} [property]\n" -"\t/x {package|productcode} [property]\n" -"Advertise a product:\n" -"\t/j[u|m] package [/t transform] [/g languageid]\n" -"Apply a patch:\n" -"\t/p patchpackage [property]\n" -"\t/p patchpackage /a package [property]\n" -"Log and UI Modifiers for above commands:\n" -"\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" -"\t/q{|n|b|r|f|n+|b+|b-}\n" -"Register MSI Service:\n" -"\t/y\n" -"Unregister MSI Service:\n" -"\t/z\n" -"Display this help:\n" -"\t/help\n" -"\t/?\n" #: msi.rc:57 msgid "enter which folder contains %s" @@ -5771,9 +5730,8 @@ msgid "application" msgstr "運用程式" #: oleacc.rc:42 -#, fuzzy msgid "document" -msgstr "Document" +msgstr "" #: oleacc.rc:43 msgid "pane" @@ -6740,9 +6698,8 @@ msgid "Program Files\\Common Files" msgstr "" #: shell32.rc:221 shell32.rc:147 shell32.rc:243 -#, fuzzy msgid "Documents" -msgstr "Document" +msgstr "" #: shell32.rc:222 msgid "Start Menu\\Programs\\Administrative Tools" @@ -6767,9 +6724,8 @@ msgid "Local Settings\\Application Data\\Microsoft\\CD Burning" msgstr "" #: shell32.rc:217 -#, fuzzy msgid "Program Files (x86)" -msgstr "Programs (*.exe)" +msgstr "" #: shell32.rc:220 msgid "Program Files (x86)\\Common Files" @@ -6863,31 +6819,31 @@ msgstr "" #: shell32.rc:166 msgid "Unable to create new Folder: Permission denied." -msgstr "Unable to create new Folder: Permission denied." +msgstr "" #: shell32.rc:167 msgid "Error during creation of a new folder" -msgstr "Error during creation of a new folder" +msgstr "" #: shell32.rc:168 msgid "Confirm file deletion" -msgstr "Confirm file deletion" +msgstr "" #: shell32.rc:169 msgid "Confirm folder deletion" -msgstr "Confirm folder deletion" +msgstr "" #: shell32.rc:170 msgid "Are you sure you want to delete '%1'?" -msgstr "Are you sure you want to delete '%1'?" +msgstr "" #: shell32.rc:171 msgid "Are you sure you want to delete these %1 items?" -msgstr "Are you sure you want to delete these %1 items?" +msgstr "" #: shell32.rc:178 msgid "Confirm file overwrite" -msgstr "Confirm file overwrite" +msgstr "" #: shell32.rc:177 msgid "" @@ -6895,32 +6851,27 @@ msgid "" "\n" "Do you want to replace it?" msgstr "" -"This folder already contains a file called '%1'.\n" -"\n" -"Do you want to replace it?" #: shell32.rc:172 msgid "Are you sure you want to delete the selected item(s)?" -msgstr "Are you sure you want to delete the selected item(s)?" +msgstr "" #: shell32.rc:174 msgid "" "Are you sure that you want to send '%1' and all its content to the Trash?" msgstr "" -"Are you sure that you want to send '%1' and all its content to the Trash?" #: shell32.rc:173 msgid "Are you sure that you want to send '%1' to the Trash?" -msgstr "Are you sure that you want to send '%1' to the Trash?" +msgstr "" #: shell32.rc:175 msgid "Are you sure that you want to send these %1 items to the Trash?" -msgstr "Are you sure that you want to send these %1 items to the Trash?" +msgstr "" #: shell32.rc:176 msgid "The item '%1' can't be sent to Trash. Do you want to delete it instead?" msgstr "" -"The item '%1' can't be sent to Trash. Do you want to delete it instead?" #: shell32.rc:179 msgid "" @@ -6930,15 +6881,10 @@ msgid "" "selected folder they will be replaced. Do you still want to move or copy\n" "the folder?" msgstr "" -"This folder already contains a folder named '%1'.\n" -"\n" -"If the files in the destination folder have the same names as files in the\n" -"selected folder they will be replaced. Do you still want to move or copy\n" -"the folder?" #: shell32.rc:247 msgid "New Folder" -msgstr "New Folder" +msgstr "" #: shell32.rc:249 msgid "Wine Control Panel" @@ -6962,19 +6908,16 @@ msgid "There is no Windows program configured to open this type of file." msgstr "" #: shell32.rc:255 -#, fuzzy msgid "Are you sure you wish to permanently delete '%1'?" -msgstr "Are you sure you want to delete '%1'?" +msgstr "" #: shell32.rc:256 -#, fuzzy msgid "Are you sure you wish to permanently delete these %1 items?" -msgstr "Are you sure you want to delete these %1 items?" +msgstr "" #: shell32.rc:257 -#, fuzzy msgid "Confirm deletion" -msgstr "Confirm file deletion" +msgstr "" #: shell32.rc:258 #, fuzzy @@ -6997,9 +6940,8 @@ msgstr "" "要替換嗎?" #: shell32.rc:260 -#, fuzzy msgid "Confirm overwrite" -msgstr "Confirm file overwrite" +msgstr "" #: shell32.rc:277 msgid "" @@ -7824,9 +7766,8 @@ msgid "Timeout" msgstr "" #: wldap32.rc:113 -#, fuzzy msgid "Auth Unknown" -msgstr "Context Unknown" +msgstr "" #: wldap32.rc:114 msgid "Filter Error" @@ -8900,9 +8841,8 @@ msgid "&Local server" msgstr "本地端口" #: oleview.rc:44 -#, fuzzy msgid "&Remote server" -msgstr "&Remove..." +msgstr "" #: oleview.rc:47 msgid "View &Type information" @@ -9623,7 +9563,7 @@ msgstr "添加一個新的多字符串值" #: regedit.rc:171 msgid "Exports selected branch of the registry to a text file" -msgstr "Exports selected branch of the registry to a text file" +msgstr "" #: start.rc:46 msgid "" @@ -10051,7 +9991,7 @@ msgstr "將進程設為低優先級" #: taskmgr.rc:247 msgid "Controls Debug Channels" -msgstr "Controls Debug Channels" +msgstr "" #: taskmgr.rc:263 #, fuzzy @@ -10247,9 +10187,8 @@ msgid "Task" msgstr "結束任務(&E)" #: taskmgr.rc:327 -#, fuzzy msgid "Debug Channels" -msgstr "Controls Debug Channels" +msgstr "" #: taskmgr.rc:328 msgid "Fixme" @@ -11248,11 +11187,11 @@ msgstr "單頁" #: wordpad.rc:167 msgid "Zoom in" -msgstr "Zoom in" +msgstr "" #: wordpad.rc:168 msgid "Zoom out" -msgstr "Zoom out" +msgstr "" #: wordpad.rc:170 #, fuzzy @@ -11286,7 +11225,7 @@ msgstr "" #: wordpad.rc:180 msgid "Document" -msgstr "Document" +msgstr "" #: wordpad.rc:181 msgid "Save changes to '%s'?" @@ -11332,7 +11271,7 @@ msgstr "你沒有開啟檔案的權力." #: wordpad.rc:193 msgid "Printing not implemented" -msgstr "Printing not implemented" +msgstr "" #: wordpad.rc:194 msgid "Cannot add more than 32 tab stops."

1 0

Jörg Höhle : mmdevapi: IsFormatSupported fills closest match iff it returns S_FALSE.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 3e1d4028811e5b57df264ac21dd4c56b383f9da9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e1d4028811e5b57df264ac21… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Aug 2 21:49:12 2011 +0200 mmdevapi: IsFormatSupported fills closest match iff it returns S_FALSE. --- dlls/winealsa.drv/mmdevdrv.c | 12 ++++++------ dlls/wineoss.drv/mmdevdrv.c | 14 ++++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 916c247..0c47876 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1189,6 +1189,9 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, dump_fmt(fmt); + if(out) + *out = NULL; + EnterCriticalSection(&This->lock); if((err = snd_pcm_hw_params_any(This->pcm_handle, This->hw_params)) < 0){ @@ -1320,17 +1323,14 @@ exit: LeaveCriticalSection(&This->lock); HeapFree(GetProcessHeap(), 0, formats); - if(hr == S_OK || !out){ - CoTaskMemFree(closest); - if(out) - *out = NULL; - }else if(closest){ + if(hr == S_FALSE && out) { closest->nBlockAlign = closest->nChannels * closest->wBitsPerSample / 8; closest->nAvgBytesPerSec = closest->nBlockAlign * closest->nSamplesPerSec; *out = closest; - } + } else + CoTaskMemFree(closest); TRACE("returning: %08x\n", hr); return hr; diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 93f71cc..629f4f7 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -676,6 +676,9 @@ static HRESULT setup_oss_device(ACImpl *This, const WAVEFORMATEX *fmt, WAVEFORMATEXTENSIBLE *fmtex = (void*)fmt; WAVEFORMATEX *closest = NULL; + if(out) + *out = NULL; + tmp = oss_format = get_oss_format(fmt); if(oss_format < 0) return AUDCLNT_E_UNSUPPORTED_FORMAT; @@ -689,6 +692,8 @@ static HRESULT setup_oss_device(ACImpl *This, const WAVEFORMATEX *fmt, } closest = clone_format(fmt); + if(!closest) + return E_OUTOFMEMORY; tmp = fmt->nSamplesPerSec; if(ioctl(This->fd, SNDCTL_DSP_SPEED, &tmp) < 0){ @@ -723,17 +728,14 @@ static HRESULT setup_oss_device(ACImpl *This, const WAVEFORMATEX *fmt, ret = S_FALSE; } - if(ret == S_OK || !out){ - CoTaskMemFree( closest); - if(out) - *out = NULL; - }else{ + if(ret == S_FALSE && out){ closest->nBlockAlign = closest->nChannels * closest->wBitsPerSample / 8; closest->nAvgBytesPerSec = closest->nBlockAlign * closest->nSamplesPerSec; *out = closest; - } + } else + CoTaskMemFree(closest); TRACE("returning: %08x\n", ret); return ret;

1 0

Francois Gouget : user32/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 03d4ef95ece26873e1ee07d83c243b48d214e2ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=03d4ef95ece26873e1ee07d83… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 9 12:49:44 2011 +0200 user32/tests: Add a trailing '\n' to an ok() call. --- dlls/user32/tests/edit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 934fc52..c1ca3a3 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -773,7 +773,7 @@ static void test_edit_control_2(void) r = SetCaretPos(0, 0); todo_wine ok(0 == r, "SetCaretPos succeeded unexpectedly, expected: 0, got: %d\n", r); phwnd = SetFocus(hwndET2); - ok(phwnd != NULL, "SetFocus failed unexpectedly, expected non-zero, got NULL"); + ok(phwnd != NULL, "SetFocus failed unexpectedly, expected non-zero, got NULL\n"); r = SetCaretPos(0, 0); ok(1 == r, "SetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); r = GetCaretPos(&cpos);

1 0

Hans Leidekker : msi: Ignore unknown components in the FeatureComponents table.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 258fc7137fa4456b80a87472f206cf16405e68af URL: http://source.winehq.org/git/wine.git/?a=commit;h=258fc7137fa4456b80a87472f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 9 11:02:11 2011 +0200 msi: Ignore unknown components in the FeatureComponents table. --- dlls/msi/action.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 69384be..62d857a 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1048,10 +1048,9 @@ static UINT iterate_load_featurecomponents(MSIRECORD *row, LPVOID param) comp = msi_get_loaded_component( ilfs->package, component ); if (!comp) { - ERR("unknown component %s\n", debugstr_w(component)); - return ERROR_FUNCTION_FAILED; + WARN("ignoring unknown component %s\n", debugstr_w(component)); + return ERROR_SUCCESS; } - add_feature_component( ilfs->feature, comp ); comp->Enabled = TRUE;

1 0

Hans Leidekker : msi: Remove some dead assignments (clang).
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 6351cd827be2c0a3378815c09f907a08a2576e5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6351cd827be2c0a3378815c09… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 9 11:01:39 2011 +0200 msi: Remove some dead assignments (clang). --- dlls/msi/appsearch.c | 5 ++--- dlls/msi/dialog.c | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 3e0607f..f93e05d 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -460,7 +460,7 @@ static UINT ACTION_AppSearchReg(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNAT switch (type & 0x0f) { case msidbLocatorTypeDirectory: - rc = ACTION_SearchDirectory(package, sig, ptr, 0, appValue); + ACTION_SearchDirectory(package, sig, ptr, 0, appValue); break; case msidbLocatorTypeFileName: *appValue = app_search_file(ptr, sig); @@ -481,7 +481,6 @@ end: msi_free( deformatted ); msiobj_release(&row->hdr); - return ERROR_SUCCESS; } @@ -961,7 +960,7 @@ static UINT ACTION_AppSearchDr(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATU { MSISIGNATURE parentSig; - rc = ACTION_AppSearchSigName(package, parentName, &parentSig, &parent); + ACTION_AppSearchSigName(package, parentName, &parentSig, &parent); ACTION_FreeSignature(&parentSig); if (!parent) { diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 51ca2e7..7074a7b 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2467,12 +2467,11 @@ MSISelectionTree_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) tvhti.pt.y = (short)HIWORD( lParam ); tvhti.flags = 0; tvhti.hItem = 0; - r = CallWindowProcW(info->oldproc, hWnd, TVM_HITTEST, 0, (LPARAM) &tvhti ); + CallWindowProcW(info->oldproc, hWnd, TVM_HITTEST, 0, (LPARAM) &tvhti ); if (tvhti.flags & TVHT_ONITEMSTATEICON) return msi_seltree_menu( hWnd, tvhti.hItem ); break; } - r = CallWindowProcW(info->oldproc, hWnd, msg, wParam, lParam); switch( msg )

1 0

Hans Leidekker : msi: Return the right error from ResolveSource when the user cancels.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: bd3885946c20be13cc2f96d2bdd8bd5490ddc1da URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd3885946c20be13cc2f96d2b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 9 11:01:12 2011 +0200 msi: Return the right error from ResolveSource when the user cancels. --- dlls/msi/action.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 4c857f9..69384be 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5149,11 +5149,11 @@ static UINT ACTION_ResolveSource(MSIPACKAGE* package) msg = msi_build_error_string(package, 1302, 1, prompt); while(attrib == INVALID_FILE_ATTRIBUTES) { - rc = MessageBoxW(NULL,msg,NULL,MB_OKCANCEL); + rc = MessageBoxW(NULL, msg, NULL, MB_OKCANCEL); if (rc == IDCANCEL) { - rc = ERROR_INSTALL_USEREXIT; - break; + msi_free(prompt); + return ERROR_INSTALL_USEREXIT; } attrib = GetFileAttributesW(package->db->path); }

1 0

Hans Leidekker : msi: SelfUnregModules' counterpart is SelfRegModules.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 984422bad16a79d611d8e9f25c621015f57e8090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=984422bad16a79d611d8e9f25… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 9 11:00:51 2011 +0200 msi: SelfUnregModules' counterpart is SelfRegModules. --- dlls/msi/action.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index fa92653..4c857f9 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7206,7 +7206,7 @@ StandardActions[] = { szRMCCPSearch, ACTION_RMCCPSearch, NULL }, { szScheduleReboot, ACTION_ScheduleReboot, NULL }, { szSelfRegModules, ACTION_SelfRegModules, szSelfUnregModules }, - { szSelfUnregModules, ACTION_SelfUnregModules, szSelfUnregModules }, + { szSelfUnregModules, ACTION_SelfUnregModules, szSelfRegModules }, { szSetODBCFolders, ACTION_SetODBCFolders, NULL }, { szStartServices, ACTION_StartServices, szStopServices }, { szStopServices, ACTION_StopServices, szStartServices },

1 0

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 September 2011