December 2009 - Wine-Commits

Alexandre Julliard : user32: Move wsprintf16 to user16.c.
by Alexandre Julliard Dec. 18, 2009

Dec. 18, 2009

Module: wine Branch: master Commit: 25d7e0b968172a58a9db09ad82d2f26d62a1b632 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25d7e0b968172a58a9db09ad8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 17 18:02:00 2009 +0100 user32: Move wsprintf16 to user16.c. --- dlls/user32/user16.c | 208 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/user32/wsprintf.c | 129 ------------------------------ 2 files changed, 208 insertions(+), 129 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=25d7e0b968172a58a9db0…

1 0

James Hawkins : msi: Free the current filename if we choose to not extract the file.
by Alexandre Julliard Dec. 18, 2009

Dec. 18, 2009

Module: wine Branch: master Commit: d9c52bfa70d694e89511129e8f04caa6b22ce053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9c52bfa70d694e89511129e8… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 17 20:00:45 2009 -0800 msi: Free the current filename if we choose to not extract the file. --- dlls/msi/media.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 67d73cc..0a6c431 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -334,7 +334,12 @@ static INT_PTR cabinet_copy_file(FDINOTIFICATIONTYPE fdint, data->curfile = strdupAtoW(pfdin->psz1); if (!data->cb(data->package, data->curfile, MSICABEXTRACT_BEGINEXTRACT, &path, &attrs, data->user)) + { + /* We're not extracting this file, so free the filename. */ + msi_free(data->curfile); + data->curfile = NULL; goto done; + } TRACE("extracting %s\n", debugstr_w(path));

1 0

Huw Davies : dsound: Fix a memory leak in the tests.
by Alexandre Julliard Dec. 18, 2009

Dec. 18, 2009

Module: wine Branch: master Commit: 14fdced3653da6d022200ae66b5e89e1f92a555e URL: http://source.winehq.org/git/wine.git/?a=commit;h=14fdced3653da6d022200ae66… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 18 10:10:18 2009 +0000 dsound: Fix a memory leak in the tests. Found by Valgrind. --- dlls/dsound/tests/propset.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/tests/propset.c b/dlls/dsound/tests/propset.c index 70a8e0d..5007fcc 100644 --- a/dlls/dsound/tests/propset.c +++ b/dlls/dsound/tests/propset.c @@ -550,6 +550,7 @@ static void propset_private_tests(void) NULL, 0, &data, sizeof(data), &bytes); ok(rc==DS_OK, "Couldn't enumerate: 0x%x\n",rc); } + IKsPropertySet_Release(pps); } static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription,

1 0

Hans Leidekker : msi: Avoid a crash in STREAMS_delete.
by Alexandre Julliard Dec. 18, 2009

Dec. 18, 2009

Module: wine Branch: master Commit: 699cfc915abf823ba916b39a2cbd2eba3890f17f URL: http://source.winehq.org/git/wine.git/?a=commit;h=699cfc915abf823ba916b39a2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 18 11:02:30 2009 +0100 msi: Avoid a crash in STREAMS_delete. --- dlls/msi/streams.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 6b281f4..4825ae6 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -400,10 +400,14 @@ static UINT STREAMS_delete(struct tagMSIVIEW *view) for (i = 0; i < sv->num_rows; i++) { - if (sv->streams[i] && sv->streams[i]->stream) - IStream_Release(sv->streams[i]->stream); - msi_free(sv->streams[i]->name); - msi_free(sv->streams[i]); + if (sv->streams[i]) + { + if (sv->streams[i]->stream) + IStream_Release(sv->streams[i]->stream); + + msi_free(sv->streams[i]->name); + msi_free(sv->streams[i]); + } } msi_free(sv->streams);

1 0

Alexandre Julliard : user32: Pre-allocate the window procedure for the icon title class.
by Alexandre Julliard Dec. 18, 2009

Dec. 18, 2009

Module: wine Branch: master Commit: d88c34099b16540c1f122d5e97ad7529a1883176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d88c34099b16540c1f122d5e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 18 12:37:05 2009 +0100 user32: Pre-allocate the window procedure for the icon title class. --- dlls/user32/controls.h | 2 ++ dlls/user32/icontitle.c | 4 +--- dlls/user32/winproc.c | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 16ebe6d..726ca72 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -45,6 +45,7 @@ enum builtin_winprocs WINPROC_STATIC, /* unicode-only procs */ WINPROC_DESKTOP, + WINPROC_ICONTITLE, NB_BUILTIN_WINPROCS, NB_BUILTIN_AW_WINPROCS = WINPROC_DESKTOP }; @@ -79,6 +80,7 @@ extern const struct builtin_class_descr SCROLL_builtin_class DECLSPEC_HIDDEN; extern const struct builtin_class_descr STATIC_builtin_class DECLSPEC_HIDDEN; extern LRESULT WINAPI DesktopWndProc(HWND,UINT,WPARAM,LPARAM) DECLSPEC_HIDDEN; +extern LRESULT WINAPI IconTitleWndProc(HWND,UINT,WPARAM,LPARAM) DECLSPEC_HIDDEN; /* Wow handlers */ diff --git a/dlls/user32/icontitle.c b/dlls/user32/icontitle.c index aa8ebc5..b6f2c08 100644 --- a/dlls/user32/icontitle.c +++ b/dlls/user32/icontitle.c @@ -38,8 +38,6 @@ static BOOL bMultiLineTitle; static HFONT hIconTitleFont; -static LRESULT WINAPI IconTitleWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam ); - /********************************************************************* * icon title class descriptor */ @@ -48,7 +46,7 @@ const struct builtin_class_descr ICONTITLE_builtin_class = (LPCWSTR)ICONTITLE_CLASS_ATOM, /* name */ 0, /* style */ NULL, /* procA (winproc is Unicode only) */ - IconTitleWndProc, /* procW */ + BUILTIN_WINPROC(WINPROC_ICONTITLE), /* procW */ 0, /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index a5cbf32..0f9b6f2 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -75,6 +75,7 @@ static WINDOWPROC winproc_array[MAX_WINPROCS] = { ScrollBarWndProcA, ScrollBarWndProcW }, /* WINPROC_SCROLLBAR */ { StaticWndProcA, StaticWndProcW }, /* WINPROC_STATIC */ { NULL, DesktopWndProc }, /* WINPROC_DESKTOP */ + { NULL, IconTitleWndProc }, /* WINPROC_ICONTITLE */ }; static UINT winproc_used = NB_BUILTIN_WINPROCS;

1 0

Alexandre Julliard : user32: Pre-allocate the window procedure for the desktop class.
by Alexandre Julliard Dec. 18, 2009

Dec. 18, 2009

Module: wine Branch: master Commit: 0c4e151ee9b8a27d86857e51eeac47c5544c6581 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c4e151ee9b8a27d86857e51e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 18 12:36:26 2009 +0100 user32: Pre-allocate the window procedure for the desktop class. --- dlls/user32/controls.h | 8 +++++++- dlls/user32/desktop.c | 6 ++---- dlls/user32/winproc.c | 5 +++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index e7aa408..16ebe6d 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -33,6 +33,7 @@ enum builtin_winprocs { + /* dual A/W procs */ WINPROC_BUTTON = 0, WINPROC_COMBO, WINPROC_DEFWND, @@ -42,7 +43,10 @@ enum builtin_winprocs WINPROC_MDICLIENT, WINPROC_SCROLLBAR, WINPROC_STATIC, - NB_BUILTIN_WINPROCS + /* unicode-only procs */ + WINPROC_DESKTOP, + NB_BUILTIN_WINPROCS, + NB_BUILTIN_AW_WINPROCS = WINPROC_DESKTOP }; #define WINPROC_HANDLE (~0u >> 16) @@ -74,6 +78,8 @@ extern const struct builtin_class_descr MESSAGE_builtin_class DECLSPEC_HIDDEN; extern const struct builtin_class_descr SCROLL_builtin_class DECLSPEC_HIDDEN; extern const struct builtin_class_descr STATIC_builtin_class DECLSPEC_HIDDEN; +extern LRESULT WINAPI DesktopWndProc(HWND,UINT,WPARAM,LPARAM) DECLSPEC_HIDDEN; + /* Wow handlers */ struct wow_handlers16 diff --git a/dlls/user32/desktop.c b/dlls/user32/desktop.c index a060aad..e29d72c 100644 --- a/dlls/user32/desktop.c +++ b/dlls/user32/desktop.c @@ -38,8 +38,6 @@ static HBITMAP hbitmapWallPaper; static SIZE bitmapSize; static BOOL fTileWallPaper; -static LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ); - /********************************************************************* * desktop class descriptor @@ -49,7 +47,7 @@ const struct builtin_class_descr DESKTOP_builtin_class = (LPCWSTR)DESKTOP_CLASS_ATOM, /* name */ CS_DBLCLKS, /* style */ NULL, /* procA (winproc is Unicode only) */ - DesktopWndProc, /* procW */ + BUILTIN_WINPROC(WINPROC_DESKTOP), /* procW */ 0, /* extra */ IDC_ARROW, /* cursor */ (HBRUSH)(COLOR_BACKGROUND+1) /* brush */ @@ -115,7 +113,7 @@ static HBITMAP DESKTOP_LoadBitmap( HDC hdc, const char *filename ) /*********************************************************************** * DesktopWndProc */ -static LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) +LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) { if (message == WM_NCCREATE) return TRUE; return 0; /* all other messages are ignored */ diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index bd30b49..a5cbf32 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -74,6 +74,7 @@ static WINDOWPROC winproc_array[MAX_WINPROCS] = { MDIClientWndProcA, MDIClientWndProcW }, /* WINPROC_MDICLIENT */ { ScrollBarWndProcA, ScrollBarWndProcW }, /* WINPROC_SCROLLBAR */ { StaticWndProcA, StaticWndProcW }, /* WINPROC_STATIC */ + { NULL, DesktopWndProc }, /* WINPROC_DESKTOP */ }; static UINT winproc_used = NB_BUILTIN_WINPROCS; @@ -104,14 +105,14 @@ static inline WINDOWPROC *find_winproc( WNDPROC funcA, WNDPROC funcW ) { unsigned int i; - for (i = 0; i < NB_BUILTIN_WINPROCS; i++) + for (i = 0; i < NB_BUILTIN_AW_WINPROCS; i++) { /* match either proc, some apps confuse A and W */ if (funcA && winproc_array[i].procA != funcA && winproc_array[i].procW != funcA) continue; if (funcW && winproc_array[i].procA != funcW && winproc_array[i].procW != funcW) continue; return &winproc_array[i]; } - for (i = NB_BUILTIN_WINPROCS; i < winproc_used; i++) + for (i = NB_BUILTIN_AW_WINPROCS; i < winproc_used; i++) { if (funcA && winproc_array[i].procA != funcA) continue; if (funcW && winproc_array[i].procW != funcW) continue;

1 0

Vincent Povirk : gdiplus: Add tests for the other frame functions, for memory bitmaps.
by Alexandre Julliard Dec. 18, 2009

Dec. 18, 2009

Module: wine Branch: master Commit: 6a7fc507082e82e9140e2f92e52d3c187920d5a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a7fc507082e82e9140e2f92e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Dec 17 19:35:19 2009 -0600 gdiplus: Add tests for the other frame functions, for memory bitmaps. --- dlls/gdiplus/tests/image.c | 47 +++++++++++++++++++++++++++++++++++-------- include/gdiplusimaging.h | 4 +++ 2 files changed, 42 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index ebdd3f9..522e5de 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -30,25 +30,31 @@ #define expect(expected, got) ok((UINT)(got) == (UINT)(expected), "Expected %.8x, got %.8x\n", (UINT)(expected), (UINT)(got)) #define expectf(expected, got) ok(fabs(expected - got) < 0.0001, "Expected %.2f, got %.2f\n", expected, got) -static void expect_rawformat(REFGUID expected, GpImage *img, int line, BOOL todo) +static void expect_guid(REFGUID expected, REFGUID got, int line, BOOL todo) { - GUID raw; WCHAR bufferW[39]; char buffer[39]; char buffer2[39]; - GpStatus stat; - stat = GdipGetImageRawFormat(img, &raw); - ok_(__FILE__, line)(stat == Ok, "GdipGetImageRawFormat failed with %d\n", stat); - if(stat != Ok) return; - StringFromGUID2(&raw, bufferW, sizeof(bufferW)/sizeof(bufferW[0])); + StringFromGUID2(got, bufferW, sizeof(bufferW)/sizeof(bufferW[0])); WideCharToMultiByte(CP_ACP, 0, bufferW, sizeof(bufferW)/sizeof(bufferW[0]), buffer, sizeof(buffer), NULL, NULL); StringFromGUID2(expected, bufferW, sizeof(bufferW)/sizeof(bufferW[0])); WideCharToMultiByte(CP_ACP, 0, bufferW, sizeof(bufferW)/sizeof(bufferW[0]), buffer2, sizeof(buffer2), NULL, NULL); if(todo) - todo_wine ok_(__FILE__, line)(IsEqualGUID(&raw, expected), "Expected format %s, got %s\n", buffer2, buffer); + todo_wine ok_(__FILE__, line)(IsEqualGUID(expected, got), "Expected %s, got %s\n", buffer2, buffer); else - ok_(__FILE__, line)(IsEqualGUID(&raw, expected), "Expected format %s, got %s\n", buffer2, buffer); + ok_(__FILE__, line)(IsEqualGUID(expected, got), "Expected %s, got %s\n", buffer2, buffer); +} + +static void expect_rawformat(REFGUID expected, GpImage *img, int line, BOOL todo) +{ + GUID raw; + GpStatus stat; + + stat = GdipGetImageRawFormat(img, &raw); + ok_(__FILE__, line)(stat == Ok, "GdipGetImageRawFormat failed with %d\n", stat); + if(stat != Ok) return; + expect_guid(expected, &raw, line, todo); } static void test_bufferrawformat(void* buff, int size, REFGUID expected, int line, BOOL todo) @@ -177,6 +183,9 @@ static void test_GdipImageGetFrameDimensionsCount(void) GpStatus stat; const REAL WIDTH = 10.0, HEIGHT = 20.0; UINT w; + GUID dimension = {0}; + UINT count; + ARGB color; bm = (GpBitmap*)0xdeadbeef; stat = GdipCreateBitmapFromScan0(WIDTH, HEIGHT, 0, PixelFormat24bppRGB,NULL, &bm); @@ -194,6 +203,26 @@ static void test_GdipImageGetFrameDimensionsCount(void) stat = GdipImageGetFrameDimensionsCount((GpImage*)bm,&w); expect(Ok, stat); expect(1, w); + + stat = GdipImageGetFrameDimensionsList((GpImage*)bm, &dimension, 1); + expect(Ok, stat); + expect_guid(&FrameDimensionPage, &dimension, __LINE__, TRUE); + + count = 12345; + stat = GdipImageGetFrameCount((GpImage*)bm, &dimension, &count); + todo_wine expect(Ok, stat); + todo_wine expect(1, count); + + GdipBitmapSetPixel(bm, 0, 0, 0xffffffff); + + stat = GdipImageSelectActiveFrame((GpImage*)bm, &dimension, 0); + expect(Ok, stat); + + /* SelectActiveFrame has no effect on image data of memory bitmaps */ + color = 0xdeadbeef; + GdipBitmapGetPixel(bm, 0, 0, &color); + expect(0xffffffff, color); + GdipDisposeImage((GpImage*)bm); } diff --git a/include/gdiplusimaging.h b/include/gdiplusimaging.h index 51a60ba..42a00cb 100644 --- a/include/gdiplusimaging.h +++ b/include/gdiplusimaging.h @@ -31,6 +31,10 @@ DEFINE_GUID(ImageFormatTIFF, 0xb96b3cb1, 0x728, 0x11d3, 0x9d, 0x7b, 0, 0, 0 DEFINE_GUID(ImageFormatEXIF, 0xb96b3cb2, 0x728, 0x11d3, 0x9d, 0x7b, 0, 0, 0xf8, 0x1e, 0xf3, 0x2e); DEFINE_GUID(ImageFormatIcon, 0xb96b3cb5, 0x728, 0x11d3, 0x9d, 0x7b, 0, 0, 0xf8, 0x1e, 0xf3, 0x2e); +DEFINE_GUID(FrameDimensionTime, 0x6aedbd6d, 0x3fb5, 0x418a, 0x83, 0xa6, 0x7f, 0x45, 0x22, 0x9d, 0xc8, 0x72); +DEFINE_GUID(FrameDimensionPage, 0x7462dc86, 0x6180, 0x4c7e, 0x8e, 0x3f, 0xee, 0x73, 0x33, 0xa7, 0xa4, 0x83); +DEFINE_GUID(FrameDimensionResolution, 0x84236f7b, 0x3bd3, 0x428f, 0x8d, 0xab, 0x4e, 0xa1, 0x43, 0x9c, 0xa3, 0x15); + enum ImageLockMode { ImageLockModeRead = 1,

1 0

Alexandre Julliard : user32: Pre-allocate the window procedure for the message class.
by Alexandre Julliard Dec. 18, 2009

Dec. 18, 2009

Module: wine Branch: master Commit: 6b0cdc192272094cf0ff783aef9176ba090bded6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b0cdc192272094cf0ff783ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 18 12:38:22 2009 +0100 user32: Pre-allocate the window procedure for the message class. --- dlls/user32/controls.h | 2 ++ dlls/user32/message.c | 8 ++++---- dlls/user32/winproc.c | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 6925f33..ba455ba 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -47,6 +47,7 @@ enum builtin_winprocs WINPROC_DESKTOP, WINPROC_ICONTITLE, WINPROC_MENU, + WINPROC_MESSAGE, NB_BUILTIN_WINPROCS, NB_BUILTIN_AW_WINPROCS = WINPROC_DESKTOP }; @@ -83,6 +84,7 @@ extern const struct builtin_class_descr STATIC_builtin_class DECLSPEC_HIDDEN; extern LRESULT WINAPI DesktopWndProc(HWND,UINT,WPARAM,LPARAM) DECLSPEC_HIDDEN; extern LRESULT WINAPI IconTitleWndProc(HWND,UINT,WPARAM,LPARAM) DECLSPEC_HIDDEN; extern LRESULT WINAPI PopupMenuWndProc(HWND,UINT,WPARAM,LPARAM) DECLSPEC_HIDDEN; +extern LRESULT WINAPI MessageWndProc(HWND,UINT,WPARAM,LPARAM) DECLSPEC_HIDDEN; /* Wow handlers */ diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 285a24c..b544a76 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -91,13 +91,13 @@ struct send_message_info /* Message class descriptor */ static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; -static LRESULT WINAPI message_winproc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ); + const struct builtin_class_descr MESSAGE_builtin_class = { messageW, /* name */ 0, /* style */ NULL, /* procA (winproc is Unicode only) */ - message_winproc, /* procW */ + BUILTIN_WINPROC(WINPROC_MESSAGE), /* procW */ 0, /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ @@ -333,11 +333,11 @@ static inline BOOL get_pending_wmchar( MSG *msg, UINT first, UINT last, BOOL rem /*********************************************************************** - * message_winproc + * MessageWndProc * * Window procedure for "Message" windows (HWND_MESSAGE parent). */ -static LRESULT WINAPI message_winproc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) +LRESULT WINAPI MessageWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) { if (message == WM_NCCREATE) return TRUE; return 0; /* all other messages are ignored */ diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 15920a1..7bdb91d 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -77,6 +77,7 @@ static WINDOWPROC winproc_array[MAX_WINPROCS] = { NULL, DesktopWndProc }, /* WINPROC_DESKTOP */ { NULL, IconTitleWndProc }, /* WINPROC_ICONTITLE */ { NULL, PopupMenuWndProc }, /* WINPROC_MENU */ + { NULL, MessageWndProc }, /* WINPROC_MESSAGE */ }; static UINT winproc_used = NB_BUILTIN_WINPROCS;

1 0

Hans Leidekker : msi: Propagate errors from IStorage_OpenStream again in db_get_raw_stream.
by Alexandre Julliard Dec. 18, 2009

Dec. 18, 2009

Module: wine Branch: master Commit: 839e487c842d328fe4fa7823a5f3f7d51c54ba42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=839e487c842d328fe4fa7823a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 18 11:03:03 2009 +0100 msi: Propagate errors from IStorage_OpenStream again in db_get_raw_stream. Fixes a regression introduced by ef522c5ef0aeb2563885ad0a70ffe3fa3f1489f5. --- dlls/msi/database.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 87fc113..b0966a2 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -167,7 +167,7 @@ UINT db_get_raw_stream( MSIDATABASE *db, LPCWSTR stname, IStream **stm ) list_add_tail( &db->streams, &stream->entry ); } - return ERROR_SUCCESS; + return SUCCEEDED(r) ? ERROR_SUCCESS : ERROR_FUNCTION_FAILED; } UINT read_raw_stream_data( MSIDATABASE *db, LPCWSTR stname,

1 0

Alexandre Julliard : user32: Simplify window procedure allocation for the builtin classes.
by Alexandre Julliard Dec. 18, 2009

Dec. 18, 2009

Module: wine Branch: master Commit: d081a7352c53b108da744370dc15b412957f28e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d081a7352c53b108da744370d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 18 12:39:13 2009 +0100 user32: Simplify window procedure allocation for the builtin classes. --- dlls/user32/button.c | 3 +-- dlls/user32/class.c | 2 +- dlls/user32/combo.c | 3 +-- dlls/user32/controls.h | 3 +-- dlls/user32/desktop.c | 3 +-- dlls/user32/dialog.c | 3 +-- dlls/user32/edit.c | 3 +-- dlls/user32/icontitle.c | 3 +-- dlls/user32/listbox.c | 6 ++---- dlls/user32/mdi.c | 3 +-- dlls/user32/menu.c | 3 +-- dlls/user32/message.c | 3 +-- dlls/user32/scroll.c | 3 +-- dlls/user32/static.c | 3 +-- 14 files changed, 15 insertions(+), 29 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 6e68785..cec92e0 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -162,8 +162,7 @@ const struct builtin_class_descr BUTTON_builtin_class = { buttonW, /* name */ CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW | CS_PARENTDC, /* style */ - NULL, /* procA */ - BUILTIN_WINPROC(WINPROC_BUTTON), /* procW */ + WINPROC_BUTTON, /* proc */ NB_EXTRA_BYTES, /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ diff --git a/dlls/user32/class.c b/dlls/user32/class.c index e8ca0e5..040f3c1 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -400,7 +400,7 @@ static void register_builtin( const struct builtin_class_descr *descr ) classPtr->hCursor = LoadCursorA( 0, (LPSTR)descr->cursor ); classPtr->hbrBackground = descr->brush; - classPtr->winproc = WINPROC_AllocProc( descr->procA, descr->procW ); + classPtr->winproc = BUILTIN_WINPROC( descr->proc ); release_class_ptr( classPtr ); } diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 948c6a7..1dd4f37 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -94,8 +94,7 @@ const struct builtin_class_descr COMBO_builtin_class = { comboboxW, /* name */ CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW, /* style */ - NULL, /* procA */ - BUILTIN_WINPROC(WINPROC_COMBO), /* procW */ + WINPROC_COMBO, /* proc */ sizeof(HEADCOMBO *), /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index ba455ba..f9a17e8 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -60,8 +60,7 @@ struct builtin_class_descr { LPCWSTR name; /* class name */ UINT style; /* class style */ - WNDPROC procA; /* ASCII window procedure */ - WNDPROC procW; /* Unicode window procedure */ + enum builtin_winprocs proc; INT extra; /* window extra bytes */ ULONG_PTR cursor; /* cursor id */ HBRUSH brush; /* brush or system color */ diff --git a/dlls/user32/desktop.c b/dlls/user32/desktop.c index e29d72c..df4ac70 100644 --- a/dlls/user32/desktop.c +++ b/dlls/user32/desktop.c @@ -46,8 +46,7 @@ const struct builtin_class_descr DESKTOP_builtin_class = { (LPCWSTR)DESKTOP_CLASS_ATOM, /* name */ CS_DBLCLKS, /* style */ - NULL, /* procA (winproc is Unicode only) */ - BUILTIN_WINPROC(WINPROC_DESKTOP), /* procW */ + WINPROC_DESKTOP, /* proc */ 0, /* extra */ IDC_ARROW, /* cursor */ (HBRUSH)(COLOR_BACKGROUND+1) /* brush */ diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 1309c09..a7040ea 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -97,8 +97,7 @@ const struct builtin_class_descr DIALOG_builtin_class = { (LPCWSTR)DIALOG_CLASS_ATOM, /* name */ CS_SAVEBITS | CS_DBLCLKS, /* style */ - NULL, /* procA */ - BUILTIN_WINPROC(WINPROC_DIALOG), /* procW */ + WINPROC_DIALOG, /* proc */ DLGWINDOWEXTRA, /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 3466002..4e86ede 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -4978,8 +4978,7 @@ const struct builtin_class_descr EDIT_builtin_class = { editW, /* name */ CS_DBLCLKS | CS_PARENTDC, /* style */ - NULL, /* procA */ - BUILTIN_WINPROC(WINPROC_EDIT), /* procW */ + WINPROC_EDIT, /* proc */ #ifdef __i386__ sizeof(EDITSTATE *) + sizeof(HLOCAL16), /* extra */ #else diff --git a/dlls/user32/icontitle.c b/dlls/user32/icontitle.c index b6f2c08..04f0c69 100644 --- a/dlls/user32/icontitle.c +++ b/dlls/user32/icontitle.c @@ -45,8 +45,7 @@ const struct builtin_class_descr ICONTITLE_builtin_class = { (LPCWSTR)ICONTITLE_CLASS_ATOM, /* name */ 0, /* style */ - NULL, /* procA (winproc is Unicode only) */ - BUILTIN_WINPROC(WINPROC_ICONTITLE), /* procW */ + WINPROC_ICONTITLE, /* proc */ 0, /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 4bc9664..03b894a 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -138,8 +138,7 @@ const struct builtin_class_descr LISTBOX_builtin_class = { listboxW, /* name */ CS_DBLCLKS /*| CS_PARENTDC*/, /* style */ - NULL, /* procA */ - BUILTIN_WINPROC(WINPROC_LISTBOX), /* procW */ + WINPROC_LISTBOX, /* proc */ sizeof(LB_DESCR *), /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ @@ -154,8 +153,7 @@ const struct builtin_class_descr COMBOLBOX_builtin_class = { combolboxW, /* name */ CS_DBLCLKS | CS_SAVEBITS, /* style */ - NULL, /* procA */ - BUILTIN_WINPROC(WINPROC_LISTBOX), /* procW */ + WINPROC_LISTBOX, /* proc */ sizeof(LB_DESCR *), /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index fcfbd27..991ba37 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -186,8 +186,7 @@ const struct builtin_class_descr MDICLIENT_builtin_class = { mdiclientW, /* name */ 0, /* style */ - NULL, /* procA */ - BUILTIN_WINPROC(WINPROC_MDICLIENT), /* procW */ + WINPROC_MDICLIENT, /* proc */ sizeof(MDICLIENTINFO), /* extra */ IDC_ARROW, /* cursor */ (HBRUSH)(COLOR_APPWORKSPACE+1) /* brush */ diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 4e03651..9205146 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -194,8 +194,7 @@ const struct builtin_class_descr MENU_builtin_class = { (LPCWSTR)POPUPMENU_CLASS_ATOM, /* name */ CS_DROPSHADOW | CS_SAVEBITS | CS_DBLCLKS, /* style */ - NULL, /* procA (winproc is Unicode only) */ - BUILTIN_WINPROC(WINPROC_MENU), /* procW */ + WINPROC_MENU, /* proc */ sizeof(HMENU), /* extra */ IDC_ARROW, /* cursor */ (HBRUSH)(COLOR_MENU+1) /* brush */ diff --git a/dlls/user32/message.c b/dlls/user32/message.c index b544a76..ffe7f76 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -96,8 +96,7 @@ const struct builtin_class_descr MESSAGE_builtin_class = { messageW, /* name */ 0, /* style */ - NULL, /* procA (winproc is Unicode only) */ - BUILTIN_WINPROC(WINPROC_MESSAGE), /* procW */ + WINPROC_MESSAGE, /* proc */ 0, /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 13b5eaf..6c34652 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -124,8 +124,7 @@ const struct builtin_class_descr SCROLL_builtin_class = { scrollbarW, /* name */ CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW | CS_PARENTDC, /* style */ - NULL, /* procA */ - BUILTIN_WINPROC(WINPROC_SCROLLBAR), /* procW */ + WINPROC_SCROLLBAR, /* proc */ sizeof(SCROLLBAR_INFO), /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ diff --git a/dlls/user32/static.c b/dlls/user32/static.c index 0f778bb..2ed3b75 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -102,8 +102,7 @@ const struct builtin_class_descr STATIC_builtin_class = { staticW, /* name */ CS_DBLCLKS | CS_PARENTDC, /* style */ - NULL, /* procA */ - BUILTIN_WINPROC(WINPROC_STATIC), /* procW */ + WINPROC_STATIC, /* proc */ STATIC_EXTRA_BYTES, /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */

1 0