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

Francois Gouget : dmsynth: Spelling fixes.
by Alexandre Julliard May 30, 2016

May 30, 2016

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

Francois Gouget : d3dxof: Spelling fixes.
by Alexandre Julliard May 30, 2016

May 30, 2016

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 : gdi.exe16: Spelling fixes.
by Alexandre Julliard May 30, 2016

May 30, 2016

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

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

May 30, 2016

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

Akihiro Sagawa : imm32/tests: Add tests showing the IME window is created if the first window is a child.
by Alexandre Julliard May 30, 2016

May 30, 2016

Module: wine Branch: master Commit: da389f5fccf682be379a3721add799b2a2394429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da389f5fccf682be379a3721a… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon May 30 01:08:12 2016 +0900 imm32/tests: Add tests showing the IME window is created if the first window is a child. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/tests/imm32.c | 61 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 47 insertions(+), 14 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 1cd7c05..7bc0a9a 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -912,17 +912,31 @@ static HWND get_ime_window(void) return ime_window; } +struct testcase_ime_window { + BOOL visible; + BOOL top_level_window; +}; + static DWORD WINAPI test_default_ime_window_cb(void *arg) { - DWORD visible = arg ? WS_VISIBLE : 0; + 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 = FIRST_WINDOW; - hwnd1 = CreateWindowExA(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", - WS_OVERLAPPEDWINDOW | visible, - CW_USEDEFAULT, CW_USEDEFAULT, - 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); + if (testcase->top_level_window) { + test_phase = FIRST_WINDOW; + hwnd1 = CreateWindowExA(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW | visible, + CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); + } + else { + hwnd1 = CreateWindowExA(WS_EX_CLIENTEDGE, "EDIT", "Wine imm32.dll test", + WS_CHILD | visible, + CW_USEDEFAULT, CW_USEDEFAULT, + 240, 24, hwnd, NULL, GetModuleHandleW(NULL), NULL); + } ime_wnd = get_ime_window(); todo_wine ok(ime_wnd != NULL, "Expected IME window existence\n"); default_ime_wnd = ImmGetDefaultIMEWnd(hwnd1); @@ -934,7 +948,10 @@ static DWORD WINAPI test_default_ime_window_cb(void *arg) CW_USEDEFAULT, CW_USEDEFAULT, 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); DestroyWindow(hwnd2); - todo_wine ok(IsWindow(ime_wnd) || broken(/* Vista */ !visible), "Expected IME window existence\n"); + todo_wine ok(IsWindow(ime_wnd) || + broken(!testcase->visible /* Vista */) || + broken(!testcase->top_level_window /* Vista */) , + "Expected IME window existence\n"); DestroyWindow(hwnd1); ok(!IsWindow(ime_wnd), "Expected no IME windows\n"); return 1; @@ -943,14 +960,30 @@ static DWORD WINAPI test_default_ime_window_cb(void *arg) static void test_default_ime_window_creation(void) { HANDLE thread; + size_t i; + struct testcase_ime_window testcases[] = { + /* visible, top-level window */ + { TRUE, TRUE }, + { FALSE, TRUE }, + { TRUE, FALSE }, + { FALSE, FALSE } + }; - thread = CreateThread(NULL, 0, test_default_ime_window_cb, (LPVOID)FALSE, 0, NULL); - WaitForSingleObject(thread, INFINITE); - CloseHandle(thread); - - thread = CreateThread(NULL, 0, test_default_ime_window_cb, (LPVOID)TRUE, 0, NULL); - WaitForSingleObject(thread, INFINITE); - CloseHandle(thread); + for (i = 0; i < sizeof(testcases)/sizeof(testcases[0]); i++) + { + thread = CreateThread(NULL, 0, test_default_ime_window_cb, &testcases[i], 0, NULL); + ok(thread != NULL, "CreateThread failed with error %u\n", GetLastError()); + while (MsgWaitForMultipleObjects(1, &thread, FALSE, INFINITE, QS_ALLINPUT) == WAIT_OBJECT_0 + 1) + { + MSG msg; + while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + } + CloseHandle(thread); + } test_phase = PHASE_UNKNOWN; }

1 0

Akihiro Sagawa : imm32/tests: Add tests showing that the IME window is created between WM_NCCREATE and WM_NCCALCSIZE.
by Alexandre Julliard May 30, 2016

May 30, 2016

Module: wine Branch: master Commit: 451fd162b42d8618e2c6adafdb22edf94c82f22a URL: http://source.winehq.org/git/wine.git/?a=commit;h=451fd162b42d8618e2c6adafd… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon May 30 01:08:11 2016 +0900 imm32/tests: Add tests showing that the IME window is created between WM_NCCREATE and WM_NCCALCSIZE. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/tests/imm32.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index bb27853..1cd7c05 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -172,15 +172,54 @@ 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 HWND hwnd; +static HWND get_ime_window(void); + static LRESULT WINAPI wndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { + HWND default_ime_wnd; switch (msg) { case WM_IME_SETCONTEXT: + return TRUE; case WM_NCCREATE: + default_ime_wnd = get_ime_window(); + switch(test_phase) { + case FIRST_WINDOW: + ok(!default_ime_wnd, "expected no IME windows\n"); + break; + case SECOND_WINDOW: + ok(default_ime_wnd != NULL, "expected IME window existence\n"); + break; + default: + break; /* do nothing */ + } + 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) + ok(default_ime_wnd != NULL, "expected IME window existence\n"); + break; + default: + break; /* do nothing */ + } + break; case WM_CREATE: + default_ime_wnd = get_ime_window(); + switch(test_phase) { + case FIRST_WINDOW: + case SECOND_WINDOW: + todo_wine_if(test_phase == FIRST_WINDOW) + ok(default_ime_wnd != NULL, "expected IME window existence\n"); + break; + default: + break; /* do nothing */ + } return TRUE; } @@ -879,6 +918,7 @@ static DWORD WINAPI test_default_ime_window_cb(void *arg) HWND hwnd1, hwnd2, default_ime_wnd, ime_wnd; ok(!get_ime_window(), "Expected no IME windows\n"); + test_phase = FIRST_WINDOW; hwnd1 = CreateWindowExA(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", WS_OVERLAPPEDWINDOW | visible, CW_USEDEFAULT, CW_USEDEFAULT, @@ -887,6 +927,8 @@ static DWORD WINAPI test_default_ime_window_cb(void *arg) todo_wine ok(ime_wnd != NULL, "Expected IME window existence\n"); default_ime_wnd = ImmGetDefaultIMEWnd(hwnd1); todo_wine ok(ime_wnd == default_ime_wnd, "Expected %p, got %p\n", ime_wnd, default_ime_wnd); + + test_phase = SECOND_WINDOW; hwnd2 = CreateWindowExA(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", WS_OVERLAPPEDWINDOW | visible, CW_USEDEFAULT, CW_USEDEFAULT, @@ -909,6 +951,8 @@ static void test_default_ime_window_creation(void) thread = CreateThread(NULL, 0, test_default_ime_window_cb, (LPVOID)TRUE, 0, NULL); WaitForSingleObject(thread, INFINITE); CloseHandle(thread); + + test_phase = PHASE_UNKNOWN; } static void test_ImmGetIMCLockCount(void)

1 0

Nikolay Sivov : dwrite: Fix font data array leak on list release (Valgrind ).
by Alexandre Julliard May 30, 2016

May 30, 2016

Module: wine Branch: master Commit: c43a3d48afe23486d6bee2d38b1d3f004514dd76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c43a3d48afe23486d6bee2d38… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 29 18:37:14 2016 +0300 dwrite: Fix font data array leak on list release (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index e68da0d..3cd178c 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1629,6 +1629,7 @@ static ULONG WINAPI dwritefontlist_Release(IDWriteFontList1 *iface) for (i = 0; i < This->font_count; i++) release_font_data(This->fonts[i]); IDWriteFontFamily1_Release(This->family); + heap_free(This->fonts); heap_free(This); }

1 0

Jacek Caban : msctf: Added Push/Pop context tests.
by Alexandre Julliard May 30, 2016

May 30, 2016

Module: wine Branch: master Commit: bc645ca71a7e2575e9808d54b78a97f84f9ffe66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc645ca71a7e2575e9808d54b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 27 18:35:35 2016 +0200 msctf: Added Push/Pop context tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 16df012..98d88ba 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -74,6 +74,7 @@ static INT test_OnPushContext = SINK_UNEXPECTED; static INT test_OnPopContext = SINK_UNEXPECTED; static INT test_KEV_OnSetFocus = SINK_UNEXPECTED; static INT test_ACP_AdviseSink = SINK_UNEXPECTED; +static INT test_ACP_UnadviseSink = SINK_UNEXPECTED; static INT test_ACP_GetStatus = SINK_UNEXPECTED; static INT test_ACP_RequestLock = SINK_UNEXPECTED; static INT test_ACP_GetEndACP = SINK_UNEXPECTED; @@ -232,6 +233,9 @@ static HRESULT WINAPI TextStoreACP_AdviseSink(ITextStoreACP *iface, sink_fire_ok(&test_ACP_AdviseSink,"TextStoreACP_AdviseSink"); + if(ACPSink) + return S_OK; + hr = IUnknown_QueryInterface(punk, &IID_ITextStoreACPSink, (void**)&ACPSink); ok(SUCCEEDED(hr),"Unable to QueryInterface on sink\n"); @@ -245,7 +249,7 @@ static HRESULT WINAPI TextStoreACP_AdviseSink(ITextStoreACP *iface, static HRESULT WINAPI TextStoreACP_UnadviseSink(ITextStoreACP *iface, IUnknown *punk) { - trace("\n"); + sink_fire_ok(&test_ACP_UnadviseSink,"TextStoreACP_UnadviseSink"); return S_OK; } @@ -1474,7 +1478,7 @@ static void test_startSession(void) DWORD editCookie; ITfDocumentMgr *dmtest; ITfContext *cxt,*cxt2,*cxt3,*cxtTest; - ITextStoreACP *ts; + ITextStoreACP *ts = NULL; TfClientId cid2 = 0; ITfThreadMgrEx *tmex; @@ -1641,6 +1645,8 @@ static void test_startSession(void) ok(hr == S_FALSE, "ITfContext_GetDocumentMgr wrong rc %x\n",hr); ok(dmtest == NULL,"returned documentmgr should be null\n"); + ITfContext_Release(cxt2); + hr = ITfDocumentMgr_GetTop(g_dm, &cxtTest); ok(SUCCEEDED(hr),"GetTop Failed\n"); ok(cxtTest == cxt, "Wrong context on top\n"); @@ -1651,6 +1657,25 @@ static void test_startSession(void) ok(cxtTest == cxt, "Wrong context on base\n"); ITfContext_Release(cxtTest); + hr = ITfDocumentMgr_CreateContext(g_dm, cid, 0, (IUnknown*)ts, &cxt2, &editCookie); + ok(hr == S_OK,"CreateContext Failed\n"); + + test_OnPushContext = SINK_EXPECTED; + test_ACP_AdviseSink = SINK_EXPECTED; + hr = ITfDocumentMgr_Push(g_dm, cxt2); + ok(hr == S_OK,"Push Failed\n"); + sink_check_ok(&test_OnPushContext,"OnPushContext"); + sink_check_ok(&test_ACP_AdviseSink,"TextStoreACP_AdviseSink"); + + test_ACP_UnadviseSink = SINK_EXPECTED; + cnt = check_context_refcount(cxt2); + test_OnPopContext = SINK_EXPECTED; + hr = ITfDocumentMgr_Pop(g_dm, 0); + ok(hr == S_OK,"Pop Failed\n"); + ok(check_context_refcount(cxt2) < cnt, "Ref count did not decrease\n"); + sink_check_ok(&test_OnPopContext,"OnPopContext"); + sink_check_ok(&test_ACP_UnadviseSink,"TextStoreACP_AdviseSink"); + hr = ITfDocumentMgr_Pop(g_dm, 0); ok(FAILED(hr),"Pop Succeeded\n");

1 0

Jacek Caban : msctf: Don't call ITextStoreACP:: UnadviseSink in context destructor.
by Alexandre Julliard May 30, 2016

May 30, 2016

Module: wine Branch: master Commit: 79025d0e6af8189fd6c3360c5bd335954124c205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79025d0e6af8189fd6c3360c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 27 18:35:24 2016 +0200 msctf: Don't call ITextStoreACP::UnadviseSink in context destructor. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/context.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 597706e..54052f6 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -119,10 +119,7 @@ static void Context_Destructor(Context *This) TRACE("destroying %p\n", This); if (This->pITextStoreACP) - { - ITextStoreACP_UnadviseSink(This->pITextStoreACP, (IUnknown*)&This->ITextStoreACPSink_iface); ITextStoreACP_Release(This->pITextStoreACP); - } if (This->pITfContextOwnerCompositionSink) ITfContextOwnerCompositionSink_Release(This->pITfContextOwnerCompositionSink);

1 0

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

May 30, 2016

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