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

Dmitry Kislyuk : kernel32/tests: Show that NULLs need to be preserved in data before first section.
by Alexandre Julliard 07 May '09

07 May '09

Module: wine Branch: master Commit: 8d9434eefe556568660b73be8b827715bf81ef3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d9434eefe556568660b73be8… Author: Dmitry Kislyuk <dimaki(a)rocketmail.com> Date: Wed May 6 23:11:35 2009 -0300 kernel32/tests: Show that NULLs need to be preserved in data before first section. --- dlls/kernel32/tests/profile.c | 35 ++++++++++++++++++++++++++++------- 1 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 15a3902..fbf5d24 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -824,11 +824,10 @@ static void test_GetPrivateProfileString(const char *content, const char *descri static DWORD timeout = 0; -static BOOL check_file_data(LPCSTR path, LPCSTR data) +static BOOL check_binary_file_data(LPCSTR path, const VOID *data, DWORD size) { HANDLE file; CHAR buf[MAX_PATH]; - DWORD size; BOOL ret; /* Sleep() is needed on Win9x and WinME */ @@ -839,17 +838,23 @@ static BOOL check_file_data(LPCSTR path, LPCSTR data) if (file == INVALID_HANDLE_VALUE) return FALSE; - size = GetFileSize(file, NULL); - buf[size] = '\0'; + if(size != GetFileSize(file, NULL) ) + { + CloseHandle(file); + return FALSE; + } + ret = ReadFile(file, buf, size, &size, NULL); CloseHandle(file); if (!ret) return FALSE; - if (!*data && size != 0) - return FALSE; + return !memcmp(buf, data, size); +} - return !lstrcmpA(buf, data); +static BOOL check_file_data(LPCSTR path, LPCSTR data) +{ + return check_binary_file_data(path, data, lstrlenA(data)); } static void test_WritePrivateProfileString(void) @@ -1039,7 +1044,23 @@ static void test_WritePrivateProfileString(void) ret = WritePrivateProfileStringA("App3", "key5", NULL, path); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); ok(check_file_data(path, data), "File doesn't match\n"); + DeleteFileA(path); + /* NULLs in file before first section. Should be preserved in output */ + data = "Data \0 before \0 first \0 section" /* 31 bytes */ + "\r\n[section1]\r\n" /* 14 bytes */ + "key1=string1\r\n"; /* 14 bytes */ + GetTempFileNameA(temp, "wine", 0, path); + create_test_file(path, data, 31); + ret = WritePrivateProfileStringA("section1", "key1", "string1", path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + todo_wine + ok( check_binary_file_data(path, data, 59) || + broken( check_binary_file_data(path, /* Windows 9x */ + "Data \0 before \0 first \0 section" /* 31 bytes */ + "\r\n\r\n[section1]\r\n" /* 14 bytes */ + "key1=string1" /* 14 bytes */ + , 59)), "File doesn't match\n"); DeleteFileA(path); }

1 0

Aric Stewart : msctf: Implement ITfKeystrokeMgr::PreserveKey.
by Alexandre Julliard 07 May '09

07 May '09

Module: wine Branch: master Commit: 45c3ff2ff827bbc11d39a15ba524e55e5b65ab9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=45c3ff2ff827bbc11d39a15ba… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu May 7 08:31:32 2009 -0500 msctf: Implement ITfKeystrokeMgr::PreserveKey. --- dlls/msctf/tests/inputprocessor.c | 2 +- dlls/msctf/threadmgr.c | 59 +++++++++++++++++++++++++++++++++++- 2 files changed, 58 insertions(+), 3 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 8d6579b..d29b319 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -409,7 +409,7 @@ static void test_KeystrokeMgr(void) todo_wine ok(test_KEV_OnSetFocus == SINK_FIRED, "KeyEventSink_OnSetFocus not fired as expected\n"); hr =ITfKeystrokeMgr_PreserveKey(keymgr, 0, &CLSID_PreservedKey, &tfpk, NULL, 0); - todo_wine ok(hr==E_INVALIDARG,"ITfKeystrokeMgr_PreserveKey inproperly succeeded\n"); + ok(hr==E_INVALIDARG,"ITfKeystrokeMgr_PreserveKey inproperly succeeded\n"); hr =ITfKeystrokeMgr_PreserveKey(keymgr, tid, &CLSID_PreservedKey, &tfpk, NULL, 0); todo_wine ok(SUCCEEDED(hr),"ITfKeystrokeMgr_PreserveKey failed\n"); diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index fcd4dae..5580410 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -56,6 +56,15 @@ typedef struct tagThreadMgrSink { } interfaces; } ThreadMgrSink; +typedef struct tagPreservedKey +{ + struct list entry; + GUID guid; + TF_PRESERVEDKEY prekey; + LPWSTR description; + TfClientId tid; +} PreservedKey; + typedef struct tagACLMulti { const ITfThreadMgrVtbl *ThreadMgrVtbl; const ITfSourceVtbl *SourceVtbl; @@ -68,6 +77,8 @@ typedef struct tagACLMulti { ITfDocumentMgr *focus; + struct list CurrentPreservedKeys; + /* kept as separate lists to reduce unnecessary iterations */ struct list ActiveLanguageProfileNotifySink; struct list DisplayAttributeNotifySink; @@ -155,6 +166,14 @@ static void ThreadMgr_Destructor(ThreadMgr *This) free_sink(sink); } + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->CurrentPreservedKeys) + { + PreservedKey* key = LIST_ENTRY(cursor,PreservedKey,entry); + list_remove(cursor); + HeapFree(GetProcessHeap(),0,key->description); + HeapFree(GetProcessHeap(),0,key); + } + HeapFree(GetProcessHeap(),0,This); } @@ -537,8 +556,42 @@ static HRESULT WINAPI KeystrokeMgr_PreserveKey(ITfKeystrokeMgr *iface, const WCHAR *pchDesc, ULONG cchDesc) { ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + struct list *cursor; + PreservedKey *newkey; + + TRACE("(%p) %x %s (%x,%x) %s\n",This,tid, debugstr_guid(rguid),(prekey)?prekey->uVKey:0,(prekey)?prekey->uModifiers:0,debugstr_wn(pchDesc,cchDesc)); + + if (!tid || ! rguid || !prekey || (cchDesc && !pchDesc)) + return E_INVALIDARG; + + LIST_FOR_EACH(cursor, &This->CurrentPreservedKeys) + { + PreservedKey* key = LIST_ENTRY(cursor,PreservedKey,entry); + if (IsEqualGUID(rguid,&key->guid) && prekey->uVKey == key->prekey.uVKey && prekey->uModifiers == key->prekey.uModifiers) + return TF_E_ALREADY_EXISTS; + } + + newkey = HeapAlloc(GetProcessHeap(),0,sizeof(PreservedKey)); + if (!newkey) + return E_OUTOFMEMORY; + + newkey->guid = *rguid; + newkey->prekey = *prekey; + newkey->tid = tid; + if (cchDesc) + { + newkey->description = HeapAlloc(GetProcessHeap(),0,cchDesc * sizeof(WCHAR)); + if (!newkey->description) + { + HeapFree(GetProcessHeap(),0,newkey); + return E_OUTOFMEMORY; + } + memcpy(newkey->description, pchDesc, cchDesc*sizeof(WCHAR)); + } + + list_add_head(&This->CurrentPreservedKeys,&newkey->entry); + + return S_OK; } static HRESULT WINAPI KeystrokeMgr_UnpreserveKey(ITfKeystrokeMgr *iface, @@ -866,6 +919,8 @@ HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) This->refCount = 1; TlsSetValue(tlsIndex,This); + list_init(&This->CurrentPreservedKeys); + list_init(&This->ActiveLanguageProfileNotifySink); list_init(&This->DisplayAttributeNotifySink); list_init(&This->KeyTraceEventSink);

1 0

Aric Stewart : msctf: Implement ITfKeystrokeMgr::UnpreserveKey.
by Alexandre Julliard 07 May '09

07 May '09

Module: wine Branch: master Commit: a2c7a99471f91184c67e7111861976a31f5e196a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2c7a99471f91184c67e71118… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu May 7 08:31:38 2009 -0500 msctf: Implement ITfKeystrokeMgr::UnpreserveKey. --- dlls/msctf/tests/inputprocessor.c | 2 +- dlls/msctf/threadmgr.c | 25 +++++++++++++++++++++++-- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index d29b319..4cc71ef 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -430,7 +430,7 @@ static void test_KeystrokeMgr(void) if (hr == S_FALSE) todo_wine ok(preserved == FALSE,"misreporting preserved key\n"); hr = ITfKeystrokeMgr_UnpreserveKey(keymgr, &CLSID_PreservedKey,&tfpk); - todo_wine ok(hr==CONNECT_E_NOCONNECTION,"ITfKeystrokeMgr_UnpreserveKey inproperly succeeded\n"); + ok(hr==CONNECT_E_NOCONNECTION,"ITfKeystrokeMgr_UnpreserveKey inproperly succeeded\n"); hr = ITfKeystrokeMgr_UnadviseKeyEventSink(keymgr,tid); todo_wine ok(SUCCEEDED(hr),"ITfKeystrokeMgr_UnadviseKeyEventSink failed\n"); diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 5580410..976fcbc 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -598,8 +598,29 @@ static HRESULT WINAPI KeystrokeMgr_UnpreserveKey(ITfKeystrokeMgr *iface, REFGUID rguid, const TF_PRESERVEDKEY *pprekey) { ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + PreservedKey* key = NULL; + struct list *cursor; + TRACE("(%p) %s (%x %x)\n",This,debugstr_guid(rguid),(pprekey)?pprekey->uVKey:0, (pprekey)?pprekey->uModifiers:0); + + if (!pprekey || !rguid) + return E_INVALIDARG; + + LIST_FOR_EACH(cursor, &This->CurrentPreservedKeys) + { + key = LIST_ENTRY(cursor,PreservedKey,entry); + if (IsEqualGUID(rguid,&key->guid) && pprekey->uVKey == key->prekey.uVKey && pprekey->uModifiers == key->prekey.uModifiers) + break; + key = NULL; + } + + if (!key) + return CONNECT_E_NOCONNECTION; + + list_remove(&key->entry); + HeapFree(GetProcessHeap(),0,key->description); + HeapFree(GetProcessHeap(),0,key); + + return S_OK; } static HRESULT WINAPI KeystrokeMgr_SetPreservedKeyDescription(ITfKeystrokeMgr *iface,

1 0

Aric Stewart : msctf: Implement ITfKeystrokeMgr::IsPreservedKey.
by Alexandre Julliard 07 May '09

07 May '09

Module: wine Branch: master Commit: 32828799acfd8cffd9f0d3094071acdfd4f9c84a URL: http://source.winehq.org/git/wine.git/?a=commit;h=32828799acfd8cffd9f0d3094… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu May 7 08:31:45 2009 -0500 msctf: Implement ITfKeystrokeMgr::IsPreservedKey. --- dlls/msctf/tests/inputprocessor.c | 6 +++--- dlls/msctf/threadmgr.c | 21 +++++++++++++++++++-- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 4cc71ef..2477ad8 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -420,14 +420,14 @@ static void test_KeystrokeMgr(void) preserved = FALSE; hr = ITfKeystrokeMgr_IsPreservedKey(keymgr, &CLSID_PreservedKey, &tfpk, &preserved); todo_wine ok(hr == S_OK, "ITfKeystrokeMgr_IsPreservedKey failed\n"); - if (hr == S_OK) todo_wine ok(preserved == TRUE,"misreporting preserved key\n"); + if (hr == S_OK) ok(preserved == TRUE,"misreporting preserved key\n"); hr = ITfKeystrokeMgr_UnpreserveKey(keymgr, &CLSID_PreservedKey,&tfpk); todo_wine ok(SUCCEEDED(hr),"ITfKeystrokeMgr_UnpreserveKey failed\n"); hr = ITfKeystrokeMgr_IsPreservedKey(keymgr, &CLSID_PreservedKey, &tfpk, &preserved); - todo_wine ok(hr == S_FALSE, "ITfKeystrokeMgr_IsPreservedKey failed\n"); - if (hr == S_FALSE) todo_wine ok(preserved == FALSE,"misreporting preserved key\n"); + ok(hr == S_FALSE, "ITfKeystrokeMgr_IsPreservedKey failed\n"); + if (hr == S_FALSE) ok(preserved == FALSE,"misreporting preserved key\n"); hr = ITfKeystrokeMgr_UnpreserveKey(keymgr, &CLSID_PreservedKey,&tfpk); ok(hr==CONNECT_E_NOCONNECTION,"ITfKeystrokeMgr_UnpreserveKey inproperly succeeded\n"); diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 976fcbc..f0c76b1 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -547,8 +547,25 @@ static HRESULT WINAPI KeystrokeMgr_IsPreservedKey(ITfKeystrokeMgr *iface, REFGUID rguid, const TF_PRESERVEDKEY *pprekey, BOOL *pfRegistered) { ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + struct list *cursor; + + TRACE("(%p) %s (%x %x) %p\n",This,debugstr_guid(rguid), (pprekey)?pprekey->uVKey:0, (pprekey)?pprekey->uModifiers:0, pfRegistered); + + if (!rguid || !pprekey || !pfRegistered) + return E_INVALIDARG; + + LIST_FOR_EACH(cursor, &This->CurrentPreservedKeys) + { + PreservedKey* key = LIST_ENTRY(cursor,PreservedKey,entry); + if (IsEqualGUID(rguid,&key->guid) && pprekey->uVKey == key->prekey.uVKey && pprekey->uModifiers == key->prekey.uModifiers) + { + *pfRegistered = TRUE; + return S_OK; + } + } + + *pfRegistered = FALSE; + return S_FALSE; } static HRESULT WINAPI KeystrokeMgr_PreserveKey(ITfKeystrokeMgr *iface,

1 0

Detlef Riekenberg : winspool: Move remaining Xcv support to the backend.
by Alexandre Julliard 07 May '09

07 May '09

Module: wine Branch: master Commit: 0bc112cfe48fecd86ce6538f62d611ed0d448342 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bc112cfe48fecd86ce6538f6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu May 7 00:11:33 2009 +0200 winspool: Move remaining Xcv support to the backend. --- dlls/localspl/provider.c | 69 +++++++++++++++++++++++++++++++++++- dlls/winspool.drv/info.c | 88 ++++------------------------------------------ 2 files changed, 75 insertions(+), 82 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 4e3289d..79541db 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1724,6 +1724,73 @@ static BOOL WINAPI fpOpenPrinter(LPWSTR lpPrinterName, HANDLE *pPrinter, return (*pPrinter != 0); } +/****************************************************************************** + * fpXcvData [exported through PRINTPROVIDOR] + * + * Execute commands in the Printmonitor DLL + * + * PARAMS + * hXcv [i] Handle from fpOpenPrinter (with XcvMonitor or XcvPort) + * pszDataName [i] Name of the command to execute + * pInputData [i] Buffer for extra Input Data (needed only for some commands) + * cbInputData [i] Size in Bytes of Buffer at pInputData + * pOutputData [o] Buffer to receive additional Data (needed only for some commands) + * cbOutputData [i] Size in Bytes of Buffer at pOutputData + * pcbOutputNeeded [o] PTR to receive the minimal Size in Bytes of the Buffer at pOutputData + * pdwStatus [o] PTR to receive the win32 error code from the Printmonitor DLL + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * NOTES + * Returning "TRUE" does mean, that the Printmonitor DLL was called successful. + * The execution of the command can still fail (check pdwStatus for ERROR_SUCCESS). + * + * Minimal List of commands, that a Printmonitor DLL should support: + * + *| "MonitorUI" : Return the Name of the Userinterface-DLL as WSTR in pOutputData + *| "AddPort" : Add a Port + *| "DeletePort": Delete a Port + * + * Many Printmonitors support additional commands. Examples for localspl.dll: + * "GetDefaultCommConfig", "SetDefaultCommConfig", + * "GetTransmissionRetryTimeout", "ConfigureLPTPortCommandOK" + * + */ +static BOOL WINAPI fpXcvData(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData, + DWORD cbInputData, PBYTE pOutputData, DWORD cbOutputData, + PDWORD pcbOutputNeeded, PDWORD pdwStatus) +{ + printer_t *printer = (printer_t * ) hXcv; + + TRACE("(%p, %s, %p, %d, %p, %d, %p, %p)\n", hXcv, debugstr_w(pszDataName), + pInputData, cbInputData, pOutputData, + cbOutputData, pcbOutputNeeded, pdwStatus); + + if (!printer || (!printer->hXcv)) { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (!pcbOutputNeeded) { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (!pszDataName || !pdwStatus || (!pOutputData && (cbOutputData > 0))) { + SetLastError(RPC_X_NULL_REF_POINTER); + return FALSE; + } + + *pcbOutputNeeded = 0; + + *pdwStatus = printer->pm->monitor->pfnXcvDataPort(printer->hXcv, pszDataName, + pInputData, cbInputData, pOutputData, cbOutputData, pcbOutputNeeded); + + return TRUE; +} + /***************************************************** * setup_provider [internal] */ @@ -1806,7 +1873,7 @@ void setup_provider(void) NULL, /* fpAddPerMachineConnection */ NULL, /* fpDeletePerMachineConnection */ NULL, /* fpEnumPerMachineConnections */ - NULL, /* fpXcvData */ + fpXcvData, fpAddPrinterDriverEx, NULL, /* fpSplReadPrinter */ NULL, /* fpDriverUnloadComplete */ diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index d2a40d0..95908b3 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -109,8 +109,6 @@ typedef struct { typedef struct { LPWSTR name; LPWSTR printername; - monitor_t *pm; - HANDLE hXcv; HANDLE backend_printer; jobqueue_t *queue; started_doc_t *doc; @@ -244,8 +242,6 @@ static const WCHAR deviceW[] = {'d','e','v','i','c','e',0}; static const WCHAR devicesW[] = {'d','e','v','i','c','e','s',0}; static const WCHAR windowsW[] = {'w','i','n','d','o','w','s',0}; static const WCHAR emptyStringW[] = {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 WCHAR May_Delete_Value[] = {'W','i','n','e','M','a','y','D','e','l','e','t','e','M','e',0}; @@ -1127,9 +1123,6 @@ static HANDLE get_opened_printer_entry(LPWSTR name, LPPRINTER_DEFAULTSW pDefault opened_printer_t *printer = NULL; LPWSTR servername; LPCWSTR printername; - HKEY hkeyPrinters; - HKEY hkeyPrinter; - DWORD len; if ((backend == NULL) && !load_backend()) return NULL; @@ -1207,69 +1200,6 @@ static HANDLE get_opened_printer_entry(LPWSTR name, LPPRINTER_DEFAULTSW pDefault goto end; } - 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) { - SetLastError(ERROR_UNKNOWN_PORT); - handle = 0; - 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) { - SetLastError(ERROR_UNKNOWN_PORT); - handle = 0; - 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) { - SetLastError(ERROR_INVALID_PARAMETER); - handle = 0; - goto end; - } - } - else - { - /* Does the Printer exist? */ - if (RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) != ERROR_SUCCESS) { - ERR("Can't create Printers key\n"); - handle = 0; - goto end; - } - if (RegOpenKeyW(hkeyPrinters, printername, &hkeyPrinter) != ERROR_SUCCESS) { - WARN("Printer not found in Registry: %s\n", debugstr_w(printername)); - RegCloseKey(hkeyPrinters); - SetLastError(ERROR_INVALID_PRINTER_NAME); - handle = 0; - goto end; - } - RegCloseKey(hkeyPrinter); - RegCloseKey(hkeyPrinters); - } - } - else - { - TRACE("using the local printserver\n"); - } - if(queue) printer->queue = queue; else @@ -1290,8 +1220,6 @@ end: LeaveCriticalSection(&printer_handles_cs); if (!handle && printer) { /* Something failed: Free all resources */ - if (printer->hXcv) printer->pm->monitor->pfnXcvClosePort(printer->hXcv); - monitor_unload(printer->pm); HeapFree(GetProcessHeap(), 0, printer->printername); HeapFree(GetProcessHeap(), 0, printer->name); if (!queue) HeapFree(GetProcessHeap(), 0, printer->queue); @@ -2897,9 +2825,7 @@ BOOL WINAPI ClosePrinter(HANDLE hPrinter) { struct list *cursor, *cursor2; - TRACE("%p: %s (hXcv: %p) for %s (doc: %p)\n", printer->pm, - debugstr_w(printer->pm ? printer->pm->dllname : NULL), - printer->hXcv, debugstr_w(printer->name), printer->doc ); + TRACE("closing %s (doc: %p)\n", debugstr_w(printer->name), printer->doc); if (printer->backend_printer) { backend->fpClosePrinter(printer->backend_printer); @@ -2917,8 +2843,7 @@ BOOL WINAPI ClosePrinter(HANDLE hPrinter) } HeapFree(GetProcessHeap(), 0, printer->queue); } - if (printer->hXcv) printer->pm->monitor->pfnXcvClosePort(printer->hXcv); - monitor_unload(printer->pm); + HeapFree(GetProcessHeap(), 0, printer->printername); HeapFree(GetProcessHeap(), 0, printer->name); HeapFree(GetProcessHeap(), 0, printer); @@ -7088,8 +7013,10 @@ BOOL WINAPI XcvDataW( HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData, pInputData, cbInputData, pOutputData, cbOutputData, pcbOutputNeeded, pdwStatus); + if ((backend == NULL) && !load_backend()) return FALSE; + printer = get_opened_printer(hXcv); - if (!printer || (!printer->hXcv)) { + if (!printer || (!printer->backend_printer)) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; } @@ -7106,10 +7033,9 @@ BOOL WINAPI XcvDataW( HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData, *pcbOutputNeeded = 0; - *pdwStatus = printer->pm->monitor->pfnXcvDataPort(printer->hXcv, pszDataName, - pInputData, cbInputData, pOutputData, cbOutputData, pcbOutputNeeded); + return backend->fpXcvData(printer->backend_printer, pszDataName, pInputData, + cbInputData, pOutputData, cbOutputData, pcbOutputNeeded, pdwStatus); - return TRUE; } /*****************************************************************************

1 0

Aric Stewart : msctf: Implement ITfClientId.
by Alexandre Julliard 07 May '09

07 May '09

Module: wine Branch: master Commit: f1d7cfa93af9c33eacd3f057d7cb9c18f319351c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1d7cfa93af9c33eacd3f057d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed May 6 10:35:52 2009 -0500 msctf: Implement ITfClientId. --- dlls/msctf/tests/inputprocessor.c | 31 +++++++++++++++++++ dlls/msctf/threadmgr.c | 59 +++++++++++++++++++++++++++++++++++++ include/msctf.idl | 13 ++++++++ 3 files changed, 103 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index b5ae508..8d6579b 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -648,6 +648,36 @@ static void test_TfGuidAtom(void) todo_wine ok(!IsEqualGUID(&g1,&GUID_NULL),"guid should not be NULL\n"); } +static void test_ClientId(void) +{ + ITfClientId *pcid; + TfClientId id1,id2; + HRESULT hr; + GUID g2; + + hr = ITfThreadMgr_QueryInterface(g_tm, &IID_ITfClientId, (LPVOID*)&pcid); + ok(SUCCEEDED(hr),"Unable to aquire ITfClientId interface\n"); + + CoCreateGuid(&g2); + + hr = ITfClientId_GetClientId(pcid,&GUID_NULL,&id1); + ok(SUCCEEDED(hr),"GetClientId failed\n"); + hr = ITfClientId_GetClientId(pcid,&GUID_NULL,&id2); + ok(SUCCEEDED(hr),"GetClientId failed\n"); + ok(id1==id2,"Id's for GUID_NULL do not match\n"); + hr = ITfClientId_GetClientId(pcid,&CLSID_FakeService,&id2); + ok(SUCCEEDED(hr),"GetClientId failed\n"); + ok(id2!=id1,"Id matches GUID_NULL\n"); + todo_wine ok(id2==tid,"Id for CLSID_FakeService not matching tid\n"); + ok(id2!=cid,"Id for CLSID_FakeService matching cid\n"); + hr = ITfClientId_GetClientId(pcid,&g2,&id2); + ok(SUCCEEDED(hr),"GetClientId failed\n"); + ok(id2!=id1,"Id matches GUID_NULL\n"); + ok(id2!=tid,"Id for random guid matching tid\n"); + ok(id2!=cid,"Id for random guid matching cid\n"); + ITfClientId_Release(pcid); +} + START_TEST(inputprocessor) { if (SUCCEEDED(initialize())) @@ -660,6 +690,7 @@ START_TEST(inputprocessor) test_Activate(); test_startSession(); test_TfGuidAtom(); + test_ClientId(); test_KeystrokeMgr(); test_endSession(); test_EnumLanguageProfiles(); diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index fa13a2f..fcd4dae 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -61,6 +61,7 @@ typedef struct tagACLMulti { const ITfSourceVtbl *SourceVtbl; const ITfKeystrokeMgrVtbl *KeystrokeMgrVtbl; const ITfMessagePumpVtbl *MessagePumpVtbl; + const ITfClientIdVtbl *ClientIdVtbl; LONG refCount; const ITfThreadMgrEventSinkVtbl *ThreadMgrEventSinkVtbl; /* internal */ @@ -91,6 +92,11 @@ static inline ThreadMgr *impl_from_ITfMessagePumpVtbl(ITfMessagePump *iface) return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,MessagePumpVtbl)); } +static inline ThreadMgr *impl_from_ITfClientIdVtbl(ITfClientId *iface) +{ + return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,ClientIdVtbl)); +} + static inline ThreadMgr *impl_from_ITfThreadMgrEventSink(ITfThreadMgrEventSink *iface) { return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,ThreadMgrEventSinkVtbl)); @@ -173,6 +179,10 @@ static HRESULT WINAPI ThreadMgr_QueryInterface(ITfThreadMgr *iface, REFIID iid, { *ppvOut = &This->MessagePumpVtbl; } + else if (IsEqualIID(iid, &IID_ITfClientId)) + { + *ppvOut = &This->ClientIdVtbl; + } if (*ppvOut) { @@ -660,6 +670,54 @@ static const ITfMessagePumpVtbl ThreadMgr_MessagePumpVtbl = }; /***************************************************** + * ITfClientId functions + *****************************************************/ + +static HRESULT WINAPI ClientId_QueryInterface(ITfClientId *iface, REFIID iid, LPVOID *ppvOut) +{ + ThreadMgr *This = impl_from_ITfClientIdVtbl(iface); + return ThreadMgr_QueryInterface((ITfThreadMgr *)This, iid, *ppvOut); +} + +static ULONG WINAPI ClientId_AddRef(ITfClientId *iface) +{ + ThreadMgr *This = impl_from_ITfClientIdVtbl(iface); + return ThreadMgr_AddRef((ITfThreadMgr*)This); +} + +static ULONG WINAPI ClientId_Release(ITfClientId *iface) +{ + ThreadMgr *This = impl_from_ITfClientIdVtbl(iface); + return ThreadMgr_Release((ITfThreadMgr *)This); +} + +static HRESULT WINAPI ClientId_GetClientId(ITfClientId *iface, + REFCLSID rclsid, TfClientId *ptid) + +{ + HRESULT hr; + ITfCategoryMgr *catmgr; + ThreadMgr *This = impl_from_ITfClientIdVtbl(iface); + + TRACE("(%p) %s\n",This,debugstr_guid(rclsid)); + + CategoryMgr_Constructor(NULL,(IUnknown**)&catmgr); + hr = ITfCategoryMgr_RegisterGUID(catmgr,rclsid,ptid); + ITfCategoryMgr_Release(catmgr); + + return hr; +} + +static const ITfClientIdVtbl ThreadMgr_ClientIdVtbl = +{ + ClientId_QueryInterface, + ClientId_AddRef, + ClientId_Release, + + ClientId_GetClientId +}; + +/***************************************************** * ITfThreadMgrEventSink functions (internal) *****************************************************/ static HRESULT WINAPI ThreadMgrEventSink_QueryInterface(ITfThreadMgrEventSink *iface, REFIID iid, LPVOID *ppvOut) @@ -803,6 +861,7 @@ HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) This->SourceVtbl = &ThreadMgr_SourceVtbl; This->KeystrokeMgrVtbl= &ThreadMgr_KeystrokeMgrVtbl; This->MessagePumpVtbl= &ThreadMgr_MessagePumpVtbl; + This->ClientIdVtbl = &ThreadMgr_ClientIdVtbl; This->ThreadMgrEventSinkVtbl = &ThreadMgr_ThreadMgrEventSinkVtbl; This->refCount = 1; TlsSetValue(tlsIndex,This); diff --git a/include/msctf.idl b/include/msctf.idl index 115e643..7e643f4 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -686,3 +686,16 @@ interface ITfMessagePump : IUnknown [in] UINT wMsgFilterMax, [out] BOOL *pfResult); }; + +[ + object, + local, + uuid(d60a7b49-1b9f-4be2-b702-47e9dc05dec3), + pointer_default(unique) +] +interface ITfClientId : IUnknown +{ + HRESULT GetClientId( + [in] REFCLSID rclsid, + [out] TfClientId *ptid); +};

1 0

Henri Verbeet : wined3d: Improve shader_sm4_read_opcode() to handle some simple opcodes.
by Alexandre Julliard 07 May '09

07 May '09

Module: wine Branch: master Commit: 94cf6186587252c3730d59ba8a6173fc9413fdd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94cf6186587252c3730d59ba8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 6 17:59:21 2009 +0200 wined3d: Improve shader_sm4_read_opcode() to handle some simple opcodes. --- dlls/wined3d/shader_sm4.c | 58 +++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 53 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 5ec8688..9a5707a 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -40,6 +40,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); #define WINED3D_SM4_SWIZZLE_SHIFT 4 #define WINED3D_SM4_SWIZZLE_MASK (0xff << WINED3D_SM4_SWIZZLE_SHIFT) +enum wined3d_sm4_opcode +{ + WINED3D_SM4_OP_ADD = 0x00, + WINED3D_SM4_OP_EXP = 0x19, + WINED3D_SM4_OP_MOV = 0x36, + WINED3D_SM4_OP_MUL = 0x38, + WINED3D_SM4_OP_RET = 0x3e, + WINED3D_SM4_OP_SINCOS = 0x4d, +}; + enum wined3d_sm4_register_type { WINED3D_SM4_RT_TEMP = 0x0, @@ -59,6 +69,24 @@ struct wined3d_sm4_data const DWORD *end; }; +struct wined3d_sm4_opcode_info +{ + enum wined3d_sm4_opcode opcode; + enum WINED3D_SHADER_INSTRUCTION_HANDLER handler_idx; + UINT dst_count; + UINT src_count; +}; + +static const struct wined3d_sm4_opcode_info opcode_table[] = +{ + {WINED3D_SM4_OP_ADD, WINED3DSIH_ADD, 1, 2}, + {WINED3D_SM4_OP_EXP, WINED3DSIH_EXP, 1, 1}, + {WINED3D_SM4_OP_MOV, WINED3DSIH_MOV, 1, 1}, + {WINED3D_SM4_OP_MUL, WINED3DSIH_MUL, 1, 2}, + {WINED3D_SM4_OP_RET, WINED3DSIH_RET, 0, 0}, + {WINED3D_SM4_OP_SINCOS, WINED3DSIH_SINCOS, 1, 2}, +}; + static const WINED3DSHADER_PARAM_REGISTER_TYPE register_type_table[] = { /* WINED3D_SM4_RT_TEMP */ WINED3DSPR_TEMP, @@ -68,6 +96,18 @@ static const WINED3DSHADER_PARAM_REGISTER_TYPE register_type_table[] = /* WINED3D_SM4_RT_IMMCONST */ WINED3DSPR_IMMCONST, }; +static const struct wined3d_sm4_opcode_info *get_opcode_info(enum wined3d_sm4_opcode opcode) +{ + unsigned int i; + + for (i = 0; i < sizeof(opcode_table) / sizeof(*opcode_table); ++i) + { + if (opcode == opcode_table[i].opcode) return &opcode_table[i]; + } + + return NULL; +} + static void *shader_sm4_init(const DWORD *byte_code) { struct wined3d_sm4_data *priv = HeapAlloc(GetProcessHeap(), 0, sizeof(*priv)); @@ -99,18 +139,26 @@ static void shader_sm4_read_header(void *data, const DWORD **ptr, DWORD *shader_ static void shader_sm4_read_opcode(void *data, const DWORD **ptr, struct wined3d_shader_instruction *ins, UINT *param_size, DWORD shader_version) { + const struct wined3d_sm4_opcode_info *opcode_info; DWORD token = *(*ptr)++; DWORD opcode = token & WINED3D_SM4_OPCODE_MASK; - FIXME("Unrecognized opcode %#x, token 0x%08x\n", opcode, token); + *param_size = ((token & WINED3D_SM4_INSTRUCTION_LENGTH_MASK) >> WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT) - 1; - ins->handler_idx = WINED3DSIH_TABLE_SIZE; + opcode_info = get_opcode_info(opcode); + if (!opcode_info) + { + FIXME("Unrecognized opcode %#x, token 0x%08x\n", opcode, token); + ins->handler_idx = WINED3DSIH_TABLE_SIZE; + return; + } + + ins->handler_idx = opcode_info->handler_idx; ins->flags = 0; ins->coissue = 0; ins->predicate = 0; - ins->dst_count = 0; - ins->src_count = 0; - *param_size = ((token & WINED3D_SM4_INSTRUCTION_LENGTH_MASK) >> WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT) - 1; + ins->dst_count = opcode_info->dst_count; + ins->src_count = opcode_info->src_count; } static void shader_sm4_read_src_param(const DWORD **ptr, struct wined3d_shader_src_param *src_param,

1 0

Henri Verbeet : wined3d: Store the shader version in the frontend' s private data.
by Alexandre Julliard 07 May '09

07 May '09

Module: wine Branch: master Commit: 5c63d93e18f050dc9912fd385e4d5a9d52765967 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c63d93e18f050dc9912fd385… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 6 17:59:21 2009 +0200 wined3d: Store the shader version in the frontend's private data. --- dlls/wined3d/baseshader.c | 38 +++++++++++++++++++------------------- dlls/wined3d/shader_sm1.c | 27 +++++++++++++++++---------- dlls/wined3d/shader_sm4.c | 13 ++++++++----- dlls/wined3d/wined3d_private.h | 11 +++++------ 4 files changed, 49 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c63d93e18f050dc9912f…

1 0

Henri Verbeet : wined3d: Create a struct wined3d_shader_version to store version information.
by Alexandre Julliard 07 May '09

07 May '09

Module: wine Branch: master Commit: 65622a052c58683e6309c6663fd6322da26344df URL: http://source.winehq.org/git/wine.git/?a=commit;h=65622a052c58683e6309c6663… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 6 17:59:21 2009 +0200 wined3d: Create a struct wined3d_shader_version to store version information. The version tokens in SM1-3 and SM4 are similar, but not the same. --- dlls/wined3d/arb_program_shader.c | 51 +++--- dlls/wined3d/baseshader.c | 48 +++--- dlls/wined3d/glsl_shader.c | 71 ++++---- dlls/wined3d/pixelshader.c | 31 ++-- dlls/wined3d/shader_sm1.c | 337 +++++++++++++++++++------------------ dlls/wined3d/shader_sm4.c | 36 ++++- dlls/wined3d/vertexshader.c | 20 ++- dlls/wined3d/wined3d_private.h | 38 +++- 8 files changed, 350 insertions(+), 282 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=65622a052c58683e6309c…

1 0

Henri Verbeet : wined3d: Add support for immediate constants to shader_dump_register().
by Alexandre Julliard 07 May '09

07 May '09

Module: wine Branch: master Commit: 690d666de5fb263c9ecb3837a6fc4f9a1ece3001 URL: http://source.winehq.org/git/wine.git/?a=commit;h=690d666de5fb263c9ecb3837a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 6 17:59:22 2009 +0200 wined3d: Add support for immediate constants to shader_dump_register(). --- dlls/wined3d/baseshader.c | 33 ++++++++++++++++++++++++++++++--- 1 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 52dd4cb..19bd0c3 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -667,6 +667,7 @@ static void shader_dump_decl_usage(const struct wined3d_shader_semantic *semanti } static void shader_dump_register(WINED3DSHADER_PARAM_REGISTER_TYPE register_type, UINT register_idx, + enum wined3d_immconst_type immconst_type, const DWORD *immconst_data, const struct wined3d_shader_src_param *rel_addr, const struct wined3d_shader_version *shader_version) { static const char * const rastout_reg_names[] = {"oPos", "oFog", "oPts"}; @@ -747,12 +748,37 @@ static void shader_dump_register(WINED3DSHADER_PARAM_REGISTER_TYPE register_type TRACE("p"); break; + case WINED3DSPR_IMMCONST: + TRACE("l"); + break; + default: TRACE("unhandled_rtype(%#x)", register_type); break; } - if (register_type != WINED3DSPR_RASTOUT && register_type != WINED3DSPR_MISCTYPE) + if (register_type == WINED3DSPR_IMMCONST) + { + TRACE("("); + switch (immconst_type) + { + case WINED3D_IMMCONST_FLOAT: + TRACE("%.8e", *(float *)immconst_data); + break; + + case WINED3D_IMMCONST_FLOAT4: + TRACE("%.8e, %.8e, %.8e, %.8e", + *(float *)&immconst_data[0], *(float *)&immconst_data[1], + *(float *)&immconst_data[2], *(float *)&immconst_data[3]); + break; + + default: + TRACE("<unhandled immconst_type %#x>", immconst_type); + break; + } + TRACE(")"); + } + else if (register_type != WINED3DSPR_RASTOUT && register_type != WINED3DSPR_MISCTYPE) { if (rel_addr) { @@ -770,7 +796,7 @@ void shader_dump_dst_param(const struct wined3d_shader_dst_param *param, { DWORD write_mask = param->write_mask; - shader_dump_register(param->register_type, param->register_idx, param->rel_addr, shader_version); + shader_dump_register(param->register_type, param->register_idx, 0, NULL, param->rel_addr, shader_version); if (write_mask != WINED3DSP_WRITEMASK_ALL) { @@ -804,7 +830,8 @@ void shader_dump_src_param(const struct wined3d_shader_src_param *param, if (src_modifier == WINED3DSPSM_ABS || src_modifier == WINED3DSPSM_ABSNEG) TRACE("abs("); - shader_dump_register(param->register_type, param->register_idx, param->rel_addr, shader_version); + shader_dump_register(param->register_type, param->register_idx, + param->immconst_type, param->immconst_data, param->rel_addr, shader_version); if (src_modifier) {

1 0