August 2010 - Wine-Commits - list.winehq.org

Andrew Eikum : shell32: Add tests for SHChangeNotify functions.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: 9f37536d6aa9cd53a77293e3c491295b0aeeab74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f37536d6aa9cd53a77293e3c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Aug 3 14:23:43 2010 -0500 shell32: Add tests for SHChangeNotify functions. --- dlls/shell32/tests/shlfolder.c | 166 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 166 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 482a31d..6c0b6f2 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3706,6 +3706,171 @@ static void test_ParseDisplayNamePBC(void) IShellFolder_Release(psf); } +static const CHAR testwindow_class[] = "testwindow"; +#define WM_USER_NOTIFY (WM_APP+1) + +static struct { + const char *id; + BOOL exp_notify; + UINT signal; + const WCHAR *path_1; + const WCHAR *path_2; +} exp_data; + +static LRESULT CALLBACK testwindow_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + UINT signal = (UINT)lparam; + + switch(msg){ + case WM_USER_NOTIFY: + if(exp_data.exp_notify){ + LPCITEMIDLIST *pidls = (LPCITEMIDLIST*)wparam; + + ok(exp_data.signal == signal, + "%s: expected notification type %x, got: %x\n", + exp_data.id, exp_data.signal, signal); + + trace("verifying pidls for: %s\n", exp_data.id); + verify_pidl(pidls[0], exp_data.path_1); + verify_pidl(pidls[1], exp_data.path_2); + + exp_data.exp_notify = FALSE; + }else + ok(exp_data.exp_notify, "Didn't expect a WM_USER_NOTIFY message (event: %x)\n", signal); + return 0; + } + return DefWindowProc(hwnd, msg, wparam, lparam); +} + +static void register_testwindow_class(void) +{ + WNDCLASSEXA cls; + ATOM ret; + + ZeroMemory(&cls, sizeof(cls)); + cls.cbSize = sizeof(cls); + cls.style = 0; + cls.lpfnWndProc = testwindow_wndproc; + cls.hInstance = GetModuleHandleA(NULL); + cls.lpszClassName = testwindow_class; + + SetLastError(0); + ret = RegisterClassExA(&cls); + ok(ret != 0, "RegisterClassExA failed: %d\n", GetLastError()); +} + +/* SHCNF_FLUSH doesn't seem to work as advertised for SHCNF_PATHA, so we + * have to poll repeatedly for the message to appear */ +static void do_events(void) +{ + int c = 0; + while (exp_data.exp_notify && (c++ < 10)){ + MSG msg; + while(PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)){ + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + if(exp_data.exp_notify) + Sleep(500); + } + trace("%s: took %d tries\n", exp_data.id, c); +} + +static void test_SHChangeNotify(void) +{ + HWND wnd; + ULONG notifyID; + HRESULT hr; + BOOL br, has_unicode; + SHChangeNotifyEntry entries[1]; + const CHAR root_dirA[] = "C:\\shell32_cn_test"; + const WCHAR root_dirW[] = {'C',':','\\','s','h','e','l','l','3','2','_','c','n','_','t','e','s','t',0}; + const CHAR test_dirA[] = "C:\\shell32_cn_test\\test"; + const WCHAR test_dirW[] = {'C',':','\\','s','h','e','l','l','3','2','_','c','n','_','t','e','s','t','\\','t','e','s','t',0}; + + CreateDirectoryW(NULL, NULL); + has_unicode = !(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED); + + /* set up the root directory & window */ + br = CreateDirectoryA(root_dirA, NULL); + ok(br == TRUE, "CreateDirectory failed: %d\n", GetLastError()); + + register_testwindow_class(); + + wnd = CreateWindowExA(0, testwindow_class, testwindow_class, 0, + CW_USEDEFAULT, CW_USEDEFAULT, 130, 105, + NULL, NULL, GetModuleHandleA(NULL), 0); + ok(wnd != NULL, "Failed to make a window\n"); + + entries[0].pidl = NULL; + if(has_unicode) + hr = SHILCreateFromPath(root_dirW, (LPITEMIDLIST*)&entries[0].pidl, 0); + else + hr = SHILCreateFromPath((LPCVOID)root_dirA, (LPITEMIDLIST*)&entries[0].pidl, 0); + ok(hr == S_OK, "SHILCreateFromPath failed: 0x%08x\n", hr); + entries[0].fRecursive = TRUE; + + notifyID = SHChangeNotifyRegister(wnd, SHCNRF_ShellLevel, + SHCNE_ALLEVENTS, WM_USER_NOTIFY, 1, entries); + ok(notifyID != 0, "Failed to register a window for change notifications\n"); + + /* MKDIR */ + br = CreateDirectoryA(test_dirA, NULL); + ok(br == TRUE, "CreateDirectory failed: %d\n", GetLastError()); + + if(has_unicode){ + exp_data.id = "MKDIR PATHW"; + exp_data.signal = SHCNE_MKDIR; + exp_data.exp_notify = TRUE; + exp_data.path_1 = test_dirW; + exp_data.path_2 = NULL; + SHChangeNotify(SHCNE_MKDIR, SHCNF_PATHW | SHCNF_FLUSH, test_dirW, NULL); + do_events(); + ok(exp_data.exp_notify == FALSE, "Expected wndproc to be called\n"); + }else + win_skip("skipping WCHAR tests\n"); + + exp_data.id = "MKDIR PATHA"; + exp_data.signal = SHCNE_MKDIR; + exp_data.exp_notify = TRUE; + exp_data.path_1 = test_dirW; + exp_data.path_2 = NULL; + SHChangeNotify(SHCNE_MKDIR, SHCNF_PATHA | SHCNF_FLUSH, test_dirA, NULL); + do_events(); + ok(exp_data.exp_notify == FALSE, "Expected wndproc to be called\n"); + + /* RMDIR */ + br = RemoveDirectoryA(test_dirA); + ok(br == TRUE, "RemoveDirectory failed: %d\n", GetLastError()); + + if(has_unicode){ + exp_data.id = "RMDIR PATHW"; + exp_data.signal = SHCNE_RMDIR; + exp_data.exp_notify = TRUE; + exp_data.path_1 = test_dirW; + exp_data.path_2 = NULL; + SHChangeNotify(SHCNE_RMDIR, SHCNF_PATHW | SHCNF_FLUSH, test_dirW, NULL); + do_events(); + ok(exp_data.exp_notify == FALSE, "Expected wndproc to be called\n"); + }else + win_skip("skipping WCHAR tests\n"); + + exp_data.id = "RMDIR PATHA"; + exp_data.signal = SHCNE_RMDIR; + exp_data.exp_notify = TRUE; + exp_data.path_1 = test_dirW; + exp_data.path_2 = NULL; + SHChangeNotify(SHCNE_RMDIR, SHCNF_PATHA | SHCNF_FLUSH, test_dirA, NULL); + do_events(); + ok(exp_data.exp_notify == FALSE, "Expected wndproc to be called\n"); + + SHChangeNotifyDeregister(notifyID); + DestroyWindow(wnd); + + br = RemoveDirectoryA(root_dirA); + ok(br == TRUE, "RemoveDirectory failed: %d\n", GetLastError()); +} + START_TEST(shlfolder) { init_function_pointers(); @@ -3736,6 +3901,7 @@ START_TEST(shlfolder) test_SHGetIDListFromObject(); test_SHGetItemFromObject(); test_ShellItemCompare(); + test_SHChangeNotify(); OleUninitialize(); }

1 0

Jacek Caban : mshtml: Moved HTTP headers list freeing to separated function .
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: dd0894c7ab10d2648afff4afeec56091cddad4f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd0894c7ab10d2648afff4afe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 3 21:37:00 2010 +0200 mshtml: Moved HTTP headers list freeing to separated function. --- dlls/mshtml/mshtml_private.h | 4 ++-- dlls/mshtml/nsio.c | 25 +++++++++++++++---------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 46886d8..4f0df7d 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -467,11 +467,11 @@ typedef struct { UINT url_scheme; } nsChannel; -struct ResponseHeader { +typedef struct ResponseHeader { struct list entry; WCHAR *header; WCHAR *data; -}; +} http_header_t; typedef struct { HRESULT (*qi)(HTMLDOMNode*,REFIID,void**); diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 0aad37a..8d4fe0a 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -311,6 +311,18 @@ static inline BOOL is_http_channel(nsChannel *This) return This->url_scheme == URL_SCHEME_HTTP || This->url_scheme == URL_SCHEME_HTTPS; } +static void free_http_headers(struct list *list) +{ + http_header_t *iter, *iter_next; + + LIST_FOR_EACH_ENTRY_SAFE(iter, iter_next, list, http_header_t, entry) { + list_remove(&iter->entry); + heap_free(iter->header); + heap_free(iter->data); + heap_free(iter); + } +} + #define NSCHANNEL_THIS(iface) DEFINE_THIS(nsChannel, HttpChannel, iface) static nsresult NSAPI nsChannel_QueryInterface(nsIHttpChannel *iface, nsIIDRef riid, void **result) @@ -364,8 +376,6 @@ static nsrefcnt NSAPI nsChannel_Release(nsIHttpChannel *iface) LONG ref = InterlockedDecrement(&This->ref); if(!ref) { - struct ResponseHeader *header, *next_hdr; - nsIURI_Release(NSURI(This->uri)); if(This->owner) nsISupports_Release(This->owner); @@ -377,16 +387,11 @@ static nsrefcnt NSAPI nsChannel_Release(nsIHttpChannel *iface) nsIInterfaceRequestor_Release(This->notif_callback); if(This->original_uri) nsIURI_Release(This->original_uri); - heap_free(This->content_type); - heap_free(This->charset); - LIST_FOR_EACH_ENTRY_SAFE(header, next_hdr, &This->response_headers, struct ResponseHeader, entry) { - list_remove(&header->entry); - heap_free(header->header); - heap_free(header->data); - heap_free(header); - } + free_http_headers(&This->response_headers); + heap_free(This->content_type); + heap_free(This->charset); heap_free(This); }

1 0

Aurimas Fišeras : shdocvw: Updated Lithuanian translation.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: 35e60aa3e06ab603f2a0ae567b5a40b282a960b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35e60aa3e06ab603f2a0ae567… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Aug 2 19:30:22 2010 +0300 shdocvw: Updated Lithuanian translation. --- dlls/shdocvw/Lt.rc | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/Lt.rc b/dlls/shdocvw/Lt.rc index e35a2d8..16074b6 100644 --- a/dlls/shdocvw/Lt.rc +++ b/dlls/shdocvw/Lt.rc @@ -28,7 +28,7 @@ STYLE DS_MODALFRAME | WS_CAPTION CAPTION "Atverti URL" FONT 8, "MS Shell Dlg" { - LTEXT "Nurodykite URL, kurį norite atverti su Internet Explorer",-1,30, 5, 150,15 + LTEXT "Nurodykite URL, kurį norite atverti su interneto naršykle",-1,30, 5, 150,15 LTEXT "Atverti:", -1, 2, 32, 25, 15 EDITTEXT IDC_BROWSE_OPEN_URL, 30, 30, 160, 13 DEFPUSHBUTTON "&Gerai", IDOK, 30, 50, 50, 15 @@ -53,8 +53,28 @@ IDR_BROWSE_MAIN_MENU MENU MENUITEM SEPARATOR MENUITEM "&Savybės...", ID_BROWSE_PROPERTIES } + POPUP "&Adresynas" + { + MENUITEM "Į&rašyti į adresyną..." ID_BROWSE_ADDFAV + MENUITEM SEPARATOR + } POPUP "&Žinynas" { - MENUITEM "&Apie Internet Explorer...", ID_BROWSE_ABOUT + MENUITEM "&Apie interneto naršyklę...", ID_BROWSE_ABOUT } } + +STRINGTABLE +{ + IDS_TB_BACK "Atgal" + IDS_TB_FORWARD "Pirmyn" + IDS_TB_STOP "Stabdyti" + IDS_TB_REFRESH "Atnaujinti" + IDS_TB_HOME "Pradžia" + IDS_TB_PRINT "Spausdinti" +} + +STRINGTABLE +{ + IDS_ADDRESS "Adresas" +}

1 0

André Hentschel : shdocvw: Update German translation.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: d0deb836242e103869fb3d47fb7a854bc864df79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0deb836242e103869fb3d47f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 3 20:33:25 2010 +0200 shdocvw: Update German translation. --- dlls/shdocvw/De.rc | 36 ++++++++++++++++++++++++++++-------- 1 files changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/shdocvw/De.rc b/dlls/shdocvw/De.rc index 82a06b5..c7978ff 100644 --- a/dlls/shdocvw/De.rc +++ b/dlls/shdocvw/De.rc @@ -40,20 +40,40 @@ IDR_BROWSE_MAIN_MENU MENU { POPUP "&Neu" { - MENUITEM "&Fenster" ID_BROWSE_NEW_WINDOW + MENUITEM "&Fenster" ID_BROWSE_NEW_WINDOW } - MENUITEM "&Öffnen...", ID_BROWSE_OPEN - MENUITEM "&Speichern", ID_BROWSE_SAVE + MENUITEM "Ö&ffnen...", ID_BROWSE_OPEN + MENUITEM "&Speichern", ID_BROWSE_SAVE MENUITEM "Speichern &als...", ID_BROWSE_SAVE_AS MENUITEM SEPARATOR - MENUITEM "Seite &einrichten...", ID_BROWSE_PRINT_FORMAT - MENUITEM "Dr&ucken...", ID_BROWSE_PRINT - MENUITEM "Seiten&vorschau...", ID_BROWSE_PRINT_PREVIEW + MENUITEM "Seite &einrichten...", ID_BROWSE_PRINT_FORMAT + MENUITEM "Dr&ucken...", ID_BROWSE_PRINT + MENUITEM "Seiten&vorschau...", ID_BROWSE_PRINT_PREVIEW + MENUITEM SEPARATOR + MENUITEM "Ei&genschaften...", ID_BROWSE_PROPERTIES + } + POPUP "&Favoriten" + { + MENUITEM "&Zu den Favoriten hinzufügen..." ID_BROWSE_ADDFAV MENUITEM SEPARATOR - MENUITEM "&Eigenschaften...", ID_BROWSE_PROPERTIES } POPUP "&Hilfe" { - MENUITEM "&Über Internet Explorer...", ID_BROWSE_ABOUT + MENUITEM "Über &Internet Explorer...", ID_BROWSE_ABOUT } } + +STRINGTABLE +{ + IDS_TB_BACK "Zurück" + IDS_TB_FORWARD "Vorwärts" + IDS_TB_STOP "Stopp" + IDS_TB_REFRESH "Neu laden" + IDS_TB_HOME "Start" + IDS_TB_PRINT "Drucken" +} + +STRINGTABLE +{ + IDS_ADDRESS "Adresse" +}

1 0

Alexander Nicolaysen Sørnes : shdocvw: Add View menu to IE with list of installed toolbars.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: 6d381a4cf594e020e1a9ce540088c24768c73638 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d381a4cf594e020e1a9ce540… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Aug 3 13:56:56 2010 +0200 shdocvw: Add View menu to IE with list of installed toolbars. --- dlls/shdocvw/En.rc | 8 +++++ dlls/shdocvw/iexplore.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/shdocvw/resource.h | 3 ++ 3 files changed, 88 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/En.rc b/dlls/shdocvw/En.rc index 014245b..0d55909 100644 --- a/dlls/shdocvw/En.rc +++ b/dlls/shdocvw/En.rc @@ -50,6 +50,14 @@ IDR_BROWSE_MAIN_MENU MENU MENUITEM SEPARATOR MENUITEM "&Properties...", ID_BROWSE_PROPERTIES } + POPUP "&View" + { + POPUP "&Toolbars" + { + MENUITEM "&Standard bar" ID_BROWSE_BAR_STD + MENUITEM "&Address bar" ID_BROWSE_BAR_ADDR + } + } POPUP "&Favorites" { MENUITEM "&Add to Favorites..." ID_BROWSE_ADDFAV diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index c8b93af..59f9173 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -78,9 +78,16 @@ void adjust_ie_docobj_rect(HWND frame, RECT* rc) } } +static HMENU get_tb_menu(HMENU menu) +{ + HMENU menu_view = GetSubMenu(menu, 1); + + return GetSubMenu(menu_view, 0); +} + static HMENU get_fav_menu(HMENU menu) { - return GetSubMenu(menu, 1); + return GetSubMenu(menu, 2); } static LPWSTR get_fav_url_from_id(HMENU menu, UINT id) @@ -234,12 +241,81 @@ static void add_favs_to_menu(HMENU favmenu, HMENU menu, LPCWSTR dir) FindClose(findhandle); } +static void add_tbs_to_menu(HMENU menu) +{ + HUSKEY toolbar_handle; + WCHAR toolbar_key[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'I','n','t','e','r','n','e','t',' ', + 'E','x','p','l','o','r','e','r','\\', + 'T','o','o','l','b','a','r',0}; + + if(SHRegOpenUSKeyW(toolbar_key, KEY_READ, NULL, &toolbar_handle, TRUE) == ERROR_SUCCESS) + { + HUSKEY classes_handle; + WCHAR classes_key[] = {'S','o','f','t','w','a','r','e','\\', + 'C','l','a','s','s','e','s','\\','C','L','S','I','D',0}; + WCHAR guid[39]; + DWORD value_len = sizeof(guid)/sizeof(guid[0]); + int i; + + if(SHRegOpenUSKeyW(classes_key, KEY_READ, NULL, &classes_handle, TRUE) != ERROR_SUCCESS) + { + SHRegCloseUSKey(toolbar_handle); + ERR("Failed to open key %s\n", debugstr_w(classes_key)); + return; + } + + for(i = 0; SHRegEnumUSValueW(toolbar_handle, i, guid, &value_len, NULL, NULL, NULL, SHREGENUM_HKLM) == ERROR_SUCCESS; i++) + { + WCHAR tb_name[100]; + DWORD tb_name_len = sizeof(tb_name)/sizeof(tb_name[0]); + HUSKEY tb_class_handle; + MENUITEMINFOW item; + LSTATUS ret; + value_len = sizeof(guid)/sizeof(guid[0]); + + if(lstrlenW(guid) != 38) + { + TRACE("Found invalid IE toolbar entry: %s\n", debugstr_w(guid)); + continue; + } + + if(SHRegOpenUSKeyW(guid, KEY_READ, classes_handle, &tb_class_handle, TRUE) != ERROR_SUCCESS) + { + ERR("Failed to get class info for %s\n", debugstr_w(guid)); + continue; + } + + ret = SHRegQueryUSValueW(tb_class_handle, NULL, NULL, tb_name, &tb_name_len, TRUE, NULL, 0); + + SHRegCloseUSKey(tb_class_handle); + + if(ret != ERROR_SUCCESS) + { + ERR("Failed to get toolbar name for %s\n", debugstr_w(guid)); + continue; + } + + item.cbSize = sizeof(item); + item.fMask = MIIM_STRING; + item.dwTypeData = tb_name; + InsertMenuItemW(menu, GetMenuItemCount(menu), TRUE, &item); + } + + SHRegCloseUSKey(classes_handle); + SHRegCloseUSKey(toolbar_handle); + } +} + static HMENU create_ie_menu(void) { HMENU menu = LoadMenuW(shdocvw_hinstance, MAKEINTRESOURCEW(IDR_BROWSE_MAIN_MENU)); HMENU favmenu = get_fav_menu(menu); WCHAR path[MAX_PATH]; + add_tbs_to_menu(get_tb_menu(menu)); + if(SHGetFolderPathW(NULL, CSIDL_COMMON_FAVORITES, NULL, SHGFP_TYPE_CURRENT, path) == S_OK) add_favs_to_menu(favmenu, favmenu, path); diff --git a/dlls/shdocvw/resource.h b/dlls/shdocvw/resource.h index c313ef7..e18a9c0 100644 --- a/dlls/shdocvw/resource.h +++ b/dlls/shdocvw/resource.h @@ -43,6 +43,9 @@ #define ID_BROWSE_ADDFAV 1200 #define ID_BROWSE_HOME 1201 +#define ID_BROWSE_BAR_STD 1300 +#define ID_BROWSE_BAR_ADDR 1301 + #define ID_BROWSE_GOTOFAV_FIRST 2000 #define ID_BROWSE_GOTOFAV_MAX 65000

1 0

Matteo Bruni : d3dcompiler_42: Stub dll.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: fe050706433f6fcd8ff09c735368c1ee7f57d2ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe050706433f6fcd8ff09c735… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Aug 3 18:44:25 2010 +0200 d3dcompiler_42: Stub dll. --- configure | 1 + configure.ac | 1 + dlls/d3dcompiler_42/Makefile.in | 13 ++++++++ dlls/d3dcompiler_42/d3dcompiler_42.spec | 13 ++++++++ dlls/d3dcompiler_42/d3dcompiler_42_main.c | 44 +++++++++++++++++++++++++++++ dlls/d3dcompiler_42/version.rc | 27 +++++++++++++++++ 6 files changed, 99 insertions(+), 0 deletions(-) diff --git a/configure b/configure index bc1196c..4f95d20 100755 --- a/configure +++ b/configure @@ -14429,6 +14429,7 @@ wine_fn_config_dll d3d8 enable_d3d8 d3d8 wine_fn_config_test dlls/d3d8/tests d3d8_test wine_fn_config_dll d3d9 enable_d3d9 d3d9 wine_fn_config_test dlls/d3d9/tests d3d9_test +wine_fn_config_dll d3dcompiler_42 enable_d3dcompiler_42 wine_fn_config_dll d3dcompiler_43 enable_d3dcompiler_43 d3dcompiler wine_fn_config_dll d3dim enable_d3dim d3dim wine_fn_config_dll d3drm enable_d3drm d3drm diff --git a/configure.ac b/configure.ac index b5430bd..dd90186 100644 --- a/configure.ac +++ b/configure.ac @@ -2285,6 +2285,7 @@ WINE_CONFIG_DLL(d3d8,,[d3d8]) WINE_CONFIG_TEST(dlls/d3d8/tests) WINE_CONFIG_DLL(d3d9,,[d3d9]) WINE_CONFIG_TEST(dlls/d3d9/tests) +WINE_CONFIG_DLL(d3dcompiler_42) WINE_CONFIG_DLL(d3dcompiler_43,,[d3dcompiler]) WINE_CONFIG_DLL(d3dim,,[d3dim]) WINE_CONFIG_DLL(d3drm,,[d3drm]) diff --git a/dlls/d3dcompiler_42/Makefile.in b/dlls/d3dcompiler_42/Makefile.in new file mode 100644 index 0000000..5d0a4a2 --- /dev/null +++ b/dlls/d3dcompiler_42/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = d3dcompiler_42.dll +IMPORTS = kernel32 + +C_SRCS = \ + d3dcompiler_42_main.c + +RC_SRCS = version.rc + +(a)MAKE_DLL_RULES@ diff --git a/dlls/d3dcompiler_42/d3dcompiler_42.spec b/dlls/d3dcompiler_42/d3dcompiler_42.spec new file mode 100644 index 0000000..84adee3 --- /dev/null +++ b/dlls/d3dcompiler_42/d3dcompiler_42.spec @@ -0,0 +1,13 @@ +@ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr) d3dcompiler_43.D3DAssemble +@ stub DebugSetMute +@ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile +@ stdcall D3DDisassemble10Effect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect +@ stdcall D3DDisassemble(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble +@ stdcall D3DGetDebugInfo(ptr long ptr) d3dcompiler_43.D3DGetDebugInfo +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputAndOutputSignatureBlob +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputSignatureBlob +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetOutputSignatureBlob +@ stdcall D3DPreprocess(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess +@ stdcall D3DReflect(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stub D3DReturnFailure1 +@ stdcall D3DStripShader(ptr long long ptr) d3dcompiler_43.D3DStripShader diff --git a/dlls/d3dcompiler_42/d3dcompiler_42_main.c b/dlls/d3dcompiler_42/d3dcompiler_42_main.c new file mode 100644 index 0000000..c4745ee --- /dev/null +++ b/dlls/d3dcompiler_42/d3dcompiler_42_main.c @@ -0,0 +1,44 @@ +/* + * Direct3D shader compiler main file + * + * Copyright 2010 Matteo Bruni for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/d3dcompiler_42/version.rc b/dlls/d3dcompiler_42/version.rc new file mode 100644 index 0000000..3ed7088 --- /dev/null +++ b/dlls/d3dcompiler_42/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright 2010 Matteo Bruni for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#define WINE_FILEDESCRIPTION_STR "Wine D3DCompiler" +#define WINE_FILENAME_STR "d3dcompiler_42.dll" +#define WINE_FILEVERSION 9,27,952,3022 +#define WINE_FILEVERSION_STR "9.27.952.3022" +#define WINE_PRODUCTVERSION 9,27,952,3022 +#define WINE_PRODUCTVERSION_STR "9.27.952.3022" + +#include "wine/wine_common_ver.rc"

1 0

Matteo Bruni : d3dcompiler_41: Stub dll.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: 79c1bc42c00f42d85f0206b64d67af6870d4d89f URL: http://source.winehq.org/git/wine.git/?a=commit;h=79c1bc42c00f42d85f0206b64… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Aug 3 18:44:25 2010 +0200 d3dcompiler_41: Stub dll. --- configure | 1 + configure.ac | 1 + dlls/d3dcompiler_41/Makefile.in | 13 ++++++++ dlls/d3dcompiler_41/d3dcompiler_41.spec | 13 ++++++++ dlls/d3dcompiler_41/d3dcompiler_41_main.c | 44 +++++++++++++++++++++++++++++ dlls/d3dcompiler_41/version.rc | 27 +++++++++++++++++ 6 files changed, 99 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 4f95d20..9b94f09 100755 --- a/configure +++ b/configure @@ -14429,6 +14429,7 @@ wine_fn_config_dll d3d8 enable_d3d8 d3d8 wine_fn_config_test dlls/d3d8/tests d3d8_test wine_fn_config_dll d3d9 enable_d3d9 d3d9 wine_fn_config_test dlls/d3d9/tests d3d9_test +wine_fn_config_dll d3dcompiler_41 enable_d3dcompiler_41 wine_fn_config_dll d3dcompiler_42 enable_d3dcompiler_42 wine_fn_config_dll d3dcompiler_43 enable_d3dcompiler_43 d3dcompiler wine_fn_config_dll d3dim enable_d3dim d3dim diff --git a/configure.ac b/configure.ac index dd90186..30f04ac 100644 --- a/configure.ac +++ b/configure.ac @@ -2285,6 +2285,7 @@ WINE_CONFIG_DLL(d3d8,,[d3d8]) WINE_CONFIG_TEST(dlls/d3d8/tests) WINE_CONFIG_DLL(d3d9,,[d3d9]) WINE_CONFIG_TEST(dlls/d3d9/tests) +WINE_CONFIG_DLL(d3dcompiler_41) WINE_CONFIG_DLL(d3dcompiler_42) WINE_CONFIG_DLL(d3dcompiler_43,,[d3dcompiler]) WINE_CONFIG_DLL(d3dim,,[d3dim]) diff --git a/dlls/d3dcompiler_41/Makefile.in b/dlls/d3dcompiler_41/Makefile.in new file mode 100644 index 0000000..bbdd6af --- /dev/null +++ b/dlls/d3dcompiler_41/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = d3dcompiler_41.dll +IMPORTS = kernel32 + +C_SRCS = \ + d3dcompiler_41_main.c + +RC_SRCS = version.rc + +(a)MAKE_DLL_RULES@ diff --git a/dlls/d3dcompiler_41/d3dcompiler_41.spec b/dlls/d3dcompiler_41/d3dcompiler_41.spec new file mode 100644 index 0000000..84adee3 --- /dev/null +++ b/dlls/d3dcompiler_41/d3dcompiler_41.spec @@ -0,0 +1,13 @@ +@ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr) d3dcompiler_43.D3DAssemble +@ stub DebugSetMute +@ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile +@ stdcall D3DDisassemble10Effect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect +@ stdcall D3DDisassemble(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble +@ stdcall D3DGetDebugInfo(ptr long ptr) d3dcompiler_43.D3DGetDebugInfo +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputAndOutputSignatureBlob +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputSignatureBlob +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetOutputSignatureBlob +@ stdcall D3DPreprocess(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess +@ stdcall D3DReflect(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stub D3DReturnFailure1 +@ stdcall D3DStripShader(ptr long long ptr) d3dcompiler_43.D3DStripShader diff --git a/dlls/d3dcompiler_41/d3dcompiler_41_main.c b/dlls/d3dcompiler_41/d3dcompiler_41_main.c new file mode 100644 index 0000000..c4745ee --- /dev/null +++ b/dlls/d3dcompiler_41/d3dcompiler_41_main.c @@ -0,0 +1,44 @@ +/* + * Direct3D shader compiler main file + * + * Copyright 2010 Matteo Bruni for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/d3dcompiler_41/version.rc b/dlls/d3dcompiler_41/version.rc new file mode 100644 index 0000000..8e21730 --- /dev/null +++ b/dlls/d3dcompiler_41/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright 2010 Matteo Bruni for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#define WINE_FILEDESCRIPTION_STR "Wine D3DCompiler" +#define WINE_FILENAME_STR "d3dcompiler_41.dll" +#define WINE_FILEVERSION 9,26,952,2844 +#define WINE_FILEVERSION_STR "9.26.952.2844" +#define WINE_PRODUCTVERSION 9,26,952,2844 +#define WINE_PRODUCTVERSION_STR "9.26.952.2844" + +#include "wine/wine_common_ver.rc"

1 0

Matteo Bruni : include: Fix some d3d10shader.h defines.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: a9e792d6d342c8a68f8802b549fd50de11f77153 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9e792d6d342c8a68f8802b54… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Aug 3 18:44:25 2010 +0200 include: Fix some d3d10shader.h defines. --- include/d3d10shader.h | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/include/d3d10shader.h b/include/d3d10shader.h index 7885bbd..592dd18 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -32,10 +32,16 @@ #define D3D10_SHADER_FORCE_PS_SOFTWARE_NO_OPT 0x0080 #define D3D10_SHADER_NO_PRESHADER 0x0100 #define D3D10_SHADER_AVOID_FLOW_CONTROL 0x0200 -#define D3D10_SHADER_PREFER_FLOW_CONTROL 0x0300 -#define D3D10_SHADER_ENABLE_STRICTNESS 0x0400 -#define D3D10_SHADER_ENABLE_BACKWARDS_COMPATIBILITY 0x0800 -#define D3D10_SHADER_IEEE_STRICTNESS 0x1000 +#define D3D10_SHADER_PREFER_FLOW_CONTROL 0x0400 +#define D3D10_SHADER_ENABLE_STRICTNESS 0x0800 +#define D3D10_SHADER_ENABLE_BACKWARDS_COMPATIBILITY 0x1000 +#define D3D10_SHADER_IEEE_STRICTNESS 0x2000 +#define D3D10_SHADER_WARNINGS_ARE_ERRORS 0x40000 + +#define D3D10_SHADER_OPTIMIZATION_LEVEL0 0x4000 +#define D3D10_SHADER_OPTIMIZATION_LEVEL1 0x0000 +#define D3D10_SHADER_OPTIMIZATION_LEVEL2 0xC000 +#define D3D10_SHADER_OPTIMIZATION_LEVEL3 0x8000 typedef enum _D3D10_SHADER_VARIABLE_CLASS {

1 0

Andrew Nguyen : mpr: Initialize the output enumeration handle to NULL in WNetOpenEnumA/ W with no providers available.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: 80b1c5e072cb26edd7046ed5a4b9a5bd53793c0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=80b1c5e072cb26edd7046ed5a… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Aug 3 13:19:30 2010 -0500 mpr: Initialize the output enumeration handle to NULL in WNetOpenEnumA/W with no providers available. --- dlls/mpr/wnet.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 66d165f..2c57aaa 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -638,7 +638,7 @@ DWORD WINAPI WNetOpenEnumA( DWORD dwScope, DWORD dwType, DWORD dwUsage, ret = WN_BAD_POINTER; else if (!providerTable || providerTable->numProviders == 0) { - lphEnum = NULL; + *lphEnum = NULL; ret = WN_NO_NETWORK; } else @@ -730,7 +730,7 @@ DWORD WINAPI WNetOpenEnumW( DWORD dwScope, DWORD dwType, DWORD dwUsage, ret = WN_BAD_POINTER; else if (!providerTable || providerTable->numProviders == 0) { - lphEnum = NULL; + *lphEnum = NULL; ret = WN_NO_NETWORK; } else

1 0

André Hentschel : ntdll: Add SXS error codes.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: 38ca35fe573c6d79cec49a580c1544fd992f498e URL: http://source.winehq.org/git/wine.git/?a=commit;h=38ca35fe573c6d79cec49a580… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 3 20:14:20 2010 +0200 ntdll: Add SXS error codes. --- dlls/ntdll/error.c | 35 ++++++++++++++++++++++++---- dlls/ntdll/tests/error.c | 27 ++++++++++++++++++++++ include/ntstatus.h | 18 ++++++++++++++ include/winerror.h | 56 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 131 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=38ca35fe573c6d79cec49…

1 0