May 2016 - Wine-commits - list.winehq.org

Akihiro Sagawa : imm32/tests: Add more tests showing that the IME window is created after WM_NCCREATE.
by Alexandre Julliard 30 May '16

30 May '16

Module: wine Branch: master Commit: 47043b9295c46ce218144385c902d9d3f11bb47a URL: http://source.winehq.org/git/wine.git/?a=commit;h=47043b9295c46ce218144385c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon May 30 01:08:14 2016 +0900 imm32/tests: Add more tests showing that the IME window is created after WM_NCCREATE. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/tests/imm32.c | 59 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 56 insertions(+), 3 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 7bc0a9a..fa6ae62 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -172,7 +172,8 @@ static void msg_spy_cleanup(void) { * messages being sent to this window in response. */ static const char wndcls[] = "winetest_imm32_wndcls"; -static enum { PHASE_UNKNOWN, FIRST_WINDOW, SECOND_WINDOW } test_phase; +static enum { PHASE_UNKNOWN, FIRST_WINDOW, SECOND_WINDOW, + CREATE_CANCEL, NCCREATE_CANCEL } test_phase; static HWND hwnd; static HWND get_ime_window(void); @@ -196,13 +197,16 @@ static LRESULT WINAPI wndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) default: break; /* do nothing */ } + if (test_phase == NCCREATE_CANCEL) + return FALSE; return TRUE; case WM_NCCALCSIZE: default_ime_wnd = get_ime_window(); switch(test_phase) { case FIRST_WINDOW: case SECOND_WINDOW: - todo_wine_if(test_phase == FIRST_WINDOW) + case CREATE_CANCEL: + todo_wine_if(test_phase == FIRST_WINDOW || test_phase == CREATE_CANCEL) ok(default_ime_wnd != NULL, "expected IME window existence\n"); break; default: @@ -214,12 +218,15 @@ static LRESULT WINAPI wndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) switch(test_phase) { case FIRST_WINDOW: case SECOND_WINDOW: - todo_wine_if(test_phase == FIRST_WINDOW) + case CREATE_CANCEL: + todo_wine_if(test_phase == FIRST_WINDOW || test_phase == CREATE_CANCEL) ok(default_ime_wnd != NULL, "expected IME window existence\n"); break; default: break; /* do nothing */ } + if (test_phase == CREATE_CANCEL) + return -1; return TRUE; } @@ -957,6 +964,44 @@ static DWORD WINAPI test_default_ime_window_cb(void *arg) return 1; } +static DWORD WINAPI test_default_ime_window_cancel_cb(void *arg) +{ + struct testcase_ime_window *testcase = (struct testcase_ime_window *)arg; + DWORD visible = testcase->visible ? WS_VISIBLE : 0; + HWND hwnd1, hwnd2, default_ime_wnd, ime_wnd; + + ok(!get_ime_window(), "Expected no IME windows\n"); + test_phase = NCCREATE_CANCEL; + hwnd1 = CreateWindowExA(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW | visible, + CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); + ok(hwnd1 == NULL, "creation suceeded, got %p\n", hwnd1); + ok(!get_ime_window(), "Expected no IME windows\n"); + + test_phase = CREATE_CANCEL; + hwnd1 = CreateWindowExA(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW | visible, + CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); + ok(hwnd1 == NULL, "creation suceeded, got %p\n", hwnd1); + ok(!get_ime_window(), "Expected no IME windows\n"); + + test_phase = FIRST_WINDOW; + hwnd2 = CreateWindowExA(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW | visible, + CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); + ime_wnd = get_ime_window(); + todo_wine ok(ime_wnd != NULL, "Expected IME window existence\n"); + default_ime_wnd = ImmGetDefaultIMEWnd(hwnd2); + todo_wine ok(ime_wnd == default_ime_wnd, "Expected %p, got %p\n", ime_wnd, default_ime_wnd); + + DestroyWindow(hwnd2); + ok(!IsWindow(ime_wnd), "Expected no IME windows\n"); + return 1; +} + static void test_default_ime_window_creation(void) { HANDLE thread; @@ -983,6 +1028,14 @@ static void test_default_ime_window_creation(void) } } CloseHandle(thread); + + if (testcases[i].top_level_window) + { + thread = CreateThread(NULL, 0, test_default_ime_window_cancel_cb, &testcases[i], 0, NULL); + ok(thread != NULL, "CreateThread failed with error %u\n", GetLastError()); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + } } test_phase = PHASE_UNKNOWN;

1 0

Nikolay Sivov : ole32: Don't try to read key value if key was not found ( Valgrind).
by Alexandre Julliard 30 May '16

30 May '16

Module: wine Branch: master Commit: 4e5698f72e4d5ca6a774b746b77dde033bbb16d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e5698f72e4d5ca6a774b746b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 29 19:22:32 2016 +0300 ole32: Don't try to read key value if key was not found (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/moniker.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index fee205c..2d6e8e8 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -1265,13 +1265,17 @@ HRESULT WINAPI GetClassFile(LPCOLESTR filePathName,CLSID *pclsid) } ret = RegQueryValueW(HKEY_CLASSES_ROOT, extension, NULL, &sizeProgId); - - /* get the progId associated to the extension */ - progId = CoTaskMemAlloc(sizeProgId); - ret = RegQueryValueW(HKEY_CLASSES_ROOT, extension, progId, &sizeProgId); - if (!ret) - /* return the clsid associated to the progId */ - res = CLSIDFromProgID(progId,pclsid); + if (!ret) { + /* get the progId associated to the extension */ + progId = CoTaskMemAlloc(sizeProgId); + ret = RegQueryValueW(HKEY_CLASSES_ROOT, extension, progId, &sizeProgId); + if (!ret) + /* return the clsid associated to the progId */ + res = CLSIDFromProgID(progId, pclsid); + else + res = HRESULT_FROM_WIN32(ret); + CoTaskMemFree(progId); + } else res = HRESULT_FROM_WIN32(ret); @@ -1279,7 +1283,6 @@ HRESULT WINAPI GetClassFile(LPCOLESTR filePathName,CLSID *pclsid) CoTaskMemFree(pathDec[i]); CoTaskMemFree(pathDec); - CoTaskMemFree(progId); return res != S_OK ? MK_E_INVALIDEXTENSION : res; }

1 0

Francois Gouget : shell32: Spelling fixes.
by Alexandre Julliard 30 May '16

30 May '16

Module: wine Branch: master Commit: cc2a2b09703b391b02ec773eba8c55e98b383fc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc2a2b09703b391b02ec773eb… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 29 12:41:31 2016 +0200 shell32: Spelling fixes. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/iconcache.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 4549d5b..c3284a2 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -106,7 +106,7 @@ static int SIC_LoadOverlayIcon(int icon_idx); * SIC_OverlayShortcutImage [internal] * * NOTES - * Creates a new icon as a copy of the passed-in icon, overlayed with a + * Creates a new icon as a copy of the passed-in icon, overlaid with a * shortcut image. */ static HICON SIC_OverlayShortcutImage(HICON SourceIcon, BOOL large) @@ -332,7 +332,7 @@ static INT SIC_LoadIcon (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags) } else { - WARN("Failed to create shortcut overlayed icons\n"); + WARN("Failed to create shortcut overlaid icons\n"); if (NULL != hiconLargeShortcut) DestroyIcon(hiconLargeShortcut); if (NULL != hiconSmallShortcut) DestroyIcon(hiconSmallShortcut); dwFlags &= ~ GIL_FORSHORTCUT;

1 0

Francois Gouget : secur32: Spelling fixes.
by Alexandre Julliard 30 May '16

30 May '16

Module: wine Branch: master Commit: 8e558cf72562809738490638c87b6dfd563317e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e558cf72562809738490638c… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 29 12:41:36 2016 +0200 secur32: Spelling fixes. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_macosx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 1c9b35d..b940881 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -596,7 +596,7 @@ static OSStatus schan_pull_adapter(SSLConnectionRef transport, void *buff, * * Returns: * noErr on complete or partial success; *buff_len indicates how much data - * was actually written, which may be less than requrested. + * was actually written, which may be less than requested. * errSSLWouldBlock when no data could be written without blocking. The * caller should try again. * other error code for failure.

1 0

Francois Gouget : mlang: Spelling fixes.
by Alexandre Julliard 30 May '16

30 May '16

Module: wine Branch: master Commit: c0a9a8b4108429c70e212e08fe251535fc470739 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0a9a8b4108429c70e212e08f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 29 12:42:07 2016 +0200 mlang: Spelling fixes. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/mlang.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index f6bd308..d9a167a 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -502,7 +502,7 @@ static void fill_cp_info(const struct mlang_data *ml_data, UINT index, MIMECPINF static LONG dll_count; /* - * Japanese Detection and Converstion Functions + * Japanese Detection and Conversion Functions */ #define HANKATA(A) ((A >= 161) && (A <= 223))

1 0

Francois Gouget : kernel32: Spelling fixes.
by Alexandre Julliard 30 May '16

30 May '16

Module: wine Branch: master Commit: 6c4484582bafde7cf7a460ec6104b2eaae48e00a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c4484582bafde7cf7a460ec6… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 29 12:42:15 2016 +0200 kernel32: Spelling fixes. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 32f2d65..f443020 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -238,7 +238,7 @@ BOOL WINAPI VirtualProtectEx( HANDLE process, LPVOID addr, SIZE_T size, NTSTATUS status; DWORD prot; - /* Win9x allows to pass NULL as old_prot while it fails on NT */ + /* Win9x allows passing NULL as old_prot while this fails on NT */ if (!old_prot && (GetVersion() & 0x80000000)) old_prot = &prot; status = NtProtectVirtualMemory( process, &addr, &size, new_prot, old_prot );

1 0

Francois Gouget : gdi.exe16: Spelling fixes.
by Alexandre Julliard 30 May '16

30 May '16

Module: wine Branch: master Commit: 06b728731f448ce0a0dd906a4b1bd6e0f3bae8bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=06b728731f448ce0a0dd906a4… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 29 12:42:21 2016 +0200 gdi.exe16: Spelling fixes. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi.exe16/printdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi.exe16/printdrv.c b/dlls/gdi.exe16/printdrv.c index fa891b7..bd7f053 100644 --- a/dlls/gdi.exe16/printdrv.c +++ b/dlls/gdi.exe16/printdrv.c @@ -62,7 +62,7 @@ static const char Printers[] = "System\\CurrentControlSet\\Control\\Pri /****************** misc. printer related functions */ /* - * The following function should implement a queing system + * The following function should implement a queuing system */ struct hpq {

1 0

Francois Gouget : d3dxof: Spelling fixes.
by Alexandre Julliard 30 May '16

30 May '16

Module: wine Branch: master Commit: 99a5afc09b1e8928a2b3270ce67784083d2f5b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=99a5afc09b1e8928a2b3270ce… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 29 12:42:56 2016 +0200 d3dxof: Spelling fixes. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dxof/parsing.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 54566b0..f7724ec 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -748,7 +748,7 @@ static WORD parse_TOKEN(parse_buffer * buf) { buf->list_nb_elements--; buf->list_separator = FALSE; - /* Insert separarator between each values and since list does not accept separator at the end + /* Insert separator between each value, and since list does not accept separator at the end use a comma so any extra separator will generate an error */ token = TOKEN_COMMA; } @@ -761,7 +761,7 @@ static WORD parse_TOKEN(parse_buffer * buf) *(DWORD*)buf->value = value; buf->list_separator = TRUE; - /* Convert list into a serie of their basic type counterpart */ + /* Convert list into a series of their basic type counterpart */ token = buf->list_type_float ? TOKEN_FLOAT : TOKEN_INTEGER; } dump_TOKEN(token);

1 0

Francois Gouget : dmsynth: Spelling fixes.
by Alexandre Julliard 30 May '16

30 May '16

Module: wine Branch: master Commit: a80f1450ce39a4357f195d29a71791ca727eb4b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a80f1450ce39a4357f195d29a… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 29 12:42:45 2016 +0200 dmsynth: Spelling fixes. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/synth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index cdf8026..c5720ec 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -147,7 +147,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_Download(LPDIRECTMUSICSYNTH8 iface, TRACE(" - cbSize = %u\n", info->cbSize); } - /* The struct should have at least one offset corresponding to the donwload object itself */ + /* The struct should have at least one offset corresponding to the download object itself */ if (!info->dwNumOffsetTableEntries) { FIXME("Offset table is empty\n");

1 0

Caron Wills : wined3d: Add Nvidia GeForce GT 730M.
by Alexandre Julliard 30 May '16

30 May '16

Module: wine Branch: master Commit: abd26b9d4468f968d10115d3cf31b4ca58b457ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=abd26b9d4468f968d10115d3c… Author: Caron Wills <caron(a)codeweavers.com> Date: Fri May 27 19:56:05 2016 +0000 wined3d: Add Nvidia GeForce GT 730M. Signed-off-by: Caron Wills <caron(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9233016..60a18bb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1274,6 +1274,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670MX, "NVIDIA GeForce GTX 670MX", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730M, "NVIDIA GeForce GT 730M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT750M, "NVIDIA GeForce GT 750M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX750, "NVIDIA GeForce GTX 750", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX750TI, "NVIDIA GeForce GTX 750 Ti", DRIVER_NVIDIA_GEFORCE8, 2048}, @@ -1776,6 +1777,7 @@ cards_nvidia_binary[] = {"GTX 750 Ti", CARD_NVIDIA_GEFORCE_GTX750TI}, /* Geforce 700 - midend */ {"GTX 750", CARD_NVIDIA_GEFORCE_GTX750}, /* Geforce 700 - midend */ {"GT 750M", CARD_NVIDIA_GEFORCE_GT750M}, /* Geforce 700 - midend mobile */ + {"GT 730M", CARD_NVIDIA_GEFORCE_GT730M}, /* Geforce 700 - midend mobile */ {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ {"GTX 670MX", CARD_NVIDIA_GEFORCE_GTX670MX}, /* Geforce 600 - highend */ {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6a8bbcb..814ac49 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1811,6 +1811,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, CARD_NVIDIA_GEFORCE_GTX670MX = 0x11a1, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, + CARD_NVIDIA_GEFORCE_GT730M = 0x0fe1, CARD_NVIDIA_GEFORCE_GT750M = 0x0fe9, CARD_NVIDIA_GEFORCE_GTX750 = 0x1381, CARD_NVIDIA_GEFORCE_GTX750TI = 0x1380,

1 0