April 2010 - Wine-commits - list.winehq.org

Eric Pouech : winedbg: For stack info command, display information in 'a' format (instead of 'x') to get word size machine (instead of forcing 32bit ).
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: 285200b29bbd43a1deea25b32454cf10bef1f0cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=285200b29bbd43a1deea25b32… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Apr 19 22:33:26 2010 +0200 winedbg: For stack info command, display information in 'a' format (instead of 'x') to get word size machine (instead of forcing 32bit). --- programs/winedbg/stack.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index 7ba2773..bccb56a 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -50,7 +50,9 @@ void stack_info(void) dbg_printf("Stack dump:\n"); switch (lvalue.addr.Mode) { - case AddrModeFlat: /* 32-bit mode */ + case AddrModeFlat: /* 32-bit or 64-bit mode */ + memory_examine(&lvalue, 24, 'a'); + break; case AddrMode1632: /* 32-bit mode */ memory_examine(&lvalue, 24, 'x'); break;

1 0

Eric Pouech : winegcc: On x86-64, don't define twice the fastcall macros.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: d4dfcc1f321be6eee478c8bbada31ca89cf607c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4dfcc1f321be6eee478c8bba… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Apr 19 22:33:33 2010 +0200 winegcc: On x86-64, don't define twice the fastcall macros. --- tools/winegcc/winegcc.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 7023ff4..a5f7004 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -360,6 +360,7 @@ static void compile(struct options* opts, const char* lang) if (gcc_defs) { + int fastcall_done = 0; if (opts->target_cpu == CPU_x86_64) { strarray_add(comp_args, "-D__stdcall=__attribute__((ms_abi))"); @@ -368,6 +369,7 @@ static void compile(struct options* opts, const char* lang) strarray_add(comp_args, "-D_cdecl=__attribute__((ms_abi))"); strarray_add(comp_args, "-D__fastcall=__attribute__((ms_abi))"); strarray_add(comp_args, "-D_fastcall=__attribute__((ms_abi))"); + fastcall_done = 1; } else if (opts->target_platform == PLATFORM_APPLE) { @@ -385,8 +387,11 @@ static void compile(struct options* opts, const char* lang) strarray_add(comp_args, "-D_cdecl=__attribute__((__cdecl__))"); } - strarray_add(comp_args, "-D__fastcall=__attribute__((__fastcall__))"); - strarray_add(comp_args, "-D_fastcall=__attribute__((__fastcall__))"); + if (!fastcall_done) + { + strarray_add(comp_args, "-D__fastcall=__attribute__((__fastcall__))"); + strarray_add(comp_args, "-D_fastcall=__attribute__((__fastcall__))"); + } strarray_add(comp_args, "-D__declspec(x)=__declspec_##x"); strarray_add(comp_args, "-D__declspec_align(x)=__attribute__((aligned(x)))"); strarray_add(comp_args, "-D__declspec_allocate(x)=__attribute__((section(x)))");

1 0

Eric Pouech : winegcc: When specifying -m32, force i386 cpu when compiling on x86_64 boxes.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: 22da105b4d4d8b2b91e88b1af3b270852fbe9334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22da105b4d4d8b2b91e88b1af… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Apr 19 22:33:40 2010 +0200 winegcc: When specifying -m32, force i386 cpu when compiling on x86_64 boxes. --- tools/winegcc/winegcc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index a5f7004..48f39bc 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1257,6 +1257,8 @@ int main(int argc, char **argv) opts.unicode_app = 1; else if (strcmp("-m32", argv[i]) == 0) { + if (opts.target_cpu == CPU_x86_64) + opts.target_cpu = CPU_x86; opts.force_pointer_size = 4; raw_linker_arg = 1; }

1 0

Eric Pouech : winedbg: Don't assert on some lvalue's write conditions.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: e5555b0fb554a4f10f9e113d6ce4f89d8221adf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5555b0fb554a4f10f9e113d6… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Apr 19 22:33:46 2010 +0200 winedbg: Don't assert on some lvalue's write conditions. --- programs/winedbg/memory.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 6560062..7d6112a 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -121,9 +121,13 @@ BOOL memory_write_value(const struct dbg_lvalue* lvalue, DWORD size, void* value BOOL ret = TRUE; DWORD64 os; - os = ~(DWORD64)size; - types_get_info(&lvalue->type, TI_GET_LENGTH, &os); - assert(size == os); + if (!types_get_info(&lvalue->type, TI_GET_LENGTH, &os)) return FALSE; + if (size != os) + { + dbg_printf("Size mismatch in memory_write_value, got %u from type while expecting %u\n", + (DWORD)os, size); + return FALSE; + } /* FIXME: only works on little endian systems */ if (lvalue->cookie == DLV_TARGET)

1 0

Eric Pouech : server: Fix write_process_memory on Wow64.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: 1298f2233f48fe0256c3d35ab1c2931942d2112d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1298f2233f48fe0256c3d35ab… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Apr 19 22:33:53 2010 +0200 server: Fix write_process_memory on Wow64. --- server/ptrace.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index b8a31cf..1118048 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -330,7 +330,7 @@ static long read_thread_long( struct thread *thread, long *addr, long *data ) static long write_thread_long( struct thread *thread, long *addr, long data, unsigned long mask ) { long res; - if (mask != ~0u) + if (mask != ~0ul) { if (read_thread_long( thread, addr, &res ) == -1) return -1; data = (data & mask) | (res & ~mask);

1 0

Michael Stefaniuc : shell32: Update the Romanian translation.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: e64779919777c39a4eaa16ff9eea4789936a7f02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e64779919777c39a4eaa16ff9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 20 02:36:53 2010 +0200 shell32: Update the Romanian translation. --- dlls/shell32/shell32_Ro.rc | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_Ro.rc b/dlls/shell32/shell32_Ro.rc index f7a5011..a74f135 100644 --- a/dlls/shell32/shell32_Ro.rc +++ b/dlls/shell32/shell32_Ro.rc @@ -208,6 +208,10 @@ STRINGTABLE IDS_SHV_COLUMN11 "Grup" IDS_SHV_COLUMN_DELFROM "Locația originală" IDS_SHV_COLUMN_DELDATE "Data ștergerii" + IDS_SHV_COL_DOCS "Documente" + IDS_SHV_COL_STATUS "Stare" + IDS_SHV_COL_LOCATION "Locație" + IDS_SHV_COL_MODEL "Model" /* special folders */ IDS_DESKTOP "Birou"

1 0

Michael Stefaniuc : wineboot: Update the Romanian translation.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: 06a9ff98d78c9b4e581a53475abe35e89c1db6ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=06a9ff98d78c9b4e581a53475… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 20 02:37:02 2010 +0200 wineboot: Update the Romanian translation. --- programs/wineboot/wineboot_Ro.rc | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/programs/wineboot/wineboot_Ro.rc b/programs/wineboot/wineboot_Ro.rc index 61f670f..a9bee98 100644 --- a/programs/wineboot/wineboot_Ro.rc +++ b/programs/wineboot/wineboot_Ro.rc @@ -38,3 +38,13 @@ BEGIN LTEXT "Prin terminarea acestui proces se pot pierde datele nesalvate.", IDC_STATIC,7,28,172,15 END + +IDD_WAITDLG DIALOG 0, 0, 200, 50 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_DISABLED +CAPTION "Wine" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_WAITICON, 3, 3, 10, 10 + LTEXT "Actualizez configurația Wine în %s, așteptați...", + IDC_WAITTEXT, 40, 5, 150, 40, SS_NOPREFIX +END

1 0

Alexandre Julliard : notepad: Set the window class small icon.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: 4c917904aeaa51290d5b71aebd79005ddcaeab42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c917904aeaa51290d5b71aeb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 19 20:12:34 2010 +0200 notepad: Set the window class small icon. --- programs/notepad/main.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 1ddd95c..841da37 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -743,6 +743,9 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) class.lpfnWndProc = NOTEPAD_WndProc; class.hInstance = Globals.hInstance; class.hIcon = LoadIconW(Globals.hInstance, MAKEINTRESOURCEW(IDI_NOTEPAD)); + class.hIconSm = LoadImageW(Globals.hInstance, MAKEINTRESOURCEW(IDI_NOTEPAD), IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), + LR_SHARED); class.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); class.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); class.lpszMenuName = MAKEINTRESOURCEW(MAIN_MENU);

1 0

Alexandre Julliard : taskmgr: Set the window small icon.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: 80997b2f05c3f2917893983b65865cb93c3feca0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80997b2f05c3f2917893983b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 19 20:12:39 2010 +0200 taskmgr: Set the window small icon. --- programs/taskmgr/taskmgr.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index 01c6926..5958d5c 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -131,6 +131,10 @@ static BOOL OnCreate(HWND hWnd) LoadStringW(hInst, IDS_PERFORMANCE, wszPerformance, sizeof(wszPerformance)/sizeof(WCHAR)); SendMessageW(hMainWnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIcon(hInst, MAKEINTRESOURCE(IDI_TASKMANAGER))); + SendMessageW(hMainWnd, WM_SETICON, ICON_SMALL, + (LPARAM)LoadImage(hInst, MAKEINTRESOURCE(IDI_TASKMANAGER), IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), + LR_SHARED)); /* Initialize the Windows Common Controls DLL */ InitCommonControls();

1 0

Alexandre Julliard : winemine: Set the window class small icon.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: 099890106c3a6672565dd3f6fc27753ac6cde236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=099890106c3a6672565dd3f6f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 19 20:12:51 2010 +0200 winemine: Set the window class small icon. --- programs/winemine/main.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/winemine/main.c b/programs/winemine/main.c index be544e8..582f2cb 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -1008,7 +1008,7 @@ static LRESULT WINAPI MainProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara int WINAPI WinMain( HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR cmdline, int cmdshow ) { MSG msg; - WNDCLASS wc; + WNDCLASSEX wc; HWND hWnd; HACCEL haccel; char appname[20]; @@ -1025,8 +1025,10 @@ int WINAPI WinMain( HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR cmdline, int cmd wc.hbrBackground = GetStockObject( BLACK_BRUSH ); wc.lpszMenuName = "MENU_WINEMINE"; wc.lpszClassName = appname; + wc.hIconSm = LoadImage( hInst, "WINEMINE", IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED ); - if (!RegisterClass(&wc)) ExitProcess(1); + if (!RegisterClassEx(&wc)) ExitProcess(1); hWnd = CreateWindow( appname, appname, wnd_style, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,

1 0