February 2008 - Wine-Commits

Huw Davies : inetcomm: Implement IMimeMessage_BindToObject.
by Alexandre Julliard Feb. 12, 2008

Feb. 12, 2008

Module: wine Branch: master Commit: a14bb14dc506b6e7d6377d0f022c7af9fdcb7123 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a14bb14dc506b6e7d6377d0f0… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 11 12:04:49 2008 +0000 inetcomm: Implement IMimeMessage_BindToObject. --- dlls/inetcomm/mimeole.c | 44 +++++++++++++++++++++++++++++++++++++++- dlls/inetcomm/tests/mimeole.c | 12 +++++++++++ 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 6c34e1d..ab68090 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1339,14 +1339,54 @@ static HRESULT WINAPI MimeMessage_HandsOffStorage( return E_NOTIMPL; } +static HRESULT find_body(struct list *list, HBODY hbody, body_t **body) +{ + body_t *cur; + HRESULT hr; + + if(hbody == HBODY_ROOT) + { + *body = LIST_ENTRY(list_head(list), body_t, entry); + return S_OK; + } + + LIST_FOR_EACH_ENTRY(cur, list, body_t, entry) + { + if(cur->hbody == hbody) + { + *body = cur; + return S_OK; + } + hr = find_body(&cur->children, hbody, body); + if(hr == S_OK) return S_OK; + } + return S_FALSE; +} + static HRESULT WINAPI MimeMessage_BindToObject( IMimeMessage *iface, const HBODY hBody, REFIID riid, void **ppvObject) { - FIXME("(%p)->(%p, %s, %p)\n", iface, hBody, debugstr_guid(riid), ppvObject); - return E_NOTIMPL; + MimeMessage *This = (MimeMessage *)iface; + HRESULT hr; + body_t *body; + + TRACE("(%p)->(%p, %s, %p)\n", iface, hBody, debugstr_guid(riid), ppvObject); + + hr = find_body(&This->body_tree, hBody, &body); + + if(hr != S_OK) return hr; + + if(IsEqualIID(riid, &IID_IMimeBody)) + { + IMimeBody_AddRef(body->mime_body); + *ppvObject = body->mime_body; + return S_OK; + } + + return E_NOINTERFACE; } static HRESULT WINAPI MimeMessage_SaveBody( diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 1f542cf..5f5fa0c 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -209,6 +209,8 @@ static void test_CreateMessage(void) IStream *stream; LARGE_INTEGER pos; LONG ref; + IMimeBody *body; + BODYOFFSETS offsets; hr = MimeOleCreateMessage(NULL, &msg); ok(hr == S_OK, "ret %08x\n", hr); @@ -221,6 +223,16 @@ static void test_CreateMessage(void) hr = IMimeMessage_Load(msg, stream); ok(hr == S_OK, "ret %08x\n", hr); + hr = IMimeMessage_BindToObject(msg, HBODY_ROOT, &IID_IMimeBody, (void**)&body); + ok(hr == S_OK, "ret %08x\n", hr); + hr = IMimeBody_GetOffsets(body, &offsets); + ok(hr == S_OK, "ret %08x\n", hr); + ok(offsets.cbBoundaryStart == 0, "got %d\n", offsets.cbBoundaryStart); + ok(offsets.cbHeaderStart == 0, "got %d\n", offsets.cbHeaderStart); + ok(offsets.cbBodyStart == 359, "got %d\n", offsets.cbBodyStart); + ok(offsets.cbBodyEnd == 666, "got %d\n", offsets.cbBodyEnd); + IMimeBody_Release(body); + IMimeMessage_Release(msg); ref = IStream_AddRef(stream);

1 0

Huw Davies : inetcomm: Add the beginnings of IMimeMessage_Load.
by Alexandre Julliard Feb. 12, 2008

Feb. 12, 2008

Module: wine Branch: master Commit: 4ba3aa5047f95690f8a24c00b11da257220d226b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ba3aa5047f95690f8a24c00b… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 8 12:17:43 2008 +0000 inetcomm: Add the beginnings of IMimeMessage_Load. --- dlls/inetcomm/mimeole.c | 22 +++++++++++++++++++--- dlls/inetcomm/tests/mimeole.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index a353e5c..a55aceb 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1091,6 +1091,7 @@ typedef struct MimeMessage const IMimeMessageVtbl *lpVtbl; LONG refs; + IStream *stream; } MimeMessage; static HRESULT WINAPI MimeMessage_QueryInterface(IMimeMessage *iface, REFIID riid, void **ppv) @@ -1130,6 +1131,7 @@ static ULONG WINAPI MimeMessage_Release(IMimeMessage *iface) refs = InterlockedDecrement(&This->refs); if (!refs) { + if(This->stream) IStream_Release(This->stream); HeapFree(GetProcessHeap(), 0, This); } @@ -1155,9 +1157,22 @@ static HRESULT WINAPI MimeMessage_IsDirty( static HRESULT WINAPI MimeMessage_Load( IMimeMessage *iface, - LPSTREAM pStm){ - FIXME("(%p)->(%p)\n", iface, pStm); - return E_NOTIMPL; + LPSTREAM pStm) +{ + MimeMessage *This = (MimeMessage *)iface; + + TRACE("(%p)->(%p)\n", iface, pStm); + + if(This->stream) + { + FIXME("already loaded a message\n"); + return E_FAIL; + } + + IStream_AddRef(pStm); + This->stream = pStm; + + return S_OK; } static HRESULT WINAPI MimeMessage_Save( @@ -1721,6 +1736,7 @@ HRESULT WINAPI MimeOleCreateMessage(IUnknown *pUnkOuter, IMimeMessage **ppMessag This->lpVtbl = &MimeMessageVtbl; This->refs = 1; + This->stream = NULL; *ppMessage = (IMimeMessage *)&This->lpVtbl; return S_OK; diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 30451f3..1f542cf 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -202,6 +202,34 @@ static void test_Allocator(void) IMimeAllocator_Release(alloc); } +static void test_CreateMessage(void) +{ + HRESULT hr; + IMimeMessage *msg; + IStream *stream; + LARGE_INTEGER pos; + LONG ref; + + hr = MimeOleCreateMessage(NULL, &msg); + ok(hr == S_OK, "ret %08x\n", hr); + + CreateStreamOnHGlobal(NULL, TRUE, &stream); + IStream_Write(stream, msg1, sizeof(msg1) - 1, NULL); + pos.QuadPart = 0; + IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); + + hr = IMimeMessage_Load(msg, stream); + ok(hr == S_OK, "ret %08x\n", hr); + + IMimeMessage_Release(msg); + + ref = IStream_AddRef(stream); + ok(ref == 2, "ref %d\n", ref); + IStream_Release(stream); + + IStream_Release(stream); +} + START_TEST(mimeole) { OleInitialize(NULL); @@ -209,5 +237,6 @@ START_TEST(mimeole) test_CreateSecurity(); test_CreateBody(); test_Allocator(); + test_CreateMessage(); OleUninitialize(); }

1 0

Andrew Talbot : avifil32: Assign to structs instead of using memcpy.
by Alexandre Julliard Feb. 12, 2008

Feb. 12, 2008

Module: wine Branch: master Commit: 292fd135e51b4dddd9021de56b44b753d562f0c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=292fd135e51b4dddd9021de56… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Feb 11 20:48:51 2008 +0000 avifil32: Assign to structs instead of using memcpy. --- dlls/avifil32/api.c | 4 ++-- dlls/avifil32/avifile.c | 2 +- dlls/avifil32/factory.c | 2 +- dlls/avifil32/getframe.c | 2 +- dlls/avifil32/wavfile.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index 465164a..7753e39 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -249,7 +249,7 @@ HRESULT WINAPI AVIFileOpenW(PAVIFILE *ppfile, LPCWSTR szFile, UINT uMode, if (! AVIFILE_GetFileHandlerByExtension(szFile, &clsidHandler)) return AVIERR_UNSUPPORTED; } else - memcpy(&clsidHandler, lpHandler, sizeof(clsidHandler)); + clsidHandler = *lpHandler; /* create instance of handler */ hr = CoCreateInstance(&clsidHandler, NULL, CLSCTX_INPROC, &IID_IAVIFile, (LPVOID*)ppfile); @@ -746,7 +746,7 @@ HRESULT WINAPI AVIMakeCompressedStream(PAVISTREAM *ppsCompressed, if (AVIFILE_CLSIDFromString(szValue, &clsidHandler) != S_OK) return AVIERR_UNSUPPORTED; } else - memcpy(&clsidHandler, pclsidHandler, sizeof(clsidHandler)); + clsidHandler = *pclsidHandler; hr = CoCreateInstance(&clsidHandler, NULL, CLSCTX_INPROC, &IID_IAVIStream, (LPVOID*)ppsCompressed); if (FAILED(hr) || *ppsCompressed == NULL) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 593cdf9..5becaf4 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -590,7 +590,7 @@ static HRESULT WINAPI IPersistFile_fnGetClassID(IPersistFile *iface, if (pClassID == NULL) return AVIERR_BADPARAM; - memcpy(pClassID, &CLSID_AVIFile, sizeof(CLSID_AVIFile)); + *pClassID = CLSID_AVIFile; return AVIERR_OK; } diff --git a/dlls/avifil32/factory.c b/dlls/avifil32/factory.c index 40e4c68..26a5ae2 100644 --- a/dlls/avifil32/factory.c +++ b/dlls/avifil32/factory.c @@ -78,7 +78,7 @@ static HRESULT AVIFILE_CreateClassFactory(const CLSID *pclsid, const IID *riid, pClassFactory->lpVtbl = &iclassfact; pClassFactory->dwRef = 0; - memcpy(&pClassFactory->clsid, pclsid, sizeof(pClassFactory->clsid)); + pClassFactory->clsid = *pclsid; hr = IClassFactory_QueryInterface((IClassFactory*)pClassFactory, riid, ppv); if (FAILED(hr)) { diff --git a/dlls/avifil32/getframe.c b/dlls/avifil32/getframe.c index d342b12..fd3ec56 100644 --- a/dlls/avifil32/getframe.c +++ b/dlls/avifil32/getframe.c @@ -212,7 +212,7 @@ static LPVOID WINAPI IGetFrame_fnGetFrame(IGetFrame *iface, LONG lPos) if (This->lpOutFormat != NULL) { BITMAPINFOHEADER bi; - memcpy(&bi, This->lpOutFormat, sizeof(bi)); + bi = *This->lpOutFormat; AVIFILE_CloseCompressor(This); if (FAILED(IGetFrame_SetFormat(iface, &bi, NULL, 0, 0, -1, -1))) { diff --git a/dlls/avifil32/wavfile.c b/dlls/avifil32/wavfile.c index 2c60bf5..7791a66 100644 --- a/dlls/avifil32/wavfile.c +++ b/dlls/avifil32/wavfile.c @@ -540,7 +540,7 @@ static HRESULT WINAPI IPersistFile_fnGetClassID(IPersistFile *iface, if (pClassID == NULL) return AVIERR_BADPARAM; - memcpy(pClassID, &CLSID_WAVFile, sizeof(CLSID_WAVFile)); + *pClassID = CLSID_WAVFile; return AVIERR_OK; }

1 0

Marcus Meissner : dinput: Make _dump_mouse_state static.
by Alexandre Julliard Feb. 12, 2008

Feb. 12, 2008

Module: wine Branch: master Commit: 9438ebfa2095fc7e13e1c33509f5091b9bc6f886 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9438ebfa2095fc7e13e1c3350… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Feb 8 17:34:00 2008 +0100 dinput: Make _dump_mouse_state static. --- dlls/dinput/mouse.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 72fbbf6..91f541f 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -75,7 +75,7 @@ const GUID DInput_Wine_Mouse_GUID = { /* 9e573ed8-7734-11d2-8d4a-23903fb6bdf7 */ 0x9e573ed8, 0x7734, 0x11d2, {0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7} }; -void _dump_mouse_state(DIMOUSESTATE2 *m_state) +static void _dump_mouse_state(DIMOUSESTATE2 *m_state) { int i;

1 0

Dan Kegel : msvcrt: Fix EOF behavior on read from pipe or console.
by Alexandre Julliard Feb. 12, 2008

Feb. 12, 2008

Module: wine Branch: master Commit: 316869b273ce8bbed968d6380c1b89f07187090a URL: http://source.winehq.org/git/wine.git/?a=commit;h=316869b273ce8bbed968d6380… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Feb 9 08:27:35 2008 -0800 msvcrt: Fix EOF behavior on read from pipe or console. The canonical way to detect EOF on read is when you request more than zero bytes, but zero bytes come back. Switching to this method seems to handle a few problem cases better. Also handle ERROR_BROKEN_PIPE properly just in case. --- dlls/msvcrt/file.c | 5 ++++- dlls/msvcrt/tests/file.c | 45 ++++++++++++++++++++++++++++++++++++--------- 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index b4ccdc0..e8189a1 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1692,11 +1692,13 @@ static int read_i(int fd, void *buf, unsigned int count) if (bufstart[i] == 0x1a) { num_read = i; + MSVCRT_fdesc[fd].wxflag |= (WX_ATEOF|WX_READEOF); + TRACE(":^Z EOF %s\n",debugstr_an(buf,num_read)); break; } } } - if (num_read != count) + if (count != 0 && num_read == 0) { MSVCRT_fdesc[fd].wxflag |= (WX_ATEOF|WX_READEOF); TRACE(":EOF %s\n",debugstr_an(buf,num_read)); @@ -1707,6 +1709,7 @@ static int read_i(int fd, void *buf, unsigned int count) if (GetLastError() == ERROR_BROKEN_PIPE) { TRACE(":end-of-pipe\n"); + MSVCRT_fdesc[fd].wxflag |= (WX_ATEOF|WX_READEOF); return 0; } else diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index e0f1b99..d406ae5 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -918,9 +918,14 @@ static void test_stat(void) static const char* pipe_string="Hello world"; +/* How many messages to transfer over the pipe */ +#define N_TEST_MESSAGES 3 + static void test_pipes_child(int argc, char** args) { int fd; + int nwritten; + int i; if (argc < 5) { @@ -932,7 +937,15 @@ static void test_pipes_child(int argc, char** args) ok(close(fd) == 0, "unable to close %d: %d\n", fd, errno); fd=atoi(args[4]); - write(fd, pipe_string, strlen(pipe_string)); + + for (i=0; i<N_TEST_MESSAGES; i++) { + nwritten=write(fd, pipe_string, strlen(pipe_string)); + ok(nwritten == strlen(pipe_string), "i %d, expected to write %d bytes, wrote %d\n", i, strlen(pipe_string), nwritten); + /* let other process wake up so they can show off their "keep reading until EOF" behavior */ + if (i < N_TEST_MESSAGES-1) + Sleep(100); + } + ok(close(fd) == 0, "unable to close %d: %d\n", fd, errno); } @@ -943,7 +956,9 @@ static void test_pipes(const char* selfname) FILE* file; const char* arg_v[6]; char buf[4096]; + char expected[4096]; int r; + int i; /* Test reading from a pipe with read() */ if (_pipe(pipes, 1024, O_BINARY) < 0) @@ -961,11 +976,14 @@ static void test_pipes(const char* selfname) proc_handles[0] = (HANDLE)_spawnvp(_P_NOWAIT, selfname, arg_v); ok(close(pipes[1]) == 0, "unable to close %d: %d\n", pipes[1], errno); - r=read(pipes[0], buf, sizeof(buf)-1); - ok(r == strlen(pipe_string), "expected to read %d bytes, got %d\n", strlen(pipe_string)+1, r); - if (r > 0) - buf[r]='\0'; - ok(strcmp(buf, pipe_string) == 0, "expected to read '%s', got '%s'\n", pipe_string, buf); + for (i=0; i<N_TEST_MESSAGES; i++) { + r=read(pipes[0], buf, sizeof(buf)-1); + ok(r == strlen(pipe_string), "i %d, expected to read %d bytes, got %d\n", i, strlen(pipe_string)+1, r); + if (r > 0) + buf[r]='\0'; + ok(strcmp(buf, pipe_string) == 0, "expected to read '%s', got '%s'\n", pipe_string, buf); + } + r=read(pipes[0], buf, sizeof(buf)-1); ok(r == 0, "expected to read 0 bytes, got %d\n", r); ok(close(pipes[0]) == 0, "unable to close %d: %d\n", pipes[0], errno); @@ -987,12 +1005,21 @@ static void test_pipes(const char* selfname) ok(close(pipes[1]) == 0, "unable to close %d: %d\n", pipes[1], errno); file=fdopen(pipes[0], "r"); + /* In blocking mode, fread will keep calling read() until it gets + * enough bytes, or EOF, even on Unix. (If this were a Unix terminal + * in cooked mode instead of a pipe, it would also stop on EOL.) + */ + expected[0] = 0; + for (i=0; i<N_TEST_MESSAGES; i++) + strcat(expected, pipe_string); r=fread(buf, 1, sizeof(buf)-1, file); - ok(r == strlen(pipe_string), "fread() returned %d instead of %d: ferror=%d\n", r, strlen(pipe_string), ferror(file)); + ok(r == strlen(expected), "fread() returned %d instead of %d: ferror=%d\n", r, strlen(expected), ferror(file)); if (r > 0) - buf[r]='\0'; - ok(strcmp(buf, pipe_string) == 0, "got '%s' expected '%s'\n", buf, pipe_string); + buf[r]='\0'; + ok(strcmp(buf, expected) == 0, "got '%s' expected '%s'\n", buf, expected); + /* Let child close the file before we read, so we can sense EOF reliably */ + Sleep(100); r=fread(buf, 1, sizeof(buf)-1, file); ok(r == 0, "fread() returned %d instead of 0\n", r); ok(ferror(file) == 0, "got ferror() = %d\n", ferror(file));

1 0

Gerald Pfeifer : gdi32: For unsigned types, directly use INTERNAL_YDS
by Alexandre Julliard Feb. 12, 2008

Feb. 12, 2008

Module: wine Branch: master Commit: 21b334713cc6b0e1df30d199487d68fd04a390c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21b334713cc6b0e1df30d1994… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Feb 10 22:31:20 2008 +0100 gdi32: For unsigned types, directly use INTERNAL_YDS --- dlls/gdi32/font.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 28853fb..3a0beed 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1690,16 +1690,16 @@ UINT WINAPI GetOutlineTextMetricsW( output->otmTextMetrics.tmOverhang = WDPTOLP(output->otmTextMetrics.tmOverhang); output->otmAscent = HDPTOLP(output->otmAscent); output->otmDescent = HDPTOLP(output->otmDescent); - output->otmLineGap = HDPTOLP(output->otmLineGap); - output->otmsCapEmHeight = HDPTOLP(output->otmsCapEmHeight); - output->otmsXHeight = HDPTOLP(output->otmsXHeight); + output->otmLineGap = abs(INTERNAL_YDSTOWS(dc,output->otmLineGap)); + output->otmsCapEmHeight = abs(INTERNAL_YDSTOWS(dc,output->otmsCapEmHeight)); + output->otmsXHeight = abs(INTERNAL_YDSTOWS(dc,output->otmsXHeight)); output->otmrcFontBox.top = HDPTOLP(output->otmrcFontBox.top); output->otmrcFontBox.bottom = HDPTOLP(output->otmrcFontBox.bottom); output->otmrcFontBox.left = WDPTOLP(output->otmrcFontBox.left); output->otmrcFontBox.right = WDPTOLP(output->otmrcFontBox.right); output->otmMacAscent = HDPTOLP(output->otmMacAscent); output->otmMacDescent = HDPTOLP(output->otmMacDescent); - output->otmMacLineGap = HDPTOLP(output->otmMacLineGap); + output->otmMacLineGap = abs(INTERNAL_YDSTOWS(dc,output->otmMacLineGap)); output->otmptSubscriptSize.x = WDPTOLP(output->otmptSubscriptSize.x); output->otmptSubscriptSize.y = HDPTOLP(output->otmptSubscriptSize.y); output->otmptSubscriptOffset.x = WDPTOLP(output->otmptSubscriptOffset.x); @@ -1708,7 +1708,7 @@ UINT WINAPI GetOutlineTextMetricsW( output->otmptSuperscriptSize.y = HDPTOLP(output->otmptSuperscriptSize.y); output->otmptSuperscriptOffset.x = WDPTOLP(output->otmptSuperscriptOffset.x); output->otmptSuperscriptOffset.y = HDPTOLP(output->otmptSuperscriptOffset.y); - output->otmsStrikeoutSize = HDPTOLP(output->otmsStrikeoutSize); + output->otmsStrikeoutSize = abs(INTERNAL_YDSTOWS(dc,output->otmsStrikeoutSize)); output->otmsStrikeoutPosition = HDPTOLP(output->otmsStrikeoutPosition); output->otmsUnderscoreSize = HDPTOLP(output->otmsUnderscoreSize); output->otmsUnderscorePosition = HDPTOLP(output->otmsUnderscorePosition);

1 0

Andrew Talbot : cabinet: Assign to structs instead of using memcpy.
by Alexandre Julliard Feb. 12, 2008

Feb. 12, 2008

Module: wine Branch: master Commit: ac796d81e76ae043545129753e59463ef2c82e93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac796d81e76ae043545129753… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Feb 11 20:48:58 2008 +0000 cabinet: Assign to structs instead of using memcpy. --- dlls/cabinet/fci.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/cabinet/fci.c b/dlls/cabinet/fci.c index a33f2e3..ea745a6 100644 --- a/dlls/cabinet/fci.c +++ b/dlls/cabinet/fci.c @@ -1331,7 +1331,7 @@ static BOOL fci_flush_folder( ) ) { /* save CCAB */ - memcpy(&(p_fci_internal->oldCCAB), p_fci_internal->pccab, sizeof(CCAB)); + p_fci_internal->oldCCAB = *p_fci_internal->pccab; /* increment cabinet index */ ++(p_fci_internal->pccab->iCab); /* get name of next cabinet */ @@ -2244,7 +2244,7 @@ static BOOL fci_flush_cabinet( CB_MAX_CABINET_NAME + CB_MAX_DISK_NAME )) { /* save CCAB */ - memcpy(&(p_fci_internal->oldCCAB), p_fci_internal->pccab, sizeof(CCAB)); + p_fci_internal->oldCCAB = *p_fci_internal->pccab; /* increment cabinet index */ ++(p_fci_internal->pccab->iCab); /* get name of next cabinet */ @@ -2477,7 +2477,7 @@ BOOL __cdecl FCIAddFile( ) ) { /* save CCAB */ - memcpy(&(p_fci_internal->oldCCAB), p_fci_internal->pccab, sizeof(CCAB)); + p_fci_internal->oldCCAB = *p_fci_internal->pccab; /* increment cabinet index */ ++(p_fci_internal->pccab->iCab); /* get name of next cabinet */ @@ -2644,7 +2644,7 @@ BOOL __cdecl FCIAddFile( ) ) { /* save CCAB */ - memcpy(&(p_fci_internal->oldCCAB), p_fci_internal->pccab, sizeof(CCAB)); + p_fci_internal->oldCCAB = *p_fci_internal->pccab; /* increment cabinet index */ ++(p_fci_internal->pccab->iCab); /* get name of next cabinet */

1 0

Reece H. Dunn : winecfg: Fixed reading in colour data from a theme file.
by Alexandre Julliard Feb. 11, 2008

Feb. 11, 2008

Module: wine Branch: master Commit: 84d77c9d2cd13f9d88cfc73f136b20d50493faa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84d77c9d2cd13f9d88cfc73f1… Author: Reece H. Dunn <msclrhd(a)gmail.com> Date: Sun Feb 10 16:22:26 2008 +0000 winecfg: Fixed reading in colour data from a theme file. --- programs/winecfg/theme.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index b7e75aa..29cee6b 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -585,7 +585,7 @@ static void do_parse_theme(WCHAR *file) sscanf(keyNameValueA, "%d %d %d", &red, &green, &blue); - color = RGB((BYTE)red, (BYTE)blue, (BYTE)green); + color = RGB((BYTE)red, (BYTE)green, (BYTE)blue); HeapFree(GetProcessHeap(), 0, keyNameValueA);

1 0

Reece H. Dunn : winecfg: Allow theme colour names to be case insensitive when reading them from a file .
by Alexandre Julliard Feb. 11, 2008

Feb. 11, 2008

Module: wine Branch: master Commit: 85703790fd1a4032f6ce94d62b78e0e9e0b5e6b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85703790fd1a4032f6ce94d62… Author: Reece H. Dunn <msclrhd(a)gmail.com> Date: Sun Feb 10 17:35:55 2008 +0000 winecfg: Allow theme colour names to be case insensitive when reading them from a file. --- programs/winecfg/theme.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 29cee6b..7eb444e 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -543,7 +543,7 @@ static void set_color_from_theme(WCHAR *keyName, COLORREF color) for (i=0; i<sizeof(metrics)/sizeof(metrics[0]); i++) { - if (strcmp(metrics[i].color_reg, keyNameA)==0) + if (lstrcmpiA(metrics[i].color_reg, keyNameA)==0) { metrics[i].color = color; save_sys_color(i, color);

1 0

James Hawkins : msi: Test the remaining installer properties returned by MsiGetProductInfo.
by Alexandre Julliard Feb. 11, 2008

Feb. 11, 2008

Module: wine Branch: master Commit: f461a8d4c1dc488a426259eafccb2eb124aa6595 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f461a8d4c1dc488a426259eaf… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Feb 11 01:18:56 2008 -0600 msi: Test the remaining installer properties returned by MsiGetProductInfo. --- dlls/msi/tests/msi.c | 534 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 533 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f461a8d4c1dc488a42625…

1 0