March 2011 - Wine-commits - list.winehq.org

Jörg Höhle : user32/tests: Add a few IsWindow checks.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 8d387f06eb7df5ad42b1b0b012cfa356f34f5510 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d387f06eb7df5ad42b1b0b01… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Mar 15 22:58:39 2011 +0100 user32/tests: Add a few IsWindow checks. --- dlls/user32/tests/win.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 603e93e..b1d77c6 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3936,6 +3936,10 @@ static void test_params(void) HWND hwnd; INT rc; + ok(!IsWindow(0), "IsWindow(0)\n"); + ok(!IsWindow(HWND_BROADCAST), "IsWindow(HWND_BROADCAST)\n"); + ok(!IsWindow(HWND_TOPMOST), "IsWindow(HWND_TOPMOST)\n"); + /* Just a param check */ if (pGetMonitorInfoA) {

1 0

Hans Leidekker : wine.inf: Pretend that the .NET 4. 0 Client and Full profiles are installed.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 5dbf6359d2657807cb4de4e452a78f425677127b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dbf6359d2657807cb4de4e45… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 30 12:29:28 2011 +0200 wine.inf: Pretend that the .NET 4.0 Client and Full profiles are installed. --- tools/wine.inf.in | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 5c09faf..cb130e6 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -511,6 +511,12 @@ HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5,Install,0x10003,1 HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5,SP,0x10003,1 HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5,Version,2,3.5.30729.01 HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5\1033,Install,0x10003,1 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Client,Install,0x10003,1 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Client,Version,2,4.0.30319 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Client,TargetVersion,2,4.0.0 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Full,Install,0x10003,1 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Full,Version,2,4.0.30319 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Full,TargetVersion,2,4.0.0 [Metrics] HKCU,%Metrics%,"ScrollWidth",2,"16"

1 0

Hans Leidekker : mscms: Trace the CMM id as a string.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 8800772f2d1237312fa28399ca953ddbae8737ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=8800772f2d1237312fa28399c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 30 12:29:45 2011 +0200 mscms: Trace the CMM id as a string. --- dlls/mscms/stub.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mscms/stub.c b/dlls/mscms/stub.c index d7e6877..84c0cdc 100644 --- a/dlls/mscms/stub.c +++ b/dlls/mscms/stub.c @@ -137,21 +137,21 @@ BOOL WINAPI GetPS2ColorSpaceArray( HPROFILE profile, DWORD intent, DWORD type, P BOOL WINAPI RegisterCMMA( PCSTR machine, DWORD id, PCSTR dll ) { - FIXME( "( %p, 0x%08x, %p ) stub\n", machine, id, dll ); + FIXME( "( %p, %s, %p ) stub\n", machine, MSCMS_dbgstr_tag(id), dll ); return TRUE; } BOOL WINAPI RegisterCMMW( PCWSTR machine, DWORD id, PCWSTR dll ) { - FIXME( "( %p, 0x%08x, %p ) stub\n", machine, id, dll ); + FIXME( "( %p, %s, %p ) stub\n", machine, MSCMS_dbgstr_tag(id), dll ); return TRUE; } BOOL WINAPI SelectCMM( DWORD id ) { - FIXME( "(%x) stub\n", id ); + FIXME( "(%s) stub\n", MSCMS_dbgstr_tag(id) ); return TRUE; } @@ -190,14 +190,14 @@ BOOL WINAPI SpoolerCopyFileEvent( LPWSTR printer, LPWSTR key, DWORD event ) BOOL WINAPI UnregisterCMMA( PCSTR machine, DWORD id ) { - FIXME( "( %p, 0x%08x ) stub\n", machine, id ); + FIXME( "( %p, %s ) stub\n", machine, MSCMS_dbgstr_tag(id) ); return TRUE; } BOOL WINAPI UnregisterCMMW( PCWSTR machine, DWORD id ) { - FIXME( "( %p, 0x%08x ) stub\n", machine, id ); + FIXME( "( %p, %s ) stub\n", machine, MSCMS_dbgstr_tag(id) ); return TRUE; }

1 0

Hans Leidekker : msi: Ignore invalid upgrade codes in the PublishProduct action.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: e82a4896f39bea9d5d31de93813ba7b9d468bc32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e82a4896f39bea9d5d31de938… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 30 12:29:59 2011 +0200 msi: Ignore invalid upgrade codes in the PublishProduct action. --- dlls/msi/action.c | 19 +++------ dlls/msi/tests/install.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+), 12 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 2f0b739..a21f234 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4364,26 +4364,21 @@ static UINT msi_publish_upgrade_code(MSIPACKAGE *package) return ERROR_SUCCESS; if (package->Context == MSIINSTALLCONTEXT_MACHINE) - { r = MSIREG_OpenClassesUpgradeCodesKey(upgrade, &hkey, TRUE); - if (r != ERROR_SUCCESS) - goto done; - } else - { r = MSIREG_OpenUserUpgradeCodesKey(upgrade, &hkey, TRUE); - if (r != ERROR_SUCCESS) - goto done; - } + if (r != ERROR_SUCCESS) + { + WARN("failed to open upgrade code key\n"); + msi_free(upgrade); + return ERROR_SUCCESS; + } squash_guid(package->ProductCode, squashed_pc); msi_reg_set_val_str(hkey, squashed_pc, NULL); - RegCloseKey(hkey); - -done: msi_free(upgrade); - return r; + return ERROR_SUCCESS; } static BOOL msi_check_publish(MSIPACKAGE *package) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index deff5f7..fb71f9d 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1191,6 +1191,53 @@ static const CHAR cl_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "InstallValidate\t\t1400\n" "InstallFinalize\t\t5000\n"; +static const CHAR uc_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "upgradecode.txt\tupgradecode\tupgradecode.txt\t1000\t\t\t8192\t1\n"; + +static const CHAR uc_feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "upgradecode\t\t\tupgradecode feature\t1\t2\tMSITESTDIR\t0\n"; + +static const CHAR uc_feature_comp_dat[] = "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "upgradecode\tupgradecode\n"; + +static const CHAR uc_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "upgradecode\t{6952B732-2FCB-4E47-976F-989FCBD7EDFB}\tMSITESTDIR\t0\t\tupgradecode.txt\n"; + +static const CHAR uc_property_dat[] = "Property\tValue\n" + "s72\tl0\n" + "Property\tProperty\n" + "INSTALLLEVEL\t3\n" + "ProductCode\t{E5FB1241-F547-4BA7-A60E-8E75797268D4}\n" + "ProductName\tMSITEST\n" + "ProductVersion\t1.1.1\n" + "UpgradeCode\t#UPGEADECODE#\n" + "MSIFASTINSTALL\t1\n"; + +static const CHAR uc_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "LaunchConditions\t\t100\n" + "CostInitialize\t\t200\n" + "FileCost\t\t300\n" + "CostFinalize\t\t400\n" + "InstallInitialize\t\t500\n" + "ProcessComponents\t\t600\n" + "InstallValidate\t\t700\n" + "RemoveFiles\t\t800\n" + "InstallFiles\t\t900\n" + "RegisterProduct\t\t1000\n" + "PublishFeatures\t\t1100\n" + "PublishProduct\t\t1200\n" + "InstallFinalize\t\t1300\n"; + typedef struct _msi_table { const CHAR *filename; @@ -1870,6 +1917,18 @@ static const msi_table cl_tables[] = ADD_TABLE(property) }; +static const msi_table uc_tables[] = +{ + ADD_TABLE(directory), + ADD_TABLE(uc_component), + ADD_TABLE(uc_feature), + ADD_TABLE(uc_feature_comp), + ADD_TABLE(uc_file), + ADD_TABLE(uc_install_exec_seq), + ADD_TABLE(media), + ADD_TABLE(uc_property) +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -6373,6 +6432,38 @@ static void test_command_line_parsing(void) RemoveDirectory("msitest"); } +static void test_upgrade_code(void) +{ + UINT r; + + if (is_process_limited()) + { + skip("process is limited\n"); + return; + } + + CreateDirectoryA("msitest", NULL); + create_file("msitest\\upgradecode.txt", 1000); + create_database(msifile, uc_tables, sizeof(uc_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(pf_exists("msitest\\upgradecode.txt"), "file not installed\n"); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(!delete_pf("msitest\\upgradecode.txt", TRUE), "file not removed\n"); + ok(!delete_pf("msitest", FALSE), "directory not removed\n"); + + DeleteFileA("msitest\\upgradecode.txt"); + RemoveDirectoryA("msitest"); + DeleteFile(msifile); +} + START_TEST(install) { DWORD len; @@ -6463,6 +6554,7 @@ START_TEST(install) test_sourcedir_props(); test_package_validation(); test_command_line_parsing(); + test_upgrade_code(); DeleteFileA(log_file);

1 0

Matteo Bruni : opengl32/tests: Test using a GL context after the drawable is destroyed.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 6af0bef46af83284249ef12e2a1770041bc7f755 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6af0bef46af83284249ef12e2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 2 22:25:46 2011 +0100 opengl32/tests: Test using a GL context after the drawable is destroyed. --- dlls/opengl32/tests/opengl.c | 124 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 124 insertions(+), 0 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 65df28b..8c81ba2 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -25,6 +25,10 @@ void WINAPI glClearColor(float red, float green, float blue, float alpha); void WINAPI glClear(unsigned int mask); void WINAPI glFinish(void); +typedef unsigned int GLenum; +#define GL_NO_ERROR 0x0 +#define GL_INVALID_OPERATION 0x502 +GLenum WINAPI glGetError(void); #define GL_COLOR_BUFFER_BIT 0x00004000 const unsigned char * WINAPI glGetString(unsigned int); #define GL_VENDOR 0x1F00 @@ -386,6 +390,8 @@ static void test_makecurrent(HDC winhdc) ret = wglMakeCurrent( NULL, NULL ); ok( ret, "wglMakeCurrent failed\n" ); + ok( wglGetCurrentContext() == NULL, "wrong context\n" ); + SetLastError( 0xdeadbeef ); ret = wglMakeCurrent( NULL, NULL ); ok( !ret, "wglMakeCurrent succeeded\n" ); @@ -880,6 +886,123 @@ static void test_minimized(void) DestroyWindow(window); } +static void test_destroy(HDC oldhdc) +{ + PIXELFORMATDESCRIPTOR pf_desc = + { + sizeof(PIXELFORMATDESCRIPTOR), + 1, /* version */ + PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER, + PFD_TYPE_RGBA, + 24, /* 24-bit color depth */ + 0, 0, 0, 0, 0, 0, /* color bits */ + 0, /* alpha buffer */ + 0, /* shift bit */ + 0, /* accumulation buffer */ + 0, 0, 0, 0, /* accum bits */ + 32, /* z-buffer */ + 0, /* stencil buffer */ + 0, /* auxiliary buffer */ + PFD_MAIN_PLANE, /* main layer */ + 0, /* reserved */ + 0, 0, 0 /* layer masks */ + }; + int pixel_format; + HWND window; + HGLRC ctx; + BOOL ret; + HDC dc; + GLenum glerr; + DWORD err; + HGLRC oldctx = wglGetCurrentContext(); + + ok(!!oldctx, "Expected to find a valid current context.\n"); + + window = CreateWindowA("static", "opengl32_test", + WS_POPUP, 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!window, "Failed to create window, last error %#x.\n", GetLastError()); + + dc = GetDC(window); + ok(!!dc, "Failed to get DC.\n"); + + pixel_format = ChoosePixelFormat(dc, &pf_desc); + if (!pixel_format) + { + win_skip("Failed to find pixel format.\n"); + ReleaseDC(window, dc); + DestroyWindow(window); + return; + } + + ret = SetPixelFormat(dc, pixel_format, &pf_desc); + ok(ret, "Failed to set pixel format, last error %#x.\n", GetLastError()); + + ctx = wglCreateContext(dc); + ok(!!ctx, "Failed to create GL context, last error %#x.\n", GetLastError()); + + ret = wglMakeCurrent(dc, ctx); + ok(ret, "Failed to make context current, last error %#x.\n", GetLastError()); + + glClear(GL_COLOR_BUFFER_BIT); + glFinish(); + glerr = glGetError(); + ok(glerr == GL_NO_ERROR, "Failed glClear, error %#x.\n", glerr); + + ret = DestroyWindow(window); + ok(ret, "Failed to destroy window, last error %#x.\n", GetLastError()); + + ok(wglGetCurrentContext() == ctx, "Wrong current context.\n"); + + SetLastError(0xdeadbeef); + ret = wglMakeCurrent(dc, ctx); + err = GetLastError(); + todo_wine ok(!ret && err == ERROR_INVALID_HANDLE, + "Unexpected behavior when making context current, ret %d, last error %#x.\n", ret, err); + + ok(wglGetCurrentContext() == ctx, "Wrong current context.\n"); + + glClear(GL_COLOR_BUFFER_BIT); + glFinish(); + glerr = glGetError(); + ok(glerr == GL_NO_ERROR, "Failed glClear, error %#x.\n", glerr); + + ret = wglMakeCurrent(NULL, NULL); + ok(ret, "Failed to clear current context, last error %#x.\n", GetLastError()); + + glClear(GL_COLOR_BUFFER_BIT); + glFinish(); + glerr = glGetError(); + todo_wine ok(glerr == GL_INVALID_OPERATION, "Failed glClear, error %#x.\n", glerr); + + SetLastError(0xdeadbeef); + ret = wglMakeCurrent(dc, ctx); + err = GetLastError(); + todo_wine ok(!ret && err == ERROR_INVALID_HANDLE, + "Unexpected behavior when making context current, ret %d, last error %#x.\n", ret, err); + + ok(wglGetCurrentContext() == NULL, "Wrong current context.\n"); + + ret = wglMakeCurrent(oldhdc, oldctx); + ok(ret, "Failed to make context current, last error %#x.\n", GetLastError()); + ok(wglGetCurrentContext() == oldctx, "Wrong current context.\n"); + + SetLastError(0xdeadbeef); + ret = wglMakeCurrent(dc, ctx); + err = GetLastError(); + todo_wine ok(!ret && err == ERROR_INVALID_HANDLE, + "Unexpected behavior when making context current, ret %d, last error %#x.\n", ret, err); + + ok(wglGetCurrentContext() == oldctx, "Wrong current context.\n"); + + ret = wglDeleteContext(ctx); + ok(ret, "Failed to delete GL context, last error %#x.\n", GetLastError()); + + ReleaseDC(window, dc); + + ret = wglMakeCurrent(oldhdc, oldctx); + ok(ret, "Failed to make context current, last error %#x.\n", GetLastError()); +} + START_TEST(opengl) { HWND hwnd; @@ -967,6 +1090,7 @@ START_TEST(opengl) test_deletecontext(hdc); test_makecurrent(hdc); test_setpixelformat(hdc); + test_destroy(hdc); test_sharelists(hdc); test_colorbits(hdc); test_gdi_dbuf(hdc);

1 0

Matteo Bruni : winex11.drv: Don' t modify current state if glXMakeCurrent fails.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 77679c4e9cde852b366d1039fb30b4e7995b44c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77679c4e9cde852b366d1039f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 3 21:06:33 2011 +0100 winex11.drv: Don't modify current state if glXMakeCurrent fails. --- dlls/winex11.drv/opengl.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index b74bc0a..c5796a4 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1907,7 +1907,6 @@ BOOL CDECL X11DRV_wglMakeCurrent(X11DRV_PDEVICE *physDev, HGLRC hglrc) { { Drawable drawable = get_glxdrawable(physDev); Wine_GLContext *prev_ctx = NtCurrentTeb()->glContext; - if (prev_ctx) prev_ctx->tid = 0; /* The describe lines below are for debugging purposes only */ if (TRACE_ON(wgl)) { @@ -1917,10 +1916,12 @@ BOOL CDECL X11DRV_wglMakeCurrent(X11DRV_PDEVICE *physDev, HGLRC hglrc) { TRACE(" make current for dis %p, drawable %p, ctx %p\n", gdi_display, (void*) drawable, ctx->ctx); ret = pglXMakeCurrent(gdi_display, drawable, ctx->ctx); - NtCurrentTeb()->glContext = ctx; - if(ret) + if (ret) { + if (prev_ctx) prev_ctx->tid = 0; + NtCurrentTeb()->glContext = ctx; + ctx->has_been_current = TRUE; ctx->tid = GetCurrentThreadId(); ctx->hdc = hdc; @@ -1935,6 +1936,8 @@ BOOL CDECL X11DRV_wglMakeCurrent(X11DRV_PDEVICE *physDev, HGLRC hglrc) { pglDrawBuffer(GL_FRONT_LEFT); } } + else + SetLastError(ERROR_INVALID_HANDLE); } wine_tsx11_unlock(); TRACE(" returning %s\n", (ret ? "True" : "False"));

1 0

Matteo Bruni : winex11.drv: Make wglMakeCurrent return the correct error when the drawable is invalid.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 716df1c2d246a35f11622044d2816260ba2ffdef URL: http://source.winehq.org/git/wine.git/?a=commit;h=716df1c2d246a35f11622044d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 17 22:49:23 2011 +0100 winex11.drv: Make wglMakeCurrent return the correct error when the drawable is invalid. --- dlls/opengl32/tests/opengl.c | 6 +++--- dlls/winex11.drv/opengl.c | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 8c81ba2..9834c6d 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -956,7 +956,7 @@ static void test_destroy(HDC oldhdc) SetLastError(0xdeadbeef); ret = wglMakeCurrent(dc, ctx); err = GetLastError(); - todo_wine ok(!ret && err == ERROR_INVALID_HANDLE, + ok(!ret && err == ERROR_INVALID_HANDLE, "Unexpected behavior when making context current, ret %d, last error %#x.\n", ret, err); ok(wglGetCurrentContext() == ctx, "Wrong current context.\n"); @@ -977,7 +977,7 @@ static void test_destroy(HDC oldhdc) SetLastError(0xdeadbeef); ret = wglMakeCurrent(dc, ctx); err = GetLastError(); - todo_wine ok(!ret && err == ERROR_INVALID_HANDLE, + ok(!ret && err == ERROR_INVALID_HANDLE, "Unexpected behavior when making context current, ret %d, last error %#x.\n", ret, err); ok(wglGetCurrentContext() == NULL, "Wrong current context.\n"); @@ -989,7 +989,7 @@ static void test_destroy(HDC oldhdc) SetLastError(0xdeadbeef); ret = wglMakeCurrent(dc, ctx); err = GetLastError(); - todo_wine ok(!ret && err == ERROR_INVALID_HANDLE, + ok(!ret && err == ERROR_INVALID_HANDLE, "Unexpected behavior when making context current, ret %d, last error %#x.\n", ret, err); ok(wglGetCurrentContext() == oldctx, "Wrong current context.\n"); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index c5796a4..0a23e44 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1896,6 +1896,12 @@ BOOL CDECL X11DRV_wglMakeCurrent(X11DRV_PDEVICE *physDev, HGLRC hglrc) { ret = pglXMakeCurrent(gdi_display, None, NULL); NtCurrentTeb()->glContext = NULL; } + else if (!physDev->current_pf) + { + WARN("Trying to use an invalid drawable\n"); + SetLastError(ERROR_INVALID_HANDLE); + ret = FALSE; + } else if (ctx->fmt->iPixelFormat != physDev->current_pf) { WARN( "mismatched pixel format hdc %p %u ctx %p %u\n",

1 0

Alexandre Julliard : server: Reset the cursor clip rectangle when the foreground thread changes.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 2b96875b6af708895006570b74b6254d7ac9b34e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b96875b6af708895006570b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 30 12:34:32 2011 +0200 server: Reset the cursor clip rectangle when the foreground thread changes. --- server/queue.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/server/queue.c b/server/queue.c index 7d25afa..2e1168d 100644 --- a/server/queue.c +++ b/server/queue.c @@ -318,6 +318,14 @@ static int assign_thread_input( struct thread *thread, struct thread_input *new_ return 1; } +/* change the foreground input and reset the cursor clip rect */ +static void set_foreground_input( struct desktop *desktop, struct thread_input *input ) +{ + if (desktop->foreground_input == input) return; + get_top_window_rectangle( desktop, &desktop->cursor_clip ); + desktop->foreground_input = input; +} + /* get the hook table for a given thread */ struct hook_table *get_queue_hooks( struct thread *thread ) { @@ -901,7 +909,7 @@ static void thread_input_destroy( struct object *obj ) empty_msg_list( &input->msg_list ); if (input->desktop) { - if (input->desktop->foreground_input == input) input->desktop->foreground_input = NULL; + if (input->desktop->foreground_input == input) set_foreground_input( input->desktop, NULL ); release_object( input->desktop ); } } @@ -2445,7 +2453,7 @@ DECL_HANDLER(set_foreground_window) ((thread = get_window_thread( req->handle ))) && (thread->queue->input->desktop == desktop)) { - desktop->foreground_input = thread->queue->input; + set_foreground_input( desktop, thread->queue->input ); reply->send_msg_new = (desktop->foreground_input != queue->input); } else set_win32_error( ERROR_INVALID_WINDOW_HANDLE );

1 0

Alexandre Julliard : user32: Reset the cursor clip rectangle before moving a window.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 2f368cfad284014396813533821754acf8e4bc70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f368cfad2840143968135338… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 30 12:34:45 2011 +0200 user32: Reset the cursor clip rectangle before moving a window. --- dlls/user32/winpos.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index a8324e8..789238f 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2491,6 +2491,7 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) pt.x = (short)LOWORD(dwPoint); pt.y = (short)HIWORD(dwPoint); capturePoint = pt; + ClipCursor( NULL ); TRACE("hwnd %p command %04lx, hittest %d, pos %d,%d\n", hwnd, syscommand, hittest, pt.x, pt.y);

1 0

Jörg Höhle : Revert "winmm: Fix PlaySound so it doesn't block when another sound is already playing.".
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 15ad749eced53e0c33454970bfc2bdb58b64f92b URL: http://source.winehq.org/git/wine.git/?a=commit;h=15ad749eced53e0c33454970b… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Mar 26 07:44:22 2011 +0100 Revert "winmm: Fix PlaySound so it doesn't block when another sound is already playing.". This reverts commit f44bc89bc41b2b8d75eeb4fc02f5aa587d84c13c. Let the player thread call waveOutReset itself instead. --- dlls/winmm/playsound.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index f6416ed..58c833a 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -45,7 +45,6 @@ typedef struct tagWINE_PLAYSOUND HMODULE hMod; DWORD fdwSound; HANDLE hThread; - HWAVEOUT hWave; struct tagWINE_PLAYSOUND* lpNext; } WINE_PLAYSOUND; @@ -271,6 +270,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) MMCKINFO ckMainRIFF; MMCKINFO mmckInfo; LPWAVEFORMATEX lpWaveFormat = NULL; + HWAVEOUT hWave = 0; LPWAVEHDR waveHdr = NULL; INT count, bufsize, left, index; struct playsound_data s; @@ -399,7 +399,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) s.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - if (waveOutOpen(&wps->hWave, WAVE_MAPPER, lpWaveFormat, (DWORD_PTR)PlaySound_Callback, + if (waveOutOpen(&hWave, WAVE_MAPPER, lpWaveFormat, (DWORD_PTR)PlaySound_Callback, (DWORD_PTR)&s, CALLBACK_FUNCTION) != MMSYSERR_NOERROR) goto errCleanUp; @@ -413,8 +413,8 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) waveHdr[0].dwLoops = waveHdr[1].dwLoops = 0L; waveHdr[0].dwFlags = waveHdr[1].dwFlags = 0L; waveHdr[0].dwBufferLength = waveHdr[1].dwBufferLength = bufsize; - if (waveOutPrepareHeader(wps->hWave, &waveHdr[0], sizeof(WAVEHDR)) || - waveOutPrepareHeader(wps->hWave, &waveHdr[1], sizeof(WAVEHDR))) { + if (waveOutPrepareHeader(hWave, &waveHdr[0], sizeof(WAVEHDR)) || + waveOutPrepareHeader(hWave, &waveHdr[1], sizeof(WAVEHDR))) { goto errCleanUp; } @@ -429,6 +429,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) { if (WaitForSingleObject(psStopEvent, 0) == WAIT_OBJECT_0) { + waveOutReset(hWave); wps->bLoop = FALSE; break; } @@ -437,7 +438,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) left -= count; waveHdr[index].dwBufferLength = count; waveHdr[index].dwFlags &= ~WHDR_DONE; - if (waveOutWrite(wps->hWave, &waveHdr[index], sizeof(WAVEHDR)) == MMSYSERR_NOERROR) { + if (waveOutWrite(hWave, &waveHdr[index], sizeof(WAVEHDR)) == MMSYSERR_NOERROR) { index ^= 1; PlaySound_WaitDone(&s); } @@ -447,17 +448,17 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) } while (wps->bLoop); PlaySound_WaitDone(&s); /* for last buffer */ - waveOutReset(wps->hWave); + waveOutReset(hWave); - waveOutUnprepareHeader(wps->hWave, &waveHdr[0], sizeof(WAVEHDR)); - waveOutUnprepareHeader(wps->hWave, &waveHdr[1], sizeof(WAVEHDR)); + waveOutUnprepareHeader(hWave, &waveHdr[0], sizeof(WAVEHDR)); + waveOutUnprepareHeader(hWave, &waveHdr[1], sizeof(WAVEHDR)); errCleanUp: TRACE("Done playing=%s => %s!\n", debugstr_w(wps->pszSound), bRet ? "ok" : "ko"); CloseHandle(s.hEvent); HeapFree(GetProcessHeap(), 0, waveHdr); HeapFree(GetProcessHeap(), 0, lpWaveFormat); - if (wps->hWave) while (waveOutClose(wps->hWave) == WAVERR_STILLPLAYING) Sleep(100); + if (hWave) while (waveOutClose(hWave) == WAVERR_STILLPLAYING) Sleep(100); if (hmmio) mmioClose(hmmio, 0); PlaySound_Free(wps); @@ -494,7 +495,6 @@ static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSo * NULL... as of today, we stop all playing instances */ SetEvent(psStopEvent); - waveOutReset(PlaySoundList->hWave); LeaveCriticalSection(&WINMM_cs); WaitForSingleObject(psLastEvent, INFINITE); EnterCriticalSection(&WINMM_cs);

1 0