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

Alexandre Julliard : msvcr90/tests: Fix the calling convention of the initterm callbacks.
by Alexandre Julliard 07 Apr '10

07 Apr '10

Module: wine Branch: master Commit: 701dd23911437c393c91e8e4cd15f86c996c0584 URL: http://source.winehq.org/git/wine.git/?a=commit;h=701dd23911437c393c91e8e4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 7 14:25:32 2010 +0200 msvcr90/tests: Fix the calling convention of the initterm callbacks. --- dlls/msvcr90/tests/msvcr90.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 2ae8c15..e094b1a 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -55,19 +55,19 @@ void __cdecl test_invalid_parameter_handler(const wchar_t *expression, ok(res == NULL, "res = %p\n", res); } -static int initterm_cb0(void) +static int __cdecl initterm_cb0(void) { cb_called[0]++; return 0; } -static int initterm_cb1(void) +static int __cdecl initterm_cb1(void) { cb_called[1]++; return 1; } -static int initterm_cb2(void) +static int __cdecl initterm_cb2(void) { cb_called[2]++; return 2;

1 0

Alexandre Julliard : winapi: Add some support for handling ifdefs, particularly ifdef _WIN64.
by Alexandre Julliard 07 Apr '10

07 Apr '10

Module: wine Branch: master Commit: 6b11a3c3f81d7db3794f3320eeaef8001cc99b74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b11a3c3f81d7db3794f3320e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 7 17:22:51 2010 +0200 winapi: Add some support for handling ifdefs, particularly ifdef _WIN64. --- tools/winapi/c_type.pm | 5 +++++ tools/winapi/winapi_test | 27 +++++++++++++++++++++++---- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/tools/winapi/c_type.pm b/tools/winapi/c_type.pm index 4e54270..b00cf81 100644 --- a/tools/winapi/c_type.pm +++ b/tools/winapi/c_type.pm @@ -330,30 +330,35 @@ sub new($$$) sub align($) { my ($self) = @_; + return undef unless defined $self->{TYPE}->field_aligns(); return $self->{TYPE}->field_aligns()->[$self->{NUMBER}]; } sub base_size($) { my ($self) = @_; + return undef unless defined $self->{TYPE}->field_base_sizes(); return $self->{TYPE}->field_base_sizes()->[$self->{NUMBER}]; } sub name($) { my ($self) = @_; + return undef unless defined $self->{TYPE}->field_names(); return $self->{TYPE}->field_names()->[$self->{NUMBER}]; } sub offset($) { my ($self) = @_; + return undef unless defined $self->{TYPE}->field_offsets(); return $self->{TYPE}->field_offsets()->[$self->{NUMBER}]; } sub size($) { my ($self) = @_; + return undef unless defined $self->{TYPE}->field_sizes(); return $self->{TYPE}->field_sizes()->[$self->{NUMBER}]; } diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index cf3a2b6..cafbafb 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -352,6 +352,7 @@ foreach my $file (@files) { my $line; my $type; my @packs = (4); + my @ifdefs = (); my $update_output = sub { my $progress = ""; @@ -384,19 +385,37 @@ foreach my $file (@files) { #print "found_preprocessor: $begin_line: [$_]\n"; if ($preprocessor =~ /^\#\s*include\s+[\"<]pshpack(\d+)\.h[\">]$/) { - push @packs, $1; + push @packs, $1 unless @ifdefs && !$ifdefs[$#ifdefs]; #print "found pack $1 on line $begin_line\n"; } elsif($preprocessor =~ /^\#\s*include\s+[\"<]poppack\.h[\">]$/) { - pop @packs; + pop @packs unless @ifdefs && !$ifdefs[$#ifdefs]; #print "found poppack on line $begin_line\n"; - } - + } elsif ($preprocessor =~ /^\#\s*ifdef\s+_WIN64/) { + push @ifdefs, 0; + } elsif ($preprocessor =~ /^\#\s*ifndef\s+_WIN64/) { + push @ifdefs, 1; + } elsif ($preprocessor =~ /^\#\s*elif\s+defined(_WIN64)/) { + $ifdefs[$#ifdefs] = 0; + } elsif ($preprocessor =~ /^\#\s*ifdef\s/) { + push @ifdefs, 2; + } elsif ($preprocessor =~ /^\#\s*ifndef\s/) { + push @ifdefs, 2; + } elsif ($preprocessor =~ /^\#\s*if/) { + push @ifdefs, 2; + } elsif ($preprocessor =~ /^\#\s*else/) { + $ifdefs[$#ifdefs] = $ifdefs[$#ifdefs] ^ 1; + } elsif ($preprocessor =~ /^\#\s*elif/) { + $ifdefs[$#ifdefs] = 2; + } elsif ($preprocessor =~ /^\#\s*endif/) { + pop @ifdefs; + } return 1; }; $parser->set_found_preprocessor_callback($found_preprocessor); my $found_type = sub { $type = shift; + return if @ifdefs && !$ifdefs[$#ifdefs]; &$update_output();

1 0

Alexandre Julliard : winapi: Generate the 64-bit variant of structure size/ alignment tests.
by Alexandre Julliard 07 Apr '10

07 Apr '10

Module: wine Branch: master Commit: a8e86e35dd1822e62893eb47af14b7b0e8e11b4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8e86e35dd1822e62893eb47a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 7 17:22:51 2010 +0200 winapi: Generate the 64-bit variant of structure size/alignment tests. --- dlls/gdi32/tests/generated.c | 6934 +++++++++++++++++++++++++++++++++++++-- dlls/kernel32/tests/generated.c | 1983 +++++++++++- dlls/ntdll/tests/generated.c | 3269 ++++++++++++++++++- dlls/rpcrt4/tests/generated.c | 953 +++++- dlls/shell32/tests/generated.c | 1876 ++++++++++- dlls/shlwapi/tests/generated.c | 113 +- dlls/urlmon/tests/generated.c | 320 ++- dlls/user32/tests/generated.c | 3704 ++++++++++++++++++++- dlls/wininet/tests/generated.c | 1371 ++++++++- tools/winapi/winapi_test | 105 +- 10 files changed, 19842 insertions(+), 786 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a8e86e35dd1822e62893e…

1 0

Alexandre Julliard : winapi: Add a few more types to the ntdll generated tests.
by Alexandre Julliard 07 Apr '10

07 Apr '10

Module: wine Branch: master Commit: b141e6e33bd1eada44c9e4e36d61aa10c0545758 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b141e6e33bd1eada44c9e4e36… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 7 17:25:19 2010 +0200 winapi: Add a few more types to the ntdll generated tests. --- dlls/ntdll/tests/generated.c | 655 ++++++++++++++++++++++++++++++++++++++++++ tools/winapi/tests.dat | 12 +- 2 files changed, 666 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b141e6e33bd1eada44c9e…

1 0

Christian Costa : d3dx9_36: Forward D3DXCreateTextureFromFileExW to D3DXCreateTextureFromFileInMemoryEx .
by Alexandre Julliard 07 Apr '10

07 Apr '10

Module: wine Branch: master Commit: 36ef502e2f737f717d503f35e9e6c3b18239cbe7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36ef502e2f737f717d503f35e… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Apr 6 21:44:16 2010 +0200 d3dx9_36: Forward D3DXCreateTextureFromFileExW to D3DXCreateTextureFromFileInMemoryEx. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/texture.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 329e501..5c5a1a6 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -95,7 +95,7 @@ @ stdcall D3DXCreateTexture(ptr long long long long long long ptr) @ stub D3DXCreateTextureFromFileA @ stub D3DXCreateTextureFromFileExA -@ stub D3DXCreateTextureFromFileExW +@ stdcall D3DXCreateTextureFromFileExW(ptr ptr long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateTextureFromFileInMemory @ stdcall D3DXCreateTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateTextureFromFileW diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 7447d81..2b1b468 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -70,3 +70,40 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(LPDIRECT3DDEVICE9 device, return E_NOTIMPL; } + +HRESULT WINAPI D3DXCreateTextureFromFileExW(LPDIRECT3DDEVICE9 device, + LPCWSTR srcfile, + UINT width, + UINT height, + UINT miplevels, + DWORD usage, + D3DFORMAT format, + D3DPOOL pool, + DWORD filter, + DWORD mipfilter, + D3DCOLOR colorkey, + D3DXIMAGE_INFO *srcinfo, + PALETTEENTRY *palette, + LPDIRECT3DTEXTURE9 *texture) +{ + HRESULT hr; + DWORD size; + LPVOID buffer; + + TRACE("(%p, %p, %u, %u, %u, %x, %x, %x, %u, %u, %x, %p, %p, %p): relay\n", device, debugstr_w(srcfile), width, + height, miplevels, usage, format, pool, filter, mipfilter, colorkey, srcinfo, palette, texture); + + if (!srcfile) + return D3DERR_INVALIDCALL; + + hr = map_view_of_file(srcfile, &buffer, &size); + if (FAILED(hr)) + return D3DXERR_INVALIDDATA; + + hr = D3DXCreateTextureFromFileInMemoryEx(device, buffer, size, width, height, miplevels, usage, format, pool, + filter, mipfilter, colorkey, srcinfo, palette, texture); + + UnmapViewOfFile(buffer); + + return hr; +}

1 0

Christian Costa : d3dx9_36: Add stub for D3DXCreateTextureFromFileA.
by Alexandre Julliard 07 Apr '10

07 Apr '10

Module: wine Branch: master Commit: 5046858528f3a080fdd06f47df0394b05aeafd37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5046858528f3a080fdd06f47d… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Apr 6 21:44:22 2010 +0200 d3dx9_36: Add stub for D3DXCreateTextureFromFileA. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/texture.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 5c5a1a6..0151f00 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -93,7 +93,7 @@ @ stub D3DXCreateTextA @ stub D3DXCreateTextW @ stdcall D3DXCreateTexture(ptr long long long long long long ptr) -@ stub D3DXCreateTextureFromFileA +@ stdcall D3DXCreateTextureFromFileA(ptr ptr ptr) @ stub D3DXCreateTextureFromFileExA @ stdcall D3DXCreateTextureFromFileExW(ptr ptr long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateTextureFromFileInMemory diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 2b1b468..9454615 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -107,3 +107,12 @@ HRESULT WINAPI D3DXCreateTextureFromFileExW(LPDIRECT3DDEVICE9 device, return hr; } + +HRESULT WINAPI D3DXCreateTextureFromFileA(LPDIRECT3DDEVICE9 device, + LPCSTR srcfile, + LPDIRECT3DTEXTURE9 *texture) +{ + FIXME("(%p, %s, %p): stub\n", device, debugstr_a(srcfile), texture); + + return E_NOTIMPL; +}

1 0

Eric Pouech : winedbg: Simplify a bit the find_triggered_watch function.
by Alexandre Julliard 07 Apr '10

07 Apr '10

Module: wine Branch: master Commit: 23671868054c2dfc8150f1aeb8086a44998cf785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23671868054c2dfc8150f1aeb… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 6 22:28:43 2010 +0200 winedbg: Simplify a bit the find_triggered_watch function. --- programs/winedbg/break.c | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index ed382bc..e72f2b6 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -535,16 +535,15 @@ void break_enable_xpoint(int num, BOOL enable) * find_triggered_watch * * Lookup the watchpoints to see if one has been triggered - * Return >= (watch point index) if one is found and *oldval is set to - * the value watched before the TRAP - * Return -1 if none found (*oldval is undetermined) + * Return >= (watch point index) if one is found + * Return -1 if none found * - * Unfortunately, Linux does *NOT* (A REAL PITA) report with ptrace + * Unfortunately, Linux used to *NOT* (A REAL PITA) report with ptrace * the DR6 register value, so we have to look with our own need the * cause of the TRAP. * -EP */ -static int find_triggered_watch(LPDWORD oldval) +static int find_triggered_watch(void) { int found = -1; int i; @@ -562,7 +561,6 @@ static int find_triggered_watch(LPDWORD oldval) { be_cpu->clear_watchpoint(&dbg_context, bp[i].info); - *oldval = bp[i].w.oldval; if (get_watched_value(i, &val)) { bp[i].w.oldval = val; @@ -584,8 +582,7 @@ static int find_triggered_watch(LPDWORD oldval) if (bp[i].refcount && bp[i].enabled && !is_xpoint_break(i) && get_watched_value(i, &val)) { - *oldval = bp[i].w.oldval; - if (val != *oldval) + if (val != bp[i].w.oldval) { be_cpu->clear_watchpoint(&dbg_context, bp[i].info); bp[i].w.oldval = val; @@ -782,8 +779,6 @@ BOOL break_should_continue(ADDRESS64* addr, DWORD code) */ void break_adjust_pc(ADDRESS64* addr, DWORD code, BOOL first_chance, BOOL* is_break) { - DWORD oldval = 0; - /* break / watch points are handled on first chance */ if ( !first_chance ) { @@ -806,7 +801,7 @@ void break_adjust_pc(ADDRESS64* addr, DWORD code, BOOL first_chance, BOOL* is_br { dbg_curr_thread->stopped_xpoint = find_xpoint(addr, be_xpoint_watch_exec); if (dbg_curr_thread->stopped_xpoint < 0) - dbg_curr_thread->stopped_xpoint = find_triggered_watch(&oldval); + dbg_curr_thread->stopped_xpoint = find_triggered_watch(); if (dbg_curr_thread->stopped_xpoint > 0) { /* If not single-stepping, do not back up over the break instruction */

1 0

Eric Pouech : winedbg: Allow using 8-byte long hardware assisted breakpoints on x86_64 CPUs.
by Alexandre Julliard 07 Apr '10

07 Apr '10

Module: wine Branch: master Commit: 5f23b94a27eec0ad405682f4c16f54a78f370596 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f23b94a27eec0ad405682f4c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 6 22:28:49 2010 +0200 winedbg: Allow using 8-byte long hardware assisted breakpoints on x86_64 CPUs. --- programs/winedbg/be_x86_64.c | 4 +++- programs/winedbg/break.c | 11 ++++++----- programs/winedbg/debugger.h | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index ac7f1fc..514310b 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -355,6 +355,7 @@ extern void be_x86_64_disasm_one_insn(ADDRESS64* addr, int display); #define DR7_LEN_1 (0x0) #define DR7_LEN_2 (0x4) #define DR7_LEN_4 (0xC) +#define DR7_LEN_8 (0x8) #define DR7_LOCAL_ENABLE_SHIFT 0 #define DR7_GLOBAL_ENABLE_SHIFT 1 @@ -429,10 +430,11 @@ static unsigned be_x86_64_insert_Xpoint(HANDLE hProcess, const struct be_process *pr = (DWORD64)addr; if (type != be_xpoint_watch_exec) switch (size) { + case 8: bits |= DR7_LEN_8; break; case 4: bits |= DR7_LEN_4; break; case 2: bits |= DR7_LEN_2; break; case 1: bits |= DR7_LEN_1; break; - default: return 0; + default: WINE_FIXME("Unsupported xpoint_watch of size %d\n", size); return 0; } *val = reg; /* clear old values */ diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index e72f2b6..e35250c 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -137,7 +137,7 @@ static int init_xpoint(int type, const ADDRESS64* addr) * * Returns the value watched by watch point 'num'. */ -static BOOL get_watched_value(int num, LPDWORD val) +static BOOL get_watched_value(int num, DWORD64* val) { BYTE buf[4]; @@ -147,6 +147,7 @@ static BOOL get_watched_value(int num, LPDWORD val) switch (dbg_curr_process->bp[num].w.len + 1) { + case 8: *val = *(DWORD64*)buf; break; case 4: *val = *(DWORD*)buf; break; case 2: *val = *(WORD*)buf; break; case 1: *val = *(BYTE*)buf; break; @@ -554,7 +555,7 @@ static int find_triggered_watch(void) */ for (i = 0; i < dbg_curr_process->next_bp; i++) { - DWORD val = 0; + DWORD64 val = 0; if (bp[i].refcount && bp[i].enabled && !is_xpoint_break(i) && (be_cpu->is_watchpoint_set(&dbg_context, bp[i].info))) @@ -577,7 +578,7 @@ static int find_triggered_watch(void) */ for (i = 0; i < dbg_curr_process->next_bp; i++) { - DWORD val = 0; + DWORD64 val = 0; if (bp[i].refcount && bp[i].enabled && !is_xpoint_break(i) && get_watched_value(i, &val)) @@ -740,8 +741,8 @@ BOOL break_should_continue(ADDRESS64* addr, DWORD code) case be_xpoint_watch_write: dbg_printf("Stopped on watchpoint %d at ", dbg_curr_thread->stopped_xpoint); print_address(addr, TRUE); - dbg_printf(" new value %u\n", - dbg_curr_process->bp[dbg_curr_thread->stopped_xpoint].w.oldval); + dbg_printf(" new value %s\n", + wine_dbgstr_longlong(dbg_curr_process->bp[dbg_curr_thread->stopped_xpoint].w.oldval)); } return FALSE; } diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 9d9c1b2..d8e1ef4 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -139,7 +139,7 @@ struct dbg_breakpoint struct /* only used for watchpoints */ { BYTE len : 2; - DWORD oldval; + DWORD64 oldval; } w; struct expr* condition; };

1 0

Dmitry Timoshkov : gdi32: Fix some DC leaks in gdi32 bitmap tests.
by Alexandre Julliard 07 Apr '10

07 Apr '10

Module: wine Branch: master Commit: fb9bca41e57582abde20f0e679767d9e4df7cca8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb9bca41e57582abde20f0e67… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Apr 7 12:44:39 2010 +0900 gdi32: Fix some DC leaks in gdi32 bitmap tests. --- dlls/gdi32/tests/bitmap.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index f6a4434..df658ff 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -411,7 +411,7 @@ static void test_dib_bits_access( HBITMAP hdib, void *bits ) char bmibuf[sizeof(BITMAPINFO) + 256 * sizeof(RGBQUAD)]; DWORD data[256]; BITMAPINFO *pbmi = (BITMAPINFO *)bmibuf; - HDC hdc = GetDC(0); + HDC hdc; char filename[MAX_PATH]; HANDLE file; DWORD written; @@ -435,11 +435,15 @@ static void test_dib_bits_access( HBITMAP hdib, void *bits ) pbmi->bmiHeader.biPlanes = 1; pbmi->bmiHeader.biCompression = BI_RGB; + hdc = GetDC(0); + ret = SetDIBits( hdc, hdib, 0, 16, data, pbmi, DIB_RGB_COLORS ); ok(ret == 16 || broken(ret == 0), /* win9x */ "SetDIBits failed: expected 16 got %d\n", ret); + ReleaseDC(0, hdc); + ok(VirtualQuery(bits, &info, sizeof(info)) == sizeof(info), "VirtualQuery failed\n"); ok(info.BaseAddress == bits, "%p != %p\n", info.BaseAddress, bits); @@ -864,8 +868,8 @@ static void test_dibsections(void) DeleteObject(hdib); DeleteObject(hpal); - DeleteDC(hdcmem); + DeleteDC(hdcmem2); ReleaseDC(0, hdc); }

1 0

Dmitry Timoshkov : winex11.drv: Do not allow WM actions for windows with WS_DISABLED style set.
by Alexandre Julliard 07 Apr '10

07 Apr '10

Module: wine Branch: master Commit: e35e75b4bf5db54cd6cda0c95dc8c9e14c1fccfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e35e75b4bf5db54cd6cda0c95… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Apr 7 15:41:01 2010 +0900 winex11.drv: Do not allow WM actions for windows with WS_DISABLED style set. Some applications do not expect and could have undefined behaviour (or even crash) when a not active (and disabled) main window under a dialog popup is being closed or minimized/maximazed. Most of Window Managers allow that, but Windows doesn't. --- dlls/winex11.drv/window.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 09820d3..ef197ca 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1073,9 +1073,12 @@ static void set_wm_hints( Display *display, struct x11drv_win_data *data ) mwm_hints.decorations = get_mwm_decorations( data, style, ex_style ); mwm_hints.functions = MWM_FUNC_MOVE; if (is_window_resizable( data, style )) mwm_hints.functions |= MWM_FUNC_RESIZE; - if (style & WS_MINIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MINIMIZE; - if (style & WS_MAXIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MAXIMIZE; - if (style & WS_SYSMENU) mwm_hints.functions |= MWM_FUNC_CLOSE; + if (!(style & WS_DISABLED)) + { + if (style & WS_MINIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MINIMIZE; + if (style & WS_MAXIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MAXIMIZE; + if (style & WS_SYSMENU) mwm_hints.functions |= MWM_FUNC_CLOSE; + } XChangeProperty( display, data->whole_window, x11drv_atom(_MOTIF_WM_HINTS), x11drv_atom(_MOTIF_WM_HINTS), 32, PropModeReplace, @@ -1660,13 +1663,8 @@ void CDECL X11DRV_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) if (offset == GWL_STYLE && (changed & WS_DISABLED)) { data = X11DRV_get_win_data( hwnd ); - if (data && data->wm_hints) - { - wine_tsx11_lock(); - data->wm_hints->input = !(style->styleNew & WS_DISABLED); - XSetWMHints( thread_display(), data->whole_window, data->wm_hints ); - wine_tsx11_unlock(); - } + if (data && data->whole_window) + set_wm_hints( thread_display(), data ); } if (offset == GWL_EXSTYLE && (changed & WS_EX_LAYERED))

1 0