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

Henri Verbeet : wined3d: Fix some more indentation.
by Alexandre Julliard May 6, 2009

May 6, 2009

Module: wine Branch: master Commit: 2576bf3dddf4fd6d1d3e2c2ede54dcb8f3cf4295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2576bf3dddf4fd6d1d3e2c2ed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 6 10:05:45 2009 +0200 wined3d: Fix some more indentation. --- dlls/wined3d/pixelshader.c | 156 +++++++++++++++++++++--------------------- dlls/wined3d/vertexshader.c | 116 ++++++++++++++++---------------- 2 files changed, 135 insertions(+), 137 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2576bf3dddf4fd6d1d3e2…

1 0

Detlef Riekenberg : localspl: Support XcvMonitor/XcvPort in OpenPrinter.
by Alexandre Julliard May 6, 2009

May 6, 2009

Module: wine Branch: master Commit: b0b8a2fb8b25bb2398c7740ad2096989b3029f0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0b8a2fb8b25bb2398c7740ad… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue May 5 05:36:42 2009 +0200 localspl: Support XcvMonitor/XcvPort in OpenPrinter. --- dlls/localspl/provider.c | 159 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 153 insertions(+), 6 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 70c7f8c..4e3289d 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -83,6 +83,8 @@ typedef struct { typedef struct { LPWSTR name; LPWSTR printername; + monitor_t * pm; + HANDLE hXcv; } printer_t; /* ############################### */ @@ -93,6 +95,7 @@ static monitor_t * pm_localport; static const PRINTPROVIDOR * pprovider = NULL; static const WCHAR backslashW[] = {'\\',0}; +static const WCHAR bs_ports_bsW[] = {'\\','P','o','r','t','s','\\',0}; static const WCHAR configuration_fileW[] = {'C','o','n','f','i','g','u','r','a','t','i','o','n',' ','F','i','l','e',0}; static const WCHAR datatypeW[] = {'D','a','t','a','t','y','p','e',0}; static const WCHAR data_fileW[] = {'D','a','t','a',' ','F','i','l','e',0}; @@ -123,20 +126,30 @@ static const WCHAR oem_urlW[] = {'O','E','M',' ','U','r','l',0}; static const WCHAR parametersW[] = {'P','a','r','a','m','e','t','e','r','s',0}; static const WCHAR portW[] = {'P','o','r','t',0}; static const WCHAR previous_namesW[] = {'P','r','e','v','i','o','u','s',' ','N','a','m','e','s',0}; +static const WCHAR printersW[] = {'S','y','s','t','e','m','\\', + 'C','u', 'r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'P','r','i','n','t','\\', + 'P','r','i','n','t','e','r','s',0}; static const WCHAR spooldriversW[] = {'\\','s','p','o','o','l','\\','d','r','i','v','e','r','s','\\',0}; +static const WCHAR version0_regpathW[] = {'\\','V','e','r','s','i','o','n','-','0',0}; +static const WCHAR version0_subdirW[] = {'\\','0',0}; +static const WCHAR version3_regpathW[] = {'\\','V','e','r','s','i','o','n','-','3',0}; +static const WCHAR version3_subdirW[] = {'\\','3',0}; static const WCHAR versionW[] = {'V','e','r','s','i','o','n',0}; - static const WCHAR win40_envnameW[] = {'W','i','n','d','o','w','s',' ','4','.','0',0}; static const WCHAR win40_subdirW[] = {'w','i','n','4','0',0}; -static const WCHAR version0_regpathW[] = {'\\','V','e','r','s','i','o','n','-','0',0}; -static const WCHAR version0_subdirW[] = {'\\','0',0}; - +static const WCHAR winnt_cv_portsW[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s',' ','N','T','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'P','o','r','t','s',0}; static const WCHAR x64_envnameW[] = {'W','i','n','d','o','w','s',' ','x','6','4',0}; static const WCHAR x64_subdirW[] = {'x','6','4',0}; static const WCHAR x86_envnameW[] = {'W','i','n','d','o','w','s',' ','N','T',' ','x','8','6',0}; static const WCHAR x86_subdirW[] = {'w','3','2','x','8','6',0}; -static const WCHAR version3_regpathW[] = {'\\','V','e','r','s','i','o','n','-','3',0}; -static const WCHAR version3_subdirW[] = {'\\','3',0}; +static const WCHAR XcvMonitorW[] = {',','X','c','v','M','o','n','i','t','o','r',' ',0}; +static const WCHAR XcvPortW[] = {',','X','c','v','P','o','r','t',' ',0}; static const printenv_t env_x86 = {x86_envnameW, x86_subdirW, 3, @@ -544,6 +557,65 @@ static DWORD monitor_loadall(void) } /****************************************************************** + * monitor_load_by_port [internal] + * + * load a printmonitor for a given port + * + * On failure, NULL is returned + */ + +static monitor_t * monitor_load_by_port(LPCWSTR portname) +{ + HKEY hroot; + HKEY hport; + LPWSTR buffer; + monitor_t * pm = NULL; + DWORD registered = 0; + DWORD id = 0; + DWORD len; + + TRACE("(%s)\n", debugstr_w(portname)); + + /* Try the Local Monitor first */ + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, winnt_cv_portsW, &hroot) == ERROR_SUCCESS) { + if (RegQueryValueExW(hroot, portname, NULL, NULL, NULL, &len) == ERROR_SUCCESS) { + /* found the portname */ + RegCloseKey(hroot); + return monitor_load(localportW, NULL); + } + RegCloseKey(hroot); + } + + len = MAX_PATH + lstrlenW(bs_ports_bsW) + lstrlenW(portname) + 1; + buffer = heap_alloc(len * sizeof(WCHAR)); + if (buffer == NULL) return NULL; + + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, monitorsW, &hroot) == ERROR_SUCCESS) { + EnterCriticalSection(&monitor_handles_cs); + RegQueryInfoKeyW(hroot, NULL, NULL, NULL, &registered, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + + while ((pm == NULL) && (id < registered)) { + buffer[0] = '\0'; + RegEnumKeyW(hroot, id, buffer, MAX_PATH); + TRACE("testing %s\n", debugstr_w(buffer)); + len = lstrlenW(buffer); + lstrcatW(buffer, bs_ports_bsW); + lstrcatW(buffer, portname); + if (RegOpenKeyW(hroot, buffer, &hport) == ERROR_SUCCESS) { + RegCloseKey(hport); + buffer[len] = '\0'; /* use only the Monitor-Name */ + pm = monitor_load(buffer, NULL); + } + id++; + } + LeaveCriticalSection(&monitor_handles_cs); + RegCloseKey(hroot); + } + heap_free(buffer); + return pm; +} + +/****************************************************************** * Return the number of bytes for an multi_sz string. * The result includes all \0s * (specifically the extra \0, that is needed as multi_sz terminator). @@ -944,6 +1016,10 @@ static HMODULE driver_load(const printenv_t * env, LPWSTR dllname) */ static VOID printer_free(printer_t * printer) { + if (printer->hXcv) + printer->pm->monitor->pfnXcvClosePort(printer->hXcv); + + monitor_unload(printer->pm); heap_free(printer->printername); heap_free(printer->name); @@ -960,6 +1036,9 @@ static HANDLE printer_alloc_handle(LPCWSTR name, LPPRINTER_DEFAULTSW pDefault) WCHAR servername[MAX_COMPUTERNAME_LENGTH + 1]; printer_t *printer = NULL; LPCWSTR printername; + HKEY hkeyPrinters; + HKEY hkeyPrinter; + DWORD len; if (copy_servername_from_name(name, servername)) { FIXME("server %s not supported\n", debugstr_w(servername)); @@ -988,6 +1067,74 @@ static HANDLE printer_alloc_handle(LPCWSTR name, LPPRINTER_DEFAULTSW pDefault) printer_free(printer); printer = NULL; } + if (printername) { + len = sizeof(XcvMonitorW)/sizeof(WCHAR) - 1; + if (strncmpW(printername, XcvMonitorW, len) == 0) { + /* OpenPrinter(",XcvMonitor ", ...) detected */ + TRACE(",XcvMonitor: %s\n", debugstr_w(&printername[len])); + printer->pm = monitor_load(&printername[len], NULL); + if (printer->pm == NULL) { + printer_free(printer); + SetLastError(ERROR_UNKNOWN_PORT); + printer = NULL; + goto end; + } + } + else + { + len = sizeof(XcvPortW)/sizeof(WCHAR) - 1; + if (strncmpW( printername, XcvPortW, len) == 0) { + /* OpenPrinter(",XcvPort ", ...) detected */ + TRACE(",XcvPort: %s\n", debugstr_w(&printername[len])); + printer->pm = monitor_load_by_port(&printername[len]); + if (printer->pm == NULL) { + printer_free(printer); + SetLastError(ERROR_UNKNOWN_PORT); + printer = NULL; + goto end; + } + } + } + + if (printer->pm) { + if ((printer->pm->monitor) && (printer->pm->monitor->pfnXcvOpenPort)) { + printer->pm->monitor->pfnXcvOpenPort(&printername[len], + pDefault ? pDefault->DesiredAccess : 0, + &printer->hXcv); + } + if (printer->hXcv == NULL) { + printer_free(printer); + SetLastError(ERROR_INVALID_PARAMETER); + printer = NULL; + goto end; + } + } + else + { + /* Does the Printer exist? */ + if (RegCreateKeyW(HKEY_LOCAL_MACHINE, printersW, &hkeyPrinters) != ERROR_SUCCESS) { + ERR("Can't create Printers key\n"); + printer_free(printer); + SetLastError(ERROR_INVALID_PRINTER_NAME); + printer = NULL; + goto end; + } + if (RegOpenKeyW(hkeyPrinters, printername, &hkeyPrinter) != ERROR_SUCCESS) { + WARN("Printer not found in Registry: %s\n", debugstr_w(printername)); + RegCloseKey(hkeyPrinters); + printer_free(printer); + SetLastError(ERROR_INVALID_PRINTER_NAME); + printer = NULL; + goto end; + } + RegCloseKey(hkeyPrinter); + RegCloseKey(hkeyPrinters); + } + } + else + { + TRACE("using the local printserver\n"); + } end:

1 0

Detlef Riekenberg : localspl: Start implementation of OpenPrinter/ ClosePrinter.
by Alexandre Julliard May 6, 2009

May 6, 2009

Module: wine Branch: master Commit: b4120c7f27bdd2dbc90f751d0adba96e5c34cf5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4120c7f27bdd2dbc90f751d0… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue May 5 05:24:34 2009 +0200 localspl: Start implementation of OpenPrinter/ClosePrinter. --- dlls/localspl/localspl_private.h | 5 + dlls/localspl/provider.c | 156 +++++++++++++++++++++++++++++++++++++- dlls/winspool.drv/info.c | 14 +++- 3 files changed, 172 insertions(+), 3 deletions(-) diff --git a/dlls/localspl/localspl_private.h b/dlls/localspl/localspl_private.h index 0ac6369..5174a1a 100644 --- a/dlls/localspl/localspl_private.h +++ b/dlls/localspl/localspl_private.h @@ -62,6 +62,11 @@ static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero( size_t len ) return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); } +static inline void * __WINE_ALLOC_SIZE(2) heap_realloc_zero( void * mem, size_t len ) +{ + return HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len ); +} + static inline BOOL heap_free( void *mem ) { return HeapFree( GetProcessHeap(), 0, mem ); diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index f308e36..70c7f8c 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -80,6 +80,11 @@ typedef struct { LPCWSTR versionsubdir; } printenv_t; +typedef struct { + LPWSTR name; + LPWSTR printername; +} printer_t; + /* ############################### */ static struct list monitor_handles = LIST_INIT( monitor_handles ); @@ -274,6 +279,32 @@ static LONG copy_servername_from_name(LPCWSTR name, LPWSTR target) } /****************************************************************** + * get_basename_from_name (internal) + * + * skip over the serverpart from the full name + * + */ +static LPCWSTR get_basename_from_name(LPCWSTR name) +{ + if (name == NULL) return NULL; + if ((name[0] == '\\') && (name[1] == '\\')) { + /* skip over the servername and search for the following '\' */ + name = strchrW(&name[2], '\\'); + if ((name) && (name[1])) { + /* found a separator ('\') followed by a name: + skip over the separator and return the rest */ + name++; + } + else + { + /* no basename present (we found only a servername) */ + return NULL; + } + } + return name; +} + +/****************************************************************** * monitor_unload [internal] * * release a printmonitor and unload it from memory, when needed @@ -907,6 +938,64 @@ static HMODULE driver_load(const printenv_t * env, LPWSTR dllname) return hui; } +/****************************************************************** + * printer_free + * free the data pointer of an opened printer + */ +static VOID printer_free(printer_t * printer) +{ + + heap_free(printer->printername); + heap_free(printer->name); + heap_free(printer); +} + +/****************************************************************** + * printer_alloc_handle + * alloc a printer handle and remember the data pointer in the printer handle table + * + */ +static HANDLE printer_alloc_handle(LPCWSTR name, LPPRINTER_DEFAULTSW pDefault) +{ + WCHAR servername[MAX_COMPUTERNAME_LENGTH + 1]; + printer_t *printer = NULL; + LPCWSTR printername; + + if (copy_servername_from_name(name, servername)) { + FIXME("server %s not supported\n", debugstr_w(servername)); + SetLastError(ERROR_INVALID_PRINTER_NAME); + return NULL; + } + + printername = get_basename_from_name(name); + if (name != printername) TRACE("converted %s to %s\n", debugstr_w(name), debugstr_w(printername)); + + /* an empty printername is invalid */ + if (printername && (!printername[0])) { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + printer = heap_alloc_zero(sizeof(printer_t)); + if (!printer) goto end; + + /* clone the base name. This is NULL for the printserver */ + printer->printername = strdupW(printername); + + /* clone the full name */ + printer->name = strdupW(name); + if (name && (!printer->name)) { + printer_free(printer); + printer = NULL; + } + +end: + + TRACE("==> %p\n", printer); + return (HANDLE)printer; +} + + /****************************************************************************** * myAddPrinterDriverEx [internal] * @@ -1213,6 +1302,34 @@ static BOOL WINAPI fpAddPrinterDriverEx(LPWSTR pName, DWORD level, LPBYTE pDrive return myAddPrinterDriverEx(level, pDriverInfo, dwFileCopyFlags, TRUE); } + +/****************************************************************************** + * fpClosePrinter [exported through PRINTPROVIDOR] + * + * Close a printer handle and free associated resources + * + * PARAMS + * hPrinter [I] Printerhandle to close + * + * RESULTS + * Success: TRUE + * Failure: FALSE + * + */ +static BOOL WINAPI fpClosePrinter(HANDLE hPrinter) +{ + printer_t *printer = (printer_t *) hPrinter; + + TRACE("(%p)\n", hPrinter); + + if (printer) { + printer_free(printer); + return TRUE; + } + return FALSE; +} + + /****************************************************************** * fpDeleteMonitor [exported through PRINTPROVIDOR] * @@ -1425,13 +1542,48 @@ emP_cleanup: return (res); } +/****************************************************************************** + * fpOpenPrinter [exported through PRINTPROVIDOR] + * + * Open a Printer / Printserver or a Printer-Object + * + * PARAMS + * lpPrinterName [I] Name of Printserver, Printer, or Printer-Object + * pPrinter [O] The resulting Handle is stored here + * pDefaults [I] PTR to Default Printer Settings or NULL + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * NOTES + * lpPrinterName is one of: + *| Printserver (NT only): "Servername" or NULL for the local Printserver + *| Printer: "PrinterName" + *| Printer-Object: "PrinterName,Job xxx" + *| XcvMonitor: "Servername,XcvMonitor MonitorName" + *| XcvPort: "Servername,XcvPort PortName" + * + * + */ +static BOOL WINAPI fpOpenPrinter(LPWSTR lpPrinterName, HANDLE *pPrinter, + LPPRINTER_DEFAULTSW pDefaults) +{ + + TRACE("(%s, %p, %p)\n", debugstr_w(lpPrinterName), pPrinter, pDefaults); + + *pPrinter = printer_alloc_handle(lpPrinterName, pDefaults); + + return (*pPrinter != 0); +} + /***************************************************** * setup_provider [internal] */ void setup_provider(void) { static const PRINTPROVIDOR backend = { - NULL, /* fpOpenPrinter */ + fpOpenPrinter, NULL, /* fpSetJob */ NULL, /* fpGetJob */ NULL, /* fpEnumJobs */ @@ -1462,7 +1614,7 @@ void setup_provider(void) NULL, /* fpGetPrinterData */ NULL, /* fpSetPrinterData */ NULL, /* fpWaitForPrinterChange */ - NULL, /* fpClosePrinter */ + fpClosePrinter, NULL, /* fpAddForm */ NULL, /* fpDeleteForm */ NULL, /* fpGetForm */ diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 8160957..d2a40d0 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -111,6 +111,7 @@ typedef struct { LPWSTR printername; monitor_t *pm; HANDLE hXcv; + HANDLE backend_printer; jobqueue_t *queue; started_doc_t *doc; } opened_printer_t; @@ -1119,7 +1120,7 @@ static LPCWSTR get_basename_from_name(LPCWSTR name) * ToDo: * - pDefault is ignored */ -static HANDLE get_opened_printer_entry(LPCWSTR name, LPPRINTER_DEFAULTSW pDefault) +static HANDLE get_opened_printer_entry(LPWSTR name, LPPRINTER_DEFAULTSW pDefault) { UINT_PTR handle = nb_printer_handles, i; jobqueue_t *queue = NULL; @@ -1130,6 +1131,8 @@ static HANDLE get_opened_printer_entry(LPCWSTR name, LPPRINTER_DEFAULTSW pDefaul HKEY hkeyPrinter; DWORD len; + if ((backend == NULL) && !load_backend()) return NULL; + servername = get_servername_from_name(name); if (servername) { FIXME("server %s not supported\n", debugstr_w(servername)); @@ -1188,6 +1191,11 @@ static HANDLE get_opened_printer_entry(LPCWSTR name, LPPRINTER_DEFAULTSW pDefaul goto end; } + /* get a printer handle from the backend */ + if (! backend->fpOpenPrinter(name, &printer->backend_printer, pDefault)) { + handle = 0; + goto end; + } /* clone the base name. This is NULL for the printserver */ printer->printername = strdupW(printername); @@ -2893,6 +2901,10 @@ BOOL WINAPI ClosePrinter(HANDLE hPrinter) debugstr_w(printer->pm ? printer->pm->dllname : NULL), printer->hXcv, debugstr_w(printer->name), printer->doc ); + if (printer->backend_printer) { + backend->fpClosePrinter(printer->backend_printer); + } + if(printer->doc) EndDocPrinter(hPrinter);

1 0

Ricardo Filipe : commdlg: Implemented notifications are only sent with OFN_EXPLORER flag set.
by Alexandre Julliard May 6, 2009

May 6, 2009

Module: wine Branch: master Commit: abadf9a37a7d08fed3e670a521ec14f79e1fb3bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=abadf9a37a7d08fed3e670a52… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Tue May 5 11:38:34 2009 +0100 commdlg: Implemented notifications are only sent with OFN_EXPLORER flag set. --- dlls/comdlg32/filedlg.c | 32 +++++++++++++++++++++----------- dlls/comdlg32/filedlgbrowser.c | 6 ++++-- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index b423942..10fccc2 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1160,9 +1160,12 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l 0, 0, SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER); } - SendCustomDlgNotificationMessage(hwnd,CDN_INITDONE); - SendCustomDlgNotificationMessage(hwnd,CDN_FOLDERCHANGE); - SendCustomDlgNotificationMessage(hwnd,CDN_SELCHANGE); + if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) + { + SendCustomDlgNotificationMessage(hwnd,CDN_INITDONE); + SendCustomDlgNotificationMessage(hwnd,CDN_FOLDERCHANGE); + SendCustomDlgNotificationMessage(hwnd,CDN_SELCHANGE); + } return 0; } case WM_SIZE: @@ -1749,11 +1752,12 @@ static BOOL FILEDLG95_SendFileOK( HWND hwnd, FileOpenDlgInfos *fodInfos ) /* ask the hook if we can close */ if(IsHooked(fodInfos)) { - LRESULT retval; + LRESULT retval = 0; TRACE("---\n"); /* First send CDN_FILEOK as MSDN doc says */ - retval = SendCustomDlgNotificationMessage(hwnd,CDN_FILEOK); + if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) + retval = SendCustomDlgNotificationMessage(hwnd,CDN_FILEOK); if (GetWindowLongPtrW(fodInfos->DlgInfos.hwndCustomDlg, DWLP_MSGRESULT)) { TRACE("canceled\n"); @@ -2148,7 +2152,8 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) IPersistFolder2_Release(ppf2); if( ! COMDLG32_PIDL_ILIsEqual(pidlCurrent, fodInfos->ShellInfos.pidlAbsCurrent)) { - if (SUCCEEDED(IShellBrowser_BrowseObject(fodInfos->Shell.FOIShellBrowser, pidlCurrent, SBSP_ABSOLUTE))) + if (SUCCEEDED(IShellBrowser_BrowseObject(fodInfos->Shell.FOIShellBrowser, pidlCurrent, SBSP_ABSOLUTE)) + && fodInfos->ofnInfos->Flags & OFN_EXPLORER) { SendCustomDlgNotificationMessage(hwnd, CDN_FOLDERCHANGE); } @@ -2451,7 +2456,8 @@ static BOOL FILEDLG95_SHELL_UpFolder(HWND hwnd) NULL, SBSP_PARENT))) { - SendCustomDlgNotificationMessage(hwnd, CDN_FOLDERCHANGE); + if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) + SendCustomDlgNotificationMessage(hwnd, CDN_FOLDERCHANGE); return TRUE; } return FALSE; @@ -2473,7 +2479,8 @@ static BOOL FILEDLG95_SHELL_BrowseToDesktop(HWND hwnd) SHGetSpecialFolderLocation(0,CSIDL_DESKTOP,&pidl); hres = IShellBrowser_BrowseObject(fodInfos->Shell.FOIShellBrowser, pidl, SBSP_ABSOLUTE); - SendCustomDlgNotificationMessage(hwnd, CDN_FOLDERCHANGE); + if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) + SendCustomDlgNotificationMessage(hwnd, CDN_FOLDERCHANGE); COMDLG32_SHFree(pidl); return SUCCEEDED(hres); } @@ -2651,7 +2658,8 @@ static BOOL FILEDLG95_FILETYPE_OnCommand(HWND hwnd, WORD wNotifyCode) len = lstrlenW(lpstrFilter)+1; fodInfos->ShellInfos.lpstrCurrentFilter = MemAlloc( len * sizeof(WCHAR) ); lstrcpyW(fodInfos->ShellInfos.lpstrCurrentFilter,lpstrFilter); - SendCustomDlgNotificationMessage(hwnd,CDN_TYPECHANGE); + if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) + SendCustomDlgNotificationMessage(hwnd,CDN_TYPECHANGE); } /* Refresh the actual view to display the included items*/ @@ -2955,7 +2963,8 @@ static BOOL FILEDLG95_LOOKIN_OnCommand(HWND hwnd, WORD wNotifyCode) tmpFolder->pidlItem, SBSP_ABSOLUTE))) { - SendCustomDlgNotificationMessage(hwnd, CDN_FOLDERCHANGE); + if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) + SendCustomDlgNotificationMessage(hwnd, CDN_FOLDERCHANGE); return TRUE; } break; @@ -3629,7 +3638,8 @@ static BOOL BrowseSelectedFolder(HWND hwnd) MessageBoxW( hwnd, notexist, fodInfos->title, MB_OK | MB_ICONEXCLAMATION ); } bBrowseSelFolder = TRUE; - SendCustomDlgNotificationMessage(hwnd,CDN_FOLDERCHANGE); + if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) + SendCustomDlgNotificationMessage(hwnd,CDN_FOLDERCHANGE); } COMDLG32_SHFree( pidlSelection ); } diff --git a/dlls/comdlg32/filedlgbrowser.c b/dlls/comdlg32/filedlgbrowser.c index f630f14..078001e 100644 --- a/dlls/comdlg32/filedlgbrowser.c +++ b/dlls/comdlg32/filedlgbrowser.c @@ -785,7 +785,8 @@ static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_OnDefaultCommand(ICommDl if (ulAttr & (SFGAO_FOLDER | SFGAO_HASSUBFOLDER) ) { hRes = IShellBrowser_BrowseObject((IShellBrowser *)This,pidl,SBSP_RELATIVE); - SendCustomDlgNotificationMessage(This->hwndOwner, CDN_FOLDERCHANGE); + if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) + SendCustomDlgNotificationMessage(This->hwndOwner, CDN_FOLDERCHANGE); } else { @@ -960,7 +961,8 @@ static HRESULT IShellBrowserImpl_ICommDlgBrowser_OnSelChange(ICommDlgBrowser *if FILEDLG95_FILENAME_FillFromSelection(This->hwndOwner); - SendCustomDlgNotificationMessage(This->hwndOwner, CDN_SELCHANGE); + if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) + SendCustomDlgNotificationMessage(This->hwndOwner, CDN_SELCHANGE); return S_OK; }

1 0

Rein Klazes : programs: Make some of the open file dialogs of a few programs resizable.
by Alexandre Julliard May 6, 2009

May 6, 2009

Module: wine Branch: master Commit: 9e8f2a70243205f4d7a33c8e02a0cad55c952209 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e8f2a70243205f4d7a33c8e0… Author: Rein Klazes <wijn(a)online.nl> Date: Wed May 6 08:41:15 2009 +0200 programs: Make some of the open file dialogs of a few programs resizable. --- programs/notepad/dialog.c | 4 ++-- programs/oleview/oleview.c | 2 +- programs/regedit/framewnd.c | 1 + programs/winhlp32/winhelp.c | 2 +- programs/wordpad/wordpad.c | 4 ++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index 8a3389b..65f9b09 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -306,7 +306,7 @@ VOID DIALOG_FileOpen(VOID) openfilename.nMaxFile = SIZEOF(szPath); openfilename.lpstrInitialDir = szDir; openfilename.Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | - OFN_HIDEREADONLY; + OFN_HIDEREADONLY | OFN_ENABLESIZING; openfilename.lpstrDefExt = szDefaultExt; @@ -345,7 +345,7 @@ BOOL DIALOG_FileSaveAs(VOID) saveas.nMaxFile = SIZEOF(szPath); saveas.lpstrInitialDir = szDir; saveas.Flags = OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT | - OFN_HIDEREADONLY; + OFN_HIDEREADONLY | OFN_ENABLESIZING; saveas.lpstrDefExt = szDefaultExt; if (GetSaveFileName(&saveas)) { diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c index e56342c..5f0fdc5 100644 --- a/programs/oleview/oleview.c +++ b/programs/oleview/oleview.c @@ -137,7 +137,7 @@ static void InitOpenFileName(HWND hWnd, OPENFILENAME *pofn, WCHAR *wszFilter, pofn->nFilterIndex = 0; pofn->lpstrFile = wszFileName; pofn->nMaxFile = MAX_LOAD_STRING; - pofn->Flags = OFN_HIDEREADONLY; + pofn->Flags = OFN_HIDEREADONLY | OFN_ENABLESIZING; } static void CopyClsid(HTREEITEM item) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index d88ef0e..a737d8d 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -341,6 +341,7 @@ static BOOL ImportRegistryFile(HWND hWnd) WCHAR title[128]; InitOpenFileName(hWnd, &ofn); + ofn.Flags |= OFN_ENABLESIZING; LoadStringW(hInst, IDS_FILEDIALOG_IMPORT_TITLE, title, COUNT_OF(title)); ofn.lpstrTitle = title; if (GetOpenFileNameW(&ofn)) { diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index ddd58ad..7f74d8b 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -179,7 +179,7 @@ BOOL WINHELP_GetOpenFileName(LPSTR lpszFile, int len) openfilename.nMaxFileTitle = 0; openfilename.lpstrInitialDir = szDir; openfilename.lpstrTitle = 0; - openfilename.Flags = 0; + openfilename.Flags = OFN_ENABLESIZING; openfilename.nFileOffset = 0; openfilename.nFileExtension = 0; openfilename.lpstrDefExt = 0; diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index a8a7fb0..022b9b1 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -870,7 +870,7 @@ static void DialogSaveFile(void) ZeroMemory(&sfn, sizeof(sfn)); sfn.lStructSize = sizeof(sfn); - sfn.Flags = OFN_HIDEREADONLY | OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT; + sfn.Flags = OFN_HIDEREADONLY | OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT | OFN_ENABLESIZING; sfn.hwndOwner = hMainWnd; sfn.lpstrFilter = wszFilter; sfn.lpstrFile = wszFile; @@ -964,7 +964,7 @@ static void DialogOpenFile(void) ZeroMemory(&ofn, sizeof(ofn)); ofn.lStructSize = sizeof(ofn); - ofn.Flags = OFN_HIDEREADONLY | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST; + ofn.Flags = OFN_HIDEREADONLY | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_ENABLESIZING; ofn.hwndOwner = hMainWnd; ofn.lpstrFilter = wszFilter; ofn.lpstrFile = wszFile;

1 0

Henri Verbeet : wined3d: Add an initial shader_sm4_read_dst_param() implementation.
by Alexandre Julliard May 6, 2009

May 6, 2009

Module: wine Branch: master Commit: 7f9cde5a31af9bd682f3b3e6b35024fdc822b58f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f9cde5a31af9bd682f3b3e6b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 6 10:05:46 2009 +0200 wined3d: Add an initial shader_sm4_read_dst_param() implementation. --- dlls/wined3d/shader_sm4.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 99b6523..cdfaa08 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -28,11 +28,31 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); #define WINED3D_SM4_OPCODE_MASK 0xff +#define WINED3D_SM4_REGISTER_TYPE_SHIFT 12 +#define WINED3D_SM4_REGISTER_TYPE_MASK (0xf << WINED3D_SM4_REGISTER_TYPE_SHIFT) + +#define WINED3D_SM4_WRITEMASK_SHIFT 4 +#define WINED3D_SM4_WRITEMASK_MASK (0xf << WINED3D_SM4_WRITEMASK_SHIFT) + +enum wined3d_sm4_register_type +{ + WINED3D_SM4_RT_TEMP = 0x0, + WINED3D_SM4_RT_INPUT = 0x1, + WINED3D_SM4_RT_OUTPUT = 0x2, +}; + struct wined3d_sm4_data { const DWORD *end; }; +static const WINED3DSHADER_PARAM_REGISTER_TYPE register_type_table[] = +{ + /* WINED3D_SM4_RT_TEMP */ WINED3DSPR_TEMP, + /* WINED3D_SM4_RT_INPUT */ WINED3DSPR_INPUT, + /* WINED3D_SM4_RT_OUTPUT */ WINED3DSPR_OUTPUT, +}; + static void *shader_sm4_init(const DWORD *byte_code) { struct wined3d_sm4_data *priv = HeapAlloc(GetProcessHeap(), 0, sizeof(*priv)); @@ -88,8 +108,26 @@ static void shader_sm4_read_src_param(const DWORD **ptr, struct wined3d_shader_s static void shader_sm4_read_dst_param(const DWORD **ptr, struct wined3d_shader_dst_param *dst_param, struct wined3d_shader_src_param *dst_rel_addr, DWORD shader_version) { - FIXME("ptr %p, dst_param %p, dst_rel_addr %p, shader_version %#x stub!\n", - ptr, dst_param, dst_rel_addr, shader_version); + DWORD token = *(*ptr)++; + UINT register_idx = *(*ptr)++; + enum wined3d_sm4_register_type register_type; + + register_type = (token & WINED3D_SM4_REGISTER_TYPE_MASK) >> WINED3D_SM4_REGISTER_TYPE_SHIFT; + if (register_type >= sizeof(register_type_table) / sizeof(*register_type_table)) + { + FIXME("Unhandled register type %#x\n", register_type); + dst_param->register_type = WINED3DSPR_TEMP; + } + else + { + dst_param->register_type = register_type_table[register_type]; + } + + dst_param->register_idx = register_idx; + dst_param->write_mask = (token & WINED3D_SM4_WRITEMASK_MASK) >> WINED3D_SM4_WRITEMASK_SHIFT; + dst_param->modifiers = 0; + dst_param->shift = 0; + dst_param->rel_addr = NULL; } static void shader_sm4_read_semantic(const DWORD **ptr, struct wined3d_shader_semantic *semantic)

1 0

Rein Klazes : winecfg: Make the open file dialogs resizable.
by Alexandre Julliard May 6, 2009

May 6, 2009

Module: wine Branch: master Commit: 64dbec13ef523efe46e6d9653e280a6c2b434875 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64dbec13ef523efe46e6d9653… Author: Rein Klazes <wijn(a)online.nl> Date: Wed May 6 08:41:14 2009 +0200 winecfg: Make the open file dialogs resizable. --- programs/winecfg/appdefaults.c | 3 ++- programs/winecfg/theme.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 28ec4fe..8e48949 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -319,7 +319,8 @@ static void on_add_app_click(HWND dialog) OPENFILENAMEW ofn = { sizeof(OPENFILENAMEW), 0, /*hInst*/0, 0, NULL, 0, 0, NULL, 0, NULL, 0, pathC, 0, - OFN_SHOWHELP | OFN_HIDEREADONLY, 0, 0, NULL, 0, NULL }; + OFN_SHOWHELP | OFN_HIDEREADONLY | OFN_ENABLESIZING, + 0, 0, NULL, 0, NULL }; LoadStringW (GetModuleHandle (NULL), IDS_SELECT_EXECUTABLE, selectExecutableStr, sizeof(selectExecutableStr)/sizeof(selectExecutableStr[0])); diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 537a113..afbd6de 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -642,7 +642,7 @@ static void on_theme_install(HWND dialog) ofn.nMaxFileTitle = sizeof(filetitle)/sizeof(filetitle[0]); ofn.lpstrInitialDir = NULL; ofn.lpstrTitle = title; - ofn.Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY; + ofn.Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_ENABLESIZING; ofn.nFileOffset = 0; ofn.nFileExtension = 0; ofn.lpstrDefExt = NULL;

1 0

Francois Gouget : taskmgr: Make FillSolidRect2() and Draw3dRect2?() static.
by Alexandre Julliard May 6, 2009

May 6, 2009

Module: wine Branch: master Commit: fb02a4c657ad2e67570e147f37d1041e9bc87c5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb02a4c657ad2e67570e147f3… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed May 6 03:33:55 2009 +0200 taskmgr: Make FillSolidRect2() and Draw3dRect2?() static. --- programs/taskmgr/taskmgr.c | 10 ++-------- programs/taskmgr/taskmgr.h | 3 --- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index b30ed8e..923a445 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -61,7 +61,7 @@ void FillSolidRect(HDC hDC, LPCRECT lpRect, COLORREF clr) ExtTextOut(hDC, 0, 0, ETO_OPAQUE, lpRect, NULL, 0, NULL); } -void FillSolidRect2(HDC hDC, int x, int y, int cx, int cy, COLORREF clr) +static void FillSolidRect2(HDC hDC, int x, int y, int cx, int cy, COLORREF clr) { RECT rect; @@ -73,7 +73,7 @@ void FillSolidRect2(HDC hDC, int x, int y, int cx, int cy, COLORREF clr) ExtTextOut(hDC, 0, 0, ETO_OPAQUE, &rect, NULL, 0, NULL); } -void Draw3dRect(HDC hDC, int x, int y, int cx, int cy, COLORREF clrTopLeft, COLORREF clrBottomRight) +static void Draw3dRect(HDC hDC, int x, int y, int cx, int cy, COLORREF clrTopLeft, COLORREF clrBottomRight) { FillSolidRect2(hDC, x, y, cx - 1, 1, clrTopLeft); FillSolidRect2(hDC, x, y, 1, cy - 1, clrTopLeft); @@ -81,12 +81,6 @@ void Draw3dRect(HDC hDC, int x, int y, int cx, int cy, COLORREF clrTopLeft, COLO FillSolidRect2(hDC, x, y + cy, cx, -1, clrBottomRight); } -void Draw3dRect2(HDC hDC, LPRECT lpRect, COLORREF clrTopLeft, COLORREF clrBottomRight) -{ - Draw3dRect(hDC, lpRect->left, lpRect->top, lpRect->right - lpRect->left, - lpRect->bottom - lpRect->top, clrTopLeft, clrBottomRight); -} - void Font_DrawText(HDC hDC, LPWSTR lpwszText, int x, int y) { HDC hFontDC; diff --git a/programs/taskmgr/taskmgr.h b/programs/taskmgr/taskmgr.h index f6df582..ed220be 100644 --- a/programs/taskmgr/taskmgr.h +++ b/programs/taskmgr/taskmgr.h @@ -143,9 +143,6 @@ extern HWND hApplicationPageNewTaskButton; /* Application New Task button */ /* Forward declarations of functions included in this code module: */ void FillSolidRect(HDC hDC, LPCRECT lpRect, COLORREF clr); -void FillSolidRect2(HDC hDC, int x, int y, int cx, int cy, COLORREF clr); -void Draw3dRect(HDC hDC, int x, int y, int cx, int cy, COLORREF clrTopLeft, COLORREF clrBottomRight); -void Draw3dRect2(HDC hDC, LPRECT lpRect, COLORREF clrTopLeft, COLORREF clrBottomRight); void Font_DrawText(HDC hDC, LPWSTR lpwszText, int x, int y); #define OPTIONS_MENU_INDEX 1

1 0

Francois Gouget : sane.ds: Remove an unused debug channel.
by Alexandre Julliard May 6, 2009

May 6, 2009

Module: wine Branch: master Commit: b6b4a8f207b269e0c610c1e96e014f2fc37bf556 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6b4a8f207b269e0c610c1e96… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed May 6 03:33:26 2009 +0200 sane.ds: Remove an unused debug channel. --- dlls/sane.ds/options.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/sane.ds/options.c b/dlls/sane.ds/options.c index 8f7b206..c78cf8e 100644 --- a/dlls/sane.ds/options.c +++ b/dlls/sane.ds/options.c @@ -23,8 +23,6 @@ #include "sane_i.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(twain); - #ifdef SONAME_LIBSANE static SANE_Status sane_find_option(SANE_Handle h, const char *option_name, const SANE_Option_Descriptor **opt_p, int *optno, SANE_Value_Type type)

1 0

Eric Pouech : user32: Make ddeml.dll into a stand-alone 16bit module.
by Alexandre Julliard May 6, 2009

May 6, 2009

Module: wine Branch: master Commit: a0053ab9aa526ab2141e4655f97f796e386bbdf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0053ab9aa526ab2141e4655f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue May 5 21:25:32 2009 +0200 user32: Make ddeml.dll into a stand-alone 16bit module. --- .gitignore | 1 - configure | 9 +++++++++ configure.ac | 1 + dlls/Makefile.in | 3 +-- dlls/ddeml.dll16/Makefile.in | 16 ++++++++++++++++ dlls/{user32/ddeml16.c => ddeml.dll16/ddeml.c} | 0 .../ddeml.spec => ddeml.dll16/ddeml.dll16.spec} | 0 dlls/user32/Makefile.in | 2 -- 8 files changed, 27 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 96eb69d..3ce8388 100644 --- a/.gitignore +++ b/.gitignore @@ -26,7 +26,6 @@ dlls/advapi32/svcctl.h dlls/advapi32/svcctl_c.c dlls/atl/atliface.h dlls/commdlg.dll16 -dlls/ddeml.dll16 dlls/gdi.exe16 dlls/jscript/jsglobal.tlb dlls/jscript/parser.tab.c diff --git a/configure b/configure index ce18e5c..e6459d6 100755 --- a/configure +++ b/configure @@ -24990,6 +24990,14 @@ dlls/dciman32/Makefile: dlls/dciman32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/dciman32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/ddeml.dll16/Makefile" +test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + ddeml.dll16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/ddeml.dll16/Makefile: dlls/ddeml.dll16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/ddeml.dll16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/ddraw/Makefile" test "x$enable_ddraw" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ ddraw" @@ -29027,6 +29035,7 @@ do "dlls/d3dxof/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3dxof/tests/Makefile" ;; "dlls/dbghelp/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dbghelp/Makefile" ;; "dlls/dciman32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dciman32/Makefile" ;; + "dlls/ddeml.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ddeml.dll16/Makefile" ;; "dlls/ddraw/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ddraw/Makefile" ;; "dlls/ddraw/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ddraw/tests/Makefile" ;; "dlls/ddrawex/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ddrawex/Makefile" ;; diff --git a/configure.ac b/configure.ac index 5f8b86f..7ab7077 100644 --- a/configure.ac +++ b/configure.ac @@ -1969,6 +1969,7 @@ WINE_CONFIG_MAKEFILE([dlls/d3dxof/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL WINE_CONFIG_MAKEFILE([dlls/d3dxof/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/dbghelp/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/dciman32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/ddeml.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/ddraw/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/ddraw/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/ddrawex/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 498cb65..a040570 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -19,7 +19,6 @@ DOCSUBDIRS = $(DLLSUBDIRS) WIN16_FILES = \ commdlg.dll16 \ - ddeml.dll16 \ gdi.exe16 \ krnl386.exe16 \ mmsystem.dll16 \ @@ -57,7 +56,7 @@ msvideo.dll16: setupx.dll16: echo "setupapi.dll" >$@ -ddeml.dll16 user.exe16: +user.exe16: echo "user32.dll" >$@ ver.dll16: diff --git a/dlls/ddeml.dll16/Makefile.in b/dlls/ddeml.dll16/Makefile.in new file mode 100644 index 0000000..b1eb6c9 --- /dev/null +++ b/dlls/ddeml.dll16/Makefile.in @@ -0,0 +1,16 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = ddeml.dll16 +IMPORTS = user32 kernel32 + +EXTRADLLFLAGS = -Wb,--subsystem,win16 + +SPEC_SRCS = ddeml.dll16.spec + +C_SRCS = ddeml.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/user32/ddeml16.c b/dlls/ddeml.dll16/ddeml.c similarity index 100% rename from dlls/user32/ddeml16.c rename to dlls/ddeml.dll16/ddeml.c diff --git a/dlls/user32/ddeml.spec b/dlls/ddeml.dll16/ddeml.dll16.spec similarity index 100% rename from dlls/user32/ddeml.spec rename to dlls/ddeml.dll16/ddeml.dll16.spec diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index da8cb8c..2141822 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -9,7 +9,6 @@ IMPORTS = gdi32 advapi32 kernel32 ntdll DELAYIMPORTS = imm32 SPEC_SRCS16 = \ - ddeml.spec \ user.exe.spec C_SRCS = \ @@ -22,7 +21,6 @@ C_SRCS = \ dde_client.c \ dde_misc.c \ dde_server.c \ - ddeml16.c \ defdlg.c \ defwnd.c \ desktop.c \

1 0