wine-commits August 2011

wine-commits@winehq.org

2 participants
770 discussions

Francois Gouget : net: Make it possible to translate the connection status descriptions.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: 9b29faae6a2b3c0d594e435c1eaac6fc6a9f80bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b29faae6a2b3c0d594e435c1… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 1 15:55:01 2011 +0200 net: Make it possible to translate the connection status descriptions. Also remove the description for USE_DISCONN as it is in fact a synonym for USE_SESSLOST. --- po/ar.po | 24 ++++++++++++++++++++++++ po/bg.po | 29 +++++++++++++++++++++++++++++ po/ca.po | 24 ++++++++++++++++++++++++ po/cs.po | 29 +++++++++++++++++++++++++++++ po/da.po | 29 +++++++++++++++++++++++++++++ po/de.po | 29 +++++++++++++++++++++++++++++ po/el.po | 27 +++++++++++++++++++++++++++ po/en.po | 24 ++++++++++++++++++++++++ po/en_US.po | 24 ++++++++++++++++++++++++ po/eo.po | 29 +++++++++++++++++++++++++++++ po/es.po | 29 +++++++++++++++++++++++++++++ po/fa.po | 24 ++++++++++++++++++++++++ po/fi.po | 29 +++++++++++++++++++++++++++++ po/fr.po | 29 +++++++++++++++++++++++++++++ po/he.po | 29 +++++++++++++++++++++++++++++ po/hi.po | 24 ++++++++++++++++++++++++ po/hu.po | 29 +++++++++++++++++++++++++++++ po/it.po | 29 +++++++++++++++++++++++++++++ po/ja.po | 29 +++++++++++++++++++++++++++++ po/ko.po | 29 +++++++++++++++++++++++++++++ po/lt.po | 29 +++++++++++++++++++++++++++++ po/ml.po | 24 ++++++++++++++++++++++++ po/nb_NO.po | 29 +++++++++++++++++++++++++++++ po/nl.po | 29 +++++++++++++++++++++++++++++ po/or.po | 24 ++++++++++++++++++++++++ po/pa.po | 24 ++++++++++++++++++++++++ po/pl.po | 29 +++++++++++++++++++++++++++++ po/pt_BR.po | 29 +++++++++++++++++++++++++++++ po/pt_PT.po | 29 +++++++++++++++++++++++++++++ po/rm.po | 25 +++++++++++++++++++++++++ po/ro.po | 29 +++++++++++++++++++++++++++++ po/ru.po | 29 +++++++++++++++++++++++++++++ po/sk.po | 28 ++++++++++++++++++++++++++++ po/sl.po | 29 +++++++++++++++++++++++++++++ po/sr_RS(a)cyrillic.po | 29 +++++++++++++++++++++++++++++ po/sr_RS(a)latin.po | 29 +++++++++++++++++++++++++++++ po/sv.po | 29 +++++++++++++++++++++++++++++ po/te.po | 24 ++++++++++++++++++++++++ po/th.po | 27 +++++++++++++++++++++++++++ po/tr.po | 29 +++++++++++++++++++++++++++++ po/uk.po | 29 +++++++++++++++++++++++++++++ po/wa.po | 25 +++++++++++++++++++++++++ po/wine.pot | 24 ++++++++++++++++++++++++ po/zh_CN.po | 29 +++++++++++++++++++++++++++++ po/zh_TW.po | 29 +++++++++++++++++++++++++++++ programs/net/net.c | 20 ++++++++++++++++---- programs/net/net.rc | 6 ++++++ programs/net/resources.h | 6 ++++++ 48 files changed, 1265 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b29faae6a2b3c0d594e4…

1 0

Francois Gouget : netapi32: Add some lmuse.h constants.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: 2b8f18df47cb02685db4dc950ce45b5000e4eb12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b8f18df47cb02685db4dc950… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 1 15:52:56 2011 +0200 netapi32: Add some lmuse.h constants. --- include/lmuse.h | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/include/lmuse.h b/include/lmuse.h index 043cfac..66b3627 100644 --- a/include/lmuse.h +++ b/include/lmuse.h @@ -25,6 +25,28 @@ extern "C" { #include "lmcons.h" #include "lmuseflg.h" + +#define USE_LOCAL_PARMNUM 1 +#define USE_REMOTE_PARMNUM 2 +#define USE_PASSWORD_PARMNUM 3 +#define USE_ASGTYPE_PARMNUM 4 +#define USE_USERNAME_PARMNUM 5 +#define USE_DOMAINNAME_PARMNUM 6 + +#define USE_OK 0 +#define USE_PAUSED 1 +#define USE_SESSLOST 2 +#define USE_DISCONN USE_SESSLOST +#define USE_NETERR 3 +#define USE_CONN 4 +#define USE_RECONN 5 + +#define USE_WILDCARD ((DWORD)-1) +#define USE_DISKDEV 0 +#define USE_SPOOLDEV 1 +#define USE_CHARDEV 2 +#define USE_IPC 3 + typedef struct _USE_INFO_1 { LMSTR ui1_local;

1 0

Francois Gouget : kernel32/tests: Make test_define_dos_deviceA() static.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: 1e93108641854e339f94f0315cf5e4772b699430 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e93108641854e339f94f0315… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 1 15:51:39 2011 +0200 kernel32/tests: Make test_define_dos_deviceA() static. --- dlls/kernel32/tests/volume.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index aa97521..6f0fd67 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -75,7 +75,7 @@ static void test_query_dos_deviceA(void) HeapFree( GetProcessHeap(), 0, buffer ); } -void test_define_dos_deviceA(void) +static void test_define_dos_deviceA(void) { char drivestr[3]; char buf[MAX_PATH];

1 0

Francois Gouget : dinput: Remove IDirectInputDevice8AImpl_{Build, Set}ActionMap() as it is unused.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: 5e9a1eeeb51b47b19369fd0e75e474d9038c424a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e9a1eeeb51b47b19369fd0e7… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 1 15:51:24 2011 +0200 dinput: Remove IDirectInputDevice8AImpl_{Build,Set}ActionMap() as it is unused. --- dlls/dinput/device.c | 37 ------------------------------------- dlls/dinput/device_private.h | 8 -------- 2 files changed, 0 insertions(+), 45 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 58d4e14..fa079a6 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1424,22 +1424,6 @@ HRESULT WINAPI IDirectInputDevice7WImpl_WriteEffectToFile(LPDIRECTINPUTDEVICE8W return DI_OK; } -HRESULT WINAPI IDirectInputDevice8AImpl_BuildActionMap(LPDIRECTINPUTDEVICE8A iface, - LPDIACTIONFORMATA lpdiaf, - LPCSTR lpszUserName, - DWORD dwFlags) -{ - FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, lpszUserName, dwFlags); -#define X(x) if (dwFlags & x) FIXME("\tdwFlags =|"#x"\n"); - X(DIDBAM_DEFAULT) - X(DIDBAM_PRESERVE) - X(DIDBAM_INITIALIZE) - X(DIDBAM_HWDEFAULTS) -#undef X - _dump_diactionformatA(lpdiaf); - return DI_OK; -} - HRESULT WINAPI IDirectInputDevice8WImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName, @@ -1456,27 +1440,6 @@ HRESULT WINAPI IDirectInputDevice8WImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W ifa return DI_OK; } -HRESULT WINAPI IDirectInputDevice8AImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface, - LPDIACTIONFORMATA lpdiaf, - LPCSTR lpszUserName, - DWORD dwFlags) -{ - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); - DIACTIONFORMATW diafW; - HRESULT hr; - - FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, lpszUserName, dwFlags); - - diafW.rgoAction = HeapAlloc(GetProcessHeap(), 0, sizeof(DIACTIONW)*lpdiaf->dwNumActions); - _copy_diactionformatAtoW(&diafW, lpdiaf); - - hr = IDirectInputDevice8WImpl_SetActionMap(&This->IDirectInputDevice8W_iface, &diafW, NULL, dwFlags); - - HeapFree(GetProcessHeap(), 0, diafW.rgoAction); - - return hr; -} - HRESULT WINAPI IDirectInputDevice8WImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName, diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 6c061b2..e8fe00a 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -237,18 +237,10 @@ extern HRESULT WINAPI IDirectInputDevice7WImpl_WriteEffectToFile(LPDIRECTINPUTDE DWORD dwEntries, LPDIFILEEFFECT rgDiFileEft, DWORD dwFlags) DECLSPEC_HIDDEN; -extern HRESULT WINAPI IDirectInputDevice8AImpl_BuildActionMap(LPDIRECTINPUTDEVICE8A iface, - LPDIACTIONFORMATA lpdiaf, - LPCSTR lpszUserName, - DWORD dwFlags) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirectInputDevice8WImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName, DWORD dwFlags) DECLSPEC_HIDDEN; -extern HRESULT WINAPI IDirectInputDevice8AImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface, - LPDIACTIONFORMATA lpdiaf, - LPCSTR lpszUserName, - DWORD dwFlags) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirectInputDevice8WImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName,

1 0

Francois Gouget : kernel32/tests: Remove a space before a '\n' in an ok() call.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: 287a5e25d23b2492c40fffec37fc686b93d506a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=287a5e25d23b2492c40fffec3… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 1 15:48:52 2011 +0200 kernel32/tests: Remove a space before a '\n' in an ok() call. --- dlls/kernel32/tests/volume.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 813ff0b..aa97521 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -99,7 +99,7 @@ void test_define_dos_deviceA(void) ret = DefineDosDeviceA(0, drivestr, buf); todo_wine - ok(ret, "Could not make drive %s point to %s! \n", drivestr, buf); + ok(ret, "Could not make drive %s point to %s!\n", drivestr, buf); if (!ret) { skip("can't test removing fake drive\n");

1 0

Francois Gouget : itss/tests: Fix spelling of a variable name.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: 91adaf623e729546467e0ed8b6084ff3d625b763 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91adaf623e729546467e0ed8b… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 1 15:48:17 2011 +0200 itss/tests: Fix spelling of a variable name. --- dlls/itss/tests/protocol.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/itss/tests/protocol.c b/dlls/itss/tests/protocol.c index b52e3d3..b718502 100644 --- a/dlls/itss/tests/protocol.c +++ b/dlls/itss/tests/protocol.c @@ -62,7 +62,7 @@ DEFINE_EXPECT(GetBindInfo); DEFINE_EXPECT(ReportProgress_BEGINDOWNLOADDATA); DEFINE_EXPECT(ReportProgress_SENDINGREQUEST); DEFINE_EXPECT(ReportProgress_MIMETYPEAVAILABLE); -DEFINE_EXPECT(ReportProgress_CACHEFILENAMEAVAIABLE); +DEFINE_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); DEFINE_EXPECT(ReportProgress_DIRECTBIND); DEFINE_EXPECT(ReportData); DEFINE_EXPECT(ReportResult); @@ -149,7 +149,7 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, ok(!lstrcmpW(szStatusText, text_html), "unexpected szStatusText\n"); break; case BINDSTATUS_CACHEFILENAMEAVAILABLE: - CHECK_EXPECT(ReportProgress_CACHEFILENAMEAVAIABLE); + CHECK_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); ok(!lstrcmpW(szStatusText, cache_file), "unexpected szStatusText\n"); break; case BINDSTATUS_DIRECTBIND: @@ -294,7 +294,7 @@ static HRESULT _protocol_start(unsigned line, IInternetProtocol *protocol, LPCWS if(expect_mime) SET_EXPECT(ReportProgress_MIMETYPEAVAILABLE); if(test_protocol == MK_PROTOCOL) - SET_EXPECT(ReportProgress_CACHEFILENAMEAVAIABLE); + SET_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); SET_EXPECT(ReportData); if(test_protocol == ITS_PROTOCOL) SET_EXPECT(ReportProgress_BEGINDOWNLOADDATA); @@ -311,7 +311,7 @@ static HRESULT _protocol_start(unsigned line, IInternetProtocol *protocol, LPCWS if(expect_mime) SET_CALLED(ReportProgress_MIMETYPEAVAILABLE); if(test_protocol == MK_PROTOCOL) - SET_EXPECT(ReportProgress_CACHEFILENAMEAVAIABLE); + SET_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); SET_CALLED(ReportData); if(test_protocol == ITS_PROTOCOL) SET_CALLED(ReportProgress_BEGINDOWNLOADDATA); @@ -324,7 +324,7 @@ static HRESULT _protocol_start(unsigned line, IInternetProtocol *protocol, LPCWS if(expect_mime) CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); if(test_protocol == MK_PROTOCOL) - SET_EXPECT(ReportProgress_CACHEFILENAMEAVAIABLE); + SET_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); CHECK_CALLED(ReportData); if(test_protocol == ITS_PROTOCOL) CHECK_CALLED(ReportProgress_BEGINDOWNLOADDATA);

1 0

Dan Kegel : riched20/tests: Fix test_EM_FINDWORDBREAK comments.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: 28b2d03a8c3dd057a22347b881c02721c974f0b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28b2d03a8c3dd057a22347b88… Author: Dan Kegel <dank(a)kegel.com> Date: Sun Jul 31 20:31:54 2011 -0700 riched20/tests: Fix test_EM_FINDWORDBREAK comments. --- dlls/riched20/tests/editor.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 6bc2d6b..77ce09e 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -7054,11 +7054,11 @@ static void test_EM_FINDWORDBREAK_W(void) BOOL isdelimiter; /* expected result of WB_ISDELIMITER */ } delimiter_tests[] = { {0x0a, FALSE}, /* newline */ - {0x0b, FALSE}, /* vertical tab mark */ + {0x0b, FALSE}, /* vertical tab */ {0x0c, FALSE}, /* form feed */ {0x0d, FALSE}, /* carriage return */ - {0x20, TRUE}, /* ANSI Space */ - {0x61, FALSE}, /* ASCII capital letter a */ + {0x20, TRUE}, /* space */ + {0x61, FALSE}, /* capital letter a */ {0xa0, FALSE}, /* no-break space */ {0x2000, FALSE}, /* en quad */ {0x3000, FALSE}, /* Ideographic space */ @@ -7067,8 +7067,8 @@ static void test_EM_FINDWORDBREAK_W(void) {0x115f, FALSE}, /* Hangul Choseong Filler (no sound, used with two letter Hangul words) Ordinary Letter */ {0xac00, FALSE}, /* Hangul character GA*/ {0xd7af, FALSE}, /* End of Hangul character chart */ - {0xf020, TRUE}, /* High Surrogate Space */ - {0xff20, FALSE}, /* MS private for CP_SYMBOL round trip? */ + {0xf020, TRUE}, /* MS private for CP_SYMBOL round trip?, see kb897872 */ + {0xff20, FALSE}, /* fullwidth commercial @ */ {WCH_EMBEDDING, FALSE}, /* object replacement character*/ }; int i; @@ -7103,11 +7103,11 @@ static void test_EM_FINDWORDBREAK_A(void) BOOL isdelimiter; /* expected result of WB_ISDELIMITER */ } delimiter_tests[] = { {0x0a, FALSE}, /* newline */ - {0x0b, FALSE}, /* vertical tab mark */ + {0x0b, FALSE}, /* vertical tab */ {0x0c, FALSE}, /* form feed */ {0x0d, FALSE}, /* carriage return */ - {0x20, TRUE}, /* ANSI Space */ - {0x61, FALSE}, /* ASCII capital letter a */ + {0x20, TRUE}, /* space */ + {0x61, FALSE}, /* capital letter a */ }; int i; HWND hwndRichEdit = new_richedit(NULL);

1 0

Alexandre Julliard : ole32: Fix a couple of race conditions with the local server pipe.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: f01c1c429d9bb35e4831efc217bfd236f5a023b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f01c1c429d9bb35e4831efc21… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 1 16:20:40 2011 +0200 ole32: Fix a couple of race conditions with the local server pipe. --- dlls/ole32/rpc.c | 44 ++++++++++++++++++++++++-------------------- 1 files changed, 24 insertions(+), 20 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 1a0b575..8ac5d2d 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1890,7 +1890,7 @@ static DWORD WINAPI local_server_thread(LPVOID param) ULONG res; BOOL multi_use = lsp->multi_use; OVERLAPPED ovl; - HANDLE pipe_event; + HANDLE pipe_event, hPipe, new_pipe; DWORD bytes; TRACE("Starting threader for %s.\n",debugstr_guid(&lsp->clsid)); @@ -1899,22 +1899,19 @@ static DWORD WINAPI local_server_thread(LPVOID param) get_localserver_pipe_name(pipefn, &lsp->clsid); ovl.hEvent = pipe_event = CreateEventW(NULL, FALSE, FALSE, NULL); + hPipe = CreateNamedPipeW( pipefn, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, + PIPE_TYPE_BYTE|PIPE_WAIT, PIPE_UNLIMITED_INSTANCES, + 4096, 4096, 500 /* 0.5 second timeout */, NULL ); + if (hPipe == INVALID_HANDLE_VALUE) + { + FIXME("pipe creation failed for %s, le is %u\n", debugstr_w(pipefn), GetLastError()); + CloseHandle(pipe_event); + return 1; + } + SetEvent(lsp->ready_event); - /* Clients trying to connect between now and CreateNamedPipeW() will - * fail and will have to retry. See also the end of the loop. - */ - while (1) { - HANDLE hPipe; - hPipe = CreateNamedPipeW( pipefn, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, - PIPE_TYPE_BYTE|PIPE_WAIT, PIPE_UNLIMITED_INSTANCES, - 4096, 4096, 500 /* 0.5 second timeout */, NULL ); - if (hPipe == INVALID_HANDLE_VALUE) - { - FIXME("pipe creation failed for %s, le is %u\n", debugstr_w(pipefn), GetLastError()); - CloseHandle(pipe_event); - return 1; - } + while (1) { if (!ConnectNamedPipe(hPipe, &ovl)) { DWORD error = GetLastError(); @@ -1976,18 +1973,25 @@ static DWORD WINAPI local_server_thread(LPVOID param) FlushFileBuffers(hPipe); DisconnectNamedPipe(hPipe); - CloseHandle(hPipe); - /* Clients trying to connect between now and CreateNamedPipeW() will - * fail and will have to retry. - */ - TRACE("done marshalling IClassFactory\n"); if (!multi_use) { TRACE("single use object, shutting down pipe %s\n", debugstr_w(pipefn)); + CloseHandle(hPipe); break; } + new_pipe = CreateNamedPipeW( pipefn, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, + PIPE_TYPE_BYTE|PIPE_WAIT, PIPE_UNLIMITED_INSTANCES, + 4096, 4096, 500 /* 0.5 second timeout */, NULL ); + CloseHandle(hPipe); + if (new_pipe == INVALID_HANDLE_VALUE) + { + FIXME("pipe creation failed for %s, le is %u\n", debugstr_w(pipefn), GetLastError()); + CloseHandle(pipe_event); + return 1; + } + hPipe = new_pipe; } CloseHandle(pipe_event); return 0;

1 0

Alexandre Julliard : widl: Only register interfaces when the factory buffer is known.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: 0359b30b1bc763f3f8904ad20a251f2844c041fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0359b30b1bc763f3f8904ad20… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 1 14:28:55 2011 +0200 widl: Only register interfaces when the factory buffer is known. --- tools/widl/register.c | 15 +++------------ 1 files changed, 3 insertions(+), 12 deletions(-) diff --git a/tools/widl/register.c b/tools/widl/register.c index 6b9980f..f18e810 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -80,7 +80,7 @@ static const type_t *find_ps_factory( const statement_list_t *stmts ) static int write_interface( const type_t *iface, const type_t *ps_factory ) { const UUID *uuid = get_attrp( iface->attrs, ATTR_UUID ); - const UUID *ps_uuid = ps_factory ? get_attrp( ps_factory->attrs, ATTR_UUID ) : NULL; + const UUID *ps_uuid = get_attrp( ps_factory->attrs, ATTR_UUID ); if (!uuid) return 0; if (!is_object( iface )) return 0; @@ -94,8 +94,7 @@ static int write_interface( const type_t *iface, const type_t *ps_factory ) put_str( indent, "{\n" ); indent++; put_str( indent, "NumMethods = s %u\n", count_methods( iface )); - put_str( indent, "ProxyStubClsid32 = s '%s'\n", - ps_uuid ? format_uuid( ps_uuid ) : "%CLSID_PSFactoryBuffer%" ); + put_str( indent, "ProxyStubClsid32 = s '%s'\n", format_uuid( ps_uuid )); indent--; put_str( indent, "}\n" ); return 1; @@ -222,7 +221,6 @@ static inline void put_string( const char *str ) void write_regscript( const statement_list_t *stmts ) { - int count; const type_t *ps_factory; if (!do_regscript) return; @@ -236,18 +234,11 @@ void write_regscript( const statement_list_t *stmts ) put_str( indent, "NoRemove Interface\n" ); put_str( indent++, "{\n" ); ps_factory = find_ps_factory( stmts ); - count = write_interfaces( stmts, ps_factory ); + if (ps_factory) write_interfaces( stmts, ps_factory ); put_str( --indent, "}\n" ); put_str( indent, "NoRemove CLSID\n" ); put_str( indent++, "{\n" ); - if (count && !ps_factory) - { - put_str( indent, "ForceRemove '%%CLSID_PSFactoryBuffer%%' = s 'PSFactoryBuffer'\n" ); - put_str( indent++, "{\n" ); - put_str( indent, "InprocServer32 = s '%%MODULE%%' { val ThreadingModel = s 'Both' }\n" ); - put_str( --indent, "}\n" ); - } write_coclasses( stmts, NULL ); put_str( --indent, "}\n" );

1 0

Alexandre Julliard : windowscodecs: Specify the PSFactoryBuffer class in the idl file.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: b6d2aeee585bc5ac5b66b5e545718e1660689d0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6d2aeee585bc5ac5b66b5e54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 1 14:27:29 2011 +0200 windowscodecs: Specify the PSFactoryBuffer class in the idl file. --- dlls/windowscodecs/windowscodecs_wincodec.idl | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/windowscodecs_wincodec.idl b/dlls/windowscodecs/windowscodecs_wincodec.idl index 7558f56..fb4dae6 100644 --- a/dlls/windowscodecs/windowscodecs_wincodec.idl +++ b/dlls/windowscodecs/windowscodecs_wincodec.idl @@ -19,6 +19,12 @@ #include "wincodec.idl" [ + threading(both), + uuid(00000301-a8f2-4877-ba0a-fd2b6645fb94) /* IWICFormatConverter */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } + +[ helpstring("WIC Imaging Factory"), threading(both), uuid(cacaf262-9370-4615-a13b-9f5539da4c0a)

1 0

← Newer
1
...
70
71
72
73
74
75
76
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2011