wine-commits March 2011

wine-commits@winehq.org

2 participants
849 discussions

Piotr Caban : msvcrt: Added space for nullbyte in size returned by wcstombs_s and mbstowcs_s.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: fdffe548f10d4b07a8fb0af9668ba310824b2304 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdffe548f10d4b07a8fb0af96… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 30 15:45:04 2011 +0200 msvcrt: Added space for nullbyte in size returned by wcstombs_s and mbstowcs_s. --- dlls/msvcrt/mbcs.c | 2 +- dlls/msvcrt/tests/string.c | 8 ++++++++ dlls/msvcrt/wcs.c | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 2a2ac72..caadc32 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1900,7 +1900,7 @@ int CDECL MSVCRT__mbstowcs_s_l(MSVCRT_size_t *ret, MSVCRT_wchar_t *wcstr, if(!wcstr && !size) { conv = MSVCRT__mbstowcs_l(NULL, mbstr, 0, locale); if(ret) - *ret = conv; + *ret = conv+1; return 0; } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index f3d8dc4..6aba883 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1337,6 +1337,10 @@ static void test_mbstowcs(void) ok(ret == 3, "ret = %d\n", (int)ret); ok(!memcmp(wOut, wHiragana, sizeof(wHiragana)), "wOut = %s\n", wine_dbgstr_w(wOut)); + err = pmbstowcs_s(&ret, NULL, 0, mHiragana, 1); + ok(err == 0, "err = %d\n", err); + ok(ret == 3, "ret = %d\n", (int)ret); + err = pwcstombs_s(&ret, mOut, 6, wSimple, _TRUNCATE); ok(err == 0, "err = %d\n", err); ok(ret == 5, "ret = %d\n", (int)ret); @@ -1346,6 +1350,10 @@ static void test_mbstowcs(void) ok(err == 0, "err = %d\n", err); ok(ret == 5, "ret = %d\n", (int)ret); ok(!memcmp(mOut, mHiragana, sizeof(mHiragana)), "mOut = %s\n", mOut); + + err = pwcstombs_s(&ret, NULL, 0, wHiragana, 1); + ok(err == 0, "err = %d\n", err); + ok(ret == 5, "ret = %d\n", (int)ret); } static void test_gcvt(void) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 93aa0f0..cf3cba3 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -341,7 +341,7 @@ MSVCRT_size_t CDECL MSVCRT__wcstombs_s_l(MSVCRT_size_t *ret, char *mbstr, if(!mbstr && !size) { conv = MSVCRT__wcstombs_l(NULL, wcstr, 0, locale); if(ret) - *ret = conv; + *ret = conv+1; return 0; }

1 0

Francois Gouget : winedbg: stack_get_register_current_frame() is not used anymore so remove it.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: f54b1688550da7df74ecbbd4e3df8bceb0318122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f54b1688550da7df74ecbbd4e… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 30 16:41:23 2011 +0200 winedbg: stack_get_register_current_frame() is not used anymore so remove it. --- programs/winedbg/stack.c | 23 ----------------------- 1 files changed, 0 insertions(+), 23 deletions(-) diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index a291c61..f6583a3 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -111,29 +111,6 @@ BOOL stack_get_current_frame(IMAGEHLP_STACK_FRAME* ihsf) return stack_get_frame(dbg_curr_thread->curr_frame, ihsf); } -BOOL stack_get_register_current_frame(unsigned regno, DWORD_PTR** pval) -{ - enum be_cpu_addr kind; - - if (dbg_curr_thread->frames == NULL) return FALSE; - - if (!be_cpu->get_register_info(regno, &kind)) return FALSE; - - switch (kind) - { - case be_cpu_addr_pc: - *pval = &dbg_curr_thread->frames[dbg_curr_thread->curr_frame].linear_pc; - break; - case be_cpu_addr_stack: - *pval = &dbg_curr_thread->frames[dbg_curr_thread->curr_frame].linear_stack; - break; - case be_cpu_addr_frame: - *pval = &dbg_curr_thread->frames[dbg_curr_thread->curr_frame].linear_frame; - break; - } - return TRUE; -} - BOOL stack_get_register_frame(const struct dbg_internal_var* div, DWORD_PTR** pval) { if (dbg_curr_thread->frames == NULL) return FALSE;

1 0

Francois Gouget : winedbg: memory_get_current_frame() is not used anymore so remove it.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: f8624006a7023ac837ec092bea616fb178d50c1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8624006a7023ac837ec092be… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 30 16:40:17 2011 +0200 winedbg: memory_get_current_frame() is not used anymore so remove it. --- programs/winedbg/debugger.h | 1 - programs/winedbg/memory.c | 7 ------- 2 files changed, 0 insertions(+), 8 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 529191f..9c72916 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -367,7 +367,6 @@ extern void memory_examine(const struct dbg_lvalue *lvalue, int coun extern void* memory_to_linear_addr(const ADDRESS64* address); extern BOOL memory_get_current_pc(ADDRESS64* address); extern BOOL memory_get_current_stack(ADDRESS64* address); -extern BOOL memory_get_current_frame(ADDRESS64* address); extern BOOL memory_get_string(struct dbg_process* pcs, void* addr, BOOL in_debuggee, BOOL unicode, char* buffer, int size); extern BOOL memory_get_string_indirect(struct dbg_process* pcs, void* addr, BOOL unicode, WCHAR* buffer, int size); extern BOOL memory_get_register(DWORD regno, DWORD_PTR** value, char* buffer, int len); diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 5a54ec1..7a0b085 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -67,13 +67,6 @@ BOOL memory_get_current_stack(ADDRESS64* addr) be_cpu_addr_stack, addr); } -BOOL memory_get_current_frame(ADDRESS64* addr) -{ - assert(be_cpu->get_addr); - return be_cpu->get_addr(dbg_curr_thread->handle, &dbg_context, - be_cpu_addr_frame, addr); -} - static void memory_report_invalid_addr(const void* addr) { ADDRESS64 address;

1 0

Francois Gouget : programs: In English punctuations are not preceded by a space.
by Alexandre Julliard 30 Mar '11

30 Mar '11

1 0

Francois Gouget : winmm: Remove a space before a punctuation.
by Alexandre Julliard 30 Mar '11

30 Mar '11

1 0

Francois Gouget : winefile: Fix the compilation when _NO_EXTENSIONS is defined.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 1a56a26b854127aafa7fdee4b23d937d6dc60522 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a56a26b854127aafa7fdee4b… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 30 16:57:46 2011 +0200 winefile: Fix the compilation when _NO_EXTENSIONS is defined. --- programs/winefile/winefile.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 40175f0..51a889d 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -2105,6 +2105,7 @@ static BOOL activate_drive_window(LPCWSTR path) return FALSE; } +#ifndef _NO_EXTENSIONS static BOOL activate_fs_window(LPCWSTR filesys) { HWND child_wnd; @@ -2127,6 +2128,7 @@ static BOOL activate_fs_window(LPCWSTR filesys) return FALSE; } +#endif /* _NO_EXTENSIONS */ static LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam) { @@ -2562,6 +2564,7 @@ static BOOL calc_widths(Pane* pane, BOOL anyway) } +#ifndef _NO_EXTENSIONS /* calculate one preferred column width */ static void calc_single_width(Pane* pane, int col) @@ -2620,6 +2623,7 @@ static void calc_single_width(Pane* pane, int col) SendMessageW(pane->hwnd, LB_SETHORIZONTALEXTENT, x, 0); } +#endif /* _NO_EXTENSIONS */ static BOOL pattern_match(LPCWSTR str, LPCWSTR pattern) @@ -3314,7 +3318,7 @@ static void draw_item(Pane* pane, LPDRAWITEMSTRUCT dis, Entry* entry, int calcWi } else hpen = CreatePen(PS_DOT, 0, RGB(255,255,255)); - lastPen = SelectPen(dis->hDC, hpen); + lastPen = SelectObject(dis->hDC, hpen); lastBrush = SelectObject(dis->hDC, GetStockObject(HOLLOW_BRUSH)); SetROP2(dis->hDC, R2_XORPEN); Rectangle(dis->hDC, focusRect.left, focusRect.top, focusRect.right, focusRect.bottom); @@ -3986,6 +3990,7 @@ static BOOL CtxMenu_HandleMenuMsg(UINT nmsg, WPARAM wparam, LPARAM lparam) } +#ifndef _NO_EXTENSIONS static HRESULT ShellFolderContextMenu(IShellFolder* shell_folder, HWND hwndParent, int cidl, LPCITEMIDLIST* apidl, int x, int y) { IContextMenu* pcm; @@ -4031,6 +4036,7 @@ static HRESULT ShellFolderContextMenu(IShellFolder* shell_folder, HWND hwndParen return FAILED(hr)? hr: executed? S_OK: S_FALSE; } +#endif /* _NO_EXTENSIONS */ static LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam) @@ -4681,7 +4687,7 @@ static BOOL CALLBACK EnumWndProc(HWND hwnd, LPARAM lparam) { WCHAR cls[128]; - GetClassName(hwnd, cls, 128); + GetClassNameW(hwnd, cls, 128); if (!lstrcmpW(cls, (LPCWSTR)lparam)) { g_foundPrevInstance++;

1 0

Francois Gouget : winefile: Remove commented out code.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 378cf80a1af9d0925cabc79211b678a95ef2a779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=378cf80a1af9d0925cabc7921… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 30 16:50:55 2011 +0200 winefile: Remove commented out code. --- programs/winefile/winefile.c | 56 +----------------------------------------- 1 files changed, 1 insertions(+), 55 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 2bad75c..40175f0 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -2872,9 +2872,6 @@ static void calc_tabbed_width(Pane* pane, LPDRAWITEMSTRUCT dis, int col, LPCWSTR { RECT rt = {0, 0, 0, 0}; -/* DRAWTEXTPARAMS dtp = {sizeof(DRAWTEXTPARAMS), 2}; - DrawTextExW(dis->hDC, (LPWSTR)str, -1, &rt, DT_CALCRECT|DT_SINGLELINE|DT_NOPREFIX|DT_EXPANDTABS|DT_TABSTOP, &dtp);*/ - DrawTextW(dis->hDC, str, -1, &rt, DT_CALCRECT|DT_SINGLELINE|DT_EXPANDTABS|DT_TABSTOP|(2<<8)); /*FIXME rt (0,0) ??? */ @@ -2906,9 +2903,6 @@ static void output_tabbed_text(Pane* pane, LPDRAWITEMSTRUCT dis, int col, LPCWST rt.right = x+pane->positions[col+1]-Globals.spaceSize.cx; rt.bottom = dis->rcItem.bottom; -/* DRAWTEXTPARAMS dtp = {sizeof(DRAWTEXTPARAMS), 2}; - DrawTextExW(dis->hDC, (LPWSTR)str, -1, &rt, DT_SINGLELINE|DT_NOPREFIX|DT_EXPANDTABS|DT_TABSTOP, &dtp);*/ - DrawTextW(dis->hDC, str, -1, &rt, DT_SINGLELINE|DT_EXPANDTABS|DT_TABSTOP|(2<<8)); } @@ -3065,7 +3059,6 @@ static void draw_item(Pane* pane, LPDRAWITEMSTRUCT dis, Entry* entry, int calcWi hrgn_org = 0; } - /* HGDIOBJ holdPen = SelectObject(dis->hDC, GetStockObject(BLACK_PEN)); */ ExtSelectClipRgn(dis->hDC, hrgn, RGN_AND); DeleteObject(hrgn); @@ -3103,7 +3096,6 @@ static void draw_item(Pane* pane, LPDRAWITEMSTRUCT dis, Entry* entry, int calcWi SelectClipRgn(dis->hDC, hrgn_org); if (hrgn_org) DeleteObject(hrgn_org); - /* SelectObject(dis->hDC, holdPen); */ } else if (calcWidthCol==col || calcWidthCol==COLUMNS) { int right = img_pos + IMAGE_WIDTH - TREE_LINE_DX; @@ -3305,43 +3297,6 @@ static void draw_item(Pane* pane, LPDRAWITEMSTRUCT dis, Entry* entry, int calcWi col++; } -/*TODO - if (flags.security) { - static const WCHAR sSecTabs[] = { - ' ','\t',' ','\t',' ','\t',' ', - ' ','\t',' ', - ' ','\t',' ','\t',' ','\t',' ', - ' ','\t',' ', - ' ','\t',' ','\t',' ','\t',' ', - '\0' - }; - - DWORD rights = get_access_mask(); - - lstrcpyW(buffer, sSecTabs); - - if (rights & FILE_READ_DATA) buffer[ 0] = 'R'; - if (rights & FILE_WRITE_DATA) buffer[ 2] = 'W'; - if (rights & FILE_APPEND_DATA) buffer[ 4] = 'A'; - if (rights & FILE_READ_EA) {buffer[6] = 'entry'; buffer[ 7] = 'R';} - if (rights & FILE_WRITE_EA) {buffer[9] = 'entry'; buffer[10] = 'W';} - if (rights & FILE_EXECUTE) buffer[12] = 'X'; - if (rights & FILE_DELETE_CHILD) buffer[14] = 'D'; - if (rights & FILE_READ_ATTRIBUTES) {buffer[16] = 'a'; buffer[17] = 'R';} - if (rights & FILE_WRITE_ATTRIBUTES) {buffer[19] = 'a'; buffer[20] = 'W';} - if (rights & WRITE_DAC) buffer[22] = 'C'; - if (rights & WRITE_OWNER) buffer[24] = 'O'; - if (rights & SYNCHRONIZE) buffer[26] = 'S'; - - output_text(dis, col++, buffer, DT_LEFT, 3, psize); - } - - if (flags.description) { - get_description(buffer); - output_text(dis, col++, buffer, 0, psize); - } -*/ - #ifdef _NO_EXTENSIONS } @@ -4037,7 +3992,6 @@ static HRESULT ShellFolderContextMenu(IShellFolder* shell_folder, HWND hwndParen BOOL executed = FALSE; HRESULT hr = IShellFolder_GetUIObjectOf(shell_folder, hwndParent, cidl, apidl, &IID_IContextMenu, NULL, (LPVOID*)&pcm); -/* HRESULT hr = CDefFolderMenu_Create2(dir?dir->_pidl:DesktopFolder(), hwndParent, 1, &pidl, shell_folder, NULL, 0, NULL, &pcm); */ if (SUCCEEDED(hr)) { HMENU hmenu = CreatePopupMenu(); @@ -4628,10 +4582,7 @@ static BOOL show_frame(HWND hwndParent, int cmdshow, LPCWSTR path) {1, ID_WINDOW_CASCADE, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0}, {2, ID_WINDOW_TILE_HORZ, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0}, {3, ID_WINDOW_TILE_VERT, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0}, -/*TODO - {4, ID_... , TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0}, - {5, ID_... , TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0}, -*/ }; + }; Globals.htoolbar = CreateToolbarEx(Globals.hMainWnd, WS_CHILD|WS_VISIBLE, IDW_TOOLBAR, 2, Globals.hInstance, IDB_TOOLBAR, toolbarBtns, @@ -4642,11 +4593,6 @@ static BOOL show_frame(HWND hwndParent, int cmdshow, LPCWSTR path) Globals.hstatusbar = CreateStatusWindowW(WS_CHILD|WS_VISIBLE, 0, Globals.hMainWnd, IDW_STATUSBAR); CheckMenuItem(Globals.hMenuOptions, ID_VIEW_STATUSBAR, MF_BYCOMMAND|MF_CHECKED); -/* CreateStatusWindowW does not accept WS_BORDER - Globals.hstatusbar = CreateWindowExW(WS_EX_NOPARENTNOTIFY, STATUSCLASSNAME, 0, - WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS|WS_BORDER|CCS_NODIVIDER, 0,0,0,0, - Globals.hMainWnd, (HMENU)IDW_STATUSBAR, hinstance, 0);*/ - /*TODO: read paths from registry */ if (!path || !*path) {

1 0

Francois Gouget : winefile: Remove the format disk command.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 519e6f896cd195e80504b2d42cea0c1cfabba317 URL: http://source.winehq.org/git/wine.git/?a=commit;h=519e6f896cd195e80504b2d42… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 30 16:47:58 2011 +0200 winefile: Remove the format disk command. SHFormatDrive() is unimplemented in Wine and a format command seems useless in winefile. --- po/ar.po | 104 ++++++++++++++++++++--------------------- po/bg.po | 104 ++++++++++++++++++++--------------------- po/ca.po | 104 ++++++++++++++++++++--------------------- po/cs.po | 104 ++++++++++++++++++++--------------------- po/da.po | 104 ++++++++++++++++++++--------------------- po/de.po | 104 ++++++++++++++++++++--------------------- po/el.po | 104 ++++++++++++++++++++--------------------- po/en.po | 104 ++++++++++++++++++++--------------------- po/en_US.po | 104 ++++++++++++++++++++--------------------- po/eo.po | 104 ++++++++++++++++++++--------------------- po/es.po | 104 ++++++++++++++++++++--------------------- po/fa.po | 104 ++++++++++++++++++++--------------------- po/fi.po | 104 ++++++++++++++++++++--------------------- po/fr.po | 104 ++++++++++++++++++++--------------------- po/he.po | 104 ++++++++++++++++++++--------------------- po/hi.po | 104 ++++++++++++++++++++--------------------- po/hu.po | 104 ++++++++++++++++++++--------------------- po/it.po | 104 ++++++++++++++++++++--------------------- po/ja.po | 104 ++++++++++++++++++++--------------------- po/ko.po | 104 ++++++++++++++++++++--------------------- po/lt.po | 104 ++++++++++++++++++++--------------------- po/ml.po | 104 ++++++++++++++++++++--------------------- po/nb_NO.po | 104 ++++++++++++++++++++--------------------- po/nl.po | 104 ++++++++++++++++++++--------------------- po/or.po | 104 ++++++++++++++++++++--------------------- po/pa.po | 104 ++++++++++++++++++++--------------------- po/pl.po | 104 ++++++++++++++++++++--------------------- po/pt_BR.po | 104 ++++++++++++++++++++--------------------- po/pt_PT.po | 104 ++++++++++++++++++++--------------------- po/rm.po | 104 ++++++++++++++++++++--------------------- po/ro.po | 104 ++++++++++++++++++++--------------------- po/ru.po | 104 ++++++++++++++++++++--------------------- po/sk.po | 104 ++++++++++++++++++++--------------------- po/sl.po | 104 ++++++++++++++++++++--------------------- po/sr_RS(a)cyrillic.po | 104 ++++++++++++++++++++--------------------- po/sr_RS(a)latin.po | 104 ++++++++++++++++++++--------------------- po/sv.po | 104 ++++++++++++++++++++--------------------- po/te.po | 104 ++++++++++++++++++++--------------------- po/th.po | 104 ++++++++++++++++++++--------------------- po/tr.po | 104 ++++++++++++++++++++--------------------- po/uk.po | 104 ++++++++++++++++++++--------------------- po/wa.po | 104 ++++++++++++++++++++--------------------- po/wine.pot | 104 ++++++++++++++++++++--------------------- po/zh_CN.po | 104 ++++++++++++++++++++--------------------- po/zh_TW.po | 104 ++++++++++++++++++++--------------------- programs/winefile/resource.h | 1 - programs/winefile/winefile.c | 7 --- programs/winefile/winefile.h | 2 +- programs/winefile/winefile.rc | 2 - 49 files changed, 2251 insertions(+), 2441 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=519e6f896cd195e80504b…

1 0

Francois Gouget : winefile: Remove unimplemented menu entries.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 0a2be1a0bee10f467838cbcd06f87cb23724c8eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a2be1a0bee10f467838cbcd0… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 30 16:46:13 2011 +0200 winefile: Remove unimplemented menu entries. They unnecessarily clutter the GUI and are unlikely to ever be implemented. --- po/ar.po | 239 ++++++++++----------------------------- po/bg.po | 242 ++++++++++------------------------------ po/ca.po | 235 ++++++++++----------------------------- po/cs.po | 235 ++++++++++----------------------------- po/da.po | 235 ++++++++++----------------------------- po/de.po | 235 ++++++++++----------------------------- po/el.po | 237 ++++++++++----------------------------- po/en.po | 234 ++++++++++---------------------------- po/en_US.po | 234 ++++++++++---------------------------- po/eo.po | 241 ++++++++++------------------------------ po/es.po | 235 ++++++++++----------------------------- po/fa.po | 239 ++++++++++----------------------------- po/fi.po | 247 ++++++++++------------------------------- po/fr.po | 234 ++++++++++---------------------------- po/he.po | 234 ++++++++++---------------------------- po/hi.po | 234 ++++++++++---------------------------- po/hu.po | 235 ++++++++++----------------------------- po/it.po | 235 ++++++++++----------------------------- po/ja.po | 234 ++++++++++---------------------------- po/ko.po | 234 ++++++++++---------------------------- po/lt.po | 234 ++++++++++---------------------------- po/ml.po | 234 ++++++++++---------------------------- po/nb_NO.po | 235 ++++++++++----------------------------- po/nl.po | 234 ++++++++++---------------------------- po/or.po | 234 ++++++++++---------------------------- po/pa.po | 234 ++++++++++---------------------------- po/pl.po | 234 ++++++++++---------------------------- po/pt_BR.po | 235 ++++++++++----------------------------- po/pt_PT.po | 235 ++++++++++----------------------------- po/rm.po | 237 ++++++++++----------------------------- po/ro.po | 235 ++++++++++----------------------------- po/ru.po | 234 ++++++++++---------------------------- po/sk.po | 237 ++++++++++----------------------------- po/sl.po | 235 ++++++++++----------------------------- po/sr_RS(a)cyrillic.po | 242 ++++++++++------------------------------ po/sr_RS(a)latin.po | 247 ++++++++++------------------------------- po/sv.po | 234 ++++++++++---------------------------- po/te.po | 234 ++++++++++---------------------------- po/th.po | 239 ++++++++++----------------------------- po/tr.po | 235 ++++++++++----------------------------- po/uk.po | 234 ++++++++++---------------------------- po/wa.po | 241 ++++++++++------------------------------ po/wine.pot | 234 ++++++++++---------------------------- po/zh_CN.po | 235 ++++++++++----------------------------- po/zh_TW.po | 235 ++++++++++----------------------------- programs/winefile/resource.h | 2 - programs/winefile/winefile.c | 2 - programs/winefile/winefile.rc | 43 ------- 48 files changed, 2745 insertions(+), 7927 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0a2be1a0bee10f467838c…

1 0

Francois Gouget : kernel32: Only get the Windows directory if PROFILE_Open( ) needs it.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: f3aabde8cb60ff2e77dc437b7897083a88828930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3aabde8cb60ff2e77dc437b7… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 30 16:43:36 2011 +0200 kernel32: Only get the Windows directory if PROFILE_Open() needs it. --- dlls/kernel32/profile.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 26c6736..a2bd5b5 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -734,7 +734,6 @@ static BOOL is_not_current(FILETIME * ft) */ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) { - WCHAR windirW[MAX_PATH]; WCHAR buffer[MAX_PATH]; HANDLE hFile = INVALID_HANDLE_VALUE; FILETIME LastWriteTime; @@ -757,8 +756,6 @@ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) ZeroMemory(&MRUProfile[i]->LastWriteTime, sizeof(FILETIME)); } - GetWindowsDirectoryW( windirW, MAX_PATH ); - if (!filename) filename = wininiW; @@ -766,6 +763,8 @@ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) !strchrW(filename, '\\') && !strchrW(filename, '/')) { static const WCHAR wszSeparator[] = {'\\', 0}; + WCHAR windirW[MAX_PATH]; + GetWindowsDirectoryW( windirW, MAX_PATH ); strcpyW(buffer, windirW); strcatW(buffer, wszSeparator); strcatW(buffer, filename);

1 0

← Newer
1
2
3
4
5
6
7
8
...
85
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 2011